adminforth 1.1.52 → 1.1.53

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/styles.ts

@@ -38,7 +38,7 @@ export const styles = () => ({
 
     lightForm: "#FFFFFF", // show view background
     lightFormBorder: "#F5F5F5", // show view rows border
-    lightFormHeading: "#EDEDED", // show view heading
+    lightFormHeading: "rgb(249 250 251)", // show view heading
 
 
     // colors for dark theme
@@ -79,7 +79,7 @@ export const styles = () => ({
 
     darkForm: "#111111", 
     darkFormBorder: "#222222", 
-    darkFormHeading: "#333333" 
+    darkFormHeading: "#334155" 
 
   },
   boxShadow: {

package/package.json

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

package/spa/src/components/ResourceListTable.vue

@@ -300,15 +300,18 @@ 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);
+    });
+  }
 }
 
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));

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>