adminforth 1.1.47 → 1.1.48

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

@@ -1,38 +1,21 @@
 <template>
   <div class="relative">
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.beforeBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
     <BreadcrumbsWithButtons>
-      <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 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-default 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"
+      <RouterLink :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 v-if="coreStore?.resourceOptions?.allowedActions?.delete"  @click="deleteRecord"
-        class="flex items-center py-1 px-3 text-sm font-medium rounded-default text-red-600 focus:outline-none bg-white  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"
+      <button  @click="deleteRecord"
+        class="flex items-center py-1 px-3 mb-2 text-sm font-medium 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" />
         Delete
       </button>
     </BreadcrumbsWithButtons>
 
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.afterBreadcrumbs || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
-
     <div v-if="loading" role="status" class="max-w-sm animate-pulse">
         <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
         <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
@@ -46,7 +29,7 @@
       v-else
       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 rounded-default">
+     <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-form-view-heading dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
@@ -58,49 +41,23 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
                 class="bg-form-view-bg odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
             >
-              <component
-                v-if="column.components?.showRow"
-                  :is="getCustomComponent(column.components.showRow)"
-                  :meta="column.components.showRow.meta"
-                  :column="column"
-                  :resource="coreStore.resource"
-                  :record="coreStore.record"
-              />
-              <template v-else>
-                <td class="px-6 py-4 whitespace-nowrap "> <!--align-top-->
-                  {{ column.label }}
+                <td class="px-6 py-4 whitespace-nowrap">
+                    {{ column.label }}
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                  <component
-                    v-if="showComponentsPerColumn[column.name]"
-                    :is="showComponentsPerColumn[column.name]"
-                    :resource="coreStore.resource"
-                    :meta="column.components.show.meta"
-                    :column="column"
-                    :record="coreStore.record"
-                  />
-                  <ValueRenderer v-else 
-                    :column="column" 
-                    :record="coreStore.record"
-                  />
+                    <component
+                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
+                        :column="column"
+                        :row="coreStore.record"
+                    />
                 </td>
-              </template>
             </tr>
+            
         </tbody>
     </table>
-
-    <component 
-      v-for="c in coreStore?.resourceOptions?.pageInjections?.show?.bottom || []"
-      :is="getCustomComponent(c)"
-      :meta="c.meta"
-      :column="column"
-      :record="coreStore.record"
-      :resource="coreStore.resource"
-      :adminUser="coreStore.adminUser"
-    />
 </div>
 
 
@@ -111,78 +68,37 @@
 <script setup>
 
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
-
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { useCoreStore } from '@/stores/core';
-import { useModalStore } from '@/stores/modal';
-import { getCustomComponent, checkAcessByAllowedActions } from '@/utils';
+import { getCustomComponent } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref } from 'vue';
-import { useRoute,useRouter } from 'vue-router';
-import {callAdminForthApi} from '@/utils';
-import {showSuccesTost} from '@/composables/useFrontendApi';
+import { useRoute } from 'vue-router';
 
 
 const item = ref(null);
 const route = useRoute();
-const router = useRouter();
 const loading = ref(false);
 let showComponentsPerColumn = {};
 
-console.log(route.params,'showWiev');
-
-
 const coreStore = useCoreStore();
