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

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

@@ -0,0 +1,27 @@
+<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", {
+                errors: this.$root.errors,
+            });
+        } finally {
+            this.done = true;
+        }
+    },
+};
+</script>

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

@@ -1,8 +1,14 @@
 <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="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"
+    >
         <el-input
             class="AM-mb-2"
             label="Full name"
@@ -12,7 +18,7 @@
             v-model="form.name"
             :error="form.errors"
         />
-        
+
         <el-input
             class="AM-mb-2"
             label="Email"
@@ -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,8 +59,14 @@
         </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
@@ -59,7 +74,9 @@
 
         <p class="disclaimer AM-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>
@@ -72,18 +89,17 @@ export default {
         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;
@@ -101,20 +117,21 @@ export default {
                     } 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.$router.push({
+                        name: `auth.login`,
+                        query: { company: res["company"] },
+                    });
                     this.$notify.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);
             } finally {
@@ -123,8 +140,6 @@ export default {
         },
 
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
             const { data: user } = await this.$store.dispatch("getUser", {
                 errors: this.$root.errors,
             });
@@ -136,7 +151,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 +165,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("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
 };
 </script>

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

@@ -8,7 +8,8 @@
                         <strong class="">Email: {{ form?.email }}</strong>
                     </p>
                     <p class="AM-mt-0.5">
-                        Please create a new password. Passwords you have used previously aren’t permitted.
+                        Please create a new password. Passwords you have used
+                        previously aren’t permitted.
                     </p>
                     <el-input
                         v-model="form.password"
@@ -22,7 +23,10 @@
                         required
                     />
 
-                    <VPasswordValidation :password="form.password" @passwordValid="updatePasswordValidity" />
+                    <VPasswordValidation
+                        :password="form.password"
+                        @passwordValid="updatePasswordValidity"
+                    />
 
                     <el-input
                         class="hidden"
@@ -34,11 +38,11 @@
                     />
 
                     <elButton
+                        native-type="submit"
                         type="primary"
                         :disabled="form.processing || !isPasswordValid"
                         :loading="form.processing"
                         @click="onSubmit"
-
                     >
                         <span v-text="'Reset password'" />
                     </elButton>
@@ -50,7 +54,7 @@
                 <p class="disclaimer AM-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>
@@ -68,11 +72,11 @@ export default {
         return {
             form: new Form(
                 {
-                    email: '',
-                    password: '',
-                    token: '',
+                    email: "",
+                    password: "",
+                    token: "",
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             isPasswordValid: false,
         };
@@ -89,13 +93,18 @@ export default {
                 const res = await this.form.post("/reset-password");
 
                 this.$router.push({
-                    name: `${this.$store.state.auth.authBase}.success-reset`,
+                    name: "auth.success-reset",
                     query: { email: this.form.email },
                 });
             } catch (e) {
-                if (e.response && e.response.status === 422 && e.response.data.message === "This password reset token is invalid.") {
+                if (
+                    e.response &&
+                    e.response.status === 422 &&
+                    e.response.data.message ===
+                        "This password reset token is invalid."
+                ) {
                     this.$router.push({
-                        name: `${this.$store.state.auth.authBase}.expired-reset`,
+                        name: "auth.expired-reset",
                         query: { email: this.form.email },
                     });
                 }
@@ -115,9 +124,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("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
 };
 </script>

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

@@ -8,12 +8,14 @@
                     <strong class="">Email: {{ form?.email }}</strong>
                 </p>
                 <p class="AM-mt">
-                    If this account exists we have sent an email containing instructions for resetting the password. <strong>Please check your inbox.</strong>
+                    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">
                     Haven’t received the email after 10 minutes?
                 </p>
-  
+
                 <el-input
                     class="hidden"
                     v-model="form.email"
@@ -26,6 +28,7 @@
                 />
 
                 <elButton
+                    native-type="submit"
                     type="primary"
                     :disabled="form.processing"
                     :loading="form.processing"
@@ -37,7 +40,7 @@
                 <p class="disclaimer AM-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>
@@ -52,15 +55,15 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data: () => ({
         form: new Form(
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
         notification: null,
     }),
@@ -79,18 +82,17 @@ export default {
                     type: "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 === 422) {
                     this.notification = this.$notify({
                         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 {
+                } else {
                     this.$root.errors(e);
                 }
             }
@@ -103,7 +105,7 @@ export default {
         // If a user has come here directly then send them off to the original forgot screen to enter an email
         if (!this.form.email) {
             this.$router.push({
-                name: `${this.$store.state.auth.authBase}.forgot`,
+                name: `auth.forgot`,
             });
         }
     },

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

@@ -2,7 +2,7 @@
     <div class="relative">
         <section id="resetPasswordForm">
             <h1 class="h2 h2--small">Success</h1>
-            
+
             <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
                 <strong class="">Email: {{ $route.query.email }}</strong>
             </p>
@@ -13,7 +13,7 @@
             <elButton
                 tag="router-link"
                 type="primary"
-                :to="{name: `${$store.state.auth.authBase}.login`}"
+                :to="{ name: 'auth.login' }"
             >
                 <span v-text="'Sign in'" />
             </elButton>
@@ -29,7 +29,7 @@ export default {
         };
     },
     components: {
-        elButton: require('../../basic/Button.vue').default,
-    }
+        elButton: require("../../basic/Button.vue").default,
+    },
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/success-verify.vue

@@ -1,12 +1,17 @@
 <template>
     <h1 class="h2 h2--small">Verification complete</h1>
-    <p class="mb-0"><strong>Welcome to {{ $store.state?.auth?.platformName }}, {{ $store.state?.auth?.user?.name }}!</strong></p>
+    <p class="mb-0">
+        <strong
+            >Welcome to {{ $root.appName }},
+            {{ $store.state?.auth?.user?.name }}!</strong
+        >
+    </p>
     <p>Your account has been verified successfully.</p>
 
     <elButton
         tag="router-link"
         type="primary"
-        :to="{name: $store.state.auth.redirect}"
+        :to="{ name: $store.state.auth.redirect }"
     >
         <span v-text="'Continue'" />
     </elButton>
@@ -14,16 +19,14 @@
 
 <script>
 export default {
-    mounted(){
-        this.$store.commit("setAuth", true);
-
+    mounted() {
         this.$store.dispatch("getUser", {
             errors: this.$root.errors,
         });
     },
     components: {
-        elButton: require('../../basic/Button.vue').default,
-    }
+        elButton: require("../../basic/Button.vue").default,
+    },
     // Problem in this file
 };
 </script>

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

@@ -6,7 +6,9 @@
             <strong class="">Email: {{ user?.email }}</strong>
         </p>
         <p class="AM-mt-0.5">
-            <strong>Please check your inbox</strong> for a Verification email from {{ $store.state?.auth?.platformName }}. Click the link in that email to verify your email address and complete your registration.
+            <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?
@@ -25,6 +27,7 @@
 
         <elButton
             class="AM-mt AM-mb-3"
+            native-type="submit"
             type="primary"
             :disabled="form.processing"
             :loading="form.processing"
@@ -35,7 +38,9 @@
 
         <p class="disclaimer AM-mt-1.5">
             Having trouble singing in?
-            <a :href="contact" class="underline">Contact us</a>
+            <a :href="$store.state.auth.contact" class="underline"
+                >Contact us</a
+            >
         </p>
     </form>
 </template>
@@ -45,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("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data: () => ({
         user: null,
@@ -54,10 +59,9 @@ export default {
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
         notification: null,
-        contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
     }),
 
     methods: {
@@ -74,25 +78,24 @@ export default {
                     type: "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({
                         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({
                         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 {
+                } else {
                     this.$root.errors(e);
                 }
             }

package/_base.scss

@@ -3,4 +3,4 @@
 @import "element-plus/theme-chalk/el-message";
 @import "element-plus/theme-chalk/el-notification";
 @import "element-plus/theme-chalk/el-overlay";
-@import "./components/input.scss";
+@import "./components/input.scss";

package/_defaults.scss

@@ -2,7 +2,7 @@
 
 @import "@fishawack/lab-ui/_defaults.scss";
 
-$colors: variables.dynamic('color', module-variables("variables"));
+$colors: variables.dynamic("color", module-variables("variables"));
 
 // Override lab-ui defaults here, e.g $button: $color6;
 $spacing: 8px;
@@ -11,11 +11,10 @@ $spacing: 8px;
     padding: 0px 5 * $spacing;
 }
 
-
 body {
     font-family: $primaryFont, sans-serif;
     font-size: get-ratio(16px);
     line-height: 1.5;
     color: $color1;
     background-color: $color3;
-}
+}

package/_variables.scss

@@ -2,24 +2,22 @@
 // Set global variables here, e.g $color6: red;
 @import "./modules/AuthVariables";
 
+$primaryFont: "Inter";
+$primaryFontThin: "Inter-Thin";
+$primaryFontExtraLight: "Inter-ExtraLight";
+$primaryFontLight: "Inter-Light";
+$primaryFontRegular: "Inter-Regular";
+$primaryFontMedium: "Inter-Medium";
+$primaryFontSemiBold: "Inter-SemiBold";
+$primaryFontBold: "Inter-Bold";
 
-$primaryFont: 'Inter';
-$primaryFontThin: 'Inter-Thin';
-$primaryFontExtraLight: 'Inter-ExtraLight';
-$primaryFontLight: 'Inter-Light';
-$primaryFontRegular: 'Inter-Regular';
-$primaryFontMedium: 'Inter-Medium';
-$primaryFontSemiBold: 'Inter-SemiBold';
-$primaryFontBold: 'Inter-Bold';
-
-
-$secondaryFont: 'NotoSerif';
-$secondaryFontMedium: 'NotoSerif-Medium';
+$secondaryFont: "NotoSerif";
+$secondaryFontMedium: "NotoSerif-Medium";
 // Colors
 
-$color1: #2D2D2D;
+$color1: #2d2d2d;
 $color2: #333333;
-$color3: #F7F7F7;
+$color3: #f7f7f7;
 $color4: #e6e6e6;
 $color5: #cccccc;
 $color6: #999999;
@@ -27,7 +25,7 @@ $color7: #666666;
 $color8: #f2f2f2; //Used
 $color9: #ff0000;
 $color10: #dcdbdb;
-$color11: #8C8C8C; //Used
-$color12: #5C5C5C;
-$color13: #3C976E;
-$colorAlert: #D53A3A;
+$color11: #8c8c8c; //Used
+$color12: #5c5c5c;
+$color13: #3c976e;
+$colorAlert: #d53a3a;

package/general.scss

@@ -31,5 +31,4 @@
 @import "./components/_loader.scss";
 @import "./modules/_AuthModule.scss";
 
-
-@import "./_base.scss";
+@import "./_base.scss";