adminforth 1.2.56 → 1.2.58

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

@@ -1,42 +1,29 @@
 <template>
   <!-- table -->
-  <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	overflow-y-hidden rounded-default">
+  <div class="relative overflow-x-auto shadow-listTableShadow dark:shadow-darkListTableShadow	overflow-y-hidden rounded-default">
 
     <!-- skelet loader -->
     <div role="status" v-if="!resource || !resource.columns"
         class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded shadow animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-      <div class="flex items-center justify-between h-16">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-
-      <div class="flex items-center justify-between  h-16 pt-4" v-for="i in new Array(10)">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-      <span class="sr-only">Loading...</span>
+      
     </div>
 
     <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
-      <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
+      <thead class="text-xs text-view-table-heading-text bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-gray-400">
       <tr>
         <th scope="col" class="p-4">
           <div v-if="rows && rows.length" class="flex items-center">
-            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()"
-                  class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+            <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
+                  class="w-4 h-4 cursor-pointer text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
             <label for="checkbox-all-search" class="sr-only">checkbox</label>
           </div>
         </th>
 
         <th v-for="c in columnsListed" scope="col" class="px-6 py-3">
+         
           <div @click="() => c.sortable && onSortButtonClick(c.name)" class="flex items-center " :class="{'cursor-pointer':c.sortable}">
             {{ c.label }}
+            
 
             <div v-if="c.sortable"
                 :style="{ 'color':ascArr.includes(c.name)?'green':descArr.includes(c.name)?'red':'currentColor'}">
@@ -52,6 +39,12 @@
                   d="M8.574 11.024h6.852a2.075 2.075 0 0 0 1.847-1.086 1.9 1.9 0 0 0-.11-1.986L13.736 2.9a2.122 2.122 0 0 0-3.472 0L6.837 7.952a1.9 1.9 0 0 0-.11 1.986 2.074 2.074 0 0 0 1.847 1.086Zm6.852 1.952H8.574a2.072 2.072 0 0 0-1.847 1.087 1.9 1.9 0 0 0 .11 1.985l3.426 5.05a2.123 2.123 0 0 0 3.472 0l3.427-5.05a1.9 1.9 0 0 0 .11-1.985 2.074 2.074 0 0 0-1.846-1.087Z"/>
               </svg>
             </div>
+            <span
+             class="bg-red-100 text-red-800 text-xs font-medium me-1 px-1 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400"
+             v-if="sort.findIndex((s) => s.field === c.name) !== -1 && sort?.length > 1">
+            {{ sort.findIndex((s) => s.field === c.name) + 1 }}
+            </span>
+
           </div>
         </th>
 
@@ -61,51 +54,8 @@
       </tr>
       </thead>
       <tbody>
-      <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
-        <td :colspan="resource?.columns.length + 2">
-
-          <div role="status"
-              class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-            <div class="flex items-center justify-between">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <span class="sr-only">Loading...</span>
-          </div>
-        </td>
-      </tr>
-      <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <SkeleteLoader v-if="!rows" :columns="3" :rows="resource?.columns.length + 2"/>  
+      <tr v-else-if="rows.length === 0" class="bg-lightListTable dark:bg-darkListTable dark:border-darkListTableBorder">
         <td :colspan="resource?.columns.length + 2">
 
           <div id="toast-simple"
@@ -118,16 +68,19 @@
         </td>
       </tr>
 
-      <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">
+      <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="row.id"
+          class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer"
+        :class="{'border-b': rowI !== rows.length - 1}"
+      >
+        <td class="w-4 p-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
+          <div class="flex items center ">
             <input
+              @click="(e)=>{e.stopPropagation()}"
               id="checkbox-table-search-1"
               type="checkbox"
               :checked="checkboxesInternal.includes(row.id)"
               @change="(e)=>{addToCheckedValues(row.id)}"
-              class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+              class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer">
             <label for="checkbox-table-search-1" class="sr-only">checkbox</label>
           </div>
         </td>
@@ -135,14 +88,14 @@
           <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
           <component
             :is="c?.components?.list ? getCustomComponent(c.components.list) : ValueRenderer"
