@fishawack/lab-velocity 2.0.0-beta.6 → 2.0.0-beta.60

package/_Build/vue/modules/AuthModule/routes/change-password.vue

@@ -7,13 +7,13 @@
             />
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
-                    <p class="AM-mt-2 AM-mb-0">
+                    <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"
@@ -25,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"
@@ -36,11 +36,11 @@
                         :password="true"
                     />
 
-                    <VPasswordValidation
+                    <VelPasswordValidation
                         :password="form.password"
                         @passwordValid="updatePasswordValidity"
                     />
-                    <div class="flex AM-mt-3">
+                    <div class="flex mt-3">
                         <elButton
                             native-type="submit"
                             class=""
@@ -66,7 +66,11 @@
                         >Email: {{ $store.state.auth?.user?.email }}</strong
                     >
                     <p v-text="`Your password has been updated.`" />
-                    <elButton class="" type="secondary" @click="handleButton">
+                    <elButton
+                        tag="router-link"
+                        type="primary"
+                        :to="{ name: $store.state.auth.redirect }"
+                    >
                         <span v-text="'Continue'" />
                     </elButton>
                 </div>
@@ -77,8 +81,17 @@
 
 <script>
 import Form from "form-backend-validation";
+import { guestRequest } from "../js/guest-request";
 
 export default {
+    components: {
+        VelPasswordValidation:
+            require("../../../components/layout/PasswordValidation.vue")
+                .default,
+        elInput: require("../../../components/form/basic.vue").default,
+        elButton: require("../../../components/basic/Button.vue").default,
+    },
+
     data() {
         return {
             form: new Form(
@@ -94,9 +107,7 @@ export default {
     },
 
     mounted() {
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
 
     methods: {
@@ -107,7 +118,7 @@ export default {
                 await this.form.put("/user/password");
                 await this.login();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
@@ -116,19 +127,13 @@ export default {
             this.loading = true;
 
             try {
-                const res = await this.form.post("/login");
-
-                if (res["logged-in"]) {
-                    try {
-                        await this.$store.dispatch("logout", {
-                            // errors: this.$root.errors,
-                        });
-                    } catch (e) {}
-
-                    await this.form.post("/login");
-                }
+                await guestRequest({
+                    form: this.form,
+                    url: "/login",
+                    store: this.$store,
+                });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
                 this.postLogin();
@@ -143,9 +148,7 @@ export default {
         },
 
         async postLogin() {
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
-            });
+            const { data: user } = await this.$store.dispatch("getUser");
         },
     },
 
@@ -154,12 +157,5 @@ export default {
             title: "Reset Password",
         };
     },
-
-    components: {
-        VPasswordValidation: require("./../components/VPasswordValidation.vue")
-            .default,
-        elInput: require("../../../components/form/basic.vue").default,
-        elButton: require("../../../components/basic/Button.vue").default,
-    },
 };
 </script>

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

@@ -5,7 +5,7 @@
                 <router-link to="/" class="logo" aria-label="Go to home page">
                     <GSvg
                         class="AuthModule__logo"
-                        :name="logoName"
+                        :name="$store.state.auth.logo"
                         embed
                         asis
                         role="presentation"
@@ -21,14 +21,5 @@
 </template>
 
 <script>
-export default {
-    mounted() {},
-    data() {
-        return {
-            logoName: process.env.HYDRATE_LOGO,
-        };
-    },
-
-    components: {},
-};
+export default {};
 </script>

package/_Build/vue/modules/AuthModule/routes/expired-reset.vue

@@ -1,10 +1,10 @@
 <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">
+    <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.
@@ -31,7 +31,7 @@
             Request new reset-link
         </elButton>
 
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             <router-link class="color-1 underline" :to="{ name: 'auth.login' }">
                 Back to Sign in
             </router-link>
@@ -66,7 +66,7 @@ export default {
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_Build/vue/modules/AuthModule/routes/expired-verification.vue

@@ -2,16 +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">
+        <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"
@@ -32,7 +32,7 @@
         </elButton>
     </form>
 
-    <p class="disclaimer AM-mt-3">
+    <p class="disclaimer mt-3">
         Having trouble singing in?
         <a :href="$store.state.auth.contact" class="underline">Contact us</a>
     </p>
@@ -40,6 +40,7 @@
 
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 
 export default {
     components: {
@@ -64,30 +65,30 @@ export default {
                     this.notification = null;
                 }
 
-                await this.form.post("/email/verification-notification");
+                await this.form.post("/email/resend-verification");
 
-                this.$notify.success({
+                ElNotification.success({
                     message: "Email has been re-sent",
                     duration: 10000,
                     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",
                         duration: 0,
                         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",
                     });
                 } else {
-                    this.$root.errors(e);
+                    console.log(e);
                 }
             }
         },

package/_Build/vue/modules/AuthModule/routes/force-reset.vue

@@ -1,21 +1,14 @@
 <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="'Welcome'" />
             <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
-                        >
+                <div>
+                    <p class="mt-2 mb-0 color-highlight">
+                        <strong class="">Email: {{ email }}</strong>
                     </p>
-                    <p class="AM-mt-0.5">
-                        <strong
-                            >Hello {{ $store.state?.auth?.user?.name }}</strong
+                    <p class="mt-0.5">
+                        <strong>Hello {{ 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
@@ -23,7 +16,7 @@
                     </p>
                     <el-input
                         v-model="form.password"
-                        class="AM-mt-2"
+                        class="mt-2"
                         label="New Password"
                         placeholder="Enter new password"
                         name="password"
@@ -33,31 +26,22 @@
                         required
                     />
 
-                    <VPasswordValidation
+                    <VelPasswordValidation
                         :password="form.password"
                         @passwordValid="updatePasswordValidity"
                     />
 
                     <elButton
                         native-type="submit"
-                        class="AM-mt-3"
+                        class="mt-3"
                         type="primary"
-                        :disabled="form.processing || !isPasswordValid"
-                        :loading="form.processing"
+                        :disabled="loading || !isPasswordValid"
+                        :loading="loading"
                         @click="onSubmit"
                     >
                         <span v-text="'Update password'" />
                     </elButton>
                 </div>
-                <div v-else>
-                    <strong class=""
-                        >Email: {{ $store.state.auth?.user?.email }}</strong
-                    >
-                    <p v-text="`Your password has been updated.`" />
-                    <elButton type="primary" @click="handleButton">
-                        Continue
-                    </elButton>
-                </div>
             </form>
         </section>
     </div>
@@ -65,8 +49,18 @@
 
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
+import { guestRequest } from "../js/guest-request";
 
 export default {
+    components: {
+        VelPasswordValidation:
+            require("../../../components/layout/PasswordValidation.vue")
+                .default,
+        elInput: require("../../../components/form/basic.vue").default,
+        elButton: require("../../../components/basic/Button.vue").default,
+    },
+
     data() {
         return {
             form: new Form(
@@ -77,13 +71,17 @@ export default {
                 { resetOnSuccess: false },
             ),
             isPasswordValid: false,
+            loading: false,
+            name: "",
+            email: "",
         };
     },
 
     mounted() {
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
+
+        this.name = this.$store.state?.auth?.user?.name;
+        this.email = this.$store.state?.auth?.user?.email;
     },
 
     methods: {
@@ -94,46 +92,41 @@ export default {
                 await this.form.put("/user/password");
                 await this.login();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
         },
         async login() {
-            this.loading = true;
-
             try {
-                const res = await this.form.post("/login");
-
-                if (res["logged-in"]) {
-                    try {
-                        await this.$store.dispatch("logout", {
-                            errors: this.$root.errors,
-                        });
-                    } catch (e) {}
-
-                    await this.form.post("/login");
-                }
+                await guestRequest({
+                    form: this.form,
+                    url: "/login",
+                    store: this.$store,
+                });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
-                this.loading = false;
                 await this.postLogin();
             }
         },
 
         async postLogin() {
-            const { data: user } = await this.$store.dispatch("getUser", {
-                errors: this.$root.errors,
+            const { data: user } = await this.$store.dispatch("getUser");
+
+            this.$router.push({ name: this.$store.state.auth.redirect });
+
+            ElNotification({
+                type: "success",
+                message: "Password updated successfully",
+                duration: 10000,
+                class: "el-notification--success el-notification--right-override",
             });
         },
 
         updatePasswordValidity(isValid) {
             this.isPasswordValid = isValid;
         },
-        handleButton() {
-            this.$emit("close");
-        },
     },
 
     metaInfo() {
@@ -141,12 +134,5 @@ export default {
             title: "Reset Password",
         };
     },
-
-    components: {
-        VPasswordValidation: require("./../components/VPasswordValidation.vue")
-            .default,
-        elInput: require("../../../components/form/basic.vue").default,
-        elButton: require("../../../components/basic/Button.vue").default,
-    },
 };
 </script>

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

@@ -3,14 +3,14 @@
         <section id="forgotPasswordForm">
             <h1 class="h2 h2--small">Reset password</h1>
             <form class="form" @submit.prevent="submit">
-                <p class="AM-mt-2">
+                <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"
@@ -32,7 +32,7 @@
                     Continue
                 </elButton>
 
-                <p class="disclaimer AM-mt-3">
+                <p class="disclaimer mt-3">
                     <router-link
                         class="color-1 underline"
                         :to="{ name: 'auth.login' }"
@@ -47,6 +47,7 @@
 
 <script>
 import Form from "form-backend-validation";
+import { guestRequest } from "../js/guest-request";
 
 export default {
     components: {
@@ -66,14 +67,18 @@ export default {
     methods: {
         async onSubmit() {
             try {
-                await this.form.post("/forgot-password");
+                await guestRequest({
+                    form: this.form,
+                    url: "/forgot-password",
+                    store: this.$store,
+                });
 
                 this.$router.push({
                     name: "auth.success-forgot",
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_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"
@@ -47,7 +47,7 @@
             Continue
         </el-button>
 
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             Having trouble signing in?
             <router-link
                 class="color-1 underline"
@@ -65,6 +65,7 @@
 
 <script>
 import Form from "form-backend-validation";
+import { guestRequest } from "../js/guest-request";
 
 export default {
     components: {
@@ -93,30 +94,22 @@ export default {
             this.loading = true;
 
             try {
-                const res = await this.form.post("/login");
-
-                if (res["logged-in"]) {
-                    try {
-                        await this.$store.dispatch("logout", {
-                            errors: this.$root.errors,
-                        });
-                    } catch (e) {}
-
-                    await this.form.post("/login");
-                }
+                const res = await guestRequest({
+                    form: this.form,
+                    url: "/login",
+                    store: this.$store,
+                });
 
                 await this.postLogin();
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }
         },
 
         async postLogin() {
-            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/logincallback.vue

@@ -16,9 +16,7 @@ export default {
 
     methods: {
         async postLogin() {
-            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/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"
@@ -35,7 +35,7 @@
                 Continue
             </el-button>
 
-            <p class="disclaimer AM-mt-3">
+            <p class="disclaimer mt-3">
                 Having trouble signing in?
                 <a :href="$store.state.auth.contact" class="underline"
                     >Contact us</a
@@ -45,13 +45,11 @@
     </template>
     <template v-else>
         <h1 class="h2 h2--small">Sign in with SSO</h1>
-        <p class="AM-mt-2">
+        <p class="mt-2">
             Redirecting you to your organisation’s Single Sign-On (SSO) gateway
-            <span class="AM-color-highlight"
-                >in {{ countdown }} seconds...</span
-            >
+            <span class="color-highlight">in {{ countdown }} seconds...</span>
         </p>
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             <a :href="redirect_url" class="underline">Go to SSO gateway</a>
         </p>
     </template>
@@ -59,6 +57,7 @@
 
 <script>
 import Form from "form-backend-validation";
+import { guestRequest } from "../js/guest-request";
 
 export default {
     components: {
@@ -89,7 +88,12 @@ export default {
             this.loading = true;
 
             try {
-                const res = await this.form.post(`/hydrate/sso/check`);
+                const res = await guestRequest({
+                    form: this.form,
+                    url: "/hydrate/sso/check",
+                    store: this.$store,
+                });
+
                 if (res["redirect_url"]) {
                     this.redirect_url = res["redirect_url"];
                     this.setRedirect();
@@ -100,7 +104,7 @@ export default {
                     });
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }