adminforth 1.1.32 → 1.1.33

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

@@ -1,21 +1,38 @@
 <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 :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"
+      <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"
       >
         <IconPenSolid class="w-4 h-4" />
         Edit
       </RouterLink>
 
-      <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"
+      <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"
       >
         <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>
@@ -29,7 +46,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">
+     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
         <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">
@@ -41,23 +58,49 @@
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
+            <tr v-for="column in coreStore.resource?.columns.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"
             >
-                <td class="px-6 py-4 whitespace-nowrap">
-                    {{ column.label }}
+              <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>
                 <td class="px-6 py-4 whitespace-nowrap whitespace-pre-wrap">
-                    <component
-                        :is="showComponentsPerColumn[column.name] || ValueRenderer"
-                        :column="column"
-                        :row="coreStore.record"
-                    />
+                  <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"
+                  />
                 </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>
 
 
@@ -68,37 +111,78 @@
 <script setup>
 
 import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
+
 import ValueRenderer from '@/components/ValueRenderer.vue';
 import { useCoreStore } from '@/stores/core';
-import { getCustomComponent } from '@/utils';
+import { useModalStore } from '@/stores/modal';
+import { getCustomComponent, checkAcessByAllowedActions } from '@/utils';
 import { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute,useRouter } from 'vue-router';