-            :meta="c?.components?.list.meta"
+            :meta="c?.components?.list?.meta"
             :column="c"
             :record="row"
             :adminUser="coreStore.adminUser"
             :resource="resource"
           />
         </td>
-        <td class=" items-center px-6 py-4">
+        <td class=" items-center px-6 py-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
           <div class="flex">
           <RouterLink
             v-if="resource.options?.allowedActions.show"
@@ -277,7 +230,8 @@ import { callAdminForthApi, getIcon } from '@/utils';
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
-import { showSuccesTost } from '@/composables/useFrontendApi';
+import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
+import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
 IconInboxOutline,
@@ -291,6 +245,7 @@ IconFilterOutline,
 IconPenSolid,
 IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
+import router from '@/router';
 
 const coreStore = useCoreStore();
 
@@ -299,7 +254,8 @@ const props = defineProps([
   'rows',
   'totalRows',
   'pageSize',
-  'checkboxes'
+  'checkboxes',
+  'sort'
 ])
 
 // emits, update page
@@ -335,6 +291,10 @@ watch(() => props.checkboxes, (newCheckboxes) => {
   checkboxesInternal.value = newCheckboxes;
 });
 
+watch(() => props.sort, (newSort) => {
+  sort.value = newSort;
+});
+
 function addToCheckedValues(id) {
   if (checkboxesInternal.value.includes(id)) {
     checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== id);
@@ -347,25 +307,25 @@ function addToCheckedValues(id) {
 const columnsListed = computed(() => props.resource?.columns?.filter(c => c.showIn.includes('list')));
 
 async function selectAll(value) {
-  props.rows.forEach((r) => {
-    if (!checkboxesInternal.value.includes(r.id)) {
-      checkboxesInternal.value.push(r.id)
-    } else {
-      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r.id)
-    }
-  });
-  checkboxesInternal.value = [ ...checkboxesInternal.value ]
-  // checkboxes.value = rows.value.map((v) => v.id);
+  if (!allFromThisPageChecked.value) {
+    props.rows.forEach((r) => {
+      if (!checkboxesInternal.value.includes(r.id)) {
+        checkboxesInternal.value.push(r.id)
+      } 
+    });
+  } else {
+    props.rows.forEach((r) => {
+      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r.id);
+    });
+  }
+  checkboxesInternal.value = [ ...checkboxesInternal.value ];
 }
 
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
-
-
-
 const allFromThisPageChecked = computed(() => {
   if (!props.rows) return false;
-  return props.rows.every((r) => props.checkboxes.includes(r.id));
+  return props.rows.every((r) => checkboxesInternal.value.includes(r.id));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));
@@ -374,7 +334,7 @@ const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').
 function onSortButtonClick(field) {
   const sortIndex = sort.value.findIndex((s) => s.field === field);
   if (sortIndex === -1) {
-    sort.value = [{field, direction: 'asc'}, ...sort.value];
+    sort.value = [...sort.value,{field, direction: 'asc'}];
   } else {
     const sortField = sort.value[sortIndex];
     if (sortField.direction === 'asc') {
@@ -385,6 +345,22 @@ function onSortButtonClick(field) {
   }
 }
 
+
+const clickTarget = ref(null);
+async function onClick(e,row) {
+  if(clickTarget.value === e.target) return;
+  clickTarget.value = e.target;
+  await new Promise((resolve) => setTimeout(resolve, 300));
+  if (window.getSelection().toString()) return;
+  else {router.push({
+    name: 'resource-show',
+    params: {
+      resourceId: props.resource.resourceId,
+      primaryKey: row._primaryKeyValue,
+    },
+  })}
+}
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',
@@ -394,26 +370,25 @@ async function deleteRecord(row) {
   if (data) {
     try {
       const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: props.resource.resourceId,
-        primaryKey: row._primaryKeyValue,
-      }});
+        path: '/delete_record',
+        method: 'POST',
+        body: {
+          resourceId: props.resource.resourceId,
+          primaryKey: row._primaryKeyValue,
+        }
+      });
+      console.log('safsa', res)
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')
       } else {
-        console.error(res.error)
+        showErrorTost(res.error)
       }
 
     } catch (e) {
+      showErrorTost(`Something went wrong, please try again later`);
       console.error(e);
-      };
-    }
-
-    
+    };
+  }
 }
