@fishawack/lab-velocity 1.11.1 → 2.0.0-beta.10

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/login.vue

@@ -1,10 +1,10 @@
 <template>
     <h1 class="h2 h2--small">Sign in</h1>
-    <p class="AM-mb-3 AM-mt-2">Enter your password to continue.</p>
+    <p class="mb-3 mt-2">Enter your password to continue.</p>
 
     <form @submit.prevent="submit" class="form" id="memberLoginForm">
         <el-input
-            class="AM-mb-3"
+            class="mb-3"
             label="Email"
             placeholder="Enter your email address"
             name="email"
@@ -15,7 +15,7 @@
         />
 
         <el-input
-            class="AM-mb-3"
+            class="mb-3"
             label="Password"
             placeholder="Enter your password"
             name="password"
@@ -37,20 +37,28 @@
         </div>
 
         <el-button
+            native-type="submit"
             type="primary"
-            :disabled="loading || (form.email?.length < 5 || form.password?.length < 8 )"
+            :disabled="
+                loading || form.email?.length < 5 || form.password?.length < 8
+            "
             @click="onSubmit"
         >
             Continue
         </el-button>
 
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             Having trouble signing in?
-            <router-link class="color-1 underline" :to="{ name: `${$store.state.auth.authBase}.forgot` }">
+            <router-link
+                class="color-1 underline"
+                :to="{ name: 'auth.forgot' }"
+            >
                 Reset password
             </router-link>
             or
-            <a :href="contact" class="underline">Contact us</a>
+            <a :href="$store.state.auth.contact" class="underline"
+                >Contact us</a
+            >
         </p>
     </form>
 </template>