-const modalStore = useModalStore();
 
 onMounted(async () => {
   loading.value = true;
-  await coreStore.fetchResourceFull({
+  await coreStore.fetchColumns({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({
     resourceId: route.params.resourceId, 
     primaryKey: route.params.primaryKey,
   });
-  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
-
-  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
-      if (column.components?.show) {
-          acc[column.name] = getCustomComponent(column.components.show);
+  showComponentsPerColumn = coreStore.resourceColumns.reduce((acc, column) => {
+      if (column.component?.show) {
+          acc[column.name] = getCustomComponent(column.component.show);
       }
       return acc;
-  }, {});
+    }, {});
   loading.value = false;
 });
 
-async function deleteRecord(row) {
-  const data = await window.adminforth.confirm({
-    message: 'Are you sure you want to delete this item?',
-    yes: 'Delete',
-    no: 'Cancel',
-  });
-  if (data) {
-    try {
-      const res = await callAdminForthApi({
-      path: '/delete_record',
-      method: 'POST',
-      body: {
-        resourceId: route.params.resourceId,
-        primaryKey: route.params.primaryKey,
-      }});
-      if (!res.error){
-        router.push({ name: 'resource-list', params: { resourceId: route.params.resourceId } });
-        showSuccesTost('Record deleted successfully')
-      } else {
-        console.error(res.error)
-      }
-
-    } catch (e) {
-      console.error(e);
-      };
-    }
-
-    
-}
-
 </script>

package/dist/spa/tailwind.config.js

@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/dist/spa/vite.config.ts

@@ -11,12 +11,6 @@ const customLogger = {
       console.log(msg);
     }
   },
-  warnOnce(msg: string) {
-    console.warn('warn once', msg);
-    if (!this.hasWarned) {
-      this.hasWarned = true;
-    }
-  },
   warn(msg: string) {
     console.warn(msg);
   },

package/dist/types.js

@@ -0,0 +1,30 @@
+// typical types which AdminForth supports
+//
+export const AdminForthTypes = {
+    STRING: 'string',
+    INTEGER: 'integer',
+    FLOAT: 'float',
+    DECIMAL: 'decimal',
+    BOOLEAN: 'boolean',
+    DATE: 'date',
+    DATETIME: 'datetime',
+    TIME: 'time',
+    TEXT: 'text',
+    JSON: 'json',
+};
+export const AdminForthFilterOperators = {
+    EQ: 'eq',
+    NE: 'ne',
+    GT: 'gt',
+    LT: 'lt',
+    GTE: 'gte',
+    LTE: 'lte',
+    LIKE: 'like',
+    ILIKE: 'ilike',
+    IN: 'in',
+    NIN: 'nin',
+};
+export const AdminForthSortDirections = {
+    ASC: 'asc',
+    DESC: 'desc',
+};

package/modules/codeInjector.ts

@@ -7,10 +7,10 @@ import os from 'os';
 import path from 'path';
 import { promisify } from 'util';
 import AdminForth from '../index.js';
-import { ADMIN_FORTH_ABSOLUTE_PATH } from './utils.js';
-import { getComponentNameFromPath } from './utils.js';
+import { ADMIN_FORTH_ABSOLUTE_PATH, getComponentNameFromPath, transformObject, deepMerge } from './utils.js';
 import { styles } from './styles.js'
 import { AdminForthComponentDeclaration, CodeInjectorType } from '../types/AdminForthConfig.js';
+import { StylesGenerator } from './styleGenerator.js';
 
 
 
@@ -290,8 +290,6 @@ class CodeInjector implements CodeInjectorType {
           });
         });
       });
