v3.13.0

jemu75 · Apr 23, 2021 · 96bfe68 · 96bfe68
1 parent a240ddd
commit 96bfe68
Show file tree

Hide file tree

Showing 49 changed files with 3,065 additions and 1,232 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.12.3",
+  "version": "3.13.0",
   "private": true,
   "author": "jemu75",
   "scripts": {

diff --git a/public/cfg/config.json b/public/cfg/config.json
@@ -6,8 +6,7 @@
   },
   "options": {
     "maxChartPoints": 100,
-    "logBuffer": 500,
-    "debugLevel": 5
+    "logBuffer": 500
   },
   "theme": {
     "dark": true,

diff --git a/src/App.vue b/src/App.vue
@@ -9,25 +9,24 @@
 
     <v-app-bar
       app
-      :color="appBarColor"
+      :color="appBar.color"
       dark
       clipped-left
     >
-      <div class="hidden-lg-and-up">
+      <div v-if="!appBar.drawer">
         <v-app-bar-nav-icon
-          @click.stop="drawer = !drawer"
+          @click.stop="appBar.drawer = !appBar.drawer"
         />
       </div>
-      <div class="hidden-md-and-down text-h5">
-        {{ app.options.clock }}
+      <div
+        v-if="appBar.drawer"
+        class="text-h5"
+      >
+        {{ appBar.clock }}
       </div>
       <v-spacer />
-      <div class="hidden-md-and-down text-h5">
-        {{ app.options.date }}
-      </div>
-
-      <div class="hidden-lg-and-up text-h5">
-        {{ app.data.header }}
+      <div class="text-h5">
+        {{ appBar.header }}
       </div>
       <v-spacer />
       <v-btn
@@ -47,8 +46,8 @@
       </v-btn>
 
       <v-btn
-        class="hidden-lg-and-up text-h5"
-        v-if="app.options.homeBtn"
+        class="text-h5"
+        v-if="app.options.homeBtn && !appBar.drawer"
         icon
         @click="goTo()"
       >
@@ -72,7 +71,7 @@
     </v-app-bar>
 
     <v-navigation-drawer
-      v-model="drawer"
+      v-model="appBar.drawer"
       app
       color="secondary"
       :dark="this.$vuetify.theme.dark"
@@ -112,7 +111,7 @@
             :key="group.title"
             class="ma-2"
             link
-            :to="group.route"
+            :to="'/devices/' + group.route"
           >
             {{ group.title }}
           </v-chip>
@@ -131,7 +130,7 @@
             :key="room.title"
             class="ma-2"
             link
-            :to="room.route"
+            :to="'/devices/' + room.route"
           >
             {{ room.title }}
           </v-chip>
@@ -199,22 +198,23 @@
       Broadcaster
     },
     data: () => ({
-      drawer: null,
-      appBarColor: 'primary',
+      appBar: {
+        color: 'primary',
+        drawer: null,
+        clock: null,
+        header: null
+      },
       app: {
         options: {
           loading: false,
           reloadBtn: false,
-          clock: null,
-          date: null
         },
         session: {
           connect: false,
         },
         data: {
           roomList: [],
           groupList: [],
-          header: ''
         }
       },
       version: 'v' + require('../package.json').version,
@@ -247,21 +247,12 @@
       this.app.session = this.$fhem.app.session;
       this.app.options = this.$fhem.app.options;
       this.app.data = this.$fhem.app.data;
-      this.$fhem.on('connect', () => this.loadRoutes())
-      this.$fhem.init();
-      this.loadRoutes();
+      this.appBar = this.$fhem.app.appBar;
 
       if(this.app.options.debugMode) this.appBarColor = 'pink darken-4'
     },
 
     methods: {
-      loadRoutes() {
-        if(!this.app.session.connect) return;
-
-        this.$fhem.getRoutes('room');
-        this.$fhem.getRoutes('group');
-      },
-
       reload() {
         location.reload(true);
       },