refactored vuex modules

Author: briancaffey

kubernetes/frontend/deployment.yml

@@ -17,4 +17,4 @@ spec:
       containers:
         - name: frontend
           imagePullPolicy: IfNotPresent
-          image: frontend:6
+          image: frontend:fixed7

quasar/src/router/routes.js

@@ -1,5 +1,5 @@
-import store from "../store";
-import router from "../router";
+// import store from "../store";
+// import router from "../router";
 
 // for pages that should not be available to logged in users,
 // such as "Recover password" or a dedicated "Login" page
@@ -12,17 +12,17 @@ import router from "../router";
 //   next("/");
 // };
 
-const ifAuthenticated = (to, from, next) => {
-  if (store.getters.isAuthenticated) {
-    next();
-    return;
-  }
+// const ifAuthenticated = (to, from, next) => {
+//   if (store.getters.isAuthenticated) {
+//     next();
+//     return;
+//   }
 
-  store.commit("setNextLink", { nextLink: to.fullPath });
-  store.commit("toggleLoginMenu");
-  router.push("/");
-  return;
-};
+//   store.commit("setNextLink", { nextLink: to.fullPath });
+//   store.commit("toggleLoginMenu");
+//   router.push("/");
+//   return;
+// };
 
 const routes = [
   {
@@ -45,7 +45,7 @@ const routes = [
       },
       {
         path: "protected",
-        beforeEnter: ifAuthenticated,
+        // beforeEnter: ifAuthenticated,
         component: () => import("pages/Protected.vue")
       },
       {
@@ -62,17 +62,17 @@ const routes = [
       },
       {
         path: "examples/",
-        beforeEnter: ifAuthenticated,
+        // beforeEnter: ifAuthenticated,
         component: () => import("pages/Examples/index.vue"),
         children: [
           {
             path: "websockets",
-            beforeEnter: ifAuthenticated,
+            // beforeEnter: ifAuthenticated,
             component: () => import("pages/Examples/Websockets.vue")
           },
           {
             path: "redis",
-            beforeEnter: ifAuthenticated,
+            // beforeEnter: ifAuthenticated,
             component: () => import("pages/Examples/Redis.vue")
           }
         ]

quasar/src/store/auth.js quasar/src/store/auth/index.jsquasar/src/store/auth.js renamed to quasar/src/store/auth/index.js

@@ -6,9 +6,9 @@ export const AUTH_ERROR = "AUTH_ERROR";
 export const AUTH_LOGOUT = "AUTH_LOGOUT";
 export const AUTH_REFRESH = "AUTH_REFRESH";
 
-import apiCall from "../utils/api";
+import apiCall from "../../utils/api";
 import { Cookies } from "quasar";
-import { USER_REQUEST } from "./user.js";
+import { USER_REQUEST } from "../user";
 
 const state = {
   token: Cookies.get("user-token") || "",

quasar/src/store/index.js

@@ -1,8 +1,8 @@
 import Vue from "vue";
 import Vuex from "vuex";
 import ui from "./ui";
-import auth from "./auth.js";
-import user from "./user.js";
+import auth from "./auth";
+import user from "./user";
 import social from "./social";
 
 // import example from './module-example'
@@ -13,16 +13,18 @@ Vue.use(Vuex);
  * If not building with SSR mode, you can
  * directly export the Store instantiation
  */
+export default function(/* { ssrContext } */) {
+  const Store = new Vuex.Store({
+    modules: {
+      ui,
+      auth,
+      user,
+      social
+    },
 
-export default new Vuex.Store({
-  modules: {
-    ui,
-    auth,
-    user,
-    social
-  },
-
-  // enable strict mode (adds overhead!)
-  // for dev mode only
-  strict: process.env.DEV
-});
+    // enable strict mode (adds overhead!)
+    // for dev mode only
+    strict: process.env.DEV
+  });
+  return Store;
+}

quasar/src/store/social.js quasar/src/store/social/index.jsquasar/src/store/social.js renamed to quasar/src/store/social/index.js

@@ -1,5 +1,5 @@
 import buildURL from "axios/lib/helpers/buildURL";
-import oauth from "../utils/oauth";
+import oauth from "../../utils/oauth";
 
 const state = {
   oauth

quasar/src/store/user.js quasar/src/store/user/index.jsquasar/src/store/user.js renamed to quasar/src/store/user/index.js

@@ -5,8 +5,8 @@ export const USER_SUCCESS = "USER_SUCCESS";
 export const USER_ERROR = "USER_ERROR";
 
 import Vue from "vue";
-import { AUTH_LOGOUT } from "./auth";
-import apiCall from "../utils/api";
+import { AUTH_LOGOUT } from "../auth";
+import apiCall from "../../utils/api";
 
 const state = {
   status: "",