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

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/change-password.vue

@@ -1,15 +1,19 @@
 <template>
     <div class="relative">
         <section id="resetPasswordForm">
-            <h1 class="h2 h2--small" v-html="!form.successful ? 'Change password' : 'Success'" />
+            <h1
+                class="h2 h2--small"
+                v-html="!form.successful ? 'Change password' : 'Success'"
+            />
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
-                    <p class="AM-mt-2 AM-mb-0">
-                        Please complete the fields below to change your password.
+                    <p class="mt-2 mb-0">
+                        Please complete the fields below to change your
+                        password.
                     </p>
 
                     <el-input
-                        class="AM-mt-3"
+                        class="mt-3"
                         label="Current password"
                         placeholder="Enter your current password"
                         name="current_password"
@@ -21,7 +25,7 @@
                     />
                     <el-input
                         v-model="form.password"
-                        class="AM-mt-2 AM-mb-2"
+                        class="mt-2 mb-2"
                         label="New Password"
                         placeholder="Enter your new password"
                         name="password"
@@ -32,9 +36,13 @@
                         :password="true"
                     />
 
-                    <VPasswordValidation :password="form.password" @passwordValid="updatePasswordValidity" />
-                    <div class="flex AM-mt-3">
+                    <VPasswordValidation
+                        :password="form.password"
+                        @passwordValid="updatePasswordValidity"
+                    />
+                    <div class="flex mt-3">
                         <elButton
+                            native-type="submit"
                             class=""
                             type="primary"
                             :disabled="form.processing || !isPasswordValid"
@@ -54,12 +62,14 @@
                     </div>
                 </div>
                 <div v-else>
-                    <strong class="">Email: {{ $store.state.auth?.user?.email }}</strong>
+                    <strong class=""
+                        >Email: {{ $store.state.auth?.user?.email }}</strong
+                    >
                     <p v-text="`Your password has been updated.`" />
                     <elButton
-                        class=""
-                        type="secondary"
-                        @click="handleButton"
+                        tag="router-link"
+                        type="primary"
+                        :to="{ name: $store.state.auth.redirect }"
                     >
                         <span v-text="'Continue'" />
                     </elButton>
