From 1046cd9d4dbdee67582d5e92fa0d6df8c635d05e Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Sun, 14 Jun 2020 11:10:21 +0000
Subject: [PATCH] alert when refresh needed on frontend. remove unnecessary
 logout page

---
 quasar.conf.js               |  5 ----
 src/router/routes.js         | 10 +-------
 src/store/index.js           | 28 +++++++++++++++++++++
 src/views/Dashboard.vue      | 47 +++++++++++++++++++++---------------
 src/views/Login.vue          |  2 +-
 src/views/Logout.vue         | 14 -----------
 src/views/SessionExpired.vue | 10 +-------
 7 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 src/views/Logout.vue

diff --git a/quasar.conf.js b/quasar.conf.js
index f6c0e09..28db7f0 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -88,15 +88,10 @@ module.exports = function () {
       plugins: [
         'Dialog',
         'Loading',
-        'LoadingBar',
         'Meta',
         'Notify'
       ],
       config: {
-        loadingBar: {
-          color: "red",
-          size: "4px"
-        },
         notify: {
           position: "top",
           timeout: 2000,
diff --git a/src/router/routes.js b/src/router/routes.js
index 9b0f70b..9dcb4ba 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -39,18 +39,10 @@ const routes = [
       requiresVisitor: true
     }
   },
-  {
-    path: "/logout",
-    name: "Logout",
-    component: () => import("@/views/Logout")
-  },
   {
     path: "/expired",
     name: "SessionExpired",
-    component: () => import("@/views/SessionExpired"),
-    meta: {
-      requireAuth: true
-    }
+    component: () => import("@/views/SessionExpired")
   },
   { path: "*", component: () => import("@/views/NotFound") }
 ]
diff --git a/src/store/index.js b/src/store/index.js
index 0c92168..2290120 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -31,6 +31,7 @@ export default function () {
       installedSoftware: [],
       scripts: [],
       toggleScriptManager: false,
+      needrefresh: false,
     },
     getters: {
       loggedIn(state) {
@@ -70,6 +71,9 @@ export default function () {
       scripts(state) {
         return state.scripts;
       },
+      needRefresh(state) {
+        return state.needrefresh;
+      }
     },
     mutations: {
       TOGGLE_SCRIPT_MANAGER(state, action) {
@@ -121,6 +125,9 @@ export default function () {
       SET_SCRIPTS(state, scripts) {
         state.scripts = scripts;
       },
+      SET_REFRESH_NEEDED(state, action) {
+        state.needrefresh = action;
+      }
     },
     actions: {
       loadAutomatedTasks(context, pk) {
@@ -228,6 +235,27 @@ export default function () {
           //commit("destroySubTable");
         });
       },
+      checkVer(context) {
+        axios.get("/core/version/").then(r => {
+          const version = r.data;
+
+          if (localStorage.getItem("rmmver")) {
+            if (localStorage.getItem("rmmver") === version) {
+              return;
+            } else {
+              localStorage.setItem("rmmver", "0.0.1");
+              context.commit("SET_REFRESH_NEEDED", true);
+            }
+          } else {
+            localStorage.setItem("rmmver", version);
+            return;
+          }
+        })
+      },
+      reload() {
+        localStorage.removeItem("rmmver");
+        location.reload();
+      },
       retrieveToken(context, credentials) {
         return new Promise((resolve, reject) => {
           axios
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index fd2c6ed..28aab4b 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -1,6 +1,10 @@
 <template>
   <q-layout view="hHh lpR fFf">
     <q-header elevated class="bg-grey-9 text-white">
+      <q-banner v-if="needRefresh" inline-actions class="bg-red text-white text-center">
+        You are viewing an outdated version of this page.
+        <q-btn color="dark" icon="refresh" label="Refresh" @click="reload" />
+      </q-banner>
       <q-toolbar>
         <q-btn dense flat push @click="refreshEntireSite" icon="refresh" />
         <q-toolbar-title>Tactical RMM</q-toolbar-title>
@@ -9,7 +13,7 @@
 
         <q-btn-dropdown flat no-caps stretch :label="user">
           <q-list>
-            <q-item to="/logout" exact>
+            <q-item to="/expired" exact>
               <q-item-section>
                 <q-item-label>Logout</q-item-label>
               </q-item-section>
@@ -44,14 +48,10 @@
                   <div class="row">
                     <q-icon :name="props.node.icon" :color="props.node.color" class="q-mr-sm" />
                     <span>{{ props.node.label }}</span>
-                    
+
                     <q-menu context-menu>
                       <q-list dense style="min-width: 200px">
-                        <q-item 
-                          clickable 
-                          v-close-popup 
-                          @click="showEditModal(props.node)"
-                        >
+                        <q-item clickable v-close-popup @click="showEditModal(props.node)">
                           <q-item-section side>
                             <q-icon name="edit" />
                           </q-item-section>
@@ -70,11 +70,7 @@
 
                         <q-separator></q-separator>
 
-                        <q-item 
-                          clickable 
-                          v-close-popup 
-                          @click="showPolicyAdd(props.node)"
-                        >
+                        <q-item clickable v-close-popup @click="showPolicyAdd(props.node)">
                           <q-item-section side>
                             <q-icon name="policy" />
                           </q-item-section>
@@ -142,7 +138,7 @@
     </q-dialog>
     <!-- add policy modal -->
     <q-dialog v-model="showPolicyAddModal">
-      <PolicyAdd 
+      <PolicyAdd
         @close="showPolicyAddModal = false"
         :type="policyAddType"
         :pk="parseInt(policyAddPk)"
@@ -158,9 +154,9 @@ import FileBar from "@/components/FileBar";
 import AgentTable from "@/components/AgentTable";
 import SubTableTabs from "@/components/SubTableTabs";
 import AlertsIcon from "@/components/AlertsIcon";
-import PolicyAdd from "@/components/automation/modals/PolicyAdd"
-import EditSites from "@/components/modals/clients/EditSites"
-import EditClients from "@/components/modals/clients/EditClients"
+import PolicyAdd from "@/components/automation/modals/PolicyAdd";
+import EditSites from "@/components/modals/clients/EditSites";
+import EditClients from "@/components/modals/clients/EditClients";
 
 export default {
   components: {
@@ -187,6 +183,7 @@ export default {
       clientActive: "",
       siteActive: "",
       frame: [],
+      poll: null,
       columns: [
         {
           name: "smsalert",
@@ -343,6 +340,14 @@ export default {
       } else {
         this.showEditSiteModal = true;
       }
+    },
+    reload() {
+      this.$store.dispatch("reload");
+    },
+    livePoll() {
+      this.poll = setInterval(() => {
+        this.$store.dispatch("checkVer");
+      }, 60 * 5 * 1000);
     }
   },
   computed: {
@@ -352,7 +357,7 @@ export default {
       treeReady: state => state.treeReady,
       clients: state => state.clients
     }),
-    ...mapGetters(["selectedAgentPk"]),
+    ...mapGetters(["selectedAgentPk", "needRefresh"]),
     allClientsActive() {
       return this.selectedTree === "" ? true : false;
     },
@@ -372,12 +377,14 @@ export default {
   created() {
     this.getTree();
     this.$store.dispatch("getUpdatedSites");
+    this.$store.dispatch("checkVer");
   },
   mounted() {
-    if (localStorage.getItem("reloaded")) {
-      localStorage.removeItem("reloaded");
-    }
     this.loadFrame(this.activeNode);
+    this.livePoll();
+  },
+  beforeDestroy() {
+    clearInterval(this.poll);
   }
 };
 </script>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 70155c9..2938b3e 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -28,7 +28,7 @@
               />
 
               <div>
-                <q-btn label="Login" type="submit" color="primary" />
+                <q-btn label="Login" type="submit" color="primary" class="full-width" />
               </div>
             </q-form>
           </q-card-section>
diff --git a/src/views/Logout.vue b/src/views/Logout.vue
deleted file mode 100644
index 7860f75..0000000
--- a/src/views/Logout.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script>
-export default {
-  name: "Logout",
-  mounted() {
-    this.$store.dispatch("destroyToken").then(response => {
-      this.$router.push({ name: "Login" });
-    });
-  }
-};
-</script>
\ No newline at end of file
diff --git a/src/views/SessionExpired.vue b/src/views/SessionExpired.vue
index d8b2478..53426f8 100644
--- a/src/views/SessionExpired.vue
+++ b/src/views/SessionExpired.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fixed-center text-center">
     <p class="text-faded">Your session has expired</p>
-    <q-btn color="secondary" style="width:200px;" @click="$router.push('/')">Login</q-btn>
+    <q-btn color="secondary" style="width:200px;" to="/login">Login</q-btn>
   </div>
 </template>
 
@@ -10,14 +10,6 @@ export default {
   name: "SessionExpired",
   created() {
     this.$store.dispatch("destroyToken");
-  },
-  mounted() {
-    if (localStorage.getItem("reloaded")) {
-      localStorage.removeItem("reloaded");
-    } else {
-      localStorage.setItem("reloaded", "1");
-      location.reload();
-    }
   }
 };
 </script>
\ No newline at end of file