From 7202800ecedc6bbd3a4a4b7632e0ca3d3bb9b45b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 27 May 2019 18:59:39 +0000
Subject: [PATCH]

---
 ayanova/src/api/aboutinfo.js   |  6 +-----
 ayanova/src/views/About.vue    | 33 +++++++++++++++++++++------------
 ayanova/src/views/login.vue    |  7 ++++++-
 ayanova/src/views/notfound.vue |  4 +++-
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/ayanova/src/api/aboutinfo.js b/ayanova/src/api/aboutinfo.js
index 0abb9a51..b532f3a6 100644
--- a/ayanova/src/api/aboutinfo.js
+++ b/ayanova/src/api/aboutinfo.js
@@ -1,10 +1,7 @@
-import store from "../store";
-
 export default {
   version: "8.0.0-alpha.5",
   copyright:
     "Copyright © 1999-2019, Ground Zero Tech-Works Inc. All Rights Reserved",
-  userName: store.state.userName,
   browser: {
     platform: window.navigator.platform,
     userAgent: window.navigator.userAgent,
@@ -19,6 +16,5 @@ export default {
     height: window.screen.height,
     devicePixelRatio: window.devicePixelRatio,
     pixelDepth: window.screen.pixelDepth
-  },
-  clientLog: store.state.logArray
+  }
 };
diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index 74d263b5..3d3a9f4b 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -22,7 +22,9 @@
         </div>
         <div>
           <span class="ml-4 body-1">{{ this.$gzlocale.get("User") }}:</span>
-          <span class="body-2">{{ clientInfo.userName }}</span>
+          <span class="body-2"
+            >{{ clientInfo.userName }}{{ this.$store.state.userName }}</span
+          >
         </div>
 
         <v-divider class="mt-4"></v-divider>
@@ -67,9 +69,9 @@
           <span class="ml-4 body-1"
             >{{ this.$gzlocale.get("RegisteredUser") }}:</span
           >
-          <span class="body-2">
-            {{ serverInfo.license.license.licensedTo }}
-          </span>
+          <span class="body-2">{{
+            serverInfo.license.license.licensedTo
+          }}</span>
         </div>
         <div>
           <span class="ml-4 body-1"
@@ -87,17 +89,17 @@
           <span class="ml-4 body-1"
             >{{ this.$gzlocale.get("LicenseExpiration") }}:</span
           >
-          <span class="body-2">
-            {{ serverInfo.license.license.licenseExpiration }}
-          </span>
+          <span class="body-2">{{
+            serverInfo.license.license.licenseExpiration
+          }}</span>
         </div>
         <div>
           <span class="ml-4 body-1"
             >{{ this.$gzlocale.get("SupportedUntil") }}:</span
           >
-          <span class="body-2">
-            {{ serverInfo.license.license.maintenanceExpiration }}
-          </span>
+          <span class="body-2">{{
+            serverInfo.license.license.maintenanceExpiration
+          }}</span>
         </div>
 
         <v-divider class="mt-4"></v-divider>
@@ -137,7 +139,9 @@ function clickHandler(menuItem) {
         var text = element.innerText || element.textContent;
 
         var logText = "";
-        this.$_.forEach(aboutInfo.clientLog, function appendLogItem(value) {
+        this.$_.forEach(m.vm.$store.state.logArray, function appendLogItem(
+          value
+        ) {
           logText += value + "\n";
         });
 
@@ -208,7 +212,6 @@ export default {
       });
   },
   created() {
-    this.clientInfo = aboutInfo;
     this.$gzapi
       .get("ServerInfo")
       .then(response => {
@@ -221,6 +224,12 @@ export default {
   beforeDestroy() {
     // this.$gzevent.$off("menu-click", clickHandler);
   },
+  mounted() {
+    this.clientInfo = {};
+    this.clientInfo = aboutInfo;
+    //eslint-disable-next-line
+    //console.log("MOUNTED");
+  },
   data() {
     return {
       serverInfo: { license: { license: {} } },
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 628b6c76..e5df6cc3 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -2,7 +2,12 @@
   <v-container fluid>
     <v-layout row wrap>
       <v-flex xs12 class="hidden-sm-and-down text-xs-center" mt-5 ml-5 pl-5>
-        <v-img :src="require('../assets/logo.svg')" class="my-3" contain height="200"></v-img>
+        <v-img
+          :src="require('../assets/logo.svg')"
+          class="my-3"
+          contain
+          height="200"
+        ></v-img>
       </v-flex>
       <v-flex xs12 class="hidden-md-and-up text-xs-center">
         <v-img :src="require('../assets/logo.svg')" contain height="64"></v-img>
diff --git a/ayanova/src/views/notfound.vue b/ayanova/src/views/notfound.vue
index 356ee333..247aa5a2 100644
--- a/ayanova/src/views/notfound.vue
+++ b/ayanova/src/views/notfound.vue
@@ -4,7 +4,9 @@
       <v-flex xs12>
         <div class="text-xs-center">
           <v-icon color="red" size="100">fa-dragon</v-icon>
-          <div class="headline">{{"404 - " + this.$gzlocale.get("ErrorAPI2010")}}</div>
+          <div class="headline">
+            {{ "404 - " + this.$gzlocale.get("ErrorAPI2010") }}
+          </div>
         </div>
       </v-flex>
     </v-layout>