@@ -78,20 +88,17 @@ export default {
             form: new Form(
                 {
                     email: this.$store.state.auth.user?.email,
-                    password: '',
-                    current_password: ''
+                    password: "",
+                    current_password: "",
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             isPasswordValid: false,
         };
     },
 
     mounted() {
-
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
 
     methods: {
@@ -99,10 +106,10 @@ export default {
             this.loading = true;
 
             try {
-                await this.form.put('/user/password');
+                await this.form.put("/user/password");
                 await this.login();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
@@ -113,18 +120,15 @@ export default {
             try {
                 const res = await this.form.post("/login");
 
-                if(res['logged-in']){
-                    try{
-                        await this.$store.dispatch("logout", {
-                            // errors: this.$root.errors,
-                        });
-                    } catch(e){}
+                if (res["logged-in"]) {
+                    try {
+                        await this.$store.dispatch("logout");
+                    } catch (e) {}
 
                     await this.form.post("/login");
                 }
-
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
                 this.postLogin();
@@ -135,15 +139,11 @@ export default {
             this.isPasswordValid = isValid;
         },
         handleButton() {
-            this.$emit('close');
+            this.$emit("close");
         },
-        
-        async postLogin() {
-            this.$store.commit("setAuth", true);
 
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+        async postLogin() {
+            const { data: user } = await this.$store.dispatch("getUser");
         },
     },
 
@@ -154,9 +154,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>

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

@@ -22,17 +22,13 @@
 
 <script>
 export default {
-    mounted() {
-
-    },
+    mounted() {},
     data() {
         return {
-              logoName: process.env.HYDRATE_LOGO,
-        }
+            logoName: process.env.HYDRATE_LOGO,
+        };
     },
 
-    components: {
-        
-    },
+    components: {},
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/expired-reset.vue

@@ -1,15 +1,16 @@
 <template>
     <h1 class="h2 h2--small">Sorry, your password reset has expired</h1>
 
-    <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
+    <p class="mt-2 mb-0 color-highlight">
         <strong class="">Email: {{ form?.email }}</strong>
     </p>
-    <p class="AM-mt-0.5">
-        For security, password reset requests are only <strong>active for 1&nbsp;hour</strong>. If you still want to reset your password, please request a new password reset-link.</p>
+    <p class="mt-0.5">
+        For security, password reset requests are only
+        <strong>active for 1&nbsp;hour</strong>. If you still want to reset your
+        password, please request a new password reset-link.
+    </p>
 
-    <form class="form"
-        @submit.prevent="submit"
-    >
+    <form class="form" @submit.prevent="submit">
         <el-input
             class="hidden"
             v-model="form.email"
@@ -21,6 +22,7 @@
             required
         />
         <elButton
+            native-type="submit"
             type="primary"
             :disabled="form.processing"
             :loading="form.processing"
@@ -29,8 +31,8 @@
             Request new reset-link
         </elButton>
 
-        <p class="disclaimer AM-mt-3">
-            <router-link class="color-1 underline" :to="{ name: `${$store.state.auth.authBase}.login` }">
+        <p class="disclaimer mt-3">
+            <router-link class="color-1 underline" :to="{ name: 'auth.login' }">
                 Back to Sign in
             </router-link>
         </p>
@@ -42,15 +44,15 @@ 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: () => ({
         form: new Form(
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
     }),
 
@@ -60,17 +62,17 @@ export default {
                 await this.form.post("/forgot-password");
 
                 this.$router.push({
-                    name: `${this.$store.state.auth.authBase}.success-forgot`,
+                    name: "auth.success-forgot",
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },
 
-    mounted(){
+    mounted() {
         this.form.email = this.$route.query.email;
-    }
+    },
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/expired-verification.vue

@@ -2,15 +2,16 @@
     <h1 class="h2 h2--small">Verification link expired</h1>
 
     <form class="form" @submit.prevent="submit">
-        <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
+        <p class="mt-2 mb-0 color-highlight">
             <strong class="">Email: {{ form?.email }}</strong>
         </p>
-        <p class="AM-mt-0.5">
-            This email verification link has expired. Not to worry, we can email you a new one.
+        <p class="mt-0.5">
+            This email verification link has expired. Not to worry, we can email
+            you a new one.
         </p>
 
         <el-input
-            class="AM-mt-2 AM-mb-2.5 hidden"
+            class="mt-2 mb-2.5 hidden"
             v-model="form.email"
             label="Email address"
             name="email"
@@ -21,6 +22,7 @@
         />
 
         <elButton
+            native-type="submit"
             type="primary"
             :disabled="form.processing"
             :loading="form.processing"
@@ -30,29 +32,29 @@
         </elButton>
     </form>
 
-    <p class="disclaimer AM-mt-3">
+    <p class="disclaimer mt-3">
         Having trouble singing in?
-        <a :href="contact" class="underline">Contact us</a>
+        <a :href="$store.state.auth.contact" class="underline">Contact us</a>
     </p>
 </template>
 
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 
 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: () => ({
         form: new Form(
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
         notification: null,
-        contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
     }),
 
     methods: {
@@ -65,29 +67,28 @@ export default {
 
                 await this.form.post("/email/verification-notification");
 
-                this.$notify.success({
+                ElNotification.success({
                     message: "Email has been re-sent",
                     duration: 10000,
-                    class: 'el-notification--success el-notification--right-override'
+                    class: "el-notification--success el-notification--right-override",
                 });
             } catch (e) {
                 if (e.response && e.response.status === 429) {
-                    this.notification = this.$notify({
+                    this.notification = ElNotification({
                         type: "warning",
-                        message: 'Please allow 10 minutes before re-requesting',
+                        message: "Please allow 10 minutes before re-requesting",
                         duration: 0,
-                        class: 'el-notification--warning el-notification--right-override'
+                        class: "el-notification--warning el-notification--right-override",
                     });
                 } else if (e.response && e.response.status === 422) {
-                    this.notification = this.$notify({
+                    this.notification = ElNotification({
                         type: "error",
                         message: e.response.data.message,
                         duration: 0,
-                        class: 'el-notification--error el-notification--right-override'
+                        class: "el-notification--error el-notification--right-override",
                     });
-                }
-                else {
-                    this.$root.errors(e);
+                } else {
+                    console.log(e);
                 }
             }
         },

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/force-reset.vue

@@ -1,18 +1,29 @@
 <template>
     <div class="relative">
         <section id="resetPasswordForm">
-            <h1 class="h2 h2--small" v-html="!form.successful ? 'Welcome' : 'Success'" />
+            <h1
+                class="h2 h2--small"
+                v-html="!form.successful ? 'Welcome' : 'Success'"
+            />
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
-                    <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
-                        <strong class="">Email: {{ $store.state?.auth?.user?.email }}</strong>
+                    <p class="mt-2 mb-0 color-highlight">
+                        <strong class=""
+                            >Email:
+                            {{ $store.state?.auth?.user?.email }}</strong
+                        >
                     </p>
-                    <p class="AM-mt-0.5">
-                        <strong>Hello {{ $store.state?.auth?.user?.name }}</strong>, and welcome to {{ $store.state.auth.platformName }}. To maintain security, anyone signing in with a one-time-password must <strong>create a new password</strong> the first time they access the {{ $store.state.auth.platformName }} portal.
+                    <p class="mt-0.5">
+                        <strong
+                            >Hello {{ $store.state?.auth?.user?.name }}</strong
+                        >, and welcome to {{ $root.appName }}. To maintain
+                        security, anyone signing in with a one-time-password
+                        must <strong>create a new password</strong> the first
+                        time they access the {{ $root.appName }} portal.
                     </p>
                     <el-input
                         v-model="form.password"
-                        class="AM-mt-2"
+                        class="mt-2"
                         label="New Password"
                         placeholder="Enter new password"
                         name="password"
@@ -22,10 +33,14 @@
                         required
                     />
 
-                    <VPasswordValidation :password="form.password" @passwordValid="updatePasswordValidity" />
+                    <VPasswordValidation
+                        :password="form.password"
+                        @passwordValid="updatePasswordValidity"
+                    />
 
                     <elButton
-                        class="AM-mt-3"
+                        native-type="submit"
+                        class="mt-3"
                         type="primary"
                         :disabled="form.processing || !isPasswordValid"
                         :loading="form.processing"
@@ -35,13 +50,16 @@
                     </elButton>
                 </div>
                 <div v-else>
-                    <strong class="">Email: {{ $store.state.auth?.user?.email }}</strong>
+                    <strong class=""
+                        >Email: {{ $store.state.auth?.user?.email }}</strong
+                    >
                     <p v-text="`Your password has been updated.`" />
                     <elButton
+                        tag="router-link"
                         type="primary"
-                        @click="handleButton"
+                        :to="{ name: $store.state.auth.redirect }"
                     >
-                        Continue
+                        <span v-text="'Continue'" />
                     </elButton>
                 </div>
             </form>
@@ -58,20 +76,16 @@ export default {
             form: new Form(
                 {
                     email: this.$store.state.auth.user?.email,
-                    password: '',
-                    otp: true,
+                    password: "",
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             isPasswordValid: false,
         };
     },
 
     mounted() {
-
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
 
     methods: {
@@ -79,10 +93,10 @@ export default {
             this.loading = true;
 
             try {
-                await this.form.put('/user/password');
+                await this.form.put("/user/password");
                 await this.login();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
@@ -93,38 +107,28 @@ export default {
             try {
                 const res = await this.form.post("/login");
 
-                if(res['logged-in']){
-                    try{
-                        await this.$store.dispatch("logout", {
-                            errors: this.$root.errors,
-                        });
-                    } catch(e){}
+                if (res["logged-in"]) {
+                    try {
+                        await this.$store.dispatch("logout");
+                    } catch (e) {}
 
                     await this.form.post("/login");
                 }
-
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
                 await this.postLogin();
             }
         },
-        
-        async postLogin() {
-            this.$store.commit("setAuth", true);
 
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+        async postLogin() {
+            const { data: user } = await this.$store.dispatch("getUser");
         },
 
         updatePasswordValidity(isValid) {
             this.isPasswordValid = isValid;
         },
-        handleButton() {
-            this.$emit('close');
-        }
     },
 
     metaInfo() {
@@ -134,9 +138,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>

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

@@ -3,13 +3,14 @@
         <section id="forgotPasswordForm">
             <h1 class="h2 h2--small">Reset password</h1>
             <form class="form" @submit.prevent="submit">
-                <p class="AM-mt-2">
-                    Enter the email address associated with your account to continue.
+                <p class="mt-2">
+                    Enter the email address associated with your account to
+                    continue.
                 </p>
 
                 <el-input
                     v-if="!form.successful"
-                    class="AM-mt-3 AM-mb-3"
+                    class="mt-3 mb-3"
                     v-model="form.email"
                     label="Email "
                     placeholder="Enter email address"
@@ -20,18 +21,21 @@
                 />
 
                 <elButton
+                    native-type="submit"
                     type="primary"
-                    :disabled="form.processing || !form.email || form.email?.length < 5"
+                    :disabled="
+                        form.processing || !form.email || form.email?.length < 5
+                    "
                     :loading="form.processing"
                     @click="onSubmit"
                 >
                     Continue
                 </elButton>
 
-                <p class="disclaimer AM-mt-3">
+                <p class="disclaimer mt-3">
                     <router-link
                         class="color-1 underline"
-                        :to="{ name: `${$store.state.auth.authBase}.login` }"
+                        :to="{ name: 'auth.login' }"
                     >
                         Back to Sign in
                     </router-link>
@@ -46,8 +50,8 @@ 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: () => ({
@@ -55,7 +59,7 @@ export default {
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
     }),
 
@@ -65,11 +69,11 @@ export default {
                 await this.form.post("/forgot-password");
 
                 this.$router.push({
-                    name: `${this.$store.state.auth.authBase}.success-forgot`,
+                    name: "auth.success-forgot",
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },