adminforth 1.1.47 → 1.1.49

package/dist/spa/spa/tailwind.config.js

@@ -9,7 +9,9 @@ export default {
 
   darkMode: 'class',
   plugins: [
-    require('flowbite/plugin'),
+    require('flowbite/plugin')({
+      charts: true,
+    }),
   ],
 }
 

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.49",
   "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>

package/spa/src/App.vue

@@ -1,12 +1,12 @@
 <template>
   <nav 
     v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady"
-    class="fixed h-14 top-0 z-20 w-full  border-b shadow-sm bg-header-bg shadow-header-shadow dark:bg-header-bg-hover dark:border-nav-menu-devider">
+    class="fixed h-14 top-0 z-20 w-full  border-b shadow-sm bg-lightNavbar shadow-headerShadow dark:bg-darkNavbar dark:border-darkSidebarDevider">
     <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 @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">
+           type="button" class="inline-flex items-center p-2 text-sm  rounded-lg sm:hidden hover:bg-lightSidebarItemHover focus:outline-none focus:ring-2 focus:ring-lightSidebarDevider dark:text-darkSidebarIcons dark:hover:bg-darkSidebarHover dark:focus:ring-lightSidebarDevider">
               <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>
@@ -17,25 +17,25 @@
         <div class="flex items-center">
           <div class="flex items-center ms-3 ">
             <div>
-              <button type="button" class="flex text-sm bg-header-bg-hover rounded-full focus:ring-4 focus:ring-nav-menu-devider dark:focus:ring-nav-menu-devider dark:bg-header-bg-hover" aria-expanded="false" data-dropdown-toggle="dropdown-user">
+              <button type="button" class="flex text-sm bg- rounded-full focus:ring-4 focus:ring-lightSidebarDevider dark:focus:ring-darkSidebarDevider dark:bg-" aria-expanded="false" data-dropdown-toggle="dropdown-user">
                 <span class="sr-only">Open user menu</span>
-                <svg class="w-8 h-8 text-nav-menu-icons dark:text-header-icons" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+                <svg class="w-8 h-8 text-lightSidebarIcons dark:text-darkSidebarIcons" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
                   <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
                 </svg>
               </button>
             </div>
-            <div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded shadow dark:shadow-black dark:bg-nav-menu-bg dark:divide-nav-menu-devider dark:shadow-black" id="dropdown-user">
+            <div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded shadow dark:shadow-black dark:bg-darkSidebar dark:divide-darkSidebarDevider dark:shadow-black" id="dropdown-user">
               <div class="px-4 py-3" role="none">
-                <p class="text-sm text-gray-900 dark:text-header-text" role="none" v-if="coreStore.userFullname">
+                <p class="text-sm text-gray-900 dark:text-darkNavbarText" role="none" v-if="coreStore.userFullname">
                   {{ coreStore.userFullname }}
                 </p>
-                <p class="text-sm font-medium text-gray-900 truncate dark:text-nav-menu-text" role="none">
+                <p class="text-sm font-medium text-gray-900 truncate dark:text-darkSidebarText" role="none">
                   {{ coreStore.username }}
                 </p>
               </div>
               <ul class="py-1" role="none">
                 <li>
-                  <span @click="toggleTheme" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-html-bg dark:text-nav-menu-text-hover dark:hover:bg-nav-menu-hover dark:hover:text-nav-menu-text-active" role="menuitem">
+                  <span @click="toggleTheme" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-lightHtml dark:text-darkSidebarTextHover dark:hover:bg-darkHtml dark:hover:text-darkSidebarTextActive" role="menuitem">
                     {{ theme === 'dark' ? 'Light' : 'Dark' }}
                     <IconMoonSolid class="w-5 h-5 text-blue-300" v-if="theme !== 'dark'" />
                     <IconSunSolid class="w-5 h-5 text-yellow-300" v-else />
@@ -43,7 +43,7 @@
                   </span>
                 </li>
                 <li>
-                  <button @click="logout" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-html-bg dark:text-nav-menu-text-hover dark:hover:bg-nav-menu-hover dark:hover:text-nav-menu-text-active w-full" role="menuitem">Sign out</button>
+                  <button @click="logout" class="cursor-pointer flex items-center gap-1 block px-4 py-2 text-sm text-black hover:bg-html dark:text-darkSidebarTextHover dark:hover:bg-darkSidebarItemHover dark:hover:text-darkSidebarTextActive w-full" role="menuitem">Sign out</button>
                 </li>
               </ul>
             </div>
