adminforth 1.1.32 → 1.1.34

package/dist/index.js

@@ -123,12 +123,21 @@ class AdminForth {
         if (!this.config.baseUrl) {
             this.config.baseUrl = '';
         }
+        if (!this.config.baseUrl.endsWith('/')) {
+            this.baseUrlSlashed = this.config.baseUrl + '/';
+        }
+        else {
+            this.baseUrlSlashed = this.config.baseUrl;
+        }
         if (!((_b = this.config) === null || _b === void 0 ? void 0 : _b.customization.brandName)) {
             this.config.customization.brandName = 'AdminForth';
         }
         if (this.config.customization.brandLogo) {
             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/dist/modules/codeInjector.js

@@ -87,7 +87,7 @@ class CodeInjector {
     }
     prepareSources(_a) {
         return __awaiter(this, arguments, void 0, function* ({ filesUpdated, verbose = false }) {
-            var _b, _c, _d, _e, _f, _g, _h, _j;
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             // check SPA_TMP_PATH exists and create if not
             try {
                 yield fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
@@ -191,6 +191,15 @@ class CodeInjector {
                 if ((_b = this.adminforth.config.customization) === null || _b === void 0 ? void 0 : _b.customComponentsDir) {
                     this.srcFoldersToSync[this.adminforth.config.customization.customComponentsDir] = './';
                 }
+                // if this.adminforth.config.customization.favicon is set, copy it to assets
+                const customFav = (_c = this.adminforth.config.customization) === null || _c === void 0 ? void 0 : _c.favicon;
+                if (customFav) {
+                    const faviconPath = path.join((_d = this.adminforth.config.customization) === null || _d === void 0 ? void 0 : _d.customComponentsDir, customFav.replace('@@/', ''));
+                    const dest = path.join(CodeInjector.SPA_TMP_PATH, 'public', 'assets', customFav.replace('@@/', ''));
+                    // make sure all folders in dest exist
+                    yield fsExtra.ensureDir(path.dirname(dest));
+                    yield 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) {
@@ -278,7 +287,7 @@ class CodeInjector {
             }
             let imports = iconImports + '\n';
             imports += customComponentsImports + '\n';
-            if ((_c = this.adminforth.config.customization) === null || _c === void 0 ? void 0 : _c.vueUsesFile) {
+            if ((_e = this.adminforth.config.customization) === null || _e === void 0 ? void 0 : _e.vueUsesFile) {
                 imports += `import addCustomUses from '${this.adminforth.config.customization.vueUsesFile}';\n`;
             }
             // inject that code into spa_tmp/src/App.vue
@@ -286,13 +295,13 @@ class CodeInjector {
             let appVueContent = yield fs.promises.readFile(appVuePath, 'utf-8');
             appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH IMPORTS */', imports);
             appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */', iconComponents + '\n' + customComponentsComponents + '\n');
-            if ((_d = this.adminforth.config.customization) === null || _d === void 0 ? void 0 : _d.vueUsesFile) {
+            if ((_f = this.adminforth.config.customization) === null || _f === void 0 ? void 0 : _f.vueUsesFile) {
                 appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH CUSTOM USES */', 'addCustomUses(app);');
             }
             yield fs.promises.writeFile(appVuePath, appVueContent);
             // generate tailwind extend styles 
-            if ((_e = this.adminforth.config) === null || _e === void 0 ? void 0 : _e.styles) {
-                const tailwindStyles = (_f = this.adminforth.config) === null || _f === void 0 ? void 0 : _f.styles;
+            if ((_g = this.adminforth.config) === null || _g === void 0 ? void 0 : _g.styles) {
+                const tailwindStyles = (_h = this.adminforth.config) === null || _h === void 0 ? void 0 : _h.styles;
                 const stylesText = JSON.stringify(tailwindStyles, null, 2).slice(1, -1);
                 let tailwindConfigPath = path.join(CodeInjector.SPA_TMP_PATH, 'tailwind.config.js');
                 let tailwindConfigContent = yield fs.promises.readFile(tailwindConfigPath, 'utf-8');
@@ -312,14 +321,17 @@ class CodeInjector {
             const indexHtmlPath = path.join(CodeInjector.SPA_TMP_PATH, 'index.html');
             let indexHtmlContent = yield fs.promises.readFile(indexHtmlPath, 'utf-8');
             indexHtmlContent = indexHtmlContent.replace('/* IMPORTANT:ADMINFORTH TITLE */', `${this.adminforth.config.customization.title || 'AdminForth'}`);
+            indexHtmlContent = indexHtmlContent.replace('/* IMPORTANT:ADMINFORTH FAVICON */', ((_j = this.adminforth.config.customization.favicon) === null || _j === void 0 ? void 0 : _j.replace('@@/', `${this.adminforth.baseUrlSlashed}assets/`))
+                ||
+                    `${this.adminforth.baseUrlSlashed}assets/favicon.png`);
             yield fs.promises.writeFile(indexHtmlPath, indexHtmlContent);
             /* generate custom routes */
             const homepageMenuItem = this.adminforth.config.menu.find((mi) => mi.homepage);
             let childrenHomePageMenuItem = this.adminforth.config.menu.find((mi) => { var _a; return mi.children && ((_a = mi.children) === null || _a === void 0 ? void 0 : _a.find((mi) => mi.homepage)); });
-            let childrenHomepage = (_g = childrenHomePageMenuItem === null || childrenHomePageMenuItem === void 0 ? void 0 : childrenHomePageMenuItem.children) === null || _g === void 0 ? void 0 : _g.find((mi) => mi.homepage);
+            let childrenHomepage = (_k = childrenHomePageMenuItem === null || childrenHomePageMenuItem === void 0 ? void 0 : childrenHomePageMenuItem.children) === null || _k === void 0 ? void 0 : _k.find((mi) => mi.homepage);
             let homePagePath = (homepageMenuItem === null || homepageMenuItem === void 0 ? void 0 : homepageMenuItem.path) || `/resource/${childrenHomepage === null || childrenHomepage === void 0 ? void 0 : childrenHomepage.resourceId}`;
             if (!homePagePath) {
-                homePagePath = ((_h = this.adminforth.config.menu.filter((mi) => mi.path)[0]) === null || _h === void 0 ? void 0 : _h.path) || `/resource/${(_j = this.adminforth.config.menu.filter((mi) => mi.children)[0]) === null || _j === void 0 ? void 0 : _j.resourceId}`;
+                homePagePath = ((_l = this.adminforth.config.menu.filter((mi) => mi.path)[0]) === null || _l === void 0 ? void 0 : _l.path) || `/resource/${(_m = this.adminforth.config.menu.filter((mi) => mi.children)[0]) === null || _m === void 0 ? void 0 : _m.resourceId}`;
             }
             routes += `{
       path: '/',

package/dist/modules/styles.js

@@ -11,7 +11,7 @@ export const styles = () => `
     "header-logo-color": "#333333", // Dark grey logo
     "header-border-color": "rgb(229 231 235)", // Light grey border
 
-    "nav-menu-bg": "#f9fafb", // Very light grey
+    "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
@@ -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/dist/spa/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/dist/spa/spa/src/App.vue

@@ -242,7 +242,6 @@ async function loadMenu() {
   
   coreStore.menu.forEach((item, i) => {
     if (item.open) {
-      console.log(item)
       opened.value.push(i);
     }
   });

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

@@ -118,7 +118,7 @@
         </td>
       </tr>
 
-      <tr v-else v-for="(row, rowI) in rows" :key="row.id"
+      <tr @click="onClick"   v-else v-for="(row, rowI) in rows" :key="row.id"
           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">
@@ -385,6 +385,15 @@ function onSortButtonClick(field) {
   }
 }
 
+const mouseDownTime = ref(0);
+
+
+
+
+
+
+
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

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

@@ -11,7 +11,7 @@ export const styles = () => `
     "header-logo-color": "#333333", // Dark grey logo
     "header-border-color": "rgb(229 231 235)", // Light grey border
 
-    "nav-menu-bg": "#f9fafb", // Very light grey
+    "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
@@ -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.34",
   "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

@@ -242,7 +242,6 @@ async function loadMenu() {
   
   coreStore.menu.forEach((item, i) => {
     if (item.open) {
-      console.log(item)
       opened.value.push(i);
     }
   });

package/spa/src/components/ResourceListTable.vue

@@ -118,7 +118,7 @@
         </td>
       </tr>
 
-      <tr v-else v-for="(row, rowI) in rows" :key="row.id"
+      <tr @click="onClick"   v-else v-for="(row, rowI) in rows" :key="row.id"
           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">
@@ -385,6 +385,15 @@ function onSortButtonClick(field) {
   }
 }
 
+const mouseDownTime = ref(0);
+
+
+
+
+
+
+
+
 async function deleteRecord(row) {
   const data = await window.adminforth.confirm({
     message: 'Are you sure you want to delete this item?',

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
        */