npm - @fishawack/lab-velocity - Versions diffs - 2.0.0-beta.8 → 2.0.0-beta.9 - Mend

@fishawack/lab-velocity 2.0.0-beta.8 → 2.0.0-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/README.md CHANGED Viewed

@@ -51,6 +51,8 @@ Auth.Axios.setAxiosDefaults(process.env.APP_URL, router);
 import { Auth } from "@fishawack/lab-velocity";
 import store from "./store.js";
+// ... initialize router
 Auth.Router.beforeEach(router, store);
 ```
@@ -100,9 +102,9 @@ import { Auth } from "@fishawack/lab-velocity";
 }
 ```
-### Base Styles (admin)
+### Base Styles
-For the **admin only** you should replace the two references to variables & defaults with @fishawack/lab-velocity ones.
+@fishawack/lab-velocity extends @fishawack/lab-ui, for this reason you should replace the two references to variables & defaults with @fishawack/lab-velocity ones.
 #### \_variables.scss
@@ -130,9 +132,18 @@ There are two different set of sass imports for the admin and the frontend route
 #### Frontend
 ```sass
-// vendor.scss
+// Vendor imports / Lab-ui imports
+@import "@fishawack/lab-ui/typography";
+@import "@fishawack/lab-ui/grid";
+@import "@fishawack/lab-ui/utilities";
+@import "@fishawack/lab-ui/icon";
-@import
+// Lab velocity
+@import "@fishawack/lab-velocity/base";
+@import "@fishawack/lab-velocity/components/basic";
+@import "@fishawack/lab-velocity/components/button";
+@import "@fishawack/lab-velocity/components/form";
+@import "@fishawack/lab-velocity/components/auth";
 ```
 #### Admin

package/_Build/vue/modules/AuthModule/adminRoutes/PCompanies/Children/create.vue CHANGED Viewed