@@ -59,30 +59,30 @@
 
     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-lightSidebar" class="fixed bg-lightSidebar border-none top-0 left-0 z-20 w-64 h-screen  transition-transform bg-lightSidebar dark:bg-darkSidebar border-r border-lightSidebarBorder  sm:translate-x-0 dark:bg-darkSidebar dark:border-darkSidebarBorder" 
     :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-lightSidebar dark:bg-darkSidebar border-r dark:border-darkSidebarBorder">
       <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">
+        <span class="self-center text-lightNavbarText-size font-semibold sm:text-lightNavbarText-size whitespace-nowrap dark:text-darkNavbarText text-lightNavbarLogo">
           {{ coreStore.config?.brandName }}
         </span>
       </div>
 
         <ul class="space-y-2 font-medium">
           <template v-for="(item, i) in coreStore.menu" :key="`menu-${i}`">
-            <div v-if="item.type === 'divider'" class="border-t border-nav-menu-devider dark:border-gray-700"></div>
+            <div v-if="item.type === 'divider'" class="border-t border-lightSidebarDevider dark:border-darkSidebarDevider"></div>
             <div v-else-if="item.type === 'gap'" class="flex items-center justify-center h-8"></div>
             <div v-else-if="item.type === 'heading'" class="flex items-center justify-left pl-2 h-8 text-gray-400 dark:text-gray-400
             ">{{ item.label }}</div>
-            <li v-else-if="item.children">
-              <button @click="clickOnMenuItem(i)" type="button" class="flex items-center w-full p-2 text-base text-nav-menu-text rounded-default transition duration-75  group hover:bg-nav-menu-bg-hover dark:text-white dark:hover:bg-gray-700" 
+            <li v-else-if="item.children" class="  ">
+              <button @click="clickOnMenuItem(i)" type="button" class="flex items-center w-full p-2 text-base text-lightSidebarText rounded-default transition duration-75  group hover:bg-lightSidebarItemHover hover:text-lightSidebarTextHover dark:text-darkSidebarText dark:hover:bg-darkSidebarHover dark:hover:text-darkSidebarTextHover" 
                   :aria-controls="`dropdown-example${i}`"
                   :data-collapse-toggle="`dropdown-example${i}`"
               >
-                <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400  dark:group-hover:text-white" ></component>
+                <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons group-hover:text-lightSidebarIconsHover transition duration-75   dark:group-hover:text-darkSidebarIconsHover dark:text-darkSidebarIcons" ></component>
 
                 <span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">{{ item.label }}</span>
                 <svg :class="{'rotate-180':  opened.includes(i) }" class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"  fill="none" viewBox="0 0 10 6">

package/spa/src/components/MenuLink.vue

@@ -1,16 +1,16 @@
 <template>
   <RouterLink 
       :to="{name: item.resourceId ? 'resource-list' : item.path, params: item.resourceId ? { resourceId: item.resourceId }: {}}" 
-      class="flex items-center py-2 text-nav-menu-text rounded-default  hover:bg-nav-menu-bg-hover active:bg-nav-menu-bg-active" role="menuitem"
+      class="flex group items-center py-2 text-lightSidebarText dark:text-darkSidebarText rounded-default  hover:bg-lightSidebarItemHover hover:text-lightSidebarTextHover dark:hover:bg-darkSidebarHover dark:hover:text-darkSidebarTextHover active:bg-lightSidebarActive dark:active:bg-darkSidebarHover" role="menuitem"
       :class="{ 
         'px-4': isChild,
         'px-2': !isChild,
-        'bg-nav-menu-bg-active dark:bg-gray-700': item.resourceId ?
+        'bg-sidebarActive dark:bg-gray-700': item.resourceId ?
         ($route.params.resourceId === item.resourceId && $route.name === 'resource-list') :
         ($route.name === item.path)
       }"
   >
-    <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" ></component>
+    <component v-if="item.icon" :is="getIcon(item.icon)" class="w-5 h-5 text-lightSidebarIcons dark:text-darkSidebarIcons  transition duration-75  group-hover:text-lightSidebarIconsHover dark:group-hover:text-darkSidebarIconsHover" ></component>
     <span class="ms-3">{{ item.label }}</span>
   </RouterLink>
 </template>

package/spa/src/components/ResourceForm.vue

@@ -2,11 +2,11 @@
   <div class="rounded-default">
     
     <div 
-      class="relative shadow-resourse-form-shadow sm:rounded-lg dark:shadow-2xl dark:shadow-black rounded-default"
+      class="relative shadow-resourseFormShadow sm:rounded-lg dark:shadow-2xl dark:shadow-black rounded-default"
     >
       <form autocomplete="off" @submit.prevent>
         <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">
+          <thead class="text-xs text-gray-700 uppercase bg-lightormHeading dark:bg-gray-700 dark:text-gray-400">
               <tr>
                   <th scope="col" class="px-6 py-3">
                       Field