@@ -60,25 +68,24 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../../components/form/basic.vue").default,
+        elButton: require("../../../components/basic/Button.vue").default,
     },
     data() {
         return {
             form: new Form(
                 {
-                    email: this.$route.query.email ?? '',
-                    password: '',
+                    email: this.$route.query.email ?? "",
+                    password: "",
                     device_name: "Mobile device",
                     remember: true,
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             loading: false,
-            contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
         };
     },
-    
+
     methods: {
         async onSubmit() {
             if (this.loading) return;
@@ -90,9 +97,7 @@ export default {
 
                 if (res["logged-in"]) {
                     try {
-                        await this.$store.dispatch("logout", {
-                            errors: this.$root.errors,
-                        });
+                        await this.$store.dispatch("logout");
                     } catch (e) {}
 
                     await this.form.post("/login");
@@ -100,18 +105,14 @@ export default {
 
                 await this.postLogin();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
         },
 
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+            const { data: user } = await this.$store.dispatch("getUser");
 
             if (window.dataLayer) {
                 window.dataLayer.push({ event: "login", user });
@@ -120,9 +121,9 @@ export default {
             if (this.$store.state.auth.intended) {
                 this.$router.push(this.$store.state.auth.intended);
             } else {
-                this.$router.push({ name: this.$store.state.auth.postLoginRedirect });
-                // this.$router.push({ name: "members" });
-                // Problem here
+                this.$router.push({
+                    name: this.$store.state.auth.redirect,
+                });
             }
 
             this.$store.commit("setIntended", null);

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/logincallback.vue

@@ -1,29 +1,22 @@
 <template>
     <!-- Set Spinner -->
-     <div class="mx-auto">
+    <div class="mx-auto">
         <VLoader class="mx-auto" />
-     </div>
+    </div>
 </template>
 
 <script>
-
 export default {
     components: {
-        VLoader: require("../../layout/Loader.vue").default
+        VLoader: require("../../../components/layout/Loader.vue").default,
     },
     data() {
-        return {
-
-        }
+        return {};
     },
-    
+
     methods: {
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+            const { data: user } = await this.$store.dispatch("getUser");
 
             if (window.dataLayer) {
                 window.dataLayer.push({ event: "login", user });

package/_Build/vue/modules/AuthModule/routes/loginheadless.vue

@@ -0,0 +1,21 @@
+<template>
+    <!-- Set Spinner -->
+    <div class="mx-auto">
+        <VLoader class="mx-auto" />
+        <p v-text="`Logging in...`" />
+    </div>
+</template>
+
+<script>
+export default {
+    mounted() {
+        const { authenticated } = this.$store.getters;
+
+        if (!authenticated) {
+            window.location = `${process.env.APP_URL}/hydrate/sso/redirect`;
+        } else {
+            window.location = `${process.env.APP_URL}/`;
+        }
+    },
+};
+</script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/loginsso.vue

@@ -1,11 +1,11 @@
 <template>
     <template v-if="stage === 1">
         <h1 class="h2 h2--small">Sign in</h1>
-        <p class="AM-mb-3 AM-mt-2">Enter your email address to continue. </p>
+        <p class="mb-3 mt-2">Enter your email address to continue.</p>
 
         <form @submit.prevent="submit" class="form" id="memberLoginForm">
             <el-input
-                class="AM-mb-3"
+                class="mb-3"
                 label="Email"
                 placeholder="Enter your email address"
                 name="email"
@@ -27,23 +27,29 @@
             </div>
 
             <el-button
+                native-type="submit"
                 type="primary"
-                :disabled="loading || (!isValidEmail(form.email))"
+                :disabled="loading || !isValidEmail(form.email)"
                 @click="onSubmit"
             >
                 Continue
             </el-button>
 
-            <p class="disclaimer AM-mt-3">
+            <p class="disclaimer mt-3">
                 Having trouble signing in?
-                <a :href="contact" class="underline">Contact us</a>
+                <a :href="$store.state.auth.contact" class="underline"
+                    >Contact us</a
+                >
             </p>
         </form>
     </template>
     <template v-else>
         <h1 class="h2 h2--small">Sign in with SSO</h1>
-        <p class="AM-mt-2">Redirecting you to your organisation’s Single Sign-On (SSO) gateway <span class="AM-color-highlight">in {{ countdown }} seconds...</span></p>
-        <p class="disclaimer AM-mt-3">
+        <p class="mt-2">
+            Redirecting you to your organisation’s Single Sign-On (SSO) gateway
+            <span class="color-highlight">in {{ countdown }} seconds...</span>
+        </p>
+        <p class="disclaimer mt-3">
             <a :href="redirect_url" class="underline">Go to SSO gateway</a>
         </p>
     </template>
@@ -54,27 +60,26 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../../components/form/basic.vue").default,
+        elButton: require("../../../components/basic/Button.vue").default,
     },
     data() {
         return {
             form: new Form(
                 {
-                    email: '',
+                    email: "",
                     device_name: "Mobile device",
                     remember: true,
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             countdown: 3,
             loading: false,
             redirect_url: null,
             stage: 1,
-            contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
         };
     },
-    
+
     methods: {
         async onSubmit() {
             if (this.loading) return;
@@ -82,46 +87,46 @@ export default {
             this.loading = true;
 
             try {
-                const res = await this.form.post(`/sso`);
-                if(res['redirect_url']) {
-                    this.redirect_url = res['redirect_url'];
+                const res = await this.form.post(`/hydrate/sso/check`);
+                if (res["redirect_url"]) {
+                    this.redirect_url = res["redirect_url"];
                     this.setRedirect();
                 } else {
-                    this.$router.push({name: `${this.$store.state.auth.authBase}.logincreds`,query: {email: this.form.email}});
+                    this.$router.push({
+                        name: "auth.logincreds",
+                        query: { email: this.form.email },
+                    });
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
         },
-        setRedirect(){
+        setRedirect() {
             this.stage = 2;
             let vue = this;
-            setTimeout(function() {
+            setTimeout(function () {
                 vue.setCountdown();
-            },1000);
+            }, 1000);
         },
         setCountdown() {
             this.countdown--;
-            if(this.countdown === 0) {
+            if (this.countdown === 0) {
                 window.location = this.redirect_url;
             } else {
                 let vue = this;
-                setTimeout(function() {
+                setTimeout(function () {
                     vue.setCountdown();
-                },1000);
+                }, 1000);
             }
         },
         isValidEmail(email) {
             const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
             return emailRegex.test(email);
-        }
-
+        },
     },
 
-    mounted() {
-        
-    },
+    mounted() {},
 };
 </script>

package/_Build/vue/modules/AuthModule/routes/logout.vue

@@ -0,0 +1,19 @@
+<script>
+export default {
+    metaInfo() {
+        return {
+            title: "Logout",
+        };
+    },
+
+    async mounted() {
+        try {
+            await this.$store.dispatch("logout");
+        } catch {
+            /* empty */
+        } finally {
+            this.$router.push({ name: "auth.login" });
+        }
+    },
+};
+</script>

package/_Build/vue/modules/AuthModule/routes/logoutheadless.vue

@@ -0,0 +1,25 @@
+<template>
+    <p v-text="done ? 'Logged out' : 'Logging out...'" />
+</template>
+
+<script>
+export default {
+    metaInfo() {
+        return {
+            title: "Logout",
+        };
+    },
+
+    data: () => ({
+        done: false,
+    }),
+
+    async mounted() {
+        try {
+            await this.$store.dispatch("logout");
+        } finally {
+            this.done = true;
+        }
+    },
+};
+</script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/register.vue

@@ -1,10 +1,16 @@
 <template>
     <h1 class="h2 h2--small">Register</h1>
-    <p class="AM-mb-3 AM-mt-2">Please enter your personal details to complete your registration.</p>
-
-    <form @submit.prevent="submit" :class="form.errors && form.errors.any() ? 'form error' : 'form'" id="memberLoginForm">
+    <p class="mb-3 mt-2">
+        Please enter your personal details to complete your registration.
+    </p>
+
+    <form
+        @submit.prevent="submit"
+        :class="form.errors && form.errors.any() ? 'form error' : 'form'"
+        id="memberLoginForm"
+    >
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Full name"
             placeholder="Enter your full name"
             name="name"
@@ -12,9 +18,9 @@
             v-model="form.name"
             :error="form.errors"
         />
-        
+
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Email"
             placeholder="Enter your email address"
             name="email"
@@ -25,7 +31,7 @@
         />
 
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Password"
             name="password"
             placeholder="Create a unique password"
@@ -36,7 +42,10 @@
             :error="form.errors"
         />
 
-        <VPasswordValidation :password="form.password" @passwordValid="updatePasswordValidity" />
+        <VPasswordValidation
+            :password="form.password"
+            @passwordValid="updatePasswordValidity"
+        />
 
         <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
         <div style="position: absolute; left: -5000px" aria-hidden="true">
@@ -50,40 +59,48 @@
         </div>
 
         <elButton
+            native-type="submit"
             type="primary"
-            :disabled="loading || (form.name?.length < 1 || form.email?.length < 5 || !isPasswordValid)"
+            :disabled="
+                loading ||
+                form.name?.length < 1 ||
+                form.email?.length < 5 ||
+                !isPasswordValid
+            "
             @click="onSubmit"
         >
             Register
         </elButton>
 
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             Having trouble registering?
-            <a :href="contact" class="underline">Contact us</a>
+            <a :href="$store.state.auth.contact" class="underline"
+                >Contact us</a
+            >
         </p>
     </form>
 </template>
 
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 
 export default {
     data() {
         return {
             form: new Form(
                 {
-                    name: '',
-                    email: '',
-                    password: '',
+                    name: "",
+                    email: "",
+                    password: "",
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             loading: false,
             isPasswordValid: false,
-            contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
         };
     },
-    
+
     methods: {
         async onSubmit() {
             if (this.loading) return;
@@ -95,39 +112,34 @@ export default {
 
                 if (res["logged-in"]) {
                     try {
-                        await this.$store.dispatch("logout", {
-                            errors: this.$root.errors,
-                        });
+                        await this.$store.dispatch("logout");
                     } catch (e) {}
 
                     await this.form.post("/register");
-
                 }
-                if(res['redirect']) {
+                if (res["redirect"]) {
                     // Redirect here
-                    this.$router.push({ name: `${this.$store.state.auth.authBase}.login`, query: {company:res['company']} });
-                    this.$notify.error({
+                    this.$router.push({
+                        name: `auth.login`,
+                        query: { company: res["company"] },
+                    });
+                    ElNotification.error({
                         title: "Domain is SSO enabled",
-                        message:"Sign in with your company email address",
+                        message: "Sign in with your company email address",
                         duration: 10000,
                     });
-                } else  {
+                } else {
                     await this.postLogin();
                 }
-                
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
         },
 
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+            const { data: user } = await this.$store.dispatch("getUser");
 
             if (window.dataLayer) {
                 window.dataLayer.push({ event: "login", user });
@@ -136,7 +148,9 @@ export default {
             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` });
+                this.$router.push({
+                    name: `auth.verify`,
+                });
                 // Problem Here
             }
 
@@ -148,9 +162,10 @@ export default {
     },
 
     components: {
-        VPasswordValidation: require("./../components/VPasswordValidation.vue").default,
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        VPasswordValidation: require("./../components/VPasswordValidation.vue")
+            .default,
+        elInput: require("../../../components/form/basic.vue").default,
+        elButton: require("../../../components/basic/Button.vue").default,
     },
 };
 </script>