@fishawack/lab-velocity 1.2.1 → 1.2.2

package/AuthModule/js/AuthAxios.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 
-export default function setAxiosDefaults() {
+function setAxiosDefaults() {
     axios.defaults.baseURL = process.env.APP_URL;
     axios.defaults.withCredentials = true;
     axios.defaults.withXSRFToken = true;
@@ -22,4 +22,6 @@ axios.interceptors.response.use(null, (error) => {
     }
 
     return Promise.reject(error);
-});
+});
+
+setAxiosDefaults();

package/AuthModule/js/AuthRoutes.js

@@ -100,5 +100,57 @@ export function authRoutes(node, store, nested = 'auth') {
             footer: false,
             fullpageModal: true,
         },
+    },
+    {
+        path: "/admin",
+        redirect: () => {
+            const { authenticated } = store.state.auth;
+
+            if (!authenticated) {
+                store.commit("setAuth", true);
+                window.location = `${process.env.APP_URL}/login`;
+            } else {
+                window.location = `${process.env.APP_URL}/`;
+            }
+        },
+        name: "admin",
+        meta: {
+            guest: true,
+        },
     }]
+}
+
+export function configureRoutes(router) {
+
+    router.beforeEach((to, from, next) => {
+        const { authenticated, user, authBase, redirect } = store.state.auth;
+
+        const admin = to.path.includes("/admin");
+
+        if (to.query.verified) {
+            next({ name: `${authBase}.success-verify` });
+        } else if (authenticated) {
+            if (admin && !user?.admin) {
+                next({ name: redirect });
+            } else if (to.name === "login" || to.name === `${authBase}.login`) {
+                next({ name: redirect });
+            } else if (
+                !user?.email_verified_at &&
+                to.matched.some((d) => d.meta.guest) !== true
+            ) {
+                next({ name: `${authBase}.verify` });
+            } else {
+                next();
+            }
+        } else {
+            if (to.matched.some((d) => d.meta.guest) === true) {
+                next();
+            } else if (admin) {
+                next({ name: "login" });
+            } else {
+                next({ name: `${authBase}.login` });
+            }
+        }
+    });
+
 }

package/AuthModule/js/AuthStore.js

@@ -1,64 +1,58 @@
 "use strict";
 import axios from "axios";
-import { createStore } from "vuex";
-import VuexPersistedState from 'vuex-persistedstate';
 
-export function initAuthStore(store) {
+const store = {
+    state() {
+        return {
+            authBase : process.env.HYDRATE_ROUTE ?? 'auth',
+            authenticated : false,
+            intended: null,
+            user: null,
+            redirect: process.env.HYDRATE_REDIRECT ?? 'index'
+        }
+    },
 
-    store.registerModule('auth',{
-        state() {
-            return {
-                authBase : process.env.HYDRATE_ROUTE ?? 'auth',
-                authenticated : false,
-                intended: null,
-                user: null,
-                redirect: process.env.HYDRATE_REDIRECT ?? 'index'
+    mutations: {
+        setAuth(state, value) {
+            state.authenticated = value;
+
+            if (!value) {
+                this.commit("setUser", null);
+            }
+        },
+        setUser(state, value) {
+            state.user = value;
+
+            if(window.dataLayer){
+                window.dataLayer.push({ event: "logic", user: value });
             }
         },
+        setIntended(state, value) {
+            state.intended = value;
+        },
+    },
 
-        mutations: {
-            setAuth(state, value) {
-                state.authenticated = value;
-    
-                if (!value) {
-                    this.commit("setUser", null);
-                }
-            },
-            setUser(state, value) {
-                console.log("we are setting the user");
-                console.log(value);
-                state.user = value;
-    
-                if(window.dataLayer){
-                    window.dataLayer.push({ event: "logic", user: value });
-                }
-            },
-            setIntended(state, value) {
-                state.intended = value;
-            },
+    actions: {
+        getUser({ commit }, { errors, query = "" }) {
+            return axios
+                .get(`/api/user/self${query}`, {
+                    params: {
+                        include: "company"
+                    }
+                })
+                .then((res) => {
+                    commit("setUser", res.data.data);
+                    return res.data.data;
+                })
+                .catch(errors);
         },
 
-        actions: {
-            getUser({ commit }, { errors, query = "" }) {
-                return axios
-                    .get(`/api/user/self${query}`, {
-                        params: {
-                            include: "company"
-                        }
-                    })
-                    .then((res) => {
-                        commit("setUser", res.data.data);
-                        return res.data.data;
-                    })
-                    .catch(errors);
-            },
-    
-            logout({ commit }, { errors }) {
-                commit("setAuth", false);
-                commit("setUser", null);
-    
-                return axios.post("/logout");
-            },
+        logout({ commit }, { errors }) {
+            commit("setAuth", false);
+            commit("setUser", null);
+
+            return axios.post("/logout");
         },
-    });
-}
+    },
+};
+export default store;

package/AuthModule/routes/force-reset.vue

@@ -61,7 +61,7 @@ export default {
         return {
             form: new Form(
                 {
-                    email: this.$store.state.user?.email,
+                    email: this.$store.state.auth.user?.email,
                     password: '',
                 },
                 { resetOnSuccess: false }

package/AuthModule/routes/login.vue

@@ -117,8 +117,8 @@ export default {
                 window.dataLayer.push({ event: "login", user });
             }
 
-            if (this.$store.state.intended) {
-                this.$router.push(this.$store.state.intended);
+            if (this.$store.state.auth.intended) {
+                this.$router.push(this.$store.state.auth.intended);
             } else {
                 this.$router.push({ name: "members" });
                 // Problem here

package/AuthModule/routes/logincallback.vue

@@ -29,11 +29,10 @@ export default {
                 window.dataLayer.push({ event: "login", user });
             }
 
-            if (this.$store.state.intended) {
-                this.$router.push(this.$store.state.intended);
+            if (this.$store.state.auth.intended) {
+                this.$router.push(this.$store.state.auth.intended);
             } else {
-                this.$router.push({ name: "members" });
-                // Problem Here
+                this.$router.push({ name: this.$store.state.auth.redirect });
             }
 
             this.$store.commit("setIntended", null);

package/AuthModule/routes/register.vue

@@ -129,8 +129,8 @@ export default {
                 window.dataLayer.push({ event: "login", user });
             }
 
-            if (this.$store.state.intended) {
-                this.$router.push(this.$store.state.intended);
+            if (this.$store.state.auth.intended) {
+                this.$router.push(this.$store.state.auth.intended);
             } else {
                 this.$router.push({ name: `${this.$store.state.auth.authBase}.verify` });
                 // Problem Here

package/modules/_AuthModule.scss

@@ -6,7 +6,7 @@
     background-color: black;
     height: 100vh;
     width: 100%;
-    background: url('../media/content/images/hero-login-large.jpg') center top no-repeat;
+    background: url('../media/content/images/hero-auth-background-desktop.jpg') center top no-repeat;
     background-size: cover;
     z-index: 10;
 
@@ -14,6 +14,12 @@
         width: 13.3rem;
         z-index: 99;
     }
+    @include breakpoint (max-width $tabletMax) {
+        background: url('../media/content/images/hero-auth-background-tablet.jpg') center top no-repeat;
+    }
+    @include breakpoint (max-width $mobileMax) {
+        background: url('../media/content/images/hero-auth-background-mobile.jpg') center top no-repeat;
+    }
 }
 
 .AuthModule__form {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-velocity",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Avalere Health branded style system",
   "scripts": {
     "setup": "npm ci || npm i && npm run content",