From 9340564e7230b0aeae0ee45c384c02346e40ea97 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 16 Dec 2019 23:23:40 +0000
Subject: [PATCH]

---
 ayanova/src/App.vue       | 93 +++++++++++++++++++++++++++------------
 ayanova/src/api/locale.js |  8 +++-
 2 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index c41269e7..bd593e43 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -3,38 +3,76 @@
     <gznotify ref="gznotify"></gznotify>
     <gzconfirm ref="gzconfirm"></gzconfirm>
     <!-- <gztest ref="gztest"></gztest> -->
-    <v-navigation-drawer v-if="isAuthenticated" v-model="drawer" app>
-      <v-list dense>
-        <template v-for="item in navItems">
-          <!-- TOP LEVEL can be holders or actions -->
-          <template v-if="!item.route">
+    <v-navigation-drawer
+      v-if="isAuthenticated"
+      v-model="drawer"
+      app
+      width="300"
+    >
+      <v-card class="mx-auto" width="300">
+        <v-list dense>
+          <template v-for="item in navItems">
+            <!-- TOP LEVEL can be holders or actions -->
+
             <!-- TOP LEVEL HOLDER -->
-            <v-list-group
-              :prepend-icon="'fa-' + item.icon"
-              value="true"
-              :key="item.key"
-            >
-              <template v-slot:activator>
-                <v-list-item-title>{{ item.title }}</v-list-item-title>
-              </template>
-              <template v-for="subitem in item.navItems">
-                <template v-if="!subitem.route">
-                  <!-- SECOND LEVEL HOLDER CONTAINS ONLY ACTIONS -->
-                  {{ subitem.title }}
+            <template v-if="!item.route">
+              <v-list-group
+                :prepend-icon="'fa-' + item.icon"
+                value="true"
+                :key="item.key"
+              >
+                <template v-slot:activator>
+                  <!--group activator -->
+                  <v-list-item-title>{{ item.title }}</v-list-item-title>
                 </template>
-                <template v-else>
-                  <!-- SECOND LEVEL ACTION -->
-                </template>
-              </template>
-            </v-list-group>
-          </template>
+                <!-- TOP LEVEL HOLDER SUBITEMS -->
+
+                <template v-for="subitem in item.navItems">
+                  <template v-if="!subitem.route">
+                    <!-- SECOND LEVEL HOLDER -->
+                    <v-list-group
+                      no-action
+                      sub-group
+                      value="true"
+                      :key="subitem.key"
+                    >
+                      <!-- Second level activator -->
+                      <template v-slot:activator>
+                        <v-list-item-content>
+                          <v-list-item-title>{{
+                            subitem.title
+                          }}</v-list-item-title>
+                        </v-list-item-content>
+                      </template>
+
+                      <v-list-item
+                        v-for="subsub in subitem.navItems"
+                        :key="subsub.key"
+                        :to="subsub.route"
+                        link
+                      >
+                        <v-list-item-title
+                          v-text="subsub.title"
+                        ></v-list-item-title>
+                        <v-list-item-icon>
+                          <v-icon>{{ "fa-" + subsub.icon }}</v-icon>
+                        </v-list-item-icon>
+                      </v-list-item>
+                    </v-list-group>
+                  </template>
+                  <template v-else>
+                    <!-- SECOND LEVEL ACTION -->
+                  </template>
+                </template>
+              </v-list-group>
+              <!-- END OF TOP LEVEL HOLDER -->
+            </template>
 
-          <template v-else>
             <!-- TOP LEVEL ACTION -->
+            <template v-else> </template>
           </template>
-        </template>
 
-        <!-- <v-list-item
+          <!-- <v-list-item
           v-for="item in navItems"
           :key="item.route"
           :to="item.route"
@@ -46,7 +84,8 @@
             <v-list-item-title>{{ item.title }}</v-list-item-title>
           </v-list-item-content>
         </v-list-item> -->
-      </v-list>
+        </v-list>
+      </v-card>
     </v-navigation-drawer>
     <v-app-bar
       v-if="isAuthenticated"
diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js
index dbddded3..235c2581 100644
--- a/ayanova/src/api/locale.js
+++ b/ayanova/src/api/locale.js
@@ -48,8 +48,14 @@ export default {
   coreKeys: [
     //main nav options
     "Home",
+    "DashboardDashboard",
+    "Schedule",
+    "Locale",
+    "SetLoginPassword",
+    "NotifySubscriptionList",
+    "UserPreferences",
     "Service",
-    "Dispatch",
+    //"Dispatch",
     "Inventory",
     "Accounting",
     "Administration",