-
-
 </script>

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

@@ -0,0 +1,23 @@
+<template>
+    <tr v-for="c in new Array(props.columns)" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListBorder">
+         <td v-for="r in new Array(props.rows)" class="items-center px-6 py-8 cursor-default" >
+            <div role="status" class="max-w-sm animate-pulse">
+                <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
+            </div>
+        </td>
+    </tr>
+</template>
+
+<script setup>
+
+const props = defineProps({
+    columns:Number,
+    rows:Number
+});
+
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -1,7 +1,13 @@
 <template>
     
 
-<div id="toast-default" class="flex  items-center w-full max-w-xs p-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800" role="alert">
+<div id="toast-default" class="flex  items-center w-full p-4 text-gray-500 rounded-lg shadow dark:text-gray-400 dark:bg-gray-800" role="alert"
+    :class="
+        {
+            'danger': 'bg-red-100',
+        }[toast.variant]
+    "
+>
     <div v-if="toast.variant == 'info'" class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 text-blue-500 bg-blue-100 rounded-lg dark:bg-blue-800 dark:text-blue-200">
         <svg class="w-4 h-4"  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20">
             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.147 15.085a7.159 7.159 0 0 1-6.189 3.307A6.713 6.713 0 0 1 3.1 15.444c-2.679-4.513.287-8.737.888-9.548A4.373 4.373 0 0 0 5 1.608c1.287.953 6.445 3.218 5.537 10.5 1.5-1.122 2.706-3.01 2.853-6.14 1.433 1.049 3.993 5.395 1.757 9.117Z"/>
@@ -26,7 +32,9 @@
         </svg>
         <span class="sr-only">Check icon</span>
     </div>
-    <div class="ms-3 text-sm font-normal">{{toast.message}}</div>
+
+    <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
+    <div class="ms-3 text-sm font-normal max-w-xs pr-2" v-else>{{toast.message}}</div>
     <button @click="closeToast" type="button" class="ms-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-gray-100 inline-flex items-center justify-center h-8 w-8 dark:text-gray-500 dark:hover:text-white dark:bg-gray-800 dark:hover:bg-gray-700" >
         <svg class="w-3 h-3"  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14">
             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
