user-store: more fixes 2

Signed-off-by: Roman <ixrock@gmail.com>

src/renderer/_vue/components/WhatsNewPage.vue

@@ -30,6 +30,8 @@
 import marked from 'marked'
 import {readFileSync} from 'fs'
 import { getStaticPath } from "../../../common/register-static"
+import { userStore } from "../../../common/user-store"
+import { tracker } from "../../../common/tracker"
 
 export default {
   name: 'WhatsNewPage',
@@ -46,7 +48,11 @@ export default {
   },
   methods: {
     toLanding: async function() {
-      await this.$store.dispatch("updateLastSeenAppVersion")
+      if(userStore.hasNewAppVersion) {
+        userStore.saveLastSeenAppVersion();
+        tracker.event("app", "whats-new-seen")
+      }
+      // await this.$store.dispatch("updateLastSeenAppVersion")
       this.$router.push({
         name: "landing-page",
       }).catch(err => {})

src/renderer/_vue/index.js

@@ -9,6 +9,8 @@ import BootstrapVue from 'bootstrap-vue'
 import App from './App'
 import router from './router'
 import store from './store'
+import { userStore } from "../../common/user-store"
+import { when } from "mobx"
 
 const promiseIpc = new PromiseIpc({maxTimeoutMs: 6000});
 
@@ -27,17 +29,15 @@ Vue.mixin({
 })
 
 // any initialization we want to do for app state
-setTimeout(() => {
-  store.dispatch('init', ).catch((error) => {
-    console.error(error)
-  }).finally(() => {
-    /* eslint-disable no-new */
-    console.log("start vue")
-    new Vue({
-      components: { App },
-      store,
-      router,
-      template: '<App/>'
-    }).$mount('#app')
-  })
-}, 0)
+setTimeout(async () => {
+  await when(() => userStore.isReady);
+
+  await store.dispatch('init')
+  console.log("start vue")
+  new Vue({
+    components: { App },
+    store,
+    router,
+    template: '<App/>'
+  }).$mount('#app')
+})

src/renderer/_vue/router/routeguard/index.js

@@ -1,23 +1,7 @@
-export function auth ( to, from, store ) {
-  if(!store.getters.isLoggedIn){
-    console.log("router: guard: auth: activated");
-    return {
-      path: '/login'
-    }
-  }
-}
+import { userStore } from "../../../../common/user-store"
 
-export function eula ( to, from, store ) {
-  if(!store.getters.isEulaAccepted){
-    console.log("router: guard: eula: activated");
-    return {
-      path: '/accept-eula'
-    }
-  }
-}
-
-export function whatsNew( to, from, store ) {
-  if(store.getters.showWhatsNew){
+export function whatsNew() {
+  if(userStore.hasNewAppVersion){
     console.log("router: guard: whatsNew: activated");
     return {
       path: '/whats-new'