adminforth 1.2.95 → 1.2.97

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

@@ -1,113 +1,137 @@
 <template>
-  <div>
-    
+  <div class="rounded-default">
     <div 
-      class="relative shadow-md sm:rounded-lg dark:shadow-2xl"
+      class="relative shadow-resourseFormShadow dark:shadow-darkResourseFormShadow sm:rounded-lg dark:shadow-2xl  rounded-default"
     >
       <form autocomplete="off" @submit.prevent>
-        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-          <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
+        <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 ">
+          <thead class="text-xs text-gray-700 uppercase bg-lightFormHeading dark:bg-gray-700 dark:text-gray-400 block md:table-row-group">
               <tr>
-                  <th scope="col" class="px-6 py-3">
+                  <th scope="col" class="px-6 py-3 hidden md:table-cell">
                       Field
                   </th>
-                  <th scope="col" class="px-6 py-3 w-4/6">
+                  <th scope="col" class="px-6 py-3 w-5/6 hidden md:table-cell">
                       Value
                   </th>
+
+                 
               </tr>
           </thead>
           <tbody>
               <tr v-for="column, i in editableColumns" :key="column.name"
-                  class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
+                  v-if="currentValues !== null"
+                  class="bg-ligftForm dark:bg-gray-800 border-b dark:border-gray-700 block md:table-row"
               >
