adminforth 1.0.65 → 1.0.67

package/dist/spa/src/views/ListView.vue

@@ -65,7 +65,7 @@
     </BreadcrumbsWithButtons>
 
     <!-- table -->
-    <div class="relative overflow-x-auto shadow-md sm:rounded-lg dark:shadow-2xl">
+    <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	  dark:s">
 
 
       <!-- skelet loader -->
@@ -90,7 +90,7 @@
       </div>
 
       <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
-        <thead class="text-xs text-gray-700 bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
+        <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
         <tr>
           <th scope="col" class="p-4">
             <div v-if="rows && rows.length" class="flex items-center">
@@ -127,7 +127,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr v-if="!rows" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div role="status"
@@ -171,7 +171,7 @@
             </div>
           </td>
         </tr>
-        <tr v-else-if="rows.length === 0" class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
+        <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
           <td :colspan="coreStore.resourceColumns.length + 2">
 
             <div id="toast-simple"
@@ -185,7 +185,7 @@
         </tr>
 
         <tr v-else v-for="(row, rowI) in rows" :key="row.id"
-            class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
+            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">
               <input
@@ -198,7 +198,12 @@
             </div>
           </td>
           <td v-for="c in columnsListed" class="px-6 py-4">
-            <ValueRenderer :column="c" :row="row"/>
+            <!-- if c.name in listComponentsPerColumn, render it. If not, render ValueRenderer -->
+            <component
+              :is="listComponentsPerColumn[c.name] || ValueRenderer"
+              :column="c"
+              :row="row"
+            />
           </td>
           <td class="flex items-center px-6 py-4">
 
@@ -310,29 +315,28 @@
 </template>
 
 <script setup>