@@ -18,7 +18,7 @@
           </thead>
           <tbody>
               <tr v-for="column, i in editableColumns" :key="column.name"
-                  class="bg-form-view-bg dark:bg-gray-800 border-b dark:border-gray-700"
+                  class="bg-ligftForm dark:bg-gray-800 border-b dark:border-gray-700"
               >
                 <!-- if column is in customComponentsPerColumn, use this component. If not, use this code -->
                 <template v-if="column?.components?.[props.source].file">

package/spa/src/components/ResourceListTable.vue

@@ -1,30 +1,15 @@
 <template>
   <!-- table -->
-  <div class="relative overflow-x-auto shadow-list-table-shadow dark:shadow-black	overflow-y-hidden rounded-default">
+  <div class="relative overflow-x-auto shadow-listTableShadow dark:shadow-black	overflow-y-hidden rounded-default">
 
     <!-- skelet loader -->
     <div role="status" v-if="!resource || !resource.columns"
         class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded shadow animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-      <div class="flex items-center justify-between h-16">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-
-      <div class="flex items-center justify-between  h-16 pt-4" v-for="i in new Array(10)">
-        <div>
-          <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-          <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-        </div>
-        <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-      </div>
-      <span class="sr-only">Loading...</span>
+      
     </div>
 
     <table v-else class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400 rounded-default">
-      <thead class="text-xs text-view-table-heading-text bg-list-view-table-heading dark:bg-gray-700 dark:text-gray-400">
+      <thead class="text-xs text-view-table-heading-text bg-lightListTableHeading dark:bg-darkListTableHeading dark:text-gray-400">
       <tr>
         <th scope="col" class="p-4">
           <div v-if="rows && rows.length" class="flex items-center">
@@ -69,51 +54,8 @@
       </tr>
       </thead>
       <tbody>
-      <tr v-if="!rows" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
-        <td :colspan="resource?.columns.length + 2">
-
-          <div role="status"
-              class="max-w p-4 space-y-4 divide-y divide-gray-200 rounded animate-pulse dark:divide-gray-700 md:p-6 dark:border-gray-700">
-            <div class="flex items-center justify-between">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <div class="flex items-center justify-between pt-4">
-              <div>
-                <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24 mb-2.5"></div>
-                <div class="w-32 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
-              </div>
-              <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-700 w-12"></div>
-            </div>
-            <span class="sr-only">Loading...</span>
-          </div>
-        </td>
-      </tr>
-      <tr v-else-if="rows.length === 0" class="bg-list-view-table-bg border-b dark:bg-gray-800 dark:border-gray-700">
+        <SkeleteLoader v-if="!rows?.length" :columns="10" :rows="10"/>  
+      <tr v-else-if="rows.length === 0" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListTableBorder">
         <td :colspan="resource?.columns.length + 2">
 
           <div id="toast-simple"
@@ -127,7 +69,7 @@
       </tr>
 
       <tr @click="onClick($event,row)"   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 cursor-pointer">
+          class="bg-lightListTable border-b dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer">
         <td class="w-4 p-4 cursor-default" @click="(e)=>{e.stopPropagation()}">
           <div class="flex items center ">
             <input
@@ -287,6 +229,7 @@ import ValueRenderer from '@/components/ValueRenderer.vue';
 import { getCustomComponent } from '@/utils';
 import { useCoreStore } from '@/stores/core';
 import { showSuccesTost } from '@/composables/useFrontendApi';
+import SkeleteLoader from '@/components/SkeleteLoader.vue';
 
 import {
 IconInboxOutline,

package/spa/src/components/SkeleteLoader.vue

@@ -0,0 +1,23 @@
+<template>
+    <tr v-for="c in new Array(props.columns)" class="bg-lightListTable border-b dark:bg-darkListTable dark:border-darkListBorder">
+         <td v-for="r in new Array(props.rows)" class="items-center px-6 py-20 cursor-default" >
+            <div role="status" class="max-w-sm animate-pulse">
+                <div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
+            </div>
+        </td>
+    </tr>
+</template>
+
+<script setup>
+
+const props = defineProps({
+    columns:Number,
+    rows:Number
+});
+
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>

package/spa/src/views/ListView.vue

@@ -22,7 +22,7 @@
         v-if="checkboxes.length"
         data-tooltip-target="tooltip-remove-all"
         data-tooltip-placement="bottom"
-        class="flex gap-1  items-center py-1 px-3 me-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 rounded-default"
+        class="flex gap-1  items-center py-1 px-3 me-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-darkListTable dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700 rounded-default"
       >
         <IconBanOutline class="w-5 h-5 "/>