From 4db975f0a149f444960747ce6f68ee8e3331606b Mon Sep 17 00:00:00 2001
From: Thomas Ballmann <mail@i-2xdream.de>
Date: Sun, 29 Nov 2020 10:53:51 +0100
Subject: [PATCH] #42 remove legacy code

---
 app/src/layouts/default.vue | 109 ++++++++++++++++++------------------
 app/src/router/index.js     |   2 -
 2 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/app/src/layouts/default.vue b/app/src/layouts/default.vue
index 885121d..84504fa 100644
--- a/app/src/layouts/default.vue
+++ b/app/src/layouts/default.vue
@@ -7,10 +7,7 @@
       class="grey darken-3"
       dark
       app
-      :temporary="temporary"
       mobile-breakpoint="sm"
-      _mini-variant-width="150"
-      _mini-variant
       :clipped="clipped"
     >
       <template
@@ -34,28 +31,20 @@
           </template>
         </v-img>
       </template>
-      <v-sheet
-        v-if="0"
-        rounded="lg"
-      >
-        <v-img
-          :aspect-ratio="16/9"
-          src="/api/device/screen"
-        >
-          <template #placeholder>
-            <v-row
-              class="fill-height ma-0 grey"
-              align="center"
-              justify="center"
-            >
-              <v-progress-circular
-                indeterminate
-                color="grey lighten-5"
-              />
-            </v-row>
-          </template>
-        </v-img>
-      </v-sheet>
+      <template #append>
+        <v-list class="py-0">
+          <v-divider />
+          <v-list-item
+            link
+            to="/setup"
+          >
+            <v-list-item-content class="text-center">
+              <v-icon>$support</v-icon>
+              <v-list-item-title>Assistant</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+        </v-list>
+      </template>
 
       <v-list nav>
         <v-list-item
@@ -65,14 +54,14 @@
           link
         >
           <v-list-item-content
-            v-if="1"
+            v-if="0"
             class="text-center"
           >
             <v-icon>{{ page.icon }}</v-icon>
             <v-list-item-title>{{ page.label }}</v-list-item-title>
           </v-list-item-content>
 
-          <template v-if="0">
+          <template v-if="1">
             <v-list-item-icon>
               <v-icon>{{ page.icon }}</v-icon>
             </v-list-item-icon>
@@ -83,6 +72,7 @@
           </template>
         </v-list-item>
 
+        <!--
         <v-divider />
         <v-list-item
           link
@@ -93,6 +83,7 @@
             <v-list-item-title>Assistant</v-list-item-title>
           </v-list-item-content>
         </v-list-item>
+        -->
       </v-list>
     </v-navigation-drawer>
 
@@ -124,30 +115,30 @@
       <div>{{ settings.device.name }}</div>
       <v-spacer />
 
-      <v-progress-circular
-        :rotate="-90"
-        :value="40"
-        class="mx-3 hidden-xs-only"
-        size="40"
-      >
-        <v-icon>$playlist</v-icon>
-      </v-progress-circular>
-
-      <v-progress-circular
-        :rotate="-90"
-        :value="40"
-        class="mx-3 hidden-xs-only"
-        size="40"
-      >
+      <div class="hidden-xs-only mx-3">
+        <v-icon>$slideshow</v-icon>
+        <v-progress-linear
+          :value="40"
+          size="40"
+          color="white"
+        />
+      </div>
+      <div class="hidden-xs-only mx-3">
         <v-icon>$storage</v-icon>
-      </v-progress-circular>
+        <v-progress-linear
+          :value="72"
+          color="white"
+        />
+      </div>
 
       <template v-if="stats.wifi.connected">
         <v-btn
           icon
           class="hidden-xs-only"
         >
-          <v-icon>{{ stats.wifi.rssi | wifiIcon(0) }}</v-icon>
+          <v-icon>
+            {{ stats.wifi.rssi | wifiIcon(0) }}
+          </v-icon>
         </v-btn>
         <span class="hidden-xs-only">{{ new Date(stats.device.time * 1000).toLocaleString(undefined, {month: 'numeric', day: 'numeric', year: 'numeric', hour: '2-digit', minute: '2-digit'}) }}</span>
       </template>
@@ -170,12 +161,25 @@
 
     <v-main class="grey lighten-3">
       <v-container>
-        <v-sheet
-          min-height="70vh"
-          rounded="lg"
+        <v-col
+          class="_md _offset-md"
+          cols="12"
+          sm="8"
+          offset-sm="2"
+          md="8"
+          offset-md="2"
+          lg="6"
+          offset-lg="3"
         >
-          <router-view />
-        </v-sheet>
+          <v-sheet
+            _min-width="1vh"
+            _max-width="50vh"
+            min-height="70vh"
+            rounded="lg"
+          >
+            <router-view />
+          </v-sheet>
+        </v-col>
       </v-container>
     </v-main>
   </div>
@@ -193,7 +197,7 @@
       pages: [
         {
           label: 'Dashboard',
-          icon: '$lock',
+          icon: '$dashboard',
           to: '/',
         },
         {
@@ -203,7 +207,7 @@
         },
         {
           label: 'Playlist',
-          icon: '$playlist',
+          icon: '$slideshow',
           to: '/playlist',
         },
         {
@@ -225,9 +229,6 @@
     }),
     computed: {
       ...mapState(['stats', 'settings']),
-      temporary () {
-        return this.smAndDown
-      },
     },
   }
 </script>
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 854d5ea..dec16f2 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 const Dashboard = () => import('../views/Dashboard')
-const Settings = () => import('../views/Settings')
 const Device = () => import('../views/Device')
 const Playlist = () => import('../views/Playlist')
 const Wifi = () => import('../views/Wifi')
@@ -22,7 +21,6 @@ Vue.use(VueRouter)
 export default new VueRouter({
     routes: [
       { path: '/', component: Dashboard },
-      { path: '/settings', component: Settings, meta: { transitionName: 'slide' } },
       { path: '/device', component: Device, meta: { transitionName: 'slide' } },
       { path: '/playlist', component: Playlist, meta: { transitionName: 'slide' } },
       { path: '/wifi', component: Wifi, meta: { transitionName: 'slide' } },