-                <td class="px-6 py-4 whitespace-nowrap">
-                  {{ column.label }}
-                  <span :data-tooltip-target="`tooltip-show-${i}`" class="relative inline-block">
-                    <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
-                      :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
-                    />
-                  </span>
-                  <div :id="`tooltip-show-${i}`"
-                    role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
-                      Required field
-                      <div class="tooltip-arrow" data-popper-arrow></div>
-                  </div>
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative">
-                  <Dropdown
-                    single
-                    v-if="column.enum"
-                    :options="column.enum"
-                    :modelValue="currentValues[column.name]"
-                    @update:modelValue="setCurrentValue(column.name, $event)"
-                  />
-                  <Dropdown
-                    single
-                    v-else-if="column.type === 'boolean'"
-                    :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
-                    :modelValue="currentValues[column.name]"
-                    @update:modelValue="setCurrentValue(column.name, $event)"
-                  />
-                  <input 
-                    v-else-if="['integer'].includes(column.type)"
-                    type="number" 
-                    step="1"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="0"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  >
-                  <CustomDatePicker
-                    v-else-if="['datetime'].includes(column.type)"
-                    :column="column"
-                    :valueStart="currentValues[column.name]"
-                    @update:valueStart="setCurrentValue(column.name, $event)"
-                  />
-                  <input
-                    v-else-if="['decimal', 'float'].includes(column.type)"
-                    type="number"
-                    step="0.1"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="0.0"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  />
-                  <textarea
-                    v-else-if="['text'].includes(column.type)"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="Text"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                  >
-                  </textarea>
-                  <input
-                    v-else
-                    :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                    placeholder="Text"
-                    :value="currentValues[column.name]"
-                    @input="setCurrentValue(column.name, $event.target.value)"
-                    autocomplete="false"
-                    data-lpignore="true"
-                    readonly
-                    onfocus="this.removeAttribute('readonly');"
-                  >
-
-                  <button
-                    v-if="column.masked"
-                    type="button"
-                    @click="unmasked[column.name] = !unmasked[column.name]"
-                    class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
-                  >
-                    <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
-                    <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
-                  </button>
-
-
-
-                  <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
-
-                  <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
+                    <td class="px-6 py-4 sm:pb-0 whitespace-nowrap flex items-center block md:table-cell"> <!--align-top-->
+                      {{ column.label }}
+                      <span :data-tooltip-target="`tooltip-show-${i}`" class="ml-1 relative inline-block">
+                          <IconExclamationCircleSolid v-if="column.required[mode]" class="w-4 h-4" 
+                          :class="(columnError(column) && validating) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-gray-500'"
+                          />
+                      </span>
+                      <div :id="`tooltip-show-${i}`"
+                          role="tooltip" 
+                          class="ml-1 absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
+                          Required field
+                          <div class="tooltip-arrow" data-popper-arrow></div>
+                      </div>
+                    </td>
+                    <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap relative block md:table-cell">
+                    <template v-if="column?.components?.[props.source]?.file">
+                      <component
+                        :is="getCustomComponent(column.components[props.source])"
+                        :column="column"
+                        :value="currentValues[column.name]"
+                        @update:value="setCurrentValue(column.name, $event)"
+                        :meta="column.components[props.source].meta"
+                        :record="currentValues"
+                        @update:inValidity="customComponentsInValidity[column.name] = $event"
+                        @update:emptiness="customComponentsEmptiness[column.name] = $event"
+                      />
+                    </template>
+                    <template v-else>
+                      <Dropdown
+                          single
+                          v-if="column.foreignResource"
+                          :options="columnOptions[column.name] || []"
+                          :placeholder = "columnOptions[column.name]?.length ?'Select...': 'There are no options available'"
+                          :modelValue="currentValues[column.name]"
+                          @update:modelValue="setCurrentValue(column.name, $event)"
+                      ></Dropdown>
+                      <Dropdown
+                          single
+                          v-else-if="column.enum"
+                          :options="column.enum"
+                          :modelValue="currentValues[column.name]"
+                          @update:modelValue="setCurrentValue(column.name, $event)"
+                      />
+                      <Dropdown
+                          single
+                          v-else-if="column.type === 'boolean'"
+                          :options="[{ label: 'Yes', value: true }, { label: 'No', value: false }, { label: 'Unset', value: null }]"
+                          :modelValue="currentValues[column.name]"
+                          @update:modelValue="setCurrentValue(column.name, $event)"
+                      />
+                      <input 
+                          v-else-if="['integer'].includes(column.type)"
+                          type="number" 
+                          step="1"
+                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                          placeholder="0"
+                          :value="currentValues[column.name]"
+                          @input="setCurrentValue(column.name, $event.target.value)"
+                      >
+                      <CustomDatePicker
+                          v-else-if="['datetime'].includes(column.type)"
+                          :column="column"
+                          :valueStart="currentValues[column.name]"
+                          auto-hide
+                          @update:valueStart="setCurrentValue(column.name, $event)"
+                      />
+                      <input
+                          v-else-if="['decimal', 'float'].includes(column.type)"
+                          type="number"
+                          step="0.1"
+                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-40 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                          placeholder="0.0"
+                          :value="currentValues[column.name]"
+                          @input="setCurrentValue(column.name, $event.target.value)"
+                      />
+                      <textarea
+                          v-else-if="['text', 'richtext'].includes(column.type)"
+                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                          placeholder="Text"
+                          :value="currentValues[column.name]"
+                          @input="setCurrentValue(column.name, $event.target.value)"
+                      >
+                      </textarea>
+                      <input
+                          v-else
+                          :type="!column.masked || unmasked[column.name] ? 'text' : 'password'"
+                          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                          placeholder="Text"
+                          :value="currentValues[column.name]"
+                          @input="setCurrentValue(column.name, $event.target.value)"
+                          autocomplete="false"
+                          data-lpignore="true"
+                          readonly
+                          onfocus="this.removeAttribute('readonly');"
+                      >
+
+                      <button
+                          v-if="column.masked"
+                          type="button"
+                          @click="unmasked[column.name] = !unmasked[column.name]"
+                          class="h-6 absolute inset-y-2 top-6 right-6 flex items-center pr-2 z-index-100 focus:outline-none"
+                      >
+                          <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked[column.name]" />
+                          <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
+                      </button>
+                    </template>
+                    <div v-if="columnError(column) && validating" class="mt-1 text-xs text-red-500 dark:text-red-400">{{ columnError(column) }}</div>
+
+                    <div v-if="column.editingNote && column.editingNote[mode]" class="mt-1 text-xs text-gray-400 dark:text-gray-500">{{ column.editingNote[mode] }}</div>
+
                 </td>
               </tr>
               
@@ -121,33 +145,55 @@
 
 <script setup>
 
