adminforth 1.1.34 → 1.1.36

package/dist/index.js

@@ -135,7 +135,7 @@ class AdminForth {
         if (this.config.customization.brandLogo) {
             errors.push(...this.checkCustomFileExists(this.config.customization.brandLogo));
         }
-        if (!this.config.customization.favicon) {
+        if (this.config.customization.favicon) {
             errors.push(...this.checkCustomFileExists(this.config.customization.favicon));
         }
         if (!this.config.customization.datesFormat) {
@@ -645,12 +645,20 @@ class AdminForth {
         function interpretResource(adminUser, resource, meta, source) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _b;
+                const newResource = JSON.parse(JSON.stringify(resource));
+                if (process.env.HEAVY_DEBUG) {
+                    console.log('🪲Interpreting resource', resource.resourceId, source);
+                }
                 yield Promise.all(Object.entries(((_b = resource.options) === null || _b === void 0 ? void 0 : _b.allowedActions) || {}).map((_c) => __awaiter(this, [_c], void 0, function* ([key, value]) {
+                    if (process.env.HEAVY_DEBUG) {
+                        console.log('🪲checking for allowed call', key, 'value:', value, 'typeof', typeof value);
+                    }
                     // if callable then call
                     if (typeof value === 'function') {
                         resource.options.allowedActions[key] = yield value({ adminUser, resource, meta, source });
                     }
                 })));
+                return newResource;
             });
         }
         function checkAccess(action, resource) {
@@ -672,11 +680,11 @@ class AdminForth {
                 if (this.statuses.dbDiscover !== 'done') {
                     return { error: 'Database discovery is still in progress, please try later' };
                 }
-                const resource = this.config.resources.find((res) => res.resourceId == resourceId);
-                if (!resource) {
+                const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
+                if (!configResource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                yield interpretResource(adminUser, resource, {}, ActionCheckSource.DisplayButtons);
+                const resource = yield interpretResource(adminUser, configResource, {}, ActionCheckSource.DisplayButtons);
                 // exclude "plugins" key
                 return { resource: Object.assign(Object.assign({}, resource), { plugins: undefined }) };
             }),
@@ -696,11 +704,11 @@ class AdminForth {
                 if (this.statuses.dbDiscover !== 'done') {
                     return { error: 'Database discovery is still in progress, please try later' };
                 }
-                const resource = this.config.resources.find((res) => res.resourceId == resourceId);
-                if (!resource) {
+                const configResource = this.config.resources.find((res) => res.resourceId == resourceId);
+                if (!configResource) {
                     return { error: `Resource ${resourceId} not found` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DisplayButtons);
+                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DisplayButtons);
                 const { allowed, error } = checkAccess(source, resource);
                 if (!allowed) {
                     return { error };
@@ -895,11 +903,11 @@ class AdminForth {
             path: '/create_record',
             handler: (_y) => __awaiter(this, [_y], void 0, function* ({ body, adminUser }) {
                 var _z, _0, _1, _2, _3;
-                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                if (!resource) {
+                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                if (!configResource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.CreateRequest);
+                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.CreateRequest);
                 const { allowed, error } = checkAccess(AllowedActionsEnum.create, resource);
                 if (!allowed) {
                     return { error };
@@ -967,19 +975,19 @@ class AdminForth {
             path: '/update_record',
             handler: (_4) => __awaiter(this, [_4], void 0, function* ({ body, adminUser }) {
                 var _5, _6, _7, _8;
-                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                if (!resource) {
+                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                if (!configResource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 const recordId = body['recordId'];
-                const connector = this.connectors[resource.dataSource];
-                const oldRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
+                const connector = this.connectors[configResource.dataSource];
+                const oldRecord = yield connector.getRecordByPrimaryKey(configResource, recordId);
                 if (!oldRecord) {
-                    const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
+                    const primaryKeyColumn = configResource.columns.find((col) => col.primaryKey);
                     return { error: `Record with ${primaryKeyColumn.name} ${recordId} not found` };
                 }
                 const record = body['record'];
-                yield interpretResource(adminUser, resource, { requestBody: body, record, oldRecord }, ActionCheckSource.EditRequest);
+                const resource = yield interpretResource(adminUser, configResource, { requestBody: body, record, oldRecord }, ActionCheckSource.EditRequest);
                 const { allowed, error } = checkAccess(AllowedActionsEnum.edit, resource);
                 if (!allowed) {
                     return { error };
@@ -1032,18 +1040,18 @@ class AdminForth {
             path: '/delete_record',
             handler: (_9) => __awaiter(this, [_9], void 0, function* ({ body, adminUser }) {
                 var _10, _11, _12, _13;
-                const resource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
-                const record = yield this.connectors[resource.dataSource].getRecordByPrimaryKey(resource, body['primaryKey']);
-                if (!resource) {
+                const configResource = this.config.resources.find((res) => res.resourceId == body['resourceId']);
+                const record = yield this.connectors[configResource.dataSource].getRecordByPrimaryKey(configResource, body['primaryKey']);
+                if (!configResource) {
                     return { error: `Resource '${body['resourceId']}' not found` };
                 }
                 if (!record) {
                     return { error: `Record with ${body['primaryKey']} not found` };
                 }
-                if (resource.options.allowedActions.delete === false) {
-                    return { error: `Resource '${resource.resourceId}' does not allow delete action` };
+                if (configResource.options.allowedActions.delete === false) {
+                    return { error: `Resource '${configResource.resourceId}' does not allow delete action` };
                 }
-                yield interpretResource(adminUser, resource, { requestBody: body }, ActionCheckSource.DeleteRequest);
+                const resource = yield interpretResource(adminUser, configResource, { requestBody: body }, ActionCheckSource.DeleteRequest);
                 const { allowed, error } = checkAccess(AllowedActionsEnum.delete, resource);
                 if (!allowed) {
                     return { error };

package/dist/spa/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
+    <link rel="icon" href="/* IMPORTANT:ADMINFORTH FAVICON */">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>/* IMPORTANT:ADMINFORTH TITLE */</title>
 <!--     
     <script>
       // On page load or when changing themes, best to add inline in `head` to avoid FOUC

package/dist/spa/package-lock.json

@@ -17,6 +17,7 @@
         "flowbite-datepicker": "^1.2.6",
         "pinia": "^2.1.7",
         "unhead": "^1.9.12",
+        "uuid": "^10.0.0",
         "vue": "^3.4.21",
         "vue-router": "^4.3.0",
         "vue-slider-component": "^4.1.0-beta.7"
@@ -36,7 +37,7 @@
         "sass": "^1.77.2",
         "tailwindcss": "^3.4.3",
         "typescript": "~5.4.0",
-        "vite": "^5.2.12",
+        "vite": "^5.2.13",
         "vue-tsc": "^2.0.11"
       }
     },
@@ -4032,10 +4033,22 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
+    "node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vite": {
-      "version": "5.2.12",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
-      "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+      "version": "5.2.13",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz",
+      "integrity": "sha512-SSq1noJfY9pR3I1TUENL3rQYDQCFqgD+lM6fTRAM8Nv6Lsg5hDLaXkjETVeBt+7vZBCMoibD+6IWnT2mJ+Zb/A==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.20.1",

package/dist/spa/package.json

@@ -21,6 +21,7 @@
     "flowbite-datepicker": "^1.2.6",
     "pinia": "^2.1.7",
     "unhead": "^1.9.12",
+    "uuid": "^10.0.0",
     "vue": "^3.4.21",
     "vue-router": "^4.3.0",
     "vue-slider-component": "^4.1.0-beta.7"
@@ -40,7 +41,7 @@
     "sass": "^1.77.2",
     "tailwindcss": "^3.4.3",
     "typescript": "~5.4.0",
-    "vite": "^5.2.12",
+    "vite": "^5.2.13",
     "vue-tsc": "^2.0.11"
   }
 }

package/dist/spa/spa/src/components/ResourceListTable.vue

@@ -118,7 +118,7 @@
         </td>
       </tr>
 
-      <tr @click="onClick"   v-else v-for="(row, rowI) in rows" :key="row.id"
+      <tr v-else v-for="(row, rowI) in rows" :key="row.id"
           class="bg-list-view-table-bg border-b dark:bg-gray-800 border-list-view-border-color dark:border-gray-700 hover:bg-list-view-table-row-hover dark:hover:bg-gray-600">
         <td class="w-4 p-4">
           <div class="flex items center">
@@ -385,15 +385,6 @@ function onSortButtonClick(field) {
   }
 }
 
-const mouseDownTime = ref(0);
-
-
-
-
-
-
-
-
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

package/dist/spa/src/App.vue

@@ -1,11 +1,12 @@
 <template>
   <nav 
-    v-if="loggedIn"
-    class="fixed h-14 top-0 z-40 w-full  border-b shadow-sm bg-header-bg shadow-header-shadow dark:bg-header-bg-hover dark:border-nav-menu-devider">
+    v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady"
+    class="fixed h-14 top-0 z-20 w-full  border-b shadow-sm bg-header-bg shadow-header-shadow dark:bg-header-bg-hover dark:border-nav-menu-devider">
     <div class="px-3 py-3 lg:px-5 lg:pl-3">
       <div class="flex items-center justify-between">
         <div class="flex items-center justify-start rtl:justify-end">
-          <button data-drawer-target="logo-sidebar" data-drawer-toggle="logo-sidebar" aria-controls="logo-sidebar" type="button" class="inline-flex items-center p-2 text-sm  rounded-lg sm:hidden hover:bg-nav-menu-bg-hover focus:outline-none focus:ring-2 focus:ring-nav-menu-devider dark:text-nav-menu-icons dark:hover:bg-nav-menu-bg-hover dark:focus:ring-nav-menu-devider">
+          <button @click="sideBarOpen = !sideBarOpen"
+           type="button" class="inline-flex items-center p-2 text-sm  rounded-lg sm:hidden hover:bg-nav-menu-bg-hover focus:outline-none focus:ring-2 focus:ring-nav-menu-devider dark:text-nav-menu-icons dark:hover:bg-nav-menu-bg-hover dark:focus:ring-nav-menu-devider">
               <span class="sr-only">Open sidebar</span>
               <svg class="w-6 h-6" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                 <path clip-rule="evenodd" fill-rule="evenodd" d="M2 4.75A.75.75 0 012.75 4h14.5a.75.75 0 010 1.5H2.75A.75.75 0 012 4.75zm0 10.5a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM2 10a.75.75 0 01.75-.75h14.5a.75.75 0 010 1.5H2.75A.75.75 0 012 10z"></path>
@@ -55,38 +56,41 @@
 
 
   <aside 
-    v-if="loggedIn"
 
-    id="logo-sidebar" class="fixed border-none top-0 left-0 z-50 w-64 h-screen  transition-transform -translate-x-full bg-nav-menu-bg border-r border-  sm:translate-x-0 dark:bg-gray-800 dark:border-gray-700" aria-label="Sidebar">
-    <div class="h-full px-3 pb-4 overflow-y-auto bg-nav-menu-bg dark:bg-gray-800">
+    v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady"
+
+    id="logo-sidebar" class="fixed border-none top-0 left-0 z-20 w-64 h-screen  transition-transform  border-r border-nav-menu-border  sm:translate-x-0 dark:bg-gray-800 dark:border-gray-700" 
+    :class="{ '-translate-x-full': !sideBarOpen, 'transform-none': sideBarOpen }"
+    aria-label="Sidebar"
+  >
+    <div class="h-full px-3 pb-4 overflow-y-auto bg-white dark:bg-gray-800 border-r">
       <div class="flex ms-2 md:me-24  m-4  ">
-            <img src="https://flowbite.com/docs/images/logo.svg" class="h-8 me-3" alt="FlowBite Logo" />
-            <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
-              {{ coreStore.config?.brandName }}
-            </span>
-          </div>
+        <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="h-8 me-3"  />
+        <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
+          {{ coreStore.config?.brandName }}
+        </span>
+      </div>
+
         <ul class="space-y-2 font-medium">
           <template v-for="(item, i) in coreStore.menu" :key="`menu-${i}`">
             <div v-if="item.type === 'divider'" class="border-t border-nav-menu-devider dark:border-gray-700"></div>
             <div v-else-if="item.type === 'gap'" class="flex items-center justify-center h-8"></div>
             <div v-else-if="item.type === 'heading'" class="flex items-center justify-left pl-2 h-8 text-gray-400 dark:text-gray-400
             ">{{ item.label }}</div>
-
-            
             <li v-else-if="item.children">
-              <button  type="button" class="flex items-center w-full p-2 text-base text-nav-menu-text rounded-default transition duration-75  group hover:bg-nav-menu-bg-hover dark:text-white dark:hover:bg-gray-700" 
+              <button @click="clickOnMenuItem(i)" type="button" class="flex items-center w-full p-2 text-base text-nav-menu-text rounded-default transition duration-75  group hover:bg-nav-menu-bg-hover dark:text-white dark:hover:bg-gray-700" 
                   :aria-controls="`dropdown-example${i}`"
                   :data-collapse-toggle="`dropdown-example${i}`"
               >
                 <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400  dark:group-hover:text-white" ></component>
 
                 <span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">{{ item.label }}</span>
-                <svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                <svg :class="{'rotate-180':  opened.includes(i) }" class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"  fill="none" viewBox="0 0 10 6">
                     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
                 </svg>
               </button>
 
-              <ul :id="`dropdown-example${i}`" role="none" class="pt-1 space-y-1" :class="{ 'hidden': !item.open }">
+              <ul :id="`dropdown-example${i}`" role="none" class="pt-1 space-y-1" :class="{ 'hidden': !opened.includes(i) }">
                 <template v-for="(child, j) in item.children" :key="`menu-${i}-${j}`">
                   <li>
                     <MenuLink :item="child" isChild="true" />
@@ -101,20 +105,61 @@
         </ul>
     </div>
   </aside>
-    
-  <div class="p-4 sm:ml-64 dark:bg-gray-800" v-if="loggedIn">
+  
+
+  <div class="p-4 sm:ml-64 dark:bg-gray-800" v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady">
     <div class="p-0 dark:border-gray-700 mt-14">
         <RouterView/>     
     </div>
   </div> 
 
-  <div v-else-if="routerIsReady">
+  <div v-else-if="routerIsReady && loginRedirectCheckIsReady">
     <RouterView/>
   </div>
+  <div v-else class="flex items-center justify-center h-screen">
+    <div class="text-3xl text-gray-400 animate-bounce">
+      <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
+      <span class="sr-only">Loading...</span>
+    </div>
+  </div>
   <AcceptModal />
+  <div v-if="toastStore.toasts.length>0" class="fixed bottom-5 right-5 flex gap-1 flex-col-reverse">
+    <transition-group
+      name="fade"
+      tag="div"
+      class="flex flex-col-reverse gap-1"
+    >
+      <Toast :toast="t" @close="toastStore.removeToast(t)" v-for="(t,i) in toastStore.toasts" :key="`t-${t.id}`" ></Toast>
+    </transition-group>
+  </div>
+
+  <div v-if="sideBarOpen" 
+  @click="sideBarOpen = false"
+  
+  drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-5"></div>
+
+
+
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
+
+  .fade-leave-active {
+    @apply transition-opacity duration-500;
+  }
+  .fade-leave-to {
+    @apply opacity-0;
+  }
+  .fade-enter-active {
+    @apply transition-opacity duration-500;
+  }
+  .fade-enter-from {
+    @apply opacity-0;
+  }
+  .fade-enter-to {
+    @apply opacity-100;
+  }
+
 </style>
 
 <script setup lang="ts">
@@ -123,6 +168,8 @@ import { RouterLink, RouterView } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 import './index.scss'
 import { useCoreStore } from '@/stores/core';
+import { useUserStore } from '@/stores/user';
+import {useModalStore} from '@/stores/modal';
 import { IconMoonSolid, IconSunSolid } from '@iconify-prerendered/vue-flowbite';
 import AcceptModal from './components/AcceptModal.vue';
 import MenuLink from './components/MenuLink.vue';
@@ -130,25 +177,34 @@ import { useRoute, useRouter } from 'vue-router';
 import { getIcon } from '@/utils';
 import { useHead } from 'unhead'
 import { createHead } from 'unhead'
+import { loadFile } from '@/utils';
+import Toast from './components/Toast.vue';
+import {useToastStore} from '@/stores/toast';
+import { FrontendAPI } from '@/composables/useStores'
 // import { link } from 'fs';
 const coreStore = useCoreStore();
-
-
+const modalStore = useModalStore();
+const toastStore = useToastStore();
+const userStore = useUserStore();
+const frontendApi = new FrontendAPI();
+frontendApi.init();
+const splitAtLast = (str: string, separator: string) => {
+  const index = str.lastIndexOf(separator);
+  return [str.slice(0, index), str.slice(index + 1)];
+}
 createHead()
-
-
-
-
-
-
+const sideBarOpen = ref(false);
 const route = useRoute();
 const router = useRouter();
 const title = ref('');
+//create a ref to store the opened menu items with ts type;
+const opened = ref<string[]>([]);
 
 
 const routerIsReady = ref(false);
+const loginRedirectCheckIsReady = ref(false);
 
-const loggedIn = computed(() => route.name !== 'login' && routerIsReady.value);
+const loggedIn = computed(() => route.name !== 'login');
 
 const theme = ref('light');
 
@@ -157,9 +213,19 @@ function toggleTheme() {
   document.documentElement.classList.toggle('dark');
 }
 
+function clickOnMenuItem (label: string) {
+if (opened.value.includes(label)) {
+  opened.value = opened.value.filter((item) => item !== label);
+} else {
+  opened.value.push(label);
+}
+ 
+}
+
 async function logout() {
-  await coreStore.logout();
-  router.push({ name: 'login' });
+  userStore.unauthorize();
+  await userStore.logout();
+  router.push({ name: 'login' })
 }
 
 
@@ -170,22 +236,36 @@ async function initRouter() {
   routerIsReady.value = true;
 }
 
+async function loadMenu() {
+  await coreStore.fetchMenuAndResource()
+  loginRedirectCheckIsReady.value = true;
+  
+  coreStore.menu.forEach((item, i) => {
+    if (item.open) {
+      opened.value.push(i);
+    }
+  });
+}
+
+
+
+watch(route, () => {
+  title.value = `${coreStore.config?.title || coreStore.config?.brandName || 'Adminforth'} | ${ Object.values(route.params)[0] || route.meta.title || ' '}`;
+  useHead({
+    title: title.value,
+  })
+});
+
 // initialize components based on data attribute selectors
 onMounted(async () => {
-  initRouter();
-  initFlowbite();
-  await coreStore.fetchMenuAndResource();
-  title.value = coreStore.config.title || 'Admin Forth';
-  useHead({
-  title: title.value,
-  link: [
-    {
-      rel: 'icon',
-      href: coreStore.config.favicon || '/favicon.ico',
-    },
-  ],
-  
-})
+  loadMenu(); // run this in async mode
+  // before init flowbite we have to wait router initialized because it affects dom(our v-ifs) and fetch menu
+  await initRouter()
+  setTimeout(() => {
+    initFlowbite();
+  }); 
+
+
 })
 
 </script>

package/dist/spa/src/assets/logo.svg

@@ -1 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_8)">
+<path d="M8.034 6.006V13H6.097V12.194C5.59433 12.8007 4.86633 13.104 3.913 13.104C3.25433 13.104 2.65633 12.9567 2.119 12.662C1.59033 12.3673 1.17433 11.947 0.871 11.401C0.567667 10.855 0.416 10.2223 0.416 9.503C0.416 8.78367 0.567667 8.151 0.871 7.605C1.17433 7.059 1.59033 6.63867 2.119 6.344C2.65633 6.04933 3.25433 5.902 3.913 5.902C4.80567 5.902 5.50333 6.18367 6.006 6.747V6.006H8.034ZM4.264 11.44C4.77533 11.44 5.2 11.2667 5.538 10.92C5.876 10.5647 6.045 10.0923 6.045 9.503C6.045 8.91367 5.876 8.44567 5.538 8.099C5.2 7.74367 4.77533 7.566 4.264 7.566C3.744 7.566 3.315 7.74367 2.977 8.099C2.639 8.44567 2.47 8.91367 2.47 9.503C2.47 10.0923 2.639 10.5647 2.977 10.92C3.315 11.2667 3.744 11.44 4.264 11.44Z" fill="url(#paint0_linear_1_8)"/>
+<path d="M13.317 5.538C12.589 5.538 12.0387 5.69833 11.666 6.019C11.2933 6.331 11.107 6.80333 11.107 7.436V7.995H14.851V9.685H11.107V13H9.001V7.449C9.001 6.279 9.365 5.369 10.093 4.719C10.8297 4.069 11.8567 3.744 13.174 3.744C13.694 3.744 14.1837 3.80033 14.643 3.913C15.1023 4.017 15.501 4.173 15.839 4.381L15.189 6.045C14.669 5.707 14.045 5.538 13.317 5.538Z" fill="url(#paint1_linear_1_8)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1_8" x1="1.5" y1="6.93333" x2="7.31883" y2="11.8926" gradientUnits="userSpaceOnUse">
+<stop stop-color="#656E7A"/>
+<stop offset="1" stop-color="#99A6B8"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1_8" x1="12.5" y1="3.73333" x2="9.68642" y2="12.7016" gradientUnits="userSpaceOnUse">
+<stop stop-color="#48C5FF"/>
+<stop offset="1" stop-color="#A1E1FF"/>
+</linearGradient>
+<clipPath id="clip0_1_8">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/dist/spa/src/components/AcceptModal.vue

@@ -3,13 +3,6 @@ import { ref,onMounted } from 'vue'
 import { useModalStore } from '@/stores/modal';
 
 const modalStore = useModalStore();
-
-
-
-
-
-
-        
 </script>
 
 <template>
@@ -28,10 +21,10 @@ const modalStore = useModalStore();
                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
                     </svg>
                     <h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">{{ modalStore?.modalContent?.content }}</h3>
-                    <button @click="()=>{modalStore.onAcceptFunction();modalStore.togleModal()}" type="button" class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center">
+                    <button @click="()=>{ modalStore.onAcceptFunction(true);modalStore.togleModal()}" type="button" class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center">
                         {{ modalStore?.modalContent?.acceptText }}
                     </button>
-                    <button @click="modalStore.togleModal"  type="button" class="py-2.5 px-5 ms-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">{{ modalStore?.modalContent?.cancelText }}</button>
+                    <button @click="()=>{modalStore.onAcceptFunction(false);modalStore.togleModal()}"  type="button" class="py-2.5 px-5 ms-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">{{ modalStore?.modalContent?.cancelText }}</button>
                 </div>
             </div>
         </div>

package/dist/spa/src/components/BreadcrumbsWithButtons.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex items-center justify-between mb-3 flex-wrap gap-y-2">
       <Breadcrumbs />
-      <div class="flex items-center space-x-1">
+      <div class="flex items-center space-x-1 flex-wrap gap-y-1">
         <slot></slot>
       </div>
     </div>

package/dist/spa/src/components/CustomDatePicker.vue

@@ -67,6 +67,9 @@ const props = defineProps({
   },
   label: {
     type: String,
+  },
+  autoHide: {
+    type: Boolean,
   }
 });
 
@@ -100,8 +103,7 @@ function updateFromProps() {
   if (!props.valueStart) {
     datepickerStartEl.value.value = '';
     startTime.value = '';
-  }
-  else {
+  } else {
     datepickerObject.value.setDate(dayjs(props.valueStart).format('DD MMM YYYY'));
     startTime.value = dayjs(props.valueStart).format('HH:mm:ss')
   }
@@ -121,7 +123,13 @@ watch(start, () => {
 })
 
 function initDatepickers() {
-  datepickerObject.value = new Datepicker(datepickerStartEl.value, { format: 'dd M yyyy' });
+  const options = {format: 'dd M yyyy'};
+
+  if (props.autoHide) {
+    options.autohide = true;
+  }
+
+  datepickerObject.value = new Datepicker(datepickerStartEl.value, options);
 
   addChangeDateListener();
 }
@@ -134,6 +142,10 @@ function removeChangeDateListener() {
   datepickerStartEl.value.removeEventListener('changeDate', setStartDate);
 }
 
+function destroyDatepickerElement() {
+  datepickerObject.value.destroy();
+}
+
 function setStartDate(event) {
   startDate.value = event.detail.date
 }
@@ -157,5 +169,6 @@ onMounted(() => {
 
 onBeforeUnmount(() => {
   removeChangeDateListener();
+  destroyDatepickerElement();
 });
 </script>

package/dist/spa/src/components/CustomDateRangePicker.vue

@@ -101,6 +101,9 @@ const endDate = ref('');
 const startTime = ref('');
 const endTime = ref('');
 
+const datepickerStartObject = ref('')
+const datepickerEndObject = ref('')
+
 const start = computed(() => {
   if (!startDate.value) {
     return;
@@ -162,9 +165,9 @@ watch(end, () => {
 
 function initDatepickers() {
 
-  new Datepicker(datepickerStartEl.value, {format: 'dd M yyyy'});
+  datepickerStartObject.value = new Datepicker(datepickerStartEl.value, {format: 'dd M yyyy'});
 
-  new Datepicker(datepickerEndEl.value, {format: 'dd M yyyy'});
+  datepickerEndObject.value = new Datepicker(datepickerEndEl.value, {format: 'dd M yyyy'});
   addChangeDateListener();
 }
 
@@ -178,6 +181,11 @@ function removeChangeDateListener() {
   datepickerEndEl.value.removeEventListener('changeDate', setEndDate);
 }
 
+function destroyDatepickerElement() {
+  datepickerStartObject.value.destroy();
+  datepickerEndObject.value.destroy();
+}
+
 function setStartDate(event) {
   startDate.value = event.detail.date
 }
@@ -205,5 +213,6 @@ onMounted(() => {
 
 onBeforeUnmount(() => {
   removeChangeDateListener();
+  destroyDatepickerElement();
 })
 </script>