-
-
     });
 
     customResourceComponents.forEach((filePath) => {
@@ -340,20 +338,14 @@ class CodeInjector implements CodeInjectorType {
     }
     await fs.promises.writeFile(appVuePath, appVueContent);
 
-    // generate tailwind extend styles 
-    if(this.adminforth.config?.styles){
-      const tailwindStyles = this.adminforth.config?.styles
-      const stylesText = JSON.stringify(tailwindStyles, null, 2).slice(1, -1);
-      let tailwindConfigPath = path.join(CodeInjector.SPA_TMP_PATH, 'tailwind.config.js');
-      let tailwindConfigContent = await fs.promises.readFile(tailwindConfigPath, 'utf-8');
-      tailwindConfigContent = tailwindConfigContent.replace('/* IMPORTANT:ADMINFORTH TAILWIND STYLES */', stylesText);
-      await fs.promises.writeFile(tailwindConfigPath, tailwindConfigContent);
-    } else {
-      let tailwindConfigPath = path.join(CodeInjector.SPA_TMP_PATH, 'tailwind.config.js');
-      let tailwindConfigContent = await fs.promises.readFile(tailwindConfigPath, 'utf-8');
-      tailwindConfigContent = tailwindConfigContent.replace('/* IMPORTANT:ADMINFORTH TAILWIND STYLES */',styles());
-      await fs.promises.writeFile(tailwindConfigPath, tailwindConfigContent);
-    }
+    // generate tailwind extend styles
+    const stylesGenerator = new StylesGenerator(this.adminforth.config.customization?.styles); 
+    const  stylesText = JSON.stringify(stylesGenerator.mergeStyles(), null, 2).slice(1, -1);
+    let tailwindConfigPath = path.join(CodeInjector.SPA_TMP_PATH, 'tailwind.config.js');
+    let tailwindConfigContent = await fs.promises.readFile(tailwindConfigPath, 'utf-8');
+    tailwindConfigContent = tailwindConfigContent.replace('/* IMPORTANT:ADMINFORTH TAILWIND STYLES */', stylesText);
+    await fs.promises.writeFile(tailwindConfigPath, tailwindConfigContent);
+    
 
     const routerVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'router', 'index.ts');
 

package/modules/styleGenerator.ts

@@ -0,0 +1,45 @@
+import { transformObject,deepMerge } from "./utils.js";
+import { styles } from "./styles.js";
+
+const aliasObject ={ lightSidebarText:'lightSidebarIcons',darkSidebarText:'darkSidebarIcons',lightSidebarTextHover:'lightSidebarIconsHover',darkSidebarTextHover:'darkSidebarIconsHover'}
+
+export class StylesGenerator {
+    styleConfig: any;
+    defaultStyles: any;
+  
+    constructor(styleConfig: any) {
+      if (!styleConfig) {
+        console.log("No styles provided using default styles.");
+      }
+      this.styleConfig = styleConfig;
+      this.defaultStyles = styles();
+    }
+  
+    private generatePlainStyles(styleObj:any) {
+      let plainCustomStyles = {}
+      if (styleObj) {
+        Object.keys(styleObj).forEach((k)=>{
+          plainCustomStyles[k] = transformObject(styleObj[k])
+        })
+      }
+      return plainCustomStyles;
+    }
+    private changeAliases(plateStyles: any) {
+      if (!plateStyles || !plateStyles.colors) {
+        return plateStyles;
+      }
+      let colors = plateStyles.colors;
+      Object.keys(aliasObject).forEach((aliasName) => {
+        if (colors[aliasObject[aliasName]]) return;
+        if (!colors[aliasName]) return;
+        colors[aliasObject[aliasName]] = colors[aliasName];
+      })
+      return plateStyles;
+    }
+  
+    mergeStyles() {
+      let mergedStyles = deepMerge(this.defaultStyles, this.changeAliases(this.generatePlainStyles(this.styleConfig)));
+      return mergedStyles;
+    }
+  
+  }

package/modules/styles.ts

@@ -1,53 +1,100 @@
-export const styles = () => `
-
-  "colors": {
-    "html-bg": "#FFFFFF", // Changed to white
-    "header-bg": "#FFFFFF", // Light grey
-    "header-bg-hover": "#D3D3D3", // Light grey hover
-    "header-text": "#333333", // Dark grey text
-    "header-text-hover": "#333333", // Dark grey text hover
-    "header-icons": "#333333", // Dark grey icons
-    "header-icons-hover": "#333333", // Dark grey icons hover
-    "header-logo-color": "#333333", // Dark grey logo
-    "header-border-color": "rgb(229 231 235)", // Light grey border
-
-    "nav-menu-bg": "#ffffff", // Very light grey
-    "nav-menu-border": "rgb(229 231 235)",
-    "nav-menu-bg-hover": "rgb(243 244 246)", // Light grey hover
-    "nav-menu-bg-active": "rgb(233, 234, 236)", // Light grey active
-    "nav-menu-hover": "#rgb(209 213 219)", // Light grey hover
-    "nav-menu-active": "#CCCCCC", // Light grey active
-    "nav-menu-active-text": "#333333", // Dark grey active text
-    "nav-menu-text": "#333333", // Dark grey text
-    "nav-menu-text-hover": "#333333", // Dark grey text hover
-    "nav-menu-text-active": "#333333", // Dark grey text active
-    "nav-menu-devider": "#E0E0E0", // Light grey divider
-    "nav-menu-icons": "#333333", // Dark grey icons
-    "nav-menu-heading": "#333333", // Dark grey heading
-
-    "list-view-bg": "#FFFFFF", // White background
-    "list-view-table-bg": "#FFFFFF", // White table background
-    "list-view-table-heading": "rgb(249 250 251)", // Very light grey heading
-    "list-view-table-heading-text": "#333333", // Dark grey heading text
-    "list-view-table-text": "#333333", // Dark grey text
-    "list-view-table-row-hover": "rgb(249 250 251)", // Very light grey row hover
-    "list-view-bread-crumbs-text": "#666666", // Medium grey bread crumbs
-    "list-view-border-color": "#DDDDDD", // Light grey border
-
-    "form-view-bg": "#FFFFFF", // White form background
-    "form-view-border-color": "#F5F5F5", // Very light grey border
-    "form-view-heading": "#EDEDED" // Dark grey heading
+
+
+export const styles = () => ({
+  colors: {
+    lightHtml: "#FFFFFF", // main background
+
+    lightNavbar: "#FFFFFF", // navbar background
+    lightNavbarHover: "#D3D3D3", // in development
+    lightNavbarText: "#333333", // in development
+    lightNavbarTextHover: "#333333", // in development
+    lightNavbarIcons: "#333333", // in development
+    lightNavbarIconsHover: "#333333", // in development
+    lightNavbarLogo: "#333333", // in development
+    lightNavbarBorder: "rgb(229 231 235)", // border
+
+    lightSidebar: "#ffffff", // sidebar background
+    lightSidebarBorder: "rgb(229 231 235)", // sidebar right border
+    lightSidebarHover: "rgb(243 244 246)", // in development
+    lightSidebarActive: "rgb(233, 234, 236)", // in development
+    lightSidebarItemHover: "rgb(243 244 246)", // sidebar list item hover
+    lightSidebarItemActive: "rgb(233, 234, 236)", // sidebar list item active
+    lightSidebarText: "#4b5563", // sidebar list item text
+    lightSidebarTextHover: "#333333", // sidebar list item text hover
+    lightSidebarTextActive: "#333333", // sidebar list item text active
+    lightSidebarDevider: "#E0E0E0", // sidebar devider
+    lightSidebarIcons: "#6b7280", // sidebar list item icons
+    lightSidebarIconsHover: "#333333", // sidebar list item icons hover
+    lightSidebarHeading: "#333333", // sidebar heading
+
+    lightList: "#FFFFFF", // list view background
+    lightListTable: "#FFFFFF", // list view table background
+    lightListTableHeading: "rgb(249 250 251)", // list view table heading
+    lightListTableHeadingText: "#333333", // list view table heading text
+    lightListTableText: "#333333", // list view table text
+    lightListTableRowHover: "rgb(249 250 251)", // list view row hover
+    lightListBreadcrumbsText: "#666666", // list view breadcrumbs text
+    lightListBorder: "#DDDDDD", // list view  rows border
+
+    lightForm: "#FFFFFF", // show view background
+    lightFormBorder: "#F5F5F5", // show view rows border
+    lightFormHeading: "#EDEDED", // show view heading
+
+
+    // colors for dark theme
+    darkHtml: "#111827",
+
+    darkNavbar: "#111827", 
+    darkNavbarHover: "#444444",
+    darkNavbarText: "#FFFFFF", 
+    darkNavbarTextHover: "#FFFFFF",
+    darkNavbarIcons: "#FFFFFF", 
+    darkNavbarIconsHover: "#FFFFFF",
+    darkNavbarLogo: "#FFFFFF", 
+    darkNavbarBorder: "#e5e7eb",
+
+    darkSidebar: "#1f2937", 
+    darkSidebarBorder: "#374151", 
+    darkSidebarHover: "#374151", 
+    darkSidebarActive: "#444444", 
+    darkSidebarItemHover: "#374151",
+    darkSidebarItemActive: "#52525b",
+    darkSidebarItemActiveText: "#FFFFFF",
+    darkSidebarText: "#9ca3af", 
+    darkSidebarTextHover: "#FFFFFF",
+    darkSidebarTextActive: "#FFFFFF", 
+    darkSidebarDevider: "#374151", 
+    darkSidebarIcons: "#9ca3af", 
+    darkSidebarIconsHover: "#FFFFFF", 
+    darkSidebarHeading: "#FFFFFF", 
+
+    darkList: "#111111", 
+    darkListTable: "#1f2937", 
+    darkListTableHeading: "#334155", 
+    darkListTableHeadingText: "#9ca3af",
+    darkListTableText: "#9ca3af", 
+    darkListTableRowHover: "#4b5563",
+    darkListBreadcrumbsText: "#BBBBBB", 
+    darkListBorder: "#444444", 
+
+    darkForm: "#111111", 
+    darkFormBorder: "#222222", 
+    darkFormHeading: "#333333" 
+
   },
-  "boxShadow": {
-    "custom-light": "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
-    "header-shadow": "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
-    "list-table-shadow": "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
-    "resourse-form-shadow": "0 4px 8px rgba(0, 0, 0, 0.1)" // Lighter shadow
+  boxShadow: {
+    customLight: "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
+    headerShadow: "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
+    listTableShadow: "0 4px 8px rgba(0, 0, 0, 0.1)", // Lighter shadow
+    resourseFormShadow: "0 4px 8px rgba(0, 0, 0, 0.1)" // Lighter shadow
   },
-  "fontSize": {
-    "header-text-size": "1rem"
+  fontSize: {
+    "headerText-size": "1rem"
   },
-  "borderRadius": {
+  borderRadius: {
     "default": "2px"
   }
-`;
+});
+
+
+

