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

package/index.js

@@ -1,34 +1,42 @@
-export { default as Button } from "./basic/Button.vue";
-export { default as Link } from "./basic/link.vue";
+import Router from "./_Build/vue/modules/AuthModule/js/router.js";
+import Axios from "./_Build/vue/modules/AuthModule/js/axios.js";
+import Store from "./_Build/vue/modules/AuthModule/js/store.js";
 
-export { default as Basic } from "./form/basic.vue";
-export { default as Checkbox } from "./form/Checkbox.vue";
-export { default as CheckboxGroup } from "./form/CheckboxGroup.vue";
-export { default as Color } from "./form/color.vue";
-export { default as DatePicker } from "./form/DatePicker.vue";
-export { default as file } from "./form/file.vue";
-export { default as Select } from "./form/Select.vue";
-export { default as Switch } from "./form/Switch.vue";
-export { default as Wysiwyg } from "./form/Wysiwyg.vue";
-export { default as Wysiwyg2 } from "./form/Wysiwyg2.vue";
-export { default as Upload } from "./form/Upload.vue";
-export { default as InputNumber } from "./form/InputNumber.vue";
+export const Auth = {
+    Router,
+    Axios,
+    Store,
+};
 
-export { default as SideBar } from "./layout/sideBar.vue";
-export { default as Footer } from "./layout/Footer.vue";
-export { default as Header } from "./layout/Header.vue";
-export { default as PageTitle } from "./layout/pageTitle.vue";
-export { default as Alert } from "./layout/Alert.vue";
-export { default as Tooltip } from "./layout/Tooltip.vue";
-export { default as Menu } from "./navigation/Menu.vue";
-export { default as MenuItem } from "./navigation/MenuItem.vue";
-export { default as MenuItemGroup } from "./navigation/MenuItemGroup.vue";
-export { default as SubMenu } from "./navigation/SubMenu.vue";
-export { default as Breadcrumbs } from "./navigation/Breadcrumbs.vue";
-export { default as BreadcrumbsItem } from "./navigation/BreadcrumbsItem.vue";
+export { default as Button } from "./_Build/vue/components/basic/Button.vue";
+export { default as Link } from "./_Build/vue/components/basic/link.vue";
 
-export { default as Icon } from "./Icon.vue";
-export { default as Svg } from "./Svg.vue";
-export { default as Loader } from "./layout/Loader.vue";
+export { default as Basic } from "./_Build/vue/components/form/basic.vue";
+export { default as Checkbox } from "./_Build/vue/components/form/Checkbox.vue";
+export { default as CheckboxGroup } from "./_Build/vue/components/form/CheckboxGroup.vue";
+export { default as Color } from "./_Build/vue/components/form/color.vue";
+export { default as DatePicker } from "./_Build/vue/components/form/DatePicker.vue";
+export { default as file } from "./_Build/vue/components/form/file.vue";
+export { default as Select } from "./_Build/vue/components/form/Select.vue";
+export { default as Switch } from "./_Build/vue/components/form/Switch.vue";
+export { default as Wysiwyg } from "./_Build/vue/components/form/Wysiwyg.vue";
+export { default as Wysiwyg2 } from "./_Build/vue/components/form/Wysiwyg2.vue";
+export { default as Upload } from "./_Build/vue/components/form/Upload.vue";
+export { default as InputNumber } from "./_Build/vue/components/form/InputNumber.vue";
 
-export { authRoutes } from './AuthModule/js/AuthRoutes.js';
+export { default as SideBar } from "./_Build/vue/components/layout/sideBar.vue";
+export { default as Footer } from "./_Build/vue/components/layout/Footer.vue";
+export { default as Header } from "./_Build/vue/components/layout/Header.vue";
+export { default as PageTitle } from "./_Build/vue/components/layout/pageTitle.vue";
+export { default as Alert } from "./_Build/vue/components/layout/Alert.vue";
+export { default as Tooltip } from "./_Build/vue/components/layout/Tooltip.vue";
+export { default as Menu } from "./_Build/vue/components/navigation/Menu.vue";
+export { default as MenuItem } from "./_Build/vue/components/navigation/MenuItem.vue";
+export { default as MenuItemGroup } from "./_Build/vue/components/navigation/MenuItemGroup.vue";
+export { default as SubMenu } from "./_Build/vue/components/navigation/SubMenu.vue";
+export { default as Breadcrumbs } from "./_Build/vue/components/navigation/Breadcrumbs.vue";
+export { default as BreadcrumbsItem } from "./_Build/vue/components/navigation/BreadcrumbsItem.vue";
+
+export { default as Icon } from "./_Build/vue/components/Icon.vue";
+export { default as Svg } from "./_Build/vue/components/Svg.vue";
+export { default as Loader } from "./_Build/vue/components/layout/Loader.vue";