+import {callAdminForthApi} from '@/utils';
+import {showSuccesTost} from '@/composables/useFrontendApi';
 
 
 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.fetchColumns({
+  await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
   await coreStore.fetchRecord({
     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);
+  checkAcessByAllowedActions(coreStore.resourceOptions.allowedActions,'show');
+
+  showComponentsPerColumn = coreStore.resource.columns.reduce((acc, column) => {
+      if (column.components?.show) {
+          acc[column.name] = getCustomComponent(column.components.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}","./src/*.{vue, js}", "./index.html", "./node_modules/flowbite/**/*.js"],
+  content:  ["./src/**/*.{vue, js, ts, tsx}","./src/*.{vue, js, ts, tsx}", "./index.html", "./node_modules/flowbite/**/*.js"],
   theme: {
     extend: {
       /* IMPORTANT:ADMINFORTH TAILWIND STYLES */

package/dist/spa/vite.config.ts

@@ -11,6 +11,12 @@ 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/index.ts

@@ -49,6 +49,8 @@ class AdminForth implements AdminForthClass {
   runningHotReload: boolean;
   activatedPlugins: Array<AdminForthPlugin>;
 
+  baseUrlSlashed: string;
+
   statuses: {
     dbDiscover?: 'running' | 'done',
   }
@@ -159,6 +161,11 @@ class AdminForth implements AdminForthClass {
     if (!this.config.baseUrl) {
       this.config.baseUrl = '';
     }
+    if (!this.config.baseUrl.endsWith('/')) {
+      this.baseUrlSlashed = this.config.baseUrl + '/';
+    } else {
+      this.baseUrlSlashed = this.config.baseUrl;
+    }
     if (!this.config?.customization.brandName) {
       this.config.customization.brandName = 'AdminForth';
     }
@@ -166,6 +173,10 @@ class AdminForth implements AdminForthClass {
       errors.push(...this.checkCustomFileExists(this.config.customization.brandLogo));
     }
 
+    if (!this.config.customization.favicon) {
+      errors.push(...this.checkCustomFileExists(this.config.customization.favicon));
+    }
+
     if (!this.config.customization.datesFormat) {
       this.config.customization.datesFormat = 'MMM D, YYYY HH:mm:ss';
     }

package/modules/codeInjector.ts

@@ -209,6 +209,18 @@ class CodeInjector implements CodeInjectorType {
         this.srcFoldersToSync[this.adminforth.config.customization.customComponentsDir] = './'
       }
 
+      // if this.adminforth.config.customization.favicon is set, copy it to assets
+      const customFav = this.adminforth.config.customization?.favicon;
+      if (customFav) {
+
+        const faviconPath = path.join(this.adminforth.config.customization?.customComponentsDir, customFav.replace('@@/', ''));
+        const dest = path.join(CodeInjector.SPA_TMP_PATH, 'public', 'assets', customFav.replace('@@/', ''));
+        // make sure all folders in dest exist
+        await fsExtra.ensureDir(path.dirname(dest));
+
+        await fsExtra.copy(faviconPath, dest);
+      }
+
       for (const [src, dest] of Object.entries(this.srcFoldersToSync)) {
         const to = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'custom', dest);
         if (process.env.HEAVY_DEBUG) {
@@ -343,7 +355,6 @@ class CodeInjector implements CodeInjectorType {
       await fs.promises.writeFile(tailwindConfigPath, tailwindConfigContent);
     }
 
-
     const routerVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'router', 'index.ts');
 
     let routerVueContent = await fs.promises.readFile(routerVuePath, 'utf-8');
@@ -353,6 +364,13 @@ class CodeInjector implements CodeInjectorType {
     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.customization.title || 'AdminForth'}`);
+    
+    indexHtmlContent = indexHtmlContent.replace(
+      '/* IMPORTANT:ADMINFORTH FAVICON */',
+      this.adminforth.config.customization.favicon?.replace('@@/', `${this.adminforth.baseUrlSlashed}assets/`)
+          ||
+       `${this.adminforth.baseUrlSlashed}assets/favicon.png`
+    );
     await fs.promises.writeFile(indexHtmlPath, indexHtmlContent);
 
 

package/modules/styles.ts

@@ -27,10 +27,10 @@ export const styles = () => `
 
     "list-view-bg": "#FFFFFF", // White background
     "list-view-table-bg": "#FFFFFF", // White table background
-    "list-view-table-heading": "#F5F5F5", // Very light grey heading
+    "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": "#F0F0F0", // Very light grey row hover
+    "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
 

package/package.json

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

package/spa/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.png">
+    <link rel="icon" href="/* IMPORTANT:ADMINFORTH FAVICON */">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>/* IMPORTANT:ADMINFORTH TITLE */</title>
 <!--     

package/spa/src/App.vue

@@ -59,11 +59,11 @@
 
     v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady"
 
-    id="logo-sidebar" class="fixed border-none top-0 left-0 z-20 w-64 h-screen  transition-transform bg-nav-menu-bg border-r border-nav-menu-border  sm:translate-x-0 dark:bg-gray-800 dark:border-gray-700" 
+    id="logo-sidebar" class="fixed border-none top-0 left-0 z-20 w-64 h-screen  transition-transform  border-r border-nav-menu-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 border-r">
+    <div class="h-full px-3 pb-4 overflow-y-auto bg-white dark:bg-gray-800 border-r">
       <div class="flex ms-2 md:me-24  m-4  ">
         <img :src="loadFile(coreStore.config?.brandLogo || '@/assets/logo.svg')" :alt="`${ coreStore.config?.brandName } Logo`" class="h-8 me-3"  />
         <span class="self-center text-header-text-size font-semibold sm:text-header-text-size whitespace-nowrap dark:text-header-text text-header-logo-color">
@@ -242,7 +242,6 @@ async function loadMenu() {
   
   coreStore.menu.forEach((item, i) => {
     if (item.open) {
-      console.log(item)
       opened.value.push(i);
     }
   });

package/types/AdminForthConfig.ts

@@ -742,6 +742,21 @@ export type AdminForthConfig = {
        */
       brandLogo?: string,
 
+      /**
+       * Path to your app favicon
+       * 
+       * Example: 
+       * Place file `favicon.png` to `./custom` folder and set this option:
+       * 
+       * ```ts
+       * favicon: '@@/favicon.png',
+       * ```
+       */
+      favicon?: string,
+
+      /**
+      favicon?: string,
+
       /**
        * DayJS format string for all dates in the app
        */

package/dist/plugins/AccessControl/index.js

@@ -1,66 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { AllowedActionsEnum } from "../../types/AdminForthConfig.js";
-import AdminForthPlugin from "../base.js";
-class AccessControlPlugin extends AdminForthPlugin {
-    constructor(options) {
-        super(options, import.meta.url);
-        this.options = options;
-    }
-    modifyResourceConfig(adminforth, resourceConfig) {
-        super.modifyResourceConfig(adminforth, resourceConfig);
-        this.adminforth = adminforth;
-        if (!resourceConfig.hooks) {
-            resourceConfig.hooks = {};
-        }
-        const checkAccess = (adminUser, action, meta) => __awaiter(this, void 0, void 0, function* () {
-            const hasAccessOrError = yield this.options.hasAccess(adminUser, action, meta);
-            if (hasAccessOrError === true) {
-                return { ok: true };
-            }
-            else {
-                return { ok: false, error: hasAccessOrError || AccessControlPlugin.defaultError };
-            }
-        });
-        const bindHookCheck = (action, hookName) => {
-            if (!resourceConfig.hooks[action]) {
-                resourceConfig.hooks[action] = {};
-            }
-            if (!resourceConfig.hooks[action][hookName]) {
-                resourceConfig.hooks[action][hookName] = [];
-            }
-            if (hookName === 'beforeDatasourceRequest') {
-                resourceConfig.hooks[action][hookName].unshift((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, query }) {
-                    return checkAccess(adminUser, action, { query });
-                }));
-            }
-            else {
-                resourceConfig.hooks[action][hookName].unshift((_b) => __awaiter(this, [_b], void 0, function* ({ adminUser, record }) {
-                    return checkAccess(adminUser, action, { record });
-                }));
-            }
-        };
-        // List check
-        bindHookCheck(AllowedActionsEnum.list, 'beforeDatasourceRequest');
-        // Show check
-        bindHookCheck(AllowedActionsEnum.show, 'beforeDatasourceRequest');
-        // Edit check
-        bindHookCheck(AllowedActionsEnum.edit, 'beforeDatasourceRequest');
-        // create check
-        bindHookCheck(AllowedActionsEnum.create, 'beforeSave');
-        // edit check
-        bindHookCheck(AllowedActionsEnum.edit, 'beforeSave');
-        // delete check
-        bindHookCheck(AllowedActionsEnum.delete, 'beforeSave');
-        console.log('resourceConfig', resourceConfig);
-    }
-}
-AccessControlPlugin.defaultError = 'Sorry, you do not have access to this resource.';
-export default AccessControlPlugin;

package/dist/plugins/AccessControl/types.js

@@ -1 +0,0 @@
-export {};

package/dist/spa/spa/.eslintrc.cjs

@@ -1,14 +0,0 @@
-/* eslint-env node */
-require('@rushstack/eslint-patch/modern-module-resolution')
-
-module.exports = {
-  root: true,
-  'extends': [
-    'plugin:vue/vue3-essential',
-    'eslint:recommended',
-    '@vue/eslint-config-typescript'
-  ],
-  parserOptions: {
-    ecmaVersion: 'latest'
-  }
-}

package/dist/spa/spa/.vscode/extensions.json

@@ -1,6 +0,0 @@
-{
-  "recommendations": [
-    "Vue.volar",
-    "dbaeumer.vscode-eslint"
-  ]
-}

package/dist/spa/spa/README.md

@@ -1,39 +0,0 @@
-# spa
-
-This template should help get you started developing with Vue 3 in Vite.
-
-## Recommended IDE Setup
-
-[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
-
-## Type Support for `.vue` Imports in TS
-
-TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types.
-
-## Customize configuration
-
-See [Vite Configuration Reference](https://vitejs.dev/config/).
-
-## Project Setup
-
-```sh
-npm install
-```
-
-### Compile and Hot-Reload for Development
-
-```sh
-npm run dev
-```
-
-### Type-Check, Compile and Minify for Production
-
-```sh
-npm run build
-```
-
-### Lint with [ESLint](https://eslint.org/)
-
-```sh
-npm run lint
-```

package/dist/spa/spa/env.d.ts

@@ -1 +0,0 @@
-/// <reference types="vite/client" />

package/dist/spa/spa/index.html

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.png">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>/* IMPORTANT:ADMINFORTH TITLE */</title>
-<!--     
-    <script>
-      // On page load or when changing themes, best to add inline in `head` to avoid FOUC
-      if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-          document.documentElement.classList.add('dark');
-      } else {
-          document.documentElement.classList.remove('dark')
-      }
-  </script> -->
-
-  </head>
-  <body class=" ">
-    <div id="app" class="min-h-screen bg-html-bg dark:bg-gray-800"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>