@@ -43,10 +51,13 @@ import { useToastStore } from '@/stores/toast';
 const toastStore = useToastStore();
 const emit = defineEmits(['close']);
 const props = defineProps<{
-    toast:{message: string;
-    variant: string;
-    id: string;
-    timeout?: number|'unlimited';}
+    toast: {
+        message?: string;
+        messageHtml?: string;
+        variant: string;
+        id: string;
+        timeout?: number|'unlimited';
+    }
 }>();
 function closeToast() {
     emit('close');
@@ -55,7 +66,7 @@ function closeToast() {
 onMounted(() => {
     if (props.toast.timeout === 'unlimited') return;
     else { 
-      setTimeout(() => {emit('close');}, props.toast.timeout  || 10000 );
+      setTimeout(() => {emit('close');}, (props.toast.timeout || 10) * 1e3 );
     }
 });
 

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

@@ -1,7 +1,6 @@
 <template>
   <div>
-    
-    <span v-if="column.foreignResource">
+    <span @click="(e)=>{e.stopPropagation()}" v-if="column.foreignResource">
       <RouterLink v-if="record[column.name]" class="font-medium text-blue-600 dark:text-blue-500 hover:brightness-110"
         :to="{ name: 'resource-show', params: { resourceId: column.foreignResource.resourceId, primaryKey: record[column.name].pk } }">
         {{ record[column.name].label }}
@@ -18,9 +17,11 @@
     <span v-else-if="column.enum">
       {{ checkEmptyValues(column.enum.find(e => e.value === record[column.name])?.label,route.meta.type) }}
     </span>
-    <span v-else-if="column.type === 'datetime'">
+    <span v-else-if="column.type === 'datetime'" class="whitespace-nowrap">
       {{ checkEmptyValues(formatDate(record[column.name]),route.meta.type) }}
-      
+    </span>
+    <span v-else-if="column.type === 'richtext'">
+      <div v-html="protectAgainstXSS(record[column.name])"></div>
     </span>
     <span v-else>
       {{ checkEmptyValues(record[column.name],route.meta.type) }}
@@ -36,6 +37,7 @@ import utc from 'dayjs/plugin/utc';
 import timezone from 'dayjs/plugin/timezone';
 import {checkEmptyValues} from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
+import sanitizeHtml from 'sanitize-html';
 
 
 import { useCoreStore } from '@/stores/core';
@@ -52,6 +54,10 @@ const props = defineProps({
   record: Object
 });
 
+function protectAgainstXSS(value) {
+  return sanitizeHtml(value);
+}
+
 
 function formatDate(date) {
   if (!date) return '';

package/dist/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 {
@@ -23,7 +35,6 @@ declare global {
 }
 
 export class FrontendAPI implements FrontendAPIInterface {
-  private validOperators: Operator[] = ['lte', 'gte', 'in','ilike'];
   private toastStore:any
   private modalStore:any
   private filtersStore:any  
@@ -56,6 +67,7 @@ export class FrontendAPI implements FrontendAPIInterface {
   alert(params: AlertParams): void {
     this.toastStore.addToast({
       message: params.message,
+      messageHtml: params.messageHtml,
       variant: params.variant,
       timeout: params.timeout  
     })
@@ -70,12 +82,8 @@ export class FrontendAPI implements FrontendAPIInterface {
       const filterField = this.coreStore.resourceColumnsWithFilters.find((col: AdminForthResourceColumn) => col.name === filter.field)
       if(!filterField){
           throw new Error(`Field ${filter.field} is not available for filtering`)
-        }
-      if(filterField) {
-        if(!this.validOperators.includes(filter.operator)){
-          throw new Error(`Operator ${filter.operator} is not valid`)
-        } 
       }
+      
     }
     return true
   }
@@ -103,7 +111,13 @@ export class FrontendAPI implements FrontendAPIInterface {
       if(index === -1) {
         this.filtersStore.setFilter(filter)
       } else {
-      this.filtersStore.setFilters([...this.filtersStore.filters.slice(0, index), filter, ...this.filtersStore.filters.slice(index + 1)])
+        const filters = [...this.filtersStore.filters];
+        if (filter.value === undefined) {
+          filters.splice(index, 1);
+        } else {
+          filters[index] = filter;
+        }
+        this.filtersStore.setFilters(filters);
       }
     }
   }

package/dist/spa/src/index.scss

@@ -23,4 +23,5 @@
 //   ::-webkit-scrollbar-thumb:hover {
 //     @apply bg-gray-700
 //   }
-// }
+// }
+

package/dist/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/router/index.ts

@@ -12,7 +12,6 @@ const router = createRouter({
       component: () => import('@/views/LoginView.vue'),
       meta: { title: 'login' },
       beforeEnter: async (to, from, next) => {
-        const userStore = useUserStore()
         if(localStorage.getItem('isAuthorized') === 'true'){
           next({name: 'home'})
         } else {

package/dist/spa/src/stores/user.ts

@@ -1,6 +1,12 @@
-import {ref} from 'vue';
-import {defineStore} from 'pinia';
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
 import { callAdminForthApi } from '@/utils';
+import { initFlowbite } from 'flowbite'
+import { useRouter } from 'vue-router';
+import { useCoreStore } from './core';
+import router from '@/router';
+
+
 
 export const useUserStore = defineStore('user', () => {
     const isAuthorized = ref(false);
@@ -15,6 +21,17 @@ export const useUserStore = defineStore('user', () => {
         localStorage.setItem('isAuthorized', 'false');
     }
 
+    async function finishLogin() {
+        const coreStore = useCoreStore();
+        authorize(); // TODO not sure we need this approach with localStorage
+        await router.push('/');
+        await router.isReady();
+        await coreStore.fetchMenuAndResource();
+        setTimeout(() => {
+            initFlowbite();
+        }); 
+    }
+
     async function logout() {
         await callAdminForthApi({
           path: '/logout',
@@ -48,7 +65,8 @@ export const useUserStore = defineStore('user', () => {
         isAuthorized,
         authorize,
         unauthorize,
-        logout
+        logout,
+        finishLogin
     }
 
 });