package/package.json

@@ -1,104 +1,105 @@
 {
-  "name": "@fishawack/lab-velocity",
-  "version": "1.11.1",
-  "description": "Avalere Health branded style system",
-  "scripts": {
-    "setup": "npm ci || npm i && npm run content",
-    "content": "npm run content --prefix node_modules/@fishawack/core/",
-    "start": "npm run production && npm run story:dev",
-    "start-modules": "npm start --prefix node_modules/@fishawack/core/",
-    "production": "npm run production --prefix node_modules/@fishawack/core/ && npm run story:build",
-    "test": "npm test --prefix node_modules/@fishawack/core/",
-    "package": "npm run package --prefix node_modules/@fishawack/core/",
-    "deploy": "npm run deploy --prefix node_modules/@fishawack/core/",
-    "mail": "npm run mail --prefix node_modules/@fishawack/core/",
-    "story:dev": "histoire dev",
-    "story:build": "histoire build",
-    "preversion": "cp -r _Build/sass/** ./ && cp -r _Build/vue/components/** ./ && cp -r _Build/vue/modules/AuthModule ./"
-  },
-  "license": "BSD-3-Clause",
-  "author": {
-    "name": "Fishawack",
-    "url": "https://fishawack.com/"
-  },
-  "keywords": [
-    "css",
-    "components"
-  ],
-  "devDependencies": {
-    "@fishawack/core": "^8.16.1",
-    "@fishawack/lab-ui": "^12.5.0",
-    "@histoire/plugin-vue": "^0.17.17",
-    "@vitejs/plugin-vue": "^5.1.1",
-    "histoire": "^0.17.17",
-    "sass": "^1.77.8",
-    "vite": "^5.3.5",
-    "vite-svg-loader": "^5.1.0",
-    "vue": "^3.4.34",
-    "vue-loader": "^17.2.2",
-    "vue-router": "^4.4.0",
-    "vuex": "^4.1.0",
-    "vuex-persistedstate": "^4.1.0",
-    "form-backend-validation": "github:mikemellor11/form-backend-validation#master",
-    "mitt": "^3.0.1"
-  },
-  "dependencies": {
-    "@tiptap/extension-link": "^2.11.2",
-    "@tiptap/extension-subscript": "^2.11.2",
-    "@tiptap/extension-superscript": "^2.11.2",
-    "@tiptap/extension-table": "^2.11.2",
-    "@tiptap/extension-table-cell": "^2.11.2",
-    "@tiptap/extension-table-header": "^2.11.2",
-    "@tiptap/extension-table-row": "^2.11.2",
-    "@tiptap/extension-underline": "^2.11.2",
-    "@tiptap/pm": "^2.11.2",
-    "@tiptap/starter-kit": "^2.11.2",
-    "@tiptap/vue-3": "^2.11.2",
-    "element-plus": "^2.7.8",
-    "quill": "^1.3.7",
-    "sanitize-html": "^2.13.1"
-  },
-  "files": [
-    "*.scss",
-    "*.vue",
-    "form",
-    "components",
-    "layout",
-    "navigation",
-    "basic",
-    "modules",
-    "AuthModule"
-  ],
-  "main": "index.js",
-  "release": {
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "conventionalcommits"
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "conventionalcommits",
-          "writerOpts": {
-            "headerPartial": "### {{version}} ({{date}})\n",
-            "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
-          },
-          "presetConfig": {
-            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
-          }
-        }
-      ],
-      [
-        "@semantic-release/changelog",
-        {
-          "changelogTitle": "## Changelog"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/git"
-    ]
-  }
+    "name": "@fishawack/lab-velocity",
+    "version": "2.0.0-beta.2",
+    "description": "Avalere Health branded style system",
+    "scripts": {
+        "setup": "npm ci || npm i && npm run content",
+        "content": "npm run content --prefix node_modules/@fishawack/core/",
+        "start": "npm run production && npm run story:dev",
+        "start-modules": "npm start --prefix node_modules/@fishawack/core/",
+        "production": "npm run production --prefix node_modules/@fishawack/core/ && npm run story:build",
+        "test": "npm test --prefix node_modules/@fishawack/core/",
+        "package": "npm run package --prefix node_modules/@fishawack/core/",
+        "deploy": "npm run deploy --prefix node_modules/@fishawack/core/",
+        "mail": "npm run mail --prefix node_modules/@fishawack/core/",
+        "story:dev": "histoire dev",
+        "story:build": "histoire build",
+        "preversion": "cp -r _Build/sass/** ./"
+    },
+    "license": "BSD-3-Clause",
+    "author": {
+        "name": "Fishawack",
+        "url": "https://fishawack.com/"
+    },
+    "keywords": [
+        "css",
+        "components"
+    ],
+    "devDependencies": {
+        "@fishawack/core": "^8.16.1",
+        "@fishawack/lab-ui": "^12.5.0",
+        "@histoire/plugin-vue": "^0.17.17",
+        "@vitejs/plugin-vue": "^5.1.1",
+        "histoire": "^0.17.17",
+        "mitt": "^3.0.1",
+        "sass": "^1.77.8",
+        "vite": "^5.3.5",
+        "vite-svg-loader": "^5.1.0",
+        "vue": "^3.4.34",
+        "vue-loader": "^17.2.2",
+        "vue-router": "^4.4.0",
+        "vuex": "^4.1.0",
+        "vuex-persistedstate": "^4.1.0"
+    },
+    "dependencies": {
+        "@tiptap/extension-link": "^2.11.2",
+        "@tiptap/extension-subscript": "^2.11.2",
+        "@tiptap/extension-superscript": "^2.11.2",
+        "@tiptap/extension-table": "^2.11.2",
+        "@tiptap/extension-table-cell": "^2.11.2",
+        "@tiptap/extension-table-header": "^2.11.2",
+        "@tiptap/extension-table-row": "^2.11.2",
+        "@tiptap/extension-underline": "^2.11.2",
+        "@tiptap/pm": "^2.11.2",
+        "@tiptap/starter-kit": "^2.11.2",
+        "@tiptap/vue-3": "^2.11.2",
+        "axios": "^1.11.0",
+        "element-plus": "^2.7.8",
+        "form-backend-validation": "github:mikemellor11/form-backend-validation#master",
+        "lodash": "^4.17.21",
+        "quill": "^1.3.7",
+        "sanitize-html": "^2.13.1"
+    },
+    "files": [
+        "*.scss",
+        "_Build/vue/components",
+        "_Build/vue/modules/AuthModule"
+    ],
+    "main": "index.js",
+    "release": {
+        "plugins": [
+            [
+                "@semantic-release/commit-analyzer",
+                {
+                    "preset": "conventionalcommits"
+                }
+            ],
+            [
+                "@semantic-release/release-notes-generator",
+                {
+                    "preset": "conventionalcommits",
+                    "writerOpts": {
+                        "headerPartial": "### {{version}} ({{date}})\n",
+                        "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
+                    },
+                    "presetConfig": {
+                        "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
+                    }
+                }
+            ],
+            [
+                "@semantic-release/changelog",
+                {
+                    "changelogTitle": "## Changelog"
+                }
+            ],
+            "@semantic-release/npm",
+            [
+                "@semantic-release/git",
+                {
+                    "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}"
+                }
+            ]
+        ]
+    }
 }