package/modules/utils.ts

@@ -36,4 +36,52 @@ export function getComponentNameFromPath(filePath) {
 
 export function listify(param?: Array<Function>) {
   return param || [];
+}
+
+export function deepMerge(target, source) {
+  if (typeof target !== 'object' || target === null) {
+      return source;
+  }
+
+  for (let key in source) {
+      if (source.hasOwnProperty(key)) {
+          if (typeof source[key] === 'object' && source[key] !== null) {
+              if (!target[key]) {
+                  target[key] = {};
+              }
+              deepMerge(target[key], source[key]);
+          } else {
+              target[key] = source[key];
+          }
+      }
+  }
+
+  return target;
+}
+
+function toCamelCase(str) {
+  return str.replace(/[-_](.)/g, (_, char) => char.toUpperCase());
+}
+
+export function transformObject(obj, parentKey = '', result = {}) {
+  for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+          const camelCaseKey = toCamelCase(parentKey ? `${parentKey}_${key}` : key);
+          if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+              transformObject(obj[key], camelCaseKey, result);
+          } else {
+              result[camelCaseKey] = obj[key];
+          }
+      }
+  }
+  //remove 'Default' from keys
+  for (const key in result) {
+    if (key.includes('Main')) {
+      const newKey = key.replace('Main', '');
+      result[newKey] = result[key];
+      delete result[key];
+    }
+  }
+
+  return result;
 }

package/package.json

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

package/spa/index.html

@@ -17,7 +17,7 @@
 
   </head>
   <body class=" ">
-    <div id="app" class="min-h-screen bg-html-bg dark:bg-gray-800"></div>
+    <div id="app" class="min-h-screen bg-lightHtml dark:bg-darkHtml"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>