@fishawack/lab-velocity 2.0.0-beta.3 → 2.0.0-beta.31

package/_Build/vue/components/layout/Layout.vue

@@ -0,0 +1,76 @@
+<template>
+    <div class="vel-app">
+        <VelHeader class="justify-end-dive">
+            <router-link :to="{ name: 'index' }">
+                <GSvg
+                    class="logo"
+                    style="width: 180px"
+                    embed
+                    asis
+                    :name="$store.state.auth.logo"
+                />
+            </router-link>
+            <template #links>
+                <div class="flex items-center pr">
+                    <GIcon
+                        class="icon fill-1 icon--0.5 mr-0.5"
+                        name="icon-account-circle"
+                        embed
+                        asis
+                    />
+                    <span>{{ $store?.state?.auth?.user?.name }}</span>
+                </div>
+                <VelButton
+                    class="ml"
+                    type="primary"
+                    tag="a"
+                    round
+                    :href="`${$root.spaUrl}?authenticated=1`"
+                >
+                    <span v-text="`Access ${$root.appName}`" />
+                </VelButton>
+            </template>
+        </VelHeader>
+        <div class="vel-content">
+            <VelSideBar>
+                <template #navigation>
+                    <VelNavigation v-bind="$attrs" />
+                </template>
+                <template #expand>
+                    <GIcon
+                        class="icon icon--0.5"
+                        name="icon-keyboard-tab"
+                        embed
+                        asis
+                    />
+                </template>
+            </VelSideBar>
+            <main class="vel-main">
+                <div class="vel-main__inner">
+                    <slot />
+                </div>
+                <VelFooter contact="mailTo:det@avalerehealth.com">
+                    <GSvg
+                        class="logo fill-0"
+                        style="width: 180px"
+                        embed
+                        asis
+                        :name="$store.state.auth.logo"
+                    />
+                </VelFooter>
+            </main>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    components: {
+        VelHeader: require("./Header.vue").default,
+        VelSideBar: require("./SideBar.vue").default,
+        VelFooter: require("./Footer.vue").default,
+        VelNavigation: require("./Navigation.vue").default,
+        VelButton: require("../basic/Button.vue").default,
+    },
+};
+</script>

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

@@ -0,0 +1,77 @@
+<template>
+    <VMenu>
+        <template v-for="(link, lkey) in links" :key="lkey">
+            <MenuItem v-if="!link.children" :index="lkey">
+                <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,
+    },
+
+    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}

@@ -5,7 +5,12 @@
                 <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>
 
@@ -22,7 +27,7 @@
 
 <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}

@@ -1,7 +1,7 @@
 <template>
     <el-table
         :data="$props.data"
-        :height="fixedHeight ? 762 : false"
+        :height="fixedHeight ? 762 : undefined"
         style="width: 100%"
         @sort-change="handleSort"
     >
@@ -13,24 +13,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>
@@ -47,18 +48,18 @@
                         v-if="$props.displayShowAction"
                         :to="$props.targetAction($props.data[scope.$index])"
                     >
-                        <el-button size="small" type="primary">
+                        <VelButton size="small" type="primary">
                             {{ `View` }}
-                        </el-button>
+                        </VelButton>
                     </router-link>
                     <router-link
                         v-if="$props.displayEditAction"
                         class="ml"
                         :to="$props.editAction($props.data[scope.$index])"
                     >
-                        <el-button size="small">
+                        <VelButton size="small">
                             {{ `Edit` }}
-                        </el-button>
+                        </VelButton>
                     </router-link>
                 </template>
             </el-table-column>
@@ -67,9 +68,24 @@
 </template>
 
 <script>
+import { ElTable, ElTableColumn } from "element-plus";
+import VelButton from "../basic/Button.vue";
+
 export default {
     name: "VTable",
 
+    components: {
+        ElTable,
+        ElTableColumn,
+        VelButton,
+    },
+
+    inject: {
+        additionalInfo: {
+            default: () => ({}),
+        },
+    },
+
     props: {
         data: {
             type: [Array, Object],
@@ -116,7 +132,7 @@ export default {
             default: true,
         },
     },
-    emits: ["sort"],
+    emits: ["sort", "reload"],
 
     methods: {
         handleSort(data) {

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

@@ -13,7 +13,7 @@
                     </p>
                 </div>
                 <div class="flex justify-end items-end grid__2/3">
-                    <el-basic
+                    <VelBasic
                         v-if="jsonData.searchable"
                         ref="search"
                         v-model="search"
@@ -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>
-                    </el-basic>
+                    </VelBasic>
                     <slot v-if="displayActions" name="table-action">
-                        <el-button
-                            v-if="displayEditAction"
+                        <VelButton
+                            v-if="displayCreateAction"
                             size="large"
                             type="primary"
                             tag="a"
                             class="ml-2"
                             @click="
                                 $router.push({
-                                    name: `${jsonData.pageLink}.create`,
+                                    name: `${jsonData.slug}.create`,
                                 })
                             "
                         >
@@ -45,16 +49,16 @@
                                 name="icon-plus"
                                 embed
                                 asis
-                                class="fill-0 mr-0.5"
+                                class="fill-0 icon--0.5 mr-0.5"
                             />
                             Create new {{ jsonData.label }}
-                        </el-button>
+                        </VelButton>
                     </slot>
                 </div>
             </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"
@@ -62,23 +66,24 @@
                 :fixed-height="fixedHeight"
                 :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
@@ -93,36 +98,41 @@
         </div>
     </div>
     <div v-else class="absolute transform-center text-center">
-        <GSpinner class="fill-5" />
-        <p v-text="`Loading...`" />
+        <VelSpinner />
     </div>
 </template>
 
 <script>
+import axios from "axios";
+import { ElPagination } from "element-plus";
+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,
+        VelSpinner,
     },
 
     props: {
         jsonData: {
             required: true,
-            type: Array,
+            type: Object,
         },
         fixedHeight: {
             default: true,
             type: Boolean,
         },
-        api: {
-            required: true,
-            type: String,
-        },
-        defaults: {
+        apiParams: {
             required: false,
-            type: String,
-            default: "",
+            type: Object,
+            default: () => ({}),
         },
         displayActions: {
             type: Boolean,
@@ -132,17 +142,25 @@ 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,
         };
@@ -159,13 +177,21 @@ export default {
     },
 
     methods: {
+        reload() {
+            this.fetchData({ page: this.table_meta.current_page }).then(
+                (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.fetchData({}).then((data) => {
                 this.table_data = data.data;
@@ -186,18 +212,17 @@ export default {
         },
 
         fetchData: function ({ page = "1" }) {
-            const mergedQuery = [
-                ...this.query,
-                this.defaults,
-                `sort=${this.sort}`,
-                `page=${page}`,
-            ];
-
-            return this.$store.dispatch("getEntity", {
-                entity: this.$props.api,
-                query: mergedQuery.join("&"),
-                errors: this.$root.errors,
-            });
+            return axios
+                .get(`${this.$props.jsonData.api}`, {
+                    params: {
+                        sort: this.sort,
+                        page: page,
+                        ...this.query,
+                        ...this.apiParams,
+                    },
+                })
+                .then((res) => res.data)
+                .catch(console.log);
         },
 
         getStatusLabel(status) {

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/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;
@@ -25,6 +42,8 @@ function setAxiosDefaults(baseUrl, router) {
             }
         }
 
+        displayErrorNotification(error);
+
         return Promise.reject(error);
     });