package/vendor.scss

@@ -4,7 +4,7 @@
 
 @import "normalize.css/normalize";
 
-#svgSprite{
+#svgSprite {
     position: absolute;
     width: 0;
     height: 0;
@@ -19,4 +19,4 @@
 @import "@fishawack/lab-ui/_utilities.scss";
 
 // Element-plus base style
-@import "./_base.scss";
+@import "./_base.scss";

package/AuthModule/components/VPasswordValidation.vue

@@ -1,66 +0,0 @@
-<template>
-    <div class="">
-        <p class="font-700 AM-mb-0.5">Your password must contain:</p>
-        <p class="flex m-0">
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-7"
-                v-if="passwordLengthValid" />
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-3" v-else />
-            At least 8 characters
-        </p>
-        <p class="flex m-0">
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-7" v-if="hasLetter" />
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-3" v-else />
-            At least one letter
-        </p>
-        <p class="flex AM-mt-0 ml-0 mr-0 AM-mb-3">
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-7" v-if="hasNumberOrSymbol" />
-            <GSvg name="icon-list-tick" embed artboard class="mr-0.5 icon icon--0.4 fill-3" v-else />
-            At least one number or symbol
-        </p>
-    </div>
-</template>
-
-<script>
-
-export default {
-    props: {
-        password: {
-            type: String,
-            default: '',
-        },
-    },
-    computed: {
-        passwordLengthValid() {
-            return this.password?.length >= 8;
-        },
-        hasLetter() {
-            return this.tests.letter.test(this.password);
-        },
-        hasNumberOrSymbol() {
-            return this.tests.number.test(this.password) || this.tests.symbol.test(this.password);
-        },
-        passwordValid() {
-            return this.passwordLengthValid && this.hasLetter && this.hasNumberOrSymbol;
-        },
-    },
-    data() {
-        return {
-            tests: {
-                letter: /[a-zA-Z]+/,
-                number: /[0-9]+/,
-                symbol: /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]+/,
-            }
-        };
-    },
-    watch: {
-        password(newPassword) {
-            this.$emit('passwordValid', this.passwordValid);
-        },
-    },
-    methods: {
-    },
-    mounted() {
-        this.$emit('passwordValid', this.passwordValid);
-    },
-}
-</script>

