adminforth 1.1.65 → 1.1.66

package/dataConnectors/mongo.ts

@@ -1,11 +1,11 @@
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
-class MongoConnector {
+class MongoConnector implements AdminForthDataSourceConnector {
     db: MongoClient
 
-    constructor({ url }) {
+    constructor({ url }: { url: string }) {
         this.db = new MongoClient(url);
         (async () => {
             try {
@@ -65,16 +65,10 @@ class MongoConnector {
 
     getFieldValue(field, value) {
         if (field.type == AdminForthDataTypes.DATETIME) {
-          if (!value) {
-            return null;
-          }
-          if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-            return dayjs.unix(+value).toISOString();
-          } else if (field._underlineType == 'varchar') {
-            return dayjs.unix(+value).toISOString();
-          } else {
-            throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
-          }
+        if (!value) {
+        return null;
+        }
+        return dayjs.unix(value).toISOString();
 
         } else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {

package/dataConnectors/postgres.ts

@@ -1,11 +1,11 @@
 import dayjs from 'dayjs';
 import pkg from 'pg';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
 const { Client } = pkg;
 
 
-class PostgresConnector {
+class PostgresConnector implements AdminForthDataSourceConnector {
 
     db: any;
 

package/dataConnectors/sqlite.ts

@@ -1,9 +1,9 @@
 import betterSqlite3 from 'better-sqlite3';
-import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/AdminForthConfig.js';
+import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, AdminForthDataSourceConnector } from '../types/AdminForthConfig.js';
 
 import dayjs from 'dayjs';
 
-class SQLiteConnector {
+class SQLiteConnector implements AdminForthDataSourceConnector {
 
     db: any;
 

package/dist/dataConnectors/mongo.js

@@ -71,15 +71,7 @@ class MongoConnector {
             if (!value) {
                 return null;
             }
-            if (field._underlineType == 'timestamp' || field._underlineType == 'int') {
-                return dayjs.unix(+value).toISOString();
-            }
-            else if (field._underlineType == 'varchar') {
-                return dayjs.unix(+value).toISOString();
-            }
-            else {
-                throw new Error(`AdminForth does not support row type: ${field._underlineType} for timestamps, use VARCHAR (with iso strings) or TIMESTAMP/INT (with unix timestamps)`);
-            }
+            return dayjs.unix(value).toISOString();
         }
         else if (field.type == AdminForthDataTypes.DATE) {
             if (!value) {

package/dist/index.js

@@ -633,11 +633,9 @@ class AdminForth {
                 let userFullName = '';
                 if (adminUser.isRoot) {
                     username = this.config.rootUser.username;
-                    console.log(username, 'this is the root');
                 }
                 else {
                     const dbUser = adminUser.dbUser;
-                    console.log(dbUser, 'this is the db user', adminUser, 'this is the admin user');
                     username = dbUser[this.config.auth.usernameField];
                     userFullName = dbUser[this.config.auth.userFullNameField];
                 }
@@ -1031,7 +1029,7 @@ class AdminForth {
                 }
                 // execute hook if needed
                 for (const hook of listify((_3 = (_2 = resource.hooks) === null || _2 === void 0 ? void 0 : _2.edit) === null || _3 === void 0 ? void 0 : _3.afterSave)) {
-                    const resp = yield hook({ resource, record, adminUser });
+                    const resp = yield hook({ resource, record, adminUser, oldRecord });
                     if (!resp || (!resp.ok && !resp.error)) {
                         throw new Error(`Hook afterSave must return object with {ok: true} or { error: 'Error' } `);
                     }

package/dist/plugins/AuditLogPlugin/custom/AuditLogView.vue

@@ -2,19 +2,20 @@
 import VueDiff from 'vue-diff';
 import { ref } from 'vue';
 import 'vue-diff/dist/index.css';
-
-const props = defineProps(['prev', 'current', 'meta']);
+import { app } from '@/main';
 
 app.use(VueDiff);
+
+const props = defineProps(['column', 'record', 'meta', 'resource', 'adminUser']);
 </script>
 
 <template>
     <Diff
       :mode="'split'"
       :theme="'light'"
-      :language="'plaintext'"
-      :prev="props.prev"
-      :current="props.current"
+      :language="'JSON'"
+      :prev="props.record[props.meta.resourceColumns.resourceDataColumnName].oldRecord"
+      :current="props.record[props.meta.resourceColumns.resourceDataColumnName].newRecord"
     />
-  </template>
+</template>
   

package/dist/plugins/AuditLogPlugin/index.js

@@ -11,20 +11,26 @@ import AdminForthPlugin from "../base.js";
 class AuditLogPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
-        this.createLogRecord = (resource, action, data, user) => __awaiter(this, void 0, void 0, function* () {
+        this.createLogRecord = (resource, action, data, user, oldRecord) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const recordIdFieldName = (_a = resource.columns.find((c) => c.primaryKey === true)) === null || _a === void 0 ? void 0 : _a.name;
-            const recordId = data[recordIdFieldName];
+            const recordId = (data === null || data === void 0 ? void 0 : data[recordIdFieldName]) || (oldRecord === null || oldRecord === void 0 ? void 0 : oldRecord[recordIdFieldName]);
+            const connector = this.adminforth.connectors[resource.dataSource];
+            const newRecord = yield connector.getRecordByPrimaryKey(resource, recordId);
+            let newData = {
+                'oldRecord': oldRecord || {},
+                'newRecord': newRecord
+            };
+            // console.log('newData', newData)
             const record = {
                 [this.options.resourceColumns.resourceIdColumnName]: resource.resourceId,
                 [this.options.resourceColumns.resourceActionColumnName]: action,
-                [this.options.resourceColumns.resourceDataColumnName]: data,
+                [this.options.resourceColumns.resourceDataColumnName]: newData,
                 [this.options.resourceColumns.resourceUserIdColumnName]: user.pk,
                 [this.options.resourceColumns.resourceRecordIdColumnName]: recordId,
                 [this.options.resourceColumns.resourceCreatedColumnName]: new Date()
             };
             const auditLogResource = this.adminforth.config.resources.find((r) => r.resourceId === this.auditLogResource);
-            console.log('rec', record);
             yield this.adminforth.createResourceRecord({ resource: auditLogResource, record, adminUser: user });
             return { ok: true };
         });
@@ -49,18 +55,17 @@ class AuditLogPlugin extends AdminForthPlugin {
                     };
                 }
                 diffColumn.components = {
-                    showRow: {
+                    show: {
                         file: this.componentPath('AuditLogView.vue'),
                         meta: Object.assign(Object.assign({}, this.options), { pluginInstanceId: this.pluginInstanceId })
                     }
                 };
-                resource.columns.push(diffColumn);
                 return;
             }
             const defaultHooks = {
-                create: { beforeSave: [] },
-                edit: { beforeSave: [] },
-                delete: { beforeSave: [] }
+                create: { afterSave: [] },
+                edit: { afterSave: [] },
+                delete: { afterSave: [] }
             };
             if (!resource.hooks) {
                 resource.hooks = defaultHooks;
@@ -69,11 +74,11 @@ class AuditLogPlugin extends AdminForthPlugin {
                 resource.hooks = Object.assign(Object.assign({}, defaultHooks), resource.hooks);
             }
             Object.keys(resource.hooks).forEach((hook) => {
-                if (!Array.isArray(resource.hooks[hook].beforeSave)) {
-                    resource.hooks[hook].beforeSave = [resource.hooks[hook].beforeSave];
+                if (!Array.isArray(resource.hooks[hook].afterSave)) {
+                    resource.hooks[hook].afterSave = [resource.hooks[hook].afterSave];
                 }
-                resource.hooks[hook].beforeSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser }) {
-                    return yield this.createLogRecord(resource, hook, record, adminUser);
+                resource.hooks[hook].afterSave.push((_a) => __awaiter(this, [_a], void 0, function* ({ resource, record, adminUser, oldRecord }) {
+                    return yield this.createLogRecord(resource, hook, record, adminUser, oldRecord);
                 }));
             });
         });

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/App.vue

@@ -163,7 +163,7 @@
 </style>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch, defineComponent } from 'vue';
+import { computed, onMounted, ref, watch, defineComponent, onBeforeMount } from 'vue';
 import { RouterLink, RouterView } from 'vue-router';
 import { initFlowbite } from 'flowbite'
 import './index.scss'
@@ -211,6 +211,8 @@ const theme = ref('light');
 function toggleTheme() {
   theme.value = theme.value === 'light' ? 'dark' : 'light';
   document.documentElement.classList.toggle('dark');
+  window.localStorage.setItem('theme', theme.value);
+
 }
 
 function clickOnMenuItem (label: string) {
@@ -237,14 +239,8 @@ async function initRouter() {
 }
 
 async function loadMenu() {
-  await coreStore.fetchMenuAndResource()
+  await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
-  
-  coreStore.menu.forEach((item, i) => {
-    if (item.open) {
-      opened.value.push(i);
-    }
-  });
 }
 
 
@@ -256,16 +252,32 @@ watch(route, () => {
   })
 });
 
+watch (()=>coreStore.menu, () => {
+    coreStore.menu.forEach((item, i) => {
+    if (item.open) {
+      opened.value.push(i);
+    };
+  });
+})
+
+watch([loggedIn,  routerIsReady, loginRedirectCheckIsReady], ([l,r,lr]) => {
+  if (l && r && lr) {
+    setTimeout(() => {
+    initFlowbite();
+  }); 
+  }
+})
+
 // initialize components based on data attribute selectors
 onMounted(async () => {
   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();
-  }); 
-
+})
 
+onBeforeMount(()=>{
+  theme.value = window.localStorage.getItem('theme') || 'light';
+  document.documentElement.classList.toggle('dark', theme.value === 'dark');
 })
 
 </script>

package/dist/spa/spa/src/composables/useStores.ts

@@ -1,4 +1,5 @@
-import type { FrontendAPIInterface, ConfirmParams, AlertParams, FilterParams,Operator } from '../types/FrontendAPI';
+import type { FrontendAPIInterface, ConfirmParams, AlertParams, } from '../types/FrontendAPI';
+import type { AdminForthFilterOperators } from '@/types/AdminForthConfig';
 import { useToastStore } from '../stores/toast';
 import { useModalStore } from '../stores/modal';
 import { useCoreStore } from '@/stores/core';
@@ -6,9 +7,20 @@ import { useFiltersStore } from '@/stores/filters';
 import router from '@/router'
 import type { AdminForthResourceColumn } from '@/types/AdminForthConfig';
 
-
-
-
+ type FilterParams = {
+  /**
+   * Field of resource to filter
+   */
+  field: string;
+  /**
+   * Operator of filter
+   */
+  operator: AdminForthFilterOperators;
+  /**
+   * Value of filter
+   */
+  value: string | number | boolean ;
+}
 
 declare global {
   interface Window {

package/dist/spa/spa/src/main.ts

@@ -6,7 +6,7 @@ import { createPinia } from 'pinia'
 import App from './App.vue'
 import router from './router'
 
-const app = createApp(App)
+export const app = createApp(App)
 /* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */
 
  

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>