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

package/_Build/vue/components/layout/Navigation.vue

@@ -0,0 +1,83 @@
+<template>
+    <VMenu>
+        <template v-for="(link, lkey) in links" :key="lkey">
+            <MenuItem v-if="!link.children" :index="resolveHref(link.href)">
+                <router-link :to="link.href">
+                    <GIcon
+                        class="icon icon--0.5"
+                        :name="link.icon"
+                        asis
+                        embed
+                    />
+                    <span>{{ link.title }}</span>
+                </router-link>
+            </MenuItem>
+            <SubMenu v-else :id="lkey" :index="lkey">
+                <template #title>
+                    <GIcon
+                        class="icon icon--0.5"
+                        :name="link.icon"
+                        asis
+                        embed
+                    />
+                    <span>{{ link.title }}</span>
+                </template>
+                <MenuItem
+                    v-for="(child, cindex) in link.children"
+                    :key="cindex"
+                    :index="lkey + '-1-' + cindex"
+                >
+                    <router-link :to="child.href">
+                        <span>{{ child.title }}</span>
+                    </router-link>
+                </MenuItem>
+            </SubMenu>
+        </template>
+    </VMenu>
+</template>
+
+<script>
+export default {
+    name: "Navigation",
+
+    components: {
+        VMenu: require("../navigation/Menu.vue").default,
+        MenuItem: require("../navigation/MenuItem.vue").default,
+        SubMenu: require("../navigation/SubMenu.vue").default,
+    },
+
+    methods: {
+        resolveHref(href) {
+            return this.$router.resolve(href).path;
+        },
+    },
+
+    props: {
+        links: {
+            type: Array,
+            default: () => [
+                {
+                    title: "Home",
+                    href: { name: "index" },
+                    icon: "icon-home",
+                },
+                {
+                    title: "Companies",
+                    href: { name: "companies.index" },
+                    icon: "icon-cases",
+                },
+                {
+                    title: "Users",
+                    href: { name: "users.index" },
+                    icon: "icon-user",
+                },
+                {
+                    title: "Utilities",
+                    href: { name: "index" },
+                    icon: "icon-utility",
+                },
+            ],
+        },
+    },
+};
+</script>

package/_Build/vue/{modules/AuthModule/components/VPageHeader.vue → components/layout/PageHeader.vue}

@@ -1,28 +1,34 @@
 <template>
-    <div class="grid justify-between">
-        <div class="grid__4/6 flex justify-start">
+    <div class="flex flex-wrap items-start gap" style="row-gap: 16px">
+        <div class="flex justify-start items-center">
             <span v-if="icon">
                 <div
                     class="p-1.5 mr-2 border-radius border border-solid border-muted flex items-center justify-center"
                 >
-                    <GIcon class="icon--3 fill-1" :name="icon" embed artboard />
+                    <GIcon
+                        class="fill-1 icon--0.5"
+                        :name="icon"
+                        embed
+                        artboard
+                    />
                 </div>
             </span>
 
             <h2 class="m-0 font-500 text-secondary">{{ title }}</h2>
         </div>
 