package/AuthModule/js/AuthAxios.js

@@ -1,59 +0,0 @@
-import axios from "axios";
-
-function setAxiosDefaults() {
-    axios.defaults.baseURL = process.env.APP_URL;
-    axios.defaults.withCredentials = true;
-    axios.defaults.withXSRFToken = true;
-
-    // Some libraries will utilize the globally available version of axios so make sure it's our exact axios instance
-    window.axios = axios;
-}
-
-// Redirect to login page if 401
-axios.interceptors.response.use(null, (error) => {
-    if (error.response) {
-        if (error.response.status === 401) {
-            store.commit("setAuth", false);
-            window.router.push({ name: `${store.state.auth.authBase}.login` });
-        }
-
-        if (error.response.status === 404) {
-            window.router.push({ name: "index" });
-        }
-    }
-
-    return Promise.reject(error);
-});
-
-// Pull all paginated data
-axios.getAll = (url, options = {}) => {
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve, reject) => {
-        try {
-            const arr = { data: { data: [] } };
-            let page = 0;
-
-            // eslint-disable-next-line no-constant-condition
-            while (true) {
-                // eslint-disable-next-line no-await-in-loop
-                const res = await axios.get(
-                    // eslint-disable-next-line no-plusplus
-                    `${url}${url.includes("?") ? "&" : "?"}page=${++page}`,
-                    options
-                );
-                arr.data.data = arr.data.data.concat(res.data.data);
-                if (
-                    res.data.next_page_url === null ||
-                    (res.data.links && res.data.links.next === null)
-                )
-                    break;
-            }
-
-            resolve(arr);
-        } catch (e) {
-            reject(e);
-        }
-    });
-};
-
-setAxiosDefaults();

package/AuthModule/js/AuthRoutes.js

