From b391fa4c91aa8782c614590b9d05846272c4fc2a Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 29 Dec 2019 10:56:27 +0100
Subject: [PATCH] Move settings and api-key page to menu

---
 app/dashboard/templates/dashboard/api_key.html |  2 ++
 app/dashboard/templates/dashboard/setting.html |  4 +++-
 templates/header.html                          |  8 --------
 templates/menu.html                            | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html
index c459ba25..594a79fa 100644
--- a/app/dashboard/templates/dashboard/api_key.html
+++ b/app/dashboard/templates/dashboard/api_key.html
@@ -4,6 +4,8 @@
   API Key
 {% endblock %}
 
+{% set active_page = "api_key" %}
+
 {% block head %}
 {% endblock %}
 
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 421857ec..ff1a7ecb 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -1,7 +1,9 @@
 {% extends 'default.html' %}
 
+{% set active_page = "setting" %}
+
 {% block title %}
-  Setting
+  Settings
 {% endblock %}
 
 {% block default_content %}
diff --git a/templates/header.html b/templates/header.html
index fa7e8cc1..8e745052 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -42,14 +42,6 @@
           </a>
 
           <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-            <a class="dropdown-item" href="{{ url_for('dashboard.setting') }}">
-              <i class="dropdown-icon fe fe-settings"></i> Settings
-            </a>
-
-            <a class="dropdown-item" href="{{ url_for('dashboard.api_key') }}">
-              <i class="dropdown-icon fe fe-chrome"></i> API Key
-            </a>
-
             <a class="dropdown-item" href="{{ url_for('dashboard.custom_domain') }}">
               <i class="dropdown-icon fe fe-server"></i> Custom Domains
               <span class="badge badge-success">Premium</span>
diff --git a/templates/menu.html b/templates/menu.html
index de8ab269..bd75a15b 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -7,6 +7,21 @@
     </a>
   </li>
 
+  <li class="nav-item">
+    <a href="{{ url_for('dashboard.setting') }}"
+       class="nav-link {{ 'active' if active_page == 'setting' }}">
+      <i class="fe fe-settings"></i>
+      Settings
+    </a>
+  </li>
+
+  <li class="nav-item">
+    <a href="{{ url_for('dashboard.api_key') }}"
+       class="nav-link {{ 'active' if active_page == 'api_key' }}">
+      <i class="fe fe-chrome"></i> API Key
+    </a>
+  </li>
+
   <!--
   <li class="nav-item">
     <a href="{{ url_for('discover.index') }}"