-import { ref, computed, onMounted, watch } from 'vue';
-import { useCoreStore } from '@/stores/core';
-import Dropdown from '@/components/Dropdown.vue';
-import { IconExclamationCircleSolid } from '@iconify-prerendered/vue-flowbite';
-import { initFlowbite } from 'flowbite'
-import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import CustomDatePicker from "@/components/CustomDatePicker.vue";
+import Dropdown from '@/components/Dropdown.vue';
+import { useCoreStore } from '@/stores/core';
+import { callAdminForthApi, getCustomComponent } from '@/utils';
+import { IconExclamationCircleSolid, IconEyeSlashSolid, IconEyeSolid } from '@iconify-prerendered/vue-flowbite';
+import { computedAsync } from '@vueuse/core';
+import { initFlowbite } from 'flowbite';
+import { computed, onMounted, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
 
 const props = defineProps({
   loading: Boolean,
-  resourceColumns: Object,
+  resource: Object,
   record: Object,
   validating: Boolean,
+  source: String,
 });
 
-
 const unmasked = ref({});
 
 const mode = computed(() => props.record  && Object.keys(props.record).length ? 'edit' : 'create');
 
 const emit = defineEmits(['update:record', 'update:isValid']);
 
-const currentValues = ref({});
+const currentValues = ref(null);
+
+const customComponentsInValidity = ref({});
+const customComponentsEmptiness = ref({});
+
 
 const columnError = (column) => {
   const val = computed(() => {
-    if ( column.required[mode.value] && (currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '') ) {
+    if (!currentValues.value) {
+      return null;
+    }
+    if (customComponentsInValidity.value[column.name]) {
+      return customComponentsInValidity.value[column.name];
+    }
+
+    if ( 
+      column.required[mode.value] && 
+      (currentValues.value[column.name] === undefined || currentValues.value[column.name] === null || currentValues.value[column.name] === '') && 
+      // if component is custum it might tell other criteria for emptiness by emitting 'update:emptiness'
+      // components which do not emit 'update:emptiness' will have undefined value in customComponentsEmptiness
+      (customComponentsEmptiness.value[column.name] !== false)
+    
+    ) {
       return 'This field is required';
     }
     if ( column.type === 'string' || column.type === 'text' ) {
@@ -159,39 +205,82 @@ const columnError = (column) => {
       }
     }
     if ( ['integer', 'decimal', 'float'].includes(column.type) ) {
-      if ( column.minValue !== undefined && currentValues.value[column.name] < column.minValue ) {
+      if ( column.minValue !== undefined 
+        && currentValues.value[column.name] !== null 
+        && currentValues.value[column.name] < column.minValue 
+      ) {
         return `This field must be greater than ${column.minValue}`;
       }
       if ( column.maxValue !== undefined && currentValues.value[column.name] > column.maxValue ) {
         return `This field must be less than ${column.maxValue}`;
       }
     }
+    if ( column.validation && column.validation.length ) {
+      const validationArray = column.validation;
+      for (let i = 0; i < validationArray.length; i++) {
+        if (validationArray[i].regExp) {
+          const regExp = new RegExp(validationArray[i].regExp);
+          let value = currentValues.value[column.name];
+          if (value === undefined || value === null) {
+            value = '';
+          }
+          if (!regExp.test(value)) {
+            return validationArray[i].message;
+          }
+        }
+      }
+
+    }
     return null;
   });
   return val.value;
 };
 
 
-
-
 const setCurrentValue = (key, value) => {
-  currentValues.value[key] = value;
-
+  const col = props.resource.columns.find((column) => column.name === key);
+  if (['integer', 'float'].includes(col.type) && (value || value === 0)) {
+    currentValues.value[key] = +value;
+  } else {
+    currentValues.value[key] = value;
+  }
+  currentValues.value = { ...currentValues.value };
+  console.log('3️⃣ setCurrentValue', key, value);
   emit('update:record', currentValues.value);
 };
 
 onMounted(() => {
-  Object.keys(props.record).forEach((key) => {
-    currentValues.value[key] = props.record[key];
-  });
+  currentValues.value = Object.assign({}, props.record);
+  console.log('2️⃣ currentValues', JSON.stringify(currentValues.value));
   initFlowbite();
+  emit('update:isValid', isValid.value);
 });
 
-const coreStore = useCoreStore();
+const columnOptions = computedAsync(async () => { 
+  return (await Promise.all(
+    Object.values(props.resource.columns).map(async (column) => {
+      if (column.foreignResource) {
+        const list = await callAdminForthApi({
+          method: 'POST',
+          path: `/get_resource_foreign_data`,
+          body: {
+            resourceId: router.currentRoute.value.params.resourceId,
+            column: column.name,
+            limit: 1000,
+            offset: 0,
+          },
+        });
+        return { [column.name]: list.items };
+      }
+    })
+  )).reduce((acc, val) => Object.assign(acc, val), {})
+
+}, {});
+
 
 const editableColumns = computed(() => {
   const mode = props.record ? 'edit' : 'create';
-  return props.resourceColumns?.filter(column => column.showIn.includes(mode));
+  return props.resource?.columns?.filter(column => column.showIn.includes(mode));
 });
 
 const isValid = computed(() => {

package/dist/spa/{spa/src → src}/components/ResourceListTable.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- table -->
-  <div class="relative overflow-x-auto shadow-listTableShadow 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"
@@ -55,7 +55,7 @@
       </thead>
       <tbody>
         <SkeleteLoader v-if="!rows" :columns="3" :rows="resource?.columns.length + 2"/>  
-      <tr v-else-if="rows.length === 0" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListTableBorder">
+      <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"
@@ -69,7 +69,9 @@
       </tr>
 
       <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="row.id"
-          class="bg-lightListTable border-b dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer">
+          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
@@ -375,6 +377,7 @@ async function deleteRecord(row) {
           primaryKey: row._primaryKeyValue,
         }
       });
+      console.log('safsa', res)
       if (!res.error){
         emits('update:records', true)
         showSuccesTost('Record deleted successfully')

package/dist/spa/{spa/src → src}/components/Toast.vue

@@ -1,7 +1,13 @@
 <template>
     
 
-<div id="toast-default" class="flex  items-center w-full 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"/>
@@ -27,8 +33,8 @@
         <span class="sr-only">Check icon</span>
     </div>
 
-    <div class="ms-3 text-sm font-normal max-w-xs" v-if="toast.messageHtml" v-html="toast.messageHtml"></div>
-    <div class="ms-3 text-sm font-normal max-w-xs" v-else>{{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"/>

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

@@ -1,18 +1,30 @@
 <template>
   <div>
-    <span v-if="column.type === 'boolean'">
-      <span v-if="row[column.name]" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">Yes</span>
+    <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 }}
+      </RouterLink>
+      <div v-else>
+        <span class="text-gray-400">-</span>
+      </div>
+    </span>
+        
+    <span v-else-if="column.type === 'boolean'">
+      <span v-if="record[column.name]" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">Yes</span>
       <span v-else class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">No</span>
     </span>
     <span v-else-if="column.enum">
-      {{ column.enum.find(e => e.value === row[column.name])?.label }}
+      {{ checkEmptyValues(column.enum.find(e => e.value === record[column.name])?.label,route.meta.type) }}
+    </span>
+    <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 === 'datetime'">
-      {{ formatDate(row[column.name]) }}
-      
+    <span v-else-if="column.type === 'richtext'">
+      <div v-html="protectAgainstXSS(record[column.name])"></div>
     </span>
     <span v-else>
-      {{ row[column.name] }}
+      {{ checkEmptyValues(record[column.name],route.meta.type) }}
     </span>
   </div>
 </template>
@@ -23,19 +35,29 @@
 import dayjs from 'dayjs';
 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';
 
 const coreStore = useCoreStore();
+const route = useRoute();
+
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
 const props = defineProps({
   column: Object,
-  row: Object
+  record: Object
 });
 
+function protectAgainstXSS(value) {
+  return sanitizeHtml(value);
+}
+
 
 function formatDate(date) {
   if (!date) return '';

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,10 +6,10 @@ 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 */
 
-
+ 
 app.use(createPinia())
 app.use(router)
 

package/dist/spa/src/router/index.ts

@@ -1,23 +1,23 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import HomeView from '../views/HomeView.vue'
 import ResourceParent from '@/views/ResourceParent.vue'
-import ListView from '@/views/ListView.vue'
-import ShowView from '@/views/ShowView.vue'
-import EditView from '@/views/EditView.vue'
-import CreateView from '@/views/CreateView.vue'
+import { useUserStore } from '@/stores/user'
+/* IMPORTANT:ADMINFORTH ROUTES IMPORTS */
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
   routes: [
-    {
-      path: '/',
-      name: 'home',
-      component: HomeView
-    },
     {
       path: '/login',
       name: 'login',
-      component: () => import('@/views/LoginView.vue')
+      component: () => import('@/views/LoginView.vue'),
+      meta: { title: 'login' },
+      beforeEnter: async (to, from, next) => {
+        if(localStorage.getItem('isAuthorized') === 'true'){
+          next({name: 'home'})
+        } else {
+          next()
+        }
+      }
     },
     {
       path: '/resource/:resourceId',
@@ -26,23 +26,29 @@ const router = createRouter({
       children: [
         {
           path: '',
-          component: ListView,
-          name: 'resource-list'
+          component: () => import('@/views/ListView.vue'),
+          name: 'resource-list',
+          meta: { title: 'list',type: 'list' }
         },
         {
           path: 'show/:primaryKey',
-          component: ShowView,
-          name: 'resource-show'
+          component: () => import('@/views/ShowView.vue'),
+          name: 'resource-show',
+          meta: { title: 'show', type: 'show'}
+
         },
         {
           path: 'edit/:primaryKey',
-          component: EditView,
-          name: 'resource-edit'
+          component: () => import('@/views/EditView.vue'),
+          name: 'resource-edit',
+          meta: { title: 'edit', type: 'edit'}
         },
         {
           path: 'create',
-          component: CreateView,
-          name: 'resource-create'
+          component: () => import('@/views/CreateView.vue'),
+          name: 'resource-create',
+          meta: { title: 'create', type: 'create'}
+
         },
       ]
     }, 
@@ -50,4 +56,8 @@ const router = createRouter({
   ]
 })
 
+
+
+
+
 export default router