@@ -54,7 +54,7 @@ export default {
                     params: { id: res.data.id },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_Build/vue/modules/AuthModule/adminRoutes/PCompanies/Children/edit.vue CHANGED Viewed

@@ -90,7 +90,7 @@ export default {
                     params: { id: res.data.id },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_Build/vue/modules/AuthModule/adminRoutes/PCompanies/Children/show.vue CHANGED Viewed

@@ -143,6 +143,7 @@
 import axios from "axios";
 import VelButton from "../../../../../components/basic/Button.vue";
 import VelSpinner from "../../../../../components/form/Spinner.vue";
+import { ElNotification } from "element-plus";
 export default {
     name: "PShow",
@@ -246,7 +247,7 @@ export default {
                 const res = await axios.post(
                     `/api/companies/${this.id}/welcome`,
                 );
-                this.$notify({
+                ElNotification({
                     title: "Success",
                     message: res.data.message,
                     type: "success",
@@ -254,7 +255,7 @@ export default {
                 this.company.primary_contact_contacted = true;
             } catch (e) {
-                this.$notify({
+                ElNotification({
                     title: "Warning",
                     message: e.response?.data?.message || e.message,
                     type: "warning",

package/_Build/vue/modules/AuthModule/adminRoutes/PUsers/Children/create.vue CHANGED Viewed

@@ -16,6 +16,7 @@
 <script>
 import { ElMessageBox } from "element-plus";
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 export default {
     name: "PCreate",
@@ -75,7 +76,7 @@ export default {
                 if (!this.form.set_password) {
                     this.open(res.data.id);
                 } else {
-                    this.$notify({
+                    ElNotification({
                         title: "Success",
                         message: "User created a notified of their new account",
                         type: "success",
@@ -87,7 +88,7 @@ export default {
                     });
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
         open(id) {

package/_Build/vue/modules/AuthModule/adminRoutes/PUsers/Children/edit.vue CHANGED Viewed

@@ -85,9 +85,7 @@ export default {
                 // if changing ourselves, re-fetch user data
                 if (res.data.id === this.$store.state.auth.user.id) {
-                    await this.$store.dispatch("getUser", {
-                        errors: this.$root.errors,
-                    });
+                    await this.$store.dispatch("getUser");
                 }
                 this.$router.replace({
@@ -95,7 +93,7 @@ export default {
                     params: { id: res.data.id },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_Build/vue/modules/AuthModule/components/VTableSorter.vue CHANGED Viewed

@@ -209,7 +209,7 @@ export default {
                 .then((res) => {
                     return res.data;
                 })
-                .catch(this.$root.errors);
+                .catch(console.log);
         },
         getStatusLabel(status) {

package/_Build/vue/modules/AuthModule/js/axios.js CHANGED Viewed

@@ -1,4 +1,21 @@
 import axios from "axios";
+import debounce from "lodash/debounce";
+import { ElNotification } from "element-plus";
+const displayErrorNotification = debounce(async function errors(e) {
+    if (e.response && !e.response.data.errors) {
+        ElNotification.error({
+            title: "Error",
+            message:
+                e.response.data.message ||
+                `${e.response.status}: ${
+                    e.response.statusText || "Please try again later!"
+                }`,
+            duration: 10000,
+        });
+    }
+}, 250);
 function setAxiosDefaults(baseUrl, router) {
     axios.defaults.baseURL = baseUrl;
@@ -25,6 +42,8 @@ function setAxiosDefaults(baseUrl, router) {
             }
         }
+        displayErrorNotification(error);
         return Promise.reject(error);
     });

package/_Build/vue/modules/AuthModule/js/store.js CHANGED Viewed

@@ -38,7 +38,7 @@ const store = {
     },
     actions: {
-        getUser({ commit }, { errors, query = "", params }) {
+        getUser({ commit }, { errors = console.log, query = "", params } = {}) {
             return axios
                 .get(`/api/users/self${query}`, {
                     params,
@@ -51,7 +51,7 @@ const store = {
                 .catch(errors);
         },
-        logout({ commit }, { errors }) {
+        logout({ commit }) {
             commit("setUser", null);
             return axios.post("/logout");

package/_Build/vue/modules/AuthModule/routes/account-exists.vue CHANGED Viewed

@@ -3,10 +3,10 @@
         <section id="resetPasswordForm">
             <h1 class="h2">Account already exists</h1>
-            <p class="mt AM-mb-0 color-21">
+            <p class="mt mb-0 color-21">
                 <strong class="">Company: {{ $route.query.company }}</strong>
             </p>
-            <p class="AM-mt-0.5">Your company already has an active account.</p>
+            <p class="mt-0.5">Your company already has an active account.</p>
             <elButton
                 tag="router-link"

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

@@ -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"
@@ -40,7 +40,7 @@
                         :password="form.password"
                         @passwordValid="updatePasswordValidity"
                     />
-                    <div class="flex AM-mt-3">
+                    <div class="flex mt-3">
                         <elButton
                             native-type="submit"
                             class=""
@@ -94,9 +94,7 @@ export default {
     },
     mounted() {
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
     methods: {
@@ -107,7 +105,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;
             }
@@ -120,15 +118,13 @@ 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");
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
                 this.postLogin();
@@ -143,9 +139,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");
         },
     },

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

@@ -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 CHANGED Viewed

@@ -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: {
@@ -66,28 +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",
                 });
             } 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 CHANGED Viewed

@@ -7,13 +7,13 @@
             />
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
-                    <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
+                    <p class="mt-2 mb-0 color-highlight">
                         <strong class=""
                             >Email:
                             {{ $store.state?.auth?.user?.email }}</strong
                         >
                     </p>
-                    <p class="AM-mt-0.5">
+                    <p class="mt-0.5">
                         <strong
                             >Hello {{ $store.state?.auth?.user?.name }}</strong
                         >, and welcome to {{ $root.appName }}. To maintain
@@ -23,7 +23,7 @@
                     </p>
                     <el-input
                         v-model="form.password"
-                        class="AM-mt-2"
+                        class="mt-2"
                         label="New Password"
                         placeholder="Enter new password"
                         name="password"
@@ -40,7 +40,7 @@
                     <elButton
                         native-type="submit"
-                        class="AM-mt-3"
+                        class="mt-3"
                         type="primary"
                         :disabled="form.processing || !isPasswordValid"
                         :loading="form.processing"
@@ -81,9 +81,7 @@ export default {
     },
     mounted() {
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
     methods: {
@@ -94,7 +92,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;
             }
@@ -107,15 +105,13 @@ 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");
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
                 await this.postLogin();
@@ -123,9 +119,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");
         },
         updatePasswordValidity(isValid) {

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

@@ -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' }"
@@ -73,7 +73,7 @@ export default {
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             }
         },
     },

package/_Build/vue/modules/AuthModule/routes/login.vue CHANGED Viewed

@@ -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"
@@ -97,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");
@@ -107,16 +105,14 @@ export default {
                 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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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>
@@ -100,7 +98,7 @@ export default {
                     });
                 }
             } catch (e) {
-                this.$root.errors(e);
+                console.log(e);
             } finally {
                 this.loading = false;
             }

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

@@ -8,9 +8,7 @@ export default {
     async mounted() {
         try {
-            await this.$store.dispatch("logout", {
-                errors: this.$root.errors,
-            });
+            await this.$store.dispatch("logout");
         } catch {
             /* empty */
         } finally {

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

@@ -16,9 +16,7 @@ export default {
     async mounted() {
         try {
-            await this.$store.dispatch("logout", {
-                errors: this.$root.errors,
-            });
+            await this.$store.dispatch("logout");
         } finally {
             this.done = true;
         }

package/_Build/vue/modules/AuthModule/routes/register.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
     <h1 class="h2 h2--small">Register</h1>
-    <p class="AM-mb-3 AM-mt-2">
+    <p class="mb-3 mt-2">
         Please enter your personal details to complete your registration.
     </p>
@@ -10,7 +10,7 @@
         id="memberLoginForm"
     >
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Full name"
             placeholder="Enter your full name"
             name="name"
@@ -20,7 +20,7 @@
         />
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Email"
             placeholder="Enter your email address"
             name="email"
@@ -31,7 +31,7 @@
         />
         <el-input
-            class="AM-mb-2"
+            class="mb-2"
             label="Password"
             name="password"
             placeholder="Create a unique password"
@@ -72,7 +72,7 @@
             Register
         </elButton>
-        <p class="disclaimer AM-mt-3">
+        <p class="disclaimer mt-3">
             Having trouble registering?
             <a :href="$store.state.auth.contact" class="underline"
                 >Contact us</a
@@ -83,6 +83,7 @@
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 export default {
     data() {
@@ -111,9 +112,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("/register");
@@ -124,7 +123,7 @@ export default {
                         name: `auth.login`,
                         query: { company: res["company"] },
                     });
-                    this.$notify.error({
+                    ElNotification.error({
                         title: "Domain is SSO enabled",
                         message: "Sign in with your company email address",
                         duration: 10000,
@@ -133,16 +132,14 @@ export default {
                     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/reset.vue CHANGED Viewed

@@ -4,16 +4,16 @@
             <h1 class="h2 h2--small">Reset password</h1>
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
-                    <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">
                         Please create a new password. Passwords you have used
                         previously aren’t permitted.
                     </p>
                     <el-input
                         v-model="form.password"
-                        class="AM-mt-3"
+                        class="mt-3"
                         label="New Password"
                         placeholder="Enter new password"
                         name="password"
@@ -51,7 +51,7 @@
                     <h4 class="mt" v-text="`Success!`" />
                     <p v-text="`Your password has been reset.`" />
                 </div>
-                <p class="disclaimer AM-mt-3">
+                <p class="disclaimer mt-3">
                     <router-link
                         class="color-1 underline"
                         :to="{ name: 'auth.login' }"
@@ -108,7 +108,7 @@ export default {
                         query: { email: this.form.email },
                     });
                 }
-                this.$root.errors(e);
+                console.log(e);
             }
         },

package/_Build/vue/modules/AuthModule/routes/success-forgot.vue CHANGED Viewed

@@ -4,15 +4,15 @@
             <h1 class="h2 h2--small">Reset password</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">
+                <p class="mt">
                     If this account exists we have sent an email containing
                     instructions for resetting the password.
                     <strong>Please check your inbox.</strong>
                 </p>
-                <p class="AM-mt-3 AM-mb">
+                <p class="mt-3 mb">
                     Haven’t received the email after 10 minutes?
                 </p>
@@ -37,7 +37,7 @@
                     Re-send instructions
                 </elButton>
-                <p class="disclaimer AM-mt-3">
+                <p class="disclaimer mt-3">
                     <router-link
                         class="color-1 underline"
                         :to="{ name: `auth.login` }"
@@ -52,6 +52,7 @@
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 export default {
     components: {
@@ -78,7 +79,7 @@ export default {
                 await this.form.post("/forgot-password");
-                this.$notify({
+                ElNotification({
                     type: "success",
                     message: "Email has been re-sent",
                     duration: 10000,
@@ -86,14 +87,14 @@ export default {
                 });
             } catch (e) {
                 if (e.response && e.response.status === 422) {
-                    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 {
-                    this.$root.errors(e);
+                    console.log(e);
                 }
             }
         },

package/_Build/vue/modules/AuthModule/routes/success-reset.vue CHANGED Viewed

@@ -3,10 +3,10 @@
         <section id="resetPasswordForm">
             <h1 class="h2 h2--small">Success</h1>
-            <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
+            <p class="mt-2 mb-0 color-highlight">
                 <strong class="">Email: {{ $route.query.email }}</strong>
             </p>
-            <p class="AM-mt">
+            <p class="mt">
                 Your password has been reset. Please sign in to continue.
             </p>

package/_Build/vue/modules/AuthModule/routes/success-verify.vue CHANGED Viewed

@@ -20,9 +20,7 @@
 <script>
 export default {
     mounted() {
-        this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.$store.dispatch("getUser");
     },
     components: {
         elButton: require("../../../components/basic/Button.vue").default,

package/_Build/vue/modules/AuthModule/routes/verify.vue CHANGED Viewed

@@ -2,17 +2,15 @@
     <h1 class="h2 h2--small">Verify your email address</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: {{ user?.email }}</strong>
         </p>
-        <p class="AM-mt-0.5">
+        <p class="mt-0.5">
             <strong>Please check your inbox</strong> for a Verification email
             from {{ $root.appName }}. Click the link in that email to verify
             your email address and complete your registration.
         </p>
-        <p class="AM-mt-0.5 AM-mb-0">
-            Haven’t received the email after 10 minutes?
-        </p>
+        <p class="mt-0.5 mb-0">Haven’t received the email after 10 minutes?</p>
         <el-input
             class="hidden"
@@ -26,7 +24,7 @@
         />
         <elButton
-            class="AM-mt AM-mb-3"
+            class="mt mb-3"
             native-type="submit"
             type="primary"
             :disabled="form.processing"
@@ -36,7 +34,7 @@
             Re-send verification link
         </elButton>
-        <p class="disclaimer AM-mt-1.5">
+        <p class="disclaimer mt-1.5">
             Having trouble singing in?
             <a :href="$store.state.auth.contact" class="underline"
                 >Contact us</a
@@ -47,6 +45,7 @@
 <script>
 import Form from "form-backend-validation";
+import { ElNotification } from "element-plus";
 export default {
     components: {
@@ -74,7 +73,7 @@ export default {
                 await this.form.post("/email/verification-notification");
-                this.$notify({
+                ElNotification({
                     type: "success",
                     message: "Email has been re-sent",
                     duration: 10000,
@@ -82,30 +81,28 @@ export default {
                 });
             } 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);
                 }
             }
         },
     },
     async mounted() {
-        this.user = await this.$store.dispatch("getUser", {
-            errors: this.$root.errors,
-        });
+        this.user = await this.$store.dispatch("getUser");
         this.form.email = this.user.email;
     },

package/components/_auth.scss CHANGED Viewed

@@ -1,4 +1,3 @@
-// AuthModule
 .AuthModule {
     position: fixed;
     background-color: black;
@@ -13,10 +12,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;
@@ -39,6 +40,7 @@
         transform: translate(-50%, 0);
         padding: 24px;
         width: calc(100% - 80px);
         h2 .h2 {
             font-size: 24px;
             line-height: 32px;
@@ -50,6 +52,7 @@
         line-height: 50px;
         font-size: 48px;
     }
     .h2--small {
         font-size: 36px;
         line-height: 44px;
@@ -60,14 +63,17 @@
         line-height: 20px;
         margin-bottom: 24px;
         letter-spacing: -0.1px;
         &.disclaimer {
             font-size: 12px;
             color: rgba($color1, 0.5);
             margin: 0;
         }
         a {
             color: $color1;
         }
         &.form__error {
             font-size: 12px;
             line-height: 18px;
@@ -79,6 +85,7 @@
         width: 200px;
         padding: 9px 23.5px;
         font-size: 14px;
         @include breakpoint(max-width $mobileMax) {
             max-width: unset;
             width: 100%;
@@ -92,43 +99,38 @@
                     border: 0.4px solid red;
                 }
             }
             .form__input.error {
                 border: none;
                 .el-input__wrapper {
                     border: 0.4px solid red;
                 }
             }
         }
-        // &__icon-container{
-        //     position: absolute;
-        //     top: 50%;
-        //     right: $spacing * 1.5;
-        //     transform: translateY(-50%);
-        //     display: flex;
-        // }
-        // &__action-icon {
-        //     margin-left: $spacing * 0.5;
-        //     cursor: pointer;
-        // }
     }
     .vel-basic__label {
         font-size: 12px;
         color: rgba($color1, 0.5);
     }
     .vel-basic__textbox {
         --el-border-color: #cfd8dd;
         --el-input-text-color: #666666;
         --el-input-focus-border-color: #cfd8dd;
         --el-input-hover-border-color: #cfd8dd;
         font-size: 14px;
-        padding-bottom: $am-spacing * 2.5;
         .el-input__inner {
             --el-input-inner-height: 38px;
         }
     }
     .el-button--primary {
         --el-button-text-color: #ffffff;
     }
     input,
     input:focus {
         @extend .el-input__inner;
@@ -140,9 +142,11 @@
     top: 48px;
     left: 0%;
 }
 .AuthModule__logo {
     position: relative;
 }
 .AuthModule__Content {
     position: absolute;
     z-index: 1;
@@ -154,52 +158,6 @@
     height: 100%;
 }
-.AM-mb {
-    margin-bottom: $am-spacing !important;
-}
-.AM-mt {
-    margin-top: $am-spacing !important;
-}
-.AM-pb {
-    padding-bottom: $am-spacing !important;
-}
-.AM-pt {
-    padding-top: $am-spacing !important;
-}
-@for $i from 1 through 5 {
-    .AM-mb-#{$i - 1} {
-        margin-bottom: ($i - 1) * $am-spacing !important;
-    }
-    .AM-mb-#{$i - 1}\.5 {
-        margin-bottom: ($i - 0.5) * $am-spacing !important;
-    }
-    .AM-mt-#{$i - 1} {
-        margin-top: ($i - 1) * $am-spacing !important;
-    }
-    .AM-mt-#{$i - 1}\.5 {
-        margin-top: ($i - 0.5) * $am-spacing !important;
-    }
-    .AM-pt-#{$i - 1} {
-        padding-top: ($i - 1) * $am-spacing !important;
-    }
-    .AM-pt-#{$i - 1}\.5 {
-        padding-top: ($i - 0.5) * $am-spacing !important;
-    }
-    .AM-pb-#{$i - 1} {
-        padding-bottom: ($i - 1) * $am-spacing !important;
-    }
-    .AM-pb-#{$i - 1}\.5 {
-        padding-bottom: ($i - 0.5) * $am-spacing !important;
-    }
-}
-.AM-color-highlight {
-    color: $am-highlight;
+.color-highlight {
+    color: green;
 }

package/package.json CHANGED Viewed

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