@@ -1,186 +0,0 @@
-"use strict";
-export function authRoutes(node, store, nested = 'auth') {
-    return [{
-        path: '/'+nested,
-        name: nested,
-        component: require("../routes/container.vue").default,
-        redirect: (to) => {
-            return { name: `${nested}.login` };
-        },
-        children: [
-            {
-                path: "login-creds",
-                component: node
-                    ? ""
-                    : require("../routes/login.vue")
-                          .default,
-                name: `${nested}.logincreds`
-            },
-            {
-                path: "login",
-                component: node
-                    ? ""
-                    : require("../routes/loginsso.vue")
-                          .default,
-                name: `${nested}.login`
-            },
-            {
-                path: "force-login",
-                component: node
-                    ? ""
-                    : require("../routes/loginheadless.vue")
-                          .default,
-                name: `${nested}.force-login`
-            },
-            {
-                path: "callback",
-                component: node
-                    ? ""
-                    : require("../routes/logincallback.vue")
-                          .default,
-                name: `${nested}.callback`
-            },
-            {
-                path: "forgot",
-                component: require("../routes/forgot.vue").default,
-                name: `${nested}.forgot`,
-            },
-            {
-                path: "reset",
-                component: require("../routes/reset.vue").default,
-                name: `${nested}.reset`,
-                props: true,
-            },
-            {
-                path: "force-reset",
-                component: require("../routes/force-reset.vue").default,
-                name: `${nested}.force-reset`,
-                props: true,
-            },
-            {
-                path: "register",
-                component: require("../routes/register.vue").default,
-                name: `${nested}.register`,
-            },
-            {
-                path: "verify",
-                component: require("../routes/verify.vue").default,
-                name: `${nested}.verify`,
-            },
-            {
-                path: "verified",
-                component: require("../routes/success-verify.vue").default,
-                name: `${nested}.success-verify`,
-            },
-            {
-                path: "expired-verification",
-                component: require("../routes/expired-verification.vue").default,
-                name: `${nested}.expired-verification`,
-            },
-            {
-                path: "expired-reset",
-                component: require("../routes/expired-reset.vue").default,
-                name: `${nested}.expired-reset`,
-            },
-            {
-                path: "success-reset",
-                component: require("../routes/success-reset.vue").default,
-                name: `${nested}.success-reset`,
-            },
-            {
-                path: "success-forgot",
-                component: require("../routes/success-forgot.vue").default,
-                name: `${nested}.success-forgot`,
-            },
-            {
-                path: "account-exists",
-                component: require("../routes/account-exists.vue").default,
-                name: `${nested}.account-exists`,
-            },
-            {
-                path: "logout",
-                component: require("../routes/logout.vue").default,
-                name: `${nested}.logout`,
-                meta: {
-                    guest: true,
-                },
-            },
-        ],
-        props: true,
-        nav: {
-            visible: true,
-        },
-        meta: {
-            guest: true,
-            header: true,
-            footer: false,
-            fullpageModal: true,
-        },
-    },
-    {
-        path: "/admin",
-        redirect: () => {
-            const { authenticated } = store.state.auth;
-
-            if (!authenticated) {
-                store.commit("setAuth", true);
-                window.location = `${process.env.APP_URL}/login`;
-            } else {
-                window.location = `${process.env.APP_URL}/`;
-            }
-        },
-        name: "admin",
-        meta: {
-            guest: true,
-        },
-    },
-    {
-        path: '/callback',
-        redirect:  { name: `${nested}.callback` }
-    }]
-}
-
-export function configureRoutes(router) {
-
-    router.beforeEach((to, from, next) => {
-        const { authenticated, user, authBase, redirect, forcePasswordChange, autoLogin } = store.state.auth;
-
-        const admin = to.path.includes("/admin");
-
-        if (to.query.verified) {
-            next({ name: `${authBase}.success-verify` });
-        } else if (authenticated) {
-            if (admin && !user?.admin) {
-                next({ name: redirect });
-            } else if (to.name === "login" || to.name === `${authBase}.login`) {
-                if(autoLogin) {
-                    next({ name: `${authBase}.force-login` });
-                } else {
-                    next({ name: redirect });
-                }
-            } else if (
-                !user?.email_verified_at &&
-                to.matched.some((d) => d.meta.guest) !== true
-            ) {
-                next({ name: `${authBase}.verify` });
-            } else {
-                next();
-            }
-        } else {
-            if (to.matched.some((d) => d.meta.guest) === true) {
-                next();
-            } else if (admin) {
-                next({ name: "login" });
-            } else if (to.path === "/callback") {
-                next({ name: `${authBase}.callback` });
-            } else {
-                if(autoLogin === true) {
-                    next({ name: `${authBase}.force-login` });
-                } else {
-                    next({ name: `${authBase}.login` });
-                }
-            }
-        }
-    });
-    window.router = router;
-}