-        <div class="grid__2/6 flex gap justify-end items-start">
-            <div class="flex gap items-center">
-                <slot />
-            </div>
+        <div
+            class="flex flex-wrap gap items-center justify-end"
+            style="margin-left: auto"
+        >
+            <slot />
         </div>
     </div>
 </template>
 
 <script>
 export default {
-    name: "VShowPageHeader",
+    name: "PageHeader",
 
     props: {
         icon: {

package/_Build/vue/components/layout/SideBar.vue

@@ -0,0 +1,26 @@
+<template>
+    <div class="vel-sidebar" :class="{ active: active }">
+        <div class="vel-sidebar__inner">
+            <div class="vel-sidebar__top">
+                <slot name="navigation" />
+            </div>
+            <div class="vel-sidebar__bottom">
+                <button class="vel-sidebar__button" @click="active = !active">
+                    <slot name="expand"> > </slot>
+                </button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "SideBar",
+
+    data() {
+        return {
+            active: true,
+        };
+    },
+};
+</script>

package/_Build/vue/{modules/AuthModule/components/VTable.vue → components/layout/Table.vue}

@@ -2,6 +2,7 @@
     <el-table
         :data="$props.data"
         :height="fixedHeight ? 762 : undefined"
+        :row-class-name="rowClassName"
         style="width: 100%"
         @sort-change="handleSort"
     >
@@ -13,24 +14,25 @@
                 <el-table-column
                     :width="item.width ?? 'auto'"
                     :sortable="!!item.sortable ? 'custom' : false"
-                    :label="item.label"
+                    :label="
+                        item.label ||
+                        item.key[0].toUpperCase() + item.key.slice(1)
+                    "
                     :prop="item.key"
                     :show-overflow-tooltip="true"
                 >
                     <!-- Support a custom render function -->
                     <template v-if="item.render" #default="scope">
-                        {{ item.render(scope.row) }}
-                    </template>
-
-                    <!-- Support module passed (as a raw component or :is property) -->
-                    <template v-else-if="item.component" #default="scope">
                         <component
                             :is="
-                                item.component.is
-                                    ? item.component.is(scope.row)
-                                    : item.component.module(scope.row)
+                                item.render(
+                                    {
+                                        model: scope.row,
+                                        ...additionalInfo,
+                                    },
+                                    this,
+                                )
                             "
-                            v-bind="item.component.props(scope.row)"
                         />
                     </template>
                 </el-table-column>
@@ -68,7 +70,7 @@
 
 <script>
 import { ElTable, ElTableColumn } from "element-plus";
-import VelButton from "../../../components/basic/Button.vue";
+import VelButton from "../basic/Button.vue";
 
 export default {
     name: "VTable",
@@ -79,6 +81,12 @@ export default {
         VelButton,
     },
 
+    inject: {
+        additionalInfo: {
+            default: () => ({}),
+        },
+    },
+
     props: {
         data: {
             type: [Array, Object],
@@ -124,8 +132,12 @@ export default {
             type: Boolean,
             default: true,
         },
+        rowClassName: {
+            type: [Function, String],
+            default: undefined,
+        },
     },
-    emits: ["sort"],
+    emits: ["sort", "reload"],
 
     methods: {
         handleSort(data) {

package/_Build/vue/{modules/AuthModule/components/VTableSorter.vue → components/layout/TableSorter.vue}

@@ -25,19 +25,23 @@
                         @update:model-value="handleSearch"
                     >
                         <template #prepend
-                            ><GIcon embed asis name="icon-search"
+                            ><GIcon
+                                embed
+                                asis
+                                name="icon-search"
+                                class="icon--0.5"
                         /></template>
                     </VelBasic>
                     <slot v-if="displayActions" name="table-action">
                         <VelButton
-                            v-if="displayEditAction"
+                            v-if="displayCreateAction"
                             size="large"
                             type="primary"
                             tag="a"
                             class="ml-2"
                             @click="
                                 $router.push({
-                                    name: `${jsonData.pageLink}.create`,
+                                    name: `${jsonData.slug}.create`,
                                 })
                             "
                         >
@@ -45,7 +49,7 @@
                                 name="icon-plus"
                                 embed
                                 asis
-                                class="fill-0 mr-0.5"
+                                class="fill-0 icon--0.5 mr-0.5"
                             />
                             Create new {{ jsonData.label }}
                         </VelButton>
@@ -54,31 +58,33 @@
             </slot>
         </div>
         <div class="bg-0 p-0.5 box-shadow-1 border-r-4">
-            <VTable
+            <VelTable
                 :data="table_data"
                 :structure="jsonData.tableStructure"
                 :label="jsonData.label"
                 :over-write-id="jsonData.overWriteId"
                 :fixed-height="fixedHeight"
+                :row-class-name="jsonData.rowClassName"
                 :target-action="
                     (item) => ({
-                        name: `${jsonData.pageLink}.show`,
-                        params: { id: item.id },
+                        name: `${jsonData.slug}.show`,
+                        params: { [idKey]: item.id },
                     })
                 "
                 :edit-action="
                     (item) => ({
-                        name: `${jsonData.pageLink}.edit`,
-                        params: { id: item.id },
+                        name: `${jsonData.slug}.edit`,
+                        params: { [idKey]: item.id },
                     })
                 "
                 :display-actions="displayActions"
                 :display-show-action="displayShowAction"
                 :display-edit-action="displayEditAction"
                 @sort="handleSort"
+                @reload="reload"
             >
                 <slot name="table-content"></slot>
-            </VTable>
+            </VelTable>
 
             <div class="flex justify-center items-center py-2">
                 <el-pagination
@@ -99,16 +105,17 @@
 
 <script>
 import axios from "axios";
+import { debounce } from "lodash";
 import { ElPagination } from "element-plus";
-import VelButton from "../../../components/basic/Button.vue";
-import VelBasic from "../../../components/form/basic.vue";
-import VelSpinner from "../../../components/form/Spinner.vue";
+import VelButton from "../basic/Button.vue";
+import VelBasic from "../form/basic.vue";
+import VelSpinner from "../form/Spinner.vue";
 
 export default {
-    name: "VTableSorter",
+    name: "TableSorter",
 
     components: {
-        VTable: require("./VTable.vue").default,
+        VelTable: require("./Table.vue").default,
         VelButton,
         VelBasic,
         ElPagination,
@@ -124,14 +131,10 @@ export default {
             default: true,
             type: Boolean,
         },
-        api: {
-            required: true,
-            type: String,
-        },
-        defaults: {
+        apiParams: {
             required: false,
-            type: String,
-            default: "",
+            type: Object,
+            default: () => ({}),
         },
         displayActions: {
             type: Boolean,
@@ -141,44 +144,79 @@ export default {
             type: Boolean,
             default: true,
         },
+        displayCreateAction: {
+            type: Boolean,
+            default: true,
+        },
         displayEditAction: {
             type: Boolean,
             default: true,
         },
+        idKey: {
+            type: String,
+            default: "id",
+        },
     },
 
     data() {
         return {
             search: null,
             sort: "-id",
-            query: [],
+            query: {},
             table_data: [],
             table_meta: null,
+            _abortController: null,
         };
     },
 
+    created() {
+        this.debouncedSearch = debounce(this._executeSearch, 300);
+    },
+
+    beforeUnmount() {
+        this.debouncedSearch.cancel();
+        this._abortController?.abort();
+    },
+
     mounted() {
         this.sort = this.jsonData.defaultSort || "-id";
         this.fetchData({ page: 1 }).then((data) => {
-            this.table_data = data.data;
-            this.table_meta = data.meta;
+            if (data) {
+                this.table_data = data.data;
+                this.table_meta = data.meta;
 
-            this.table_curr_page = this.table_meta.current_page;
+                this.table_curr_page = this.table_meta.current_page;
+            }
         });
     },
 
     methods: {
+        reload() {
+            this.fetchData({ page: this.table_meta.current_page }).then(
+                (data) => {
+                    if (data) {
+                        this.table_data = data.data;
+                        this.table_meta = data.meta;
+                    }
+                },
+            );
+        },
         handleSearch(data) {
             if (data === null || data.length < 3) {
-                this.query = [];
+                this.query = {};
             } else {
-                this.query = [
-                    `filter[${this.$refs.search.$el.dataset.key}]=${data}`,
-                ];
+                this.query = {
+                    [`filter[${this.$refs.search.$el.dataset.key}]`]: data,
+                };
             }
+            this.debouncedSearch();
+        },
+        _executeSearch() {
             this.fetchData({}).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
         handleSort(data) {
@@ -189,27 +227,31 @@ export default {
                     data.order === "ascending" ? data.prop : "-" + data.prop;
             }
             this.fetchData({}).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
 
         fetchData: function ({ page = "1" }) {
-            const mergedQuery = [
-                ...this.query,
-                this.defaults,
-                `sort=${this.sort}`,
-                `page=${page}`,
-            ];
-
-            const query = mergedQuery.join("&");
+            this._abortController?.abort();
+            this._abortController = new AbortController();
 
             return axios
-                .get(`/api/${this.$props.api}${query ? "?" + query : ""}`)
-                .then((res) => {
-                    return res.data;
+                .get(`${this.$props.jsonData.api}`, {
+                    params: {
+                        sort: this.sort,
+                        page: page,
+                        ...this.query,
+                        ...this.apiParams,
+                    },
+                    signal: this._abortController.signal,
                 })
-                .catch(this.$root.errors);
+                .then((res) => res.data)
+                .catch((err) => {
+                    if (!axios.isCancel(err)) console.log(err);
+                });
         },
 
         getStatusLabel(status) {
@@ -225,8 +267,10 @@ export default {
 
         handleCurrentPageChange(val) {
             this.fetchData({ page: val }).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
 

package/_Build/vue/components/layout/TokenDisplay.vue

@@ -0,0 +1,52 @@
+<template>
+    <el-dialog
+        :model-value="true"
+        title="Token Created"
+        width="560px"
+        class="token-display"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :show-close="false"
+    >
+        <p class="token-display__warning">
+            <strong>The token below will not be shown again.</strong> Ensure
+            you've taken a copy before closing this window.
+        </p>
+
+        <div class="token-display__block">
+            <div class="token-display__header">
+                <span class="token-display__label">Bearer Token</span>
+                <el-button size="small" plain @click="copy">
+                    {{ copied ? "Copied ✓" : "Copy" }}
+                </el-button>
+            </div>
+            <pre class="token-display__value">{{ token }}</pre>
+        </div>
+
+        <template #footer>
+            <el-button type="primary" @click="$emit('close')">Done</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { ElDialog, ElButton } from "element-plus";
+
+const props = defineProps({
+    token: {
+        type: String,
+        required: true,
+    },
+});
+
+defineEmits(["close"]);
+
+const copied = ref(false);
+
+async function copy() {
+    await navigator.clipboard.writeText(props.token);
+    copied.value = true;
+    setTimeout(() => (copied.value = false), 2000);
+}
+</script>

package/_Build/vue/components/layout/pageTitle.vue

@@ -6,7 +6,7 @@
 
 <script>
 export default {
-    name: "VPageTitle",
+    name: "PageTitle",
 
     props: {
         title: {

package/_Build/vue/components/navigation/Menu.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-menu class="vel-menu">
+    <el-menu class="vel-menu" :default-active="activeRoute">
         <slot />
     </el-menu>
 </template>
@@ -10,5 +10,10 @@ export default {
     components: {
         ElMenu,
     },
+    computed: {
+        activeRoute() {
+            return this.$route.path.replace(/\/$/, "") || "/";
+        },
+    },
 };
 </script>

package/_Build/vue/components/navigation/MenuItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-menu-item :index="index" class="vel-menu-item" v-bind="$props">
+    <el-menu-item class="vel-menu-item" v-bind="$props" :index="`${index}`">
         <template #title>
             <slot name="title" />
         </template>
@@ -15,6 +15,11 @@ export default {
     components: {
         ElMenuItem,
     },
-    props: ["index"],
+    props: {
+        index: {
+            type: [String, Number],
+            required: true,
+        },
+    },
 };
 </script>

package/_Build/vue/components/navigation/MenuItemGroup.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-sub-menu :index="index" v-bind="$props">
+    <el-sub-menu v-bind="$props" :index="`${index}`">
         <template #title>
             <slot name="title" />
         </template>
@@ -15,6 +15,11 @@ export default {
     components: {
         ElSubMenu,
     },
-    props: ["index"],
+    props: {
+        index: {
+            type: [String, Number],
+            required: true,
+        },
+    },
 };
 </script>

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

@@ -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;
@@ -12,7 +29,8 @@ function setAxiosDefaults(baseUrl, router) {
     axios.interceptors.response.use(null, (error) => {
         if (error.response) {
             if (
-                error.response.status === 401 &&
+                (error.response.status === 401 ||
+                    error.response.status === 419) &&
                 router.currentRoute.value.name !== "auth.logout"
             ) {
                 router.push({
@@ -25,6 +43,8 @@ function setAxiosDefaults(baseUrl, router) {
             }
         }
 
+        displayErrorNotification(error);
+
         return Promise.reject(error);
     });