-import {ref, onMounted, watch, computed} from 'vue';
-import {callAdminForthApi, getIcon} from '@/utils';
-import {useRoute} from 'vue-router';
-import {useCoreStore} from '@/stores/core';
-import {useModalStore} from '@/stores/modal';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import {initFlowbite} from 'flowbite'
+import { useCoreStore } from '@/stores/core';
+import { useModalStore } from '@/stores/modal';
+import { callAdminForthApi, getIcon } from '@/utils';
+import { initFlowbite } from 'flowbite';
+import { computed, onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 
 import ValueRenderer from '@/components/ValueRenderer.vue';
+import { getCustomComponent } from '@/utils';
 
 import {
-  IconChevronDoubleLeftOutline,
-  IconChevronDoubleRightOutline,
-  IconInboxFullSolid,
-  IconInboxOutline,
-  IconPlusOutline
+IconInboxOutline,
+IconPlusOutline
 } from '@iconify-prerendered/vue-flowbite';
 
 import {
-  IconEyeSolid,
-  IconTrashBinSolid,
-  IconPenSolid,
-  IconFilterOutline, IconBanOutline
+IconBanOutline,
+IconEyeSolid,
+IconFilterOutline,
+IconPenSolid,
+IconTrashBinSolid
 } from '@iconify-prerendered/vue-flowbite';
 
 import Filters from '@/components/Filters.vue';
@@ -357,7 +361,6 @@ const totalRows = ref(0);
 const allCheckedActions = ref([]);
 const allowedActions = ref({});
 
-
 const DEFAULT_PAGE_SIZE = 10;
 
 const columnsListed = computed(() => coreStore.resourceColumns?.filter(c => c.showIn.includes('list')));
@@ -376,6 +379,7 @@ async function selectAll(value) {
 
 const pageSize = computed(() => coreStore.resourceById[route.params.resourceId]?.pageSize || DEFAULT_PAGE_SIZE);
 const totalPages = computed(() => Math.ceil(totalRows.value / pageSize.value));
+let listComponentsPerColumn = {};
 const allFromThisPageChecked = computed(() => {
   if (!rows.value) return false;
   return rows.value.every((r) => checkboxes.value.includes(r.id));
@@ -419,6 +423,7 @@ async function getList() {
     path: '/get_resource_data',
     method: 'POST',
     body: {
+      source: 'list',
       resourceId: route.params.resourceId,
       limit: pageSize.value,
       offset: (page.value - 1) * pageSize.value,
@@ -426,7 +431,14 @@ async function getList() {
       sort: sort.value,
     }
   });
-  fetchStatus.value.pending = false;
+  listComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.list) {
+          acc[column.name] = getCustomComponent(column.component.list);
+      }
+      return acc;
+    }, {});
+
+fetchStatus.value.pending = false;
   rows.value = data.data?.map(row => {
     row._primaryKeyValue = row[coreStore.resourceColumns.find(c => c.primaryKey).name];
     return row;

package/dist/spa/src/views/LoginView.vue

@@ -11,7 +11,7 @@
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
                 <!-- Modal header -->
                 <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
                     <h3 class="text-xl font-semibold text-gray-900 dark:text-white">

package/dist/spa/src/views/ResourceParent.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`">
     <RouterView/>
   </div>
 </template>

package/dist/spa/src/views/ShowView.vue

@@ -27,10 +27,10 @@
     </div>
     <div 
       v-else
-      class="relative overflow-x-auto shadow-md sm:rounded-lg"
+      class="relative overflow-x-auto shadow-resourse-form-shadow "
     >
      <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">
+        <thead class="text-xs text-gray-700 uppercase bg-form-view-heading dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
                     Field
@@ -42,13 +42,17 @@
         </thead>
         <tbody>
             <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :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"
+                class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
                 <td class="px-6 py-4 whitespace-nowrap">
                     {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                    <ValueRenderer :column="column" :row="coreStore.record" />
+                    <component
+                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
+                        :column="column"
+                        :row="coreStore.record"
+                    />
                 </td>
             </tr>
             
@@ -63,18 +67,19 @@
 
 <script setup>
 
-import { ref, computed, onMounted } from 'vue';  
-import { useRoute } from 'vue-router';
-import { callAdminForthApi } from '@/utils';
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
-import { useCoreStore } from '@/stores/core';
 import ValueRenderer from '@/components/ValueRenderer.vue';
+import { useCoreStore } from '@/stores/core';
+import { getCustomComponent } from '@/utils';
+import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
+import { onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
 
 const item = ref(null);
 const route = useRoute();
 const loading = ref(false);
+let showComponentsPerColumn = {};
 
 const coreStore = useCoreStore();
 
@@ -87,6 +92,12 @@ onMounted(async () => {
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
+  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.show) {
+          acc[column.name] = getCustomComponent(column.component.show);
+      }
+      return acc;
+    }, {});
   loading.value = false;
 });
 

package/dist/spa/tailwind.config.js

@@ -1,9 +1,12 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js}", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
-    extend: {},
+    extend: {
+      /* IMPORTANT:ADMINFORTH TAILWIND STYLES */
+  }
   },
+
   darkMode: 'class',
   plugins: [
     require('flowbite/plugin'),

package/modules/codeInjector.ts

@@ -296,6 +296,12 @@ class CodeInjector {
     let routerVueContent = await fs.promises.readFile(routerVuePath, 'utf-8');
     routerVueContent = routerVueContent.replace('/* IMPORTANT:ADMINFORTH ROUTES IMPORTS */', routerComponents);
 
+    // inject title to index.html
+    const indexHtmlPath = path.join(CodeInjector.SPA_TMP_PATH, 'index.html');
+    let indexHtmlContent = await fs.promises.readFile(indexHtmlPath, 'utf-8');
+    indexHtmlContent = indexHtmlContent.replace('/* IMPORTANT:ADMINFORTH TITLE */', `${this.adminforth.config.title || 'AdminForth'}`);
+    await fs.promises.writeFile(indexHtmlPath, indexHtmlContent);
+
 
 
     /* generate custom routes */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <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/spa/src/App.vue

@@ -5,7 +5,8 @@
     <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>
@@ -58,7 +59,10 @@
 
     v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady"
 
-    id="logo-sidebar" class="fixed border-none top-0 left-0 z-40 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">
+    id="logo-sidebar" class="fixed border-none top-0 left-0 z-50 w-64 h-screen  transition-transform bg-nav-menu-bg border-r 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-nav-menu-bg dark:bg-gray-800">
 
       <div class="flex ms-2 md:me-24  m-4  ">
@@ -101,7 +105,8 @@
         </ul>
     </div>
   </aside>
-    
+  
+
   <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/>     
@@ -119,6 +124,11 @@
   </div>
   <AcceptModal />
 
+  <div v-if="sideBarOpen" 
+  @click="sideBarOpen = false"
+  
+  drawer-backdrop="" class="bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-30"></div>
+
 </template>
 
 <style scoped>
@@ -144,7 +154,7 @@ const coreStore = useCoreStore();
 createHead()
 
 
-
+const sideBarOpen = ref(false);
 
 
 
@@ -198,16 +208,16 @@ onMounted(async () => {
   await coreStore.fetchMenuAndResource();
   loginRedirectCheckIsReady.value = true;
   title.value = coreStore.config?.title || 'AdminForth';
-  useHead({
-  title: title.value,
-  link: [
-    {
-      rel: 'icon',
-      href: coreStore.config.favicon || '/favicon.ico',
-    },
-  ],
+//   useHead({
+//   title: title.value,
+//   link: [
+//     {
+//       rel: 'icon',
+//       href: coreStore.config.favicon || '/favicon.ico',
+//     },
+//   ],
   
-})
+// })
 coreStore.menu.forEach((item, i) => {
   if (item.open) {
     opened.value.push(i);

package/spa/src/stores/core.ts

@@ -8,6 +8,7 @@ export const useCoreStore = defineStore('core', () => {
   const config = ref({});
   const record = ref({});
   const resourceColumns = ref(null);
+  const resourceOptions = ref(null);
   const resourceColumnsError = ref('');
   const resourceColumnsId = ref(null);
   const user = ref(null);
@@ -62,6 +63,7 @@ export const useCoreStore = defineStore('core', () => {
 
     console.log('📦 record', respData);
     record.value = respData.data[0];
+    resourceOptions.value = respData.options;
   }
 
   async function fetchColumns({ resourceId }) {
@@ -127,6 +129,7 @@ export const useCoreStore = defineStore('core', () => {
     fetchColumns, 
     resourceColumnsError,
     flowBitIsInitialised,
+    resourceOptions,
     logout
   }
 })

package/spa/src/views/ShowView.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="relative">
     <BreadcrumbsWithButtons>
-      <RouterLink :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
+      <RouterLink v-if="coreStore?.resourceOptions?.allowedActions?.edit" :to="{ name: 'resource-edit', params: { resourceId: $route.params.resourceId, primaryKey: $route.params.primaryKey } }" 
         class="flex items-center py-1 px-3 me-2 mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded border border-gray-300 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"
       >
         <IconPenSolid class="w-4 h-4" />
         Edit
       </RouterLink>
 
-      <button  @click="deleteRecord"
+      <button v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
         class="flex items-center py-1 px-3 mb-2 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white rounded border border-gray-300 hover:bg-gray-100 hover:text-red-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-red-500 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
       >
         <IconTrashBinSolid class="w-4 h-4" />
@@ -95,6 +95,7 @@ const loading = ref(false);
 let showComponentsPerColumn = {};
 let showRowComponentsPerColumn = {};
 
+
 const coreStore = useCoreStore();
 
 onMounted(async () => {

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

@@ -1,14 +0,0 @@
-<template>
-  <td class="px-6 py-4 whitespace-nowrap">
-      {{ column.label }}
-  </td>
-  <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-    <ValueRenderer :column="column" :row="row" />
-  </td>
-</template>
-
-<script setup>
-import ValueRenderer from '@/components/ValueRenderer.vue';
-
-defineProps(['column', 'row']);
-</script>

package/dist/spa/spa/src/views/HomeView.vue

@@ -1,8 +0,0 @@
-<script setup lang="ts">
-</script>
-
-<template>
-  <main>
-    123
-  </main>
-</template>

package/dist/spa/src/views/HomeView.vue

@@ -1,8 +0,0 @@
-<script setup lang="ts">
-</script>
-
-<template>
-  <main>
-    123
-  </main>
-</template>