@fishawack/lab-velocity 2.0.0-beta.40 → 2.0.0-beta.42

package/_Build/vue/modules/resource/index.js

@@ -12,6 +12,7 @@ import {
     ElNotification,
 } from "element-plus";
 import VelButton from "../../components/basic/Button.vue";
+import VelAudit from "../../components/layout/Audit.vue";
 
 export const defaultResource = meta();
 
@@ -50,12 +51,15 @@ export function meta(name = "default", properties = {}) {
                 value: "name",
                 label: `Search ${name}`,
             },
+            auditable: false,
             form: {
                 component: null,
                 submit: null,
+                class: "grid__1/2",
                 fields: () => ({}),
                 preparation: ({ form }) => form.data(),
                 structure: [],
+                groups: {},
             },
             table: {
                 actions: [
@@ -488,21 +492,24 @@ export function routes(node, name, properties = {}, children = []) {
                     path: "",
                     component: node
                         ? ""
-                        : require("../resource/Children/index.vue").default,
+                        : resource.index.component ||
+                          require("../resource/Children/index.vue").default,
                     name: `${resource.routeName}.index`,
                 },
                 {
                     path: "create",
                     component: node
                         ? ""
-                        : require("../resource/Children/create.vue").default,
+                        : resource.create?.component ||
+                          require("../resource/Children/create.vue").default,
                     name: `${resource.routeName}.create`,
                 },
                 {
                     path: `:${resource.id}`,
                     component: node
                         ? ""
-                        : require("../resource/Children/show.vue").default,
+                        : resource.show.component ||
+                          require("../resource/Children/show.vue").default,
                     name: `${resource.routeName}.show`,
                     // Remove leading / for nested routes or they'll resolve to the root of the site
                     children: cloneDeepWith(children, (value, key) => {
@@ -522,7 +529,8 @@ export function routes(node, name, properties = {}, children = []) {
                     path: `:${resource.id}/edit`,
                     component: node
                         ? ""
-                        : require("../resource/Children/edit.vue").default,
+                        : resource.edit?.component ||
+                          require("../resource/Children/edit.vue").default,
                     name: `${resource.routeName}.edit`,
                     meta: {
                         breadcrumb: ({ $route }) => $route.params[resource.id],

package/components/_form.scss

@@ -22,3 +22,21 @@
         }
     }
 }
+
+.vel-resource-form {
+    display: flex;
+    flex-direction: column;
+    gap: 2.5 * $spacing;
+}
+
+.vel-form-group {
+    border: 1px solid lighten($color4, 3%);
+    border-radius: $spacing * 0.5;
+    padding: 2 * $spacing;
+
+    legend {
+        font-weight: 600;
+        font-size: get-ratio(16px);
+        padding: 0 $spacing * 0.5;
+    }
+}

package/components/_menu.scss

@@ -93,11 +93,6 @@ ul.vel-menu {
     flex-direction: column;
     height: 100%;
 
-    li:last-child {
-        margin-top: auto;
-        margin-bottom: 0px;
-    }
-
     .el-sub-menu {
         .vel-menu-item {
             a.active {

package/index.js

@@ -10,6 +10,13 @@ export const Auth = {
 
 export { default as Resource } from "./_Build/vue/modules/resource/index.js";
 
+export { default as UserResource } from "./_Build/vue/modules/AuthModule/routes/PUsers/resource.js";
+export { default as UserColumns } from "./_Build/vue/modules/AuthModule/routes/PUsers/columns.js";
+export { default as CompanyResource } from "./_Build/vue/modules/AuthModule/routes/PCompanies/resource.js";
+export { default as CompanyColumns } from "./_Build/vue/modules/AuthModule/routes/PCompanies/columns.js";
+export { default as TeamResource } from "./_Build/vue/modules/AuthModule/routes/PTeams/resource.js";
+export { default as IntegrationResource } from "./_Build/vue/modules/AuthModule/routes/PIntegrations/resource.js";
+
 export { default as Button } from "./_Build/vue/components/basic/Button.vue";
 export { default as Link } from "./_Build/vue/components/basic/link.vue";
 
@@ -24,9 +31,11 @@ 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 Avatar } from "./_Build/vue/components/form/Avatar.vue";
 export { default as InputNumber } from "./_Build/vue/components/form/InputNumber.vue";
 
 export { default as RoleLegend } from "./_Build/vue/components/layout/RoleLegend.vue";
+export { default as FormRole } from "./_Build/vue/components/layout/FormRole.vue";
 export { default as TableSorter } from "./_Build/vue/components/layout/TableSorter.vue";
 export { default as Chip } from "./_Build/vue/components/layout/Chip.vue";
 export { default as Chips } from "./_Build/vue/components/layout/Chips.vue";
@@ -49,3 +58,10 @@ export { default as BreadcrumbsItem } from "./_Build/vue/components/navigation/B
 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";
+
+export { default as Filters } from "./_Build/js/libs/filters.js";
+export {
+    ucfirst,
+    calendarFormat,
+    dateFormat,
+} from "./_Build/js/libs/filters.js";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-velocity",
-    "version": "2.0.0-beta.40",
+    "version": "2.0.0-beta.42",
     "description": "Avalere Health branded style system",
     "scripts": {
         "setup": "npm ci || npm i && npm run content",
@@ -54,6 +54,7 @@
         "@tiptap/starter-kit": "^2.11.2",
         "@tiptap/vue-3": "^2.11.2",
         "axios": "^1.11.0",
+        "dayjs": "^1.11.20",
         "element-plus": "^2.11.8",
         "form-backend-validation": "github:mikemellor11/form-backend-validation#master",
         "lodash": "^4.17.21",
@@ -63,6 +64,7 @@
     "files": [
         "*.scss",
         "components",
+        "_Build/js/libs",
         "_Build/vue/components",
         "_Build/vue/modules/AuthModule",
         "_Build/vue/modules/resource"

package/_Build/vue/modules/AuthModule/routes/PCompanies/form.vue

@@ -1,205 +0,0 @@
-<!-- eslint-disable vue/no-mutating-props -->
-<template>
-    <form class="" @submit.prevent="submit">
-        <VelBasic
-            v-model="form.name"
-            name="name"
-            :error="form.errors"
-            type="text"
-            placeholder="Name"
-            label="Company name"
-        >
-            <template #label>
-                Company name <sup class="color-status-red-100">*</sup>
-            </template>
-        </VelBasic>
-
-        <VelSelect
-            v-if="method === 'patch'"
-            v-model="form.primary_contact"
-            name="primary_contact"
-            :error="form.errors"
-            placeholder="Primary Contact"
-            label="Primary Contact"
-            :options="
-                users?.map(({ name, id }) => ({
-                    label: name,
-                    value: id,
-                }))
-            "
-        />
-
-        <hr class="my-3 hr-muted" />
-
-        <p class="my-0">Domain/s <sup class="color-status-red-100">*</sup></p>
-
-        <ul class="list-none pl-0 mt mb-2">
-            <li
-                v-for="(path, index) in form.domains"
-                :key="index"
-                class="mb-0.5"
-            >
-                <el-input
-                    v-model="form.domains[index]"
-                    placeholder="avalerehealth.com"
-                >
-                    <template #prepend>@</template>
-                    <template #append>
-                        <VelButton
-                            type="danger"
-                            @click="form.domains.splice(index, 1)"
-                        >
-                            <GSvg class="vel-icon" name="icon-trash" />
-                        </VelButton>
-                    </template>
-                </el-input>
-
-                <small
-                    v-if="form.errors && form.errors.has(`domains.${index}`)"
-                    class="form__error vel-basic__error"
-                    v-text="form.errors.first(`domains.${index}`)"
-                ></small>
-            </li>
-        </ul>
-
-        <div>
-            <VelButton @click="form.domains.push('')">
-                Add Domain
-
-                <GIcon
-                    name="icon-plus"
-                    embed
-                    asis
-                    class="fill-0 icon--0.5 ml"
-                />
-            </VelButton>
-        </div>
-
-        <VelBasic
-            v-model="form.seats"
-            name="seats"
-            :error="form.errors"
-            type="number"
-            placeholder="Company seats"
-            label="Company seats"
-            min="0"
-            class="mb-0 mt-2"
-        >
-            <template #label>
-                Company seats <sup class="color-status-red-100">*</sup>
-            </template>
-        </VelBasic>
-
-        <hr class="my-5 hr-muted" />
-
-        <template v-if="$store.getters.can('edit roles')">
-            <VelFormRole :form="form" />
-
-            <hr class="my-5 hr-muted" />
-        </template>
-
-        <template v-if="$store.getters.can('edit sso')">
-            <h3 class="h3 mb-2">SSO Settings</h3>
-
-            <VelSelect
-                v-model="form.sso_type"
-                name="sso_type"
-                :error="form.errors"
-                placeholder="Please Select"
-                label="Provider"
-                clearable
-                :options="[
-                    {
-                        value: 'azure',
-                        label: 'azure',
-                    },
-                    {
-                        value: 'google',
-                        label: 'google',
-                    },
-                ]"
-            />
-            <VelBasic
-                v-model="form.sso_client_id"
-                name="sso_client_id"
-                :error="form.errors"
-                type="text"
-                placeholder="Key"
-                label="Key"
-            />
-            <VelBasic
-                v-model="form.sso_tenant"
-                name="sso_tenant"
-                :error="form.errors"
-                type="text"
-                placeholder="Tenant"
-                label="Tenant"
-            />
-            <VelBasic
-                v-model="form.sso_client_secret"
-                name="sso_client_secret"
-                :error="form.errors"
-                type="password"
-                placeholder="Secret"
-                label="Secret"
-            />
-
-            <hr class="my-3 hr-muted" />
-        </template>
-
-        <VelFormFooter :form="form" />
-    </form>
-</template>
-
-<!-- eslint-disable vue/no-mutating-props -->
-<script>
-import axios from "axios";
-import VelButton from "../../../../components/basic/Button.vue";
-import VelSelect from "../../../../components/form/Select.vue";
-import VelBasic from "../../../../components/form/basic.vue";
-import VelFormRole from "../../../../components/layout/FormRole.vue";
-import VelFormFooter from "../../../../components/layout/FormFooter.vue";
-import { ElInput } from "element-plus";
-
-export default {
-    components: {
-        VelFormFooter,
-        VelFormRole,
-        VelButton,
-        VelSelect,
-        VelBasic,
-        ElInput,
-    },
-
-    props: {
-        form: {
-            required: true,
-            type: Object,
-        },
-        submit: {
-            required: true,
-            type: Function,
-        },
-        method: {
-            type: String,
-            default: "post",
-        },
-    },
-
-    data() {
-        return {
-            users: [],
-        };
-    },
-
-    mounted() {
-        axios
-            .getAll(
-                `/api/users?filter[company_id]=${this.$route.params.companiesId}`,
-            )
-            .then((res) => {
-                this.users = res.data.data;
-            });
-    },
-};
-</script>

package/_Build/vue/modules/AuthModule/routes/PUsers/form.vue

@@ -1,193 +0,0 @@
-<!-- eslint-disable vue/no-mutating-props -->
-<template>
-    <form class="" @submit.prevent="submit">
-        <template v-if="method !== 'patch'">
-            <VelBasic
-                v-model="form.name"
-                name="name"
-                :error="form.errors"
-                type="text"
-                placeholder="Name"
-                label="Name"
-            />
-
-            <VelBasic
-                v-model="form.email"
-                placeholder="Email"
-                label="Email"
-                type="text"
-                name="email"
-                :error="form.errors"
-            />
-
-            Company: <span v-text="company?.name" />
-
-            <hr class="my-3 hr-muted" />
-
-            <template v-if="isSSOCompany">
-                <p class="mb-3">
-                    This user belongs to an SSO-enabled company. They
-                    will authenticate via SSO on first login. No
-                    password is required.
-                </p>
-            </template>
-            <template v-else>
-                <VelCheckbox
-                    v-model="form.notify_user"
-                    name="notify_user"
-                    :error="form.errors"
-                    label="Send email to notify user of account and password"
-                />
-                <VelCheckbox
-                    v-model="form.force_password_change"
-                    name="force_password_change"
-                    :error="form.errors"
-                    label="Force password change on first login"
-                />
-                <VelCheckbox
-                    v-model="form.set_password"
-                    name="set_password"
-                    :error="form.errors"
-                    label="Auto generate password"
-                />
-                <template v-if="!form.set_password">
-                    <VelBasic
-                        v-model="form.password"
-                        name="password"
-                        :error="form.errors"
-                        type="password"
-                        placeholder="Password"
-                        label="Password"
-                    />
-                    <VelBasic
-                        v-model="form.password_confirmation"
-                        name="password_confirmation"
-                        :error="form.errors"
-                        type="password"
-                        placeholder="Password Confirmation"
-                        label="Password Confirmation"
-                    />
-                </template>
-            </template>
-
-            <hr class="my-5 hr-muted" />
-        </template>
-
-        <template v-if="$store.getters.can('edit roles')">
-            <template v-if="enableRoles">
-                <VelButton
-                    @click="
-                        form.roles = [];
-                        enableRoles = false;
-                    "
-                >
-                    Reset roles
-                </VelButton>
-                <VelFormRole :form="form" />
-            </template>
-            <template v-else>
-                <VelButton @click="enableRoles = true">
-                    <GIcon
-                        name="icon-plus"
-                        embed
-                        asis
-                        class="fill-0 icon--0.5 mr"
-                    />
-                    Override roles
-                </VelButton>
-                <p class="mt-2">
-                    Roles will be inherited from the company level.
-                </p>
-            </template>
-            <hr class="my-5 hr-muted" />
-        </template>
-
-        <VelFormFooter :loading="form.processing" />
-    </form>
-</template>
-
-<script>
-import axios from "axios";
-import { debounce } from "lodash";
-import VelButton from "../../../../components/basic/Button.vue";
-import VelCheckbox from "../../../../components/form/Checkbox.vue";
-import VelBasic from "../../../../components/form/basic.vue";
-import VelFormRole from "../../../../components/layout/FormRole.vue";
-import VelFormFooter from "../../../../components/layout/FormFooter.vue";
-
-export default {
-    components: {
-        VelFormFooter,
-        VelFormRole,
-        VelCheckbox,
-        VelButton,
-        VelBasic,
-    },
-    props: {
-        form: {
-            required: true,
-            type: Object,
-        },
-        submit: {
-            required: true,
-            type: Function,
-        },
-        method: {
-            type: String,
-            default: "post",
-        },
-    },
-
-    data() {
-        return {
-            companies: null,
-            enableRoles: null,
-            company: null,
-        };
-    },
-
-    computed: {
-        domain() {
-            return this.form.email?.split("@")[1];
-        },
-        isSSOCompany() {
-            return !!this.company?.sso_enabled;
-        },
-    },
-
-    watch: {
-        "form.roles": {
-            handler(newVal) {
-                if (this.enableRoles === null) {
-                    this.enableRoles = newVal.length > 0;
-                }
-            },
-        },
-        "form.email": debounce(function () {
-            if (this.domain) {
-                axios
-                    .get("/api/companies", {
-                        params: {
-                            "filter[domains.domain]": this.domain,
-                        },
-                    })
-                    .then((res) => {
-                        this.company = res.data.data[0];
-                    })
-                    .catch((error) => {
-                        console.error("Error fetching company:", error);
-                        this.company = null;
-                    });
-            } else {
-                this.company = null;
-            }
-        }, 500),
-    },
-
-    mounted() {
-        axios.getAll("/api/companies").then((res) => {
-            this.companies = res.data.data;
-        });
-    },
-};
-</script>