adminforth 1.2.87 → 1.2.89

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

@@ -1,18 +1,17 @@
 <template>
   <div class="relative flex items-center justify-center min-h-screen bg-gray-100 dark:bg-gray-800"
     :style="coreStore.config?.loginBackgroundImage ? {
-      'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
+      'background-image': 'url(' + coreStore.config?.loginBackgroundImage + ')',
       'background-size': 'cover',
       'background-position': 'center',
       'background-blend-mode': 'darken'
     }: {}"
     >
-
-    <!-- Main modal -->
+   <!-- Main modal -->
     <div id="authentication-modal" tabindex="-1" class=" overflow-y-auto overflow-x-hidden z-50 min-w-[400px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-w-md max-h-full">
             <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
+            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
                 <!-- Modal header -->
                 <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
                     <h3 class="text-xl font-semibold text-gray-900 dark:text-white">
@@ -22,23 +21,17 @@
                 </div>
                 <!-- Modal body -->
                 <div class="p-4 md:p-5">
-                    <form class="space-y-4" @submit.prevent>
+                    <form class="space-y-4"  @submit.prevent>
                         <div>
                             <label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your {{ coreStore.config?.usernameFieldName?.toLowerCase() }}</label>
-                            <input type="username" name="username" id="username" 
-                              ref="usernameInput"
-                              @keydown.enter="passwordInput.focus()"
-                              class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
+                            <input type="username" name="username" id="username" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
                         </div>
                         <div class="relative">
                             <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your password</label>
-                            <input 
-                              ref="passwordInput"
-                              @keydown.enter="login"
-                              :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
+                            <input :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
                             <button type="button" @click="showPw = !showPw" class="absolute top-12 right-3 -translate-y-1/2 text-gray-400 dark:text-gray-300">
-                              <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
-                              <IconEyeSlashSolid class="w-5 h-5" v-else />
+                                <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
+                                <IconEyeSlashSolid class="w-5 h-5" v-else />
                             </button>
                         </div>
                         <!-- <div class="flex justify-between">
@@ -61,17 +54,6 @@
                           </div>
                         </div>
                         
-
-                        <div v-if="coreStore.config?.loginPromptHTML"
-                          class="flex items-center p-4 mb-4 text-sm text-gray-800 rounded-lg bg-gray-50 dark:bg-gray-800 dark:text-gray-400" role="alert"
-                        >
-                          <svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-                            <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
-                          </svg>
-                          <span class="sr-only">Info</span>
-                          <div v-html="coreStore.config?.loginPromptHTML"></div>
-                        </div>
-
                         <button 
                           @click="login"
                           type="submit" class="flex items-center justify-center gap-1 w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
@@ -96,64 +78,44 @@
 
 <script setup>
 
-import { onMounted, ref, watchEffect } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useCoreStore } from '@/stores/core';
-import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
-import { callAdminForthApi, loadFile } from '@/utils';
+import { callAdminForthApi } from '@/utils';
 import { useRouter } from 'vue-router';
 
-const passwordInput = ref(null);
-const usernameInput = ref(null);
-
 const router = useRouter();
 const inProgress = ref(false);
 
 const coreStore = useCoreStore();
-const user = useUserStore();
-
 
 const showPw = ref(false);
 
 const error = ref(null);
 
-onMounted(async () => {
-    await coreStore.getPublicConfig();
-    if (coreStore.config?.demoCredentials) {
-      console.log('Setting demo credentials');
-      const [username, password] = coreStore.config.demoCredentials.split(':');
-      usernameInput.value.value = username;
-      passwordInput.value.value = password;
-    }
-    usernameInput.value.focus();
+onMounted(() => {
+    coreStore.getPublicConfig()
 });
 
-
 async function login() {
-  const username = usernameInput.value.value;
-  const password = passwordInput.value.value;
-
-  if (!username || !password) {
-    return;
-  }
-  inProgress.value = true;
-  const resp = await callAdminForthApi({
-    path: '/login',
-    method: 'POST',
-    body: {
-      username,
-      password,
+    inProgress.value = true;
+    const resp = await callAdminForthApi({
+      path: '/login',
+      method: 'POST',
+      body: {
+        username: document.getElementById('username').value,
+        password: document.getElementById('password').value,
+      }
+    });
+    inProgress.value = false;
+    if (resp.error) {
+      error.value = resp.error;
+    } else {
+      error.value = null;
+      router.push('/');
+      await coreStore.fetchMenuAndResource();
     }
-  });
-  inProgress.value = false;
-  if (resp.error) {
-    error.value = resp.error;
-  } else if (resp.redirectTo) {
-    router.push(resp.redirectTo);
-  } else {
-    error.value = null;
-    await user.finishLogin();
-  }
+
 }
 
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div :key="`${$route?.params.resourceId}---${$route?.params.primaryKey}`" class="p-4">
+  <div>
     <RouterView/>
   </div>
 </template>
@@ -11,6 +11,7 @@
 
 
 import { useCoreStore } from '@/stores/core';
+import { onMounted } from 'vue';
 
 const coreStore = useCoreStore()
 

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>
@@ -43,69 +26,35 @@
         <span class="sr-only">Loading...</span>
     </div>
     <div 
-      v-else-if="coreStore.record"
-      class="relative overflow-x-auto rounded-default shadow-resourseFormShadow "
+      v-else
+      class="relative overflow-x-auto shadow-md sm:rounded-lg"
     >
-     <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-lightFormHeading dark:bg-gray-700 dark:text-gray-400">
+     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
+        <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
             <tr>
                 <th scope="col" class="px-6 py-3">
                     Field
                 </th>
-                <th scope="col" class="px-6 py-3 w-5/6">
+                <th scope="col" class="px-6 py-3 w-4/6">
                     Value
                 </th>
             </tr>
         </thead>
         <tbody>
-            <tr v-for="column in coreStore.resource?.columns.filter(c => c.showIn.includes('show'))" :key="column.name"
-                class="bg-lightForm bg-darkForm odd:dark:bg-gray-900  even:dark:bg-gray-800 border-b  dark:border-gray-700"
+            <tr v-for="column in coreStore.resourceColumns?.filter(c => c.showIn.includes('show'))" :key="column.name"
+                class="odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800 border-b dark:border-gray-700"
             >
-              <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="column?.components?.show"
-                    :is="getCustomComponent(column?.components?.show)"
-                    :resource="coreStore.resource"
-                    :meta="column.components.show.meta"
-                    :column="column"
-                    :record="coreStore.record"
-                  />
-                  <ValueRenderer v-else 
-                    :column="column" 
-                    :record="coreStore.record"
-                  />
+                    <ValueRenderer :column="column" :row="coreStore.record" />
                 </td>
-              </template>
             </tr>
+            
         </tbody>
-     </table>
-    </div>
-
-    <div v-else class="text-center text-gray-500 dark:text-gray-400 mt-10">
-      Ooops. Record not found
-    </div>
-
-    <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"
-    />
+    </table>
+</div>
 
 
   </div>
@@ -114,71 +63,31 @@
 
 <script setup>
 
+import { ref, computed, onMounted } from 'vue';  
+import { useRoute } from 'vue-router';
+import { callAdminForthApi } from '@/utils';
 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 { IconPenSolid, IconTrashBinSolid } from '@iconify-prerendered/vue-flowbite';
-import { onMounted, ref } from 'vue';
-import { useRoute,useRouter } from 'vue-router';
-import {callAdminForthApi} from '@/utils';
-import { showSuccesTost, showErrorTost } from '@/composables/useFrontendApi';
+import { useCoreStore } from '@/stores/core';
+import ValueRenderer from '@/components/ValueRenderer.vue';
 
 
 const item = ref(null);
 const route = useRoute();
-const router = useRouter();
-const loading = ref(true);
-
-console.log(route.params,'showWiev');
-
+const loading = ref(false);
 
 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');
   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 {
-        showErrorTost(res.error)
-      }
-
-    } catch (e) {
-      console.error(e);
-      };
-    }
-
-    
-}
-
-</script>
+</script>

package/dist/spa/tailwind.config.js

@@ -1,17 +1,12 @@
 /** @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}", "./node_modules/flowbite/**/*.js"],
   theme: {
-    extend: {
-      /* IMPORTANT:ADMINFORTH TAILWIND STYLES */
-  }
+    extend: {},
   },
-
   darkMode: 'class',
   plugins: [
-    require('flowbite/plugin')({
-      charts: true,
-    }),
+    require('flowbite/plugin'),
   ],
 }
 

package/dist/spa/vite.config.ts

@@ -2,7 +2,6 @@ import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import { clear, error } from 'node:console';
 
 
 const customLogger = {
@@ -12,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);
   },
@@ -27,13 +20,7 @@ const customLogger = {
   clear() {
     console.clear();
   },
-  clearScreen() {
-    console.clear();
-  },
   hasWarned: false,
-  hasErrorLogged: (error: any): boolean => {
-    return false;
-  }
 };
 
 // https://vitejs.dev/config/

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

@@ -182,7 +182,18 @@ export default class AdminForthRestAPI {
               throw new Error(`'visible' function of ${menuItem.label || menuItem.type }  must return boolean value`);
             }
             return toReturn;
-          }}
+          }
+        
+          
+        }
+
+        function processMenuItem(menuItem) {
+            if (menuItem.badge) {
+                if (typeof menuItem.badge === 'function') {
+                    menuItem.badge = menuItem.badge(adminUser);
+                }
+            }
+        }
         let newMenu = []
         for (let menuItem of this.adminforth.config.menu) {
           let newMenuItem = {...menuItem,}
@@ -200,10 +211,12 @@ export default class AdminForthRestAPI {
                   continue
                 }
               }
+              processMenuItem(newChild)
               newChildren.push(newChild)
             }
             newMenuItem = {...newMenuItem, children: newChildren}
           }
+          processMenuItem(newMenuItem)
           newMenu.push(newMenuItem)
         }
 

package/package.json

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

package/spa/src/components/MenuLink.vue

@@ -12,6 +12,9 @@
   >
     <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>
+    <span v-if="item.badge" class="inline-flex items-center justify-center w-3 h-3 p-3 ms-3 text-sm font-medium rounded-full bg-lightAnnouncementBG dark:bg-darkAnnouncementBG 
+          fill-lightAnnouncementText dark:fill-darkAccent text-lightAnnouncementText dark:text-darkAccent">{{ item.badge }}</span>
+
   </RouterLink>
 </template>
 

package/types/AdminForthConfig.ts

@@ -469,6 +469,12 @@ export type AdminForthConfigMenuItem = {
      * You can use it to hide menu items depending on some user
      */
     visible?: (user: AdminUser) => boolean,
+
+    /**
+     * Optional callback which will be called before rendering the menu for each item.
+     * Result of callback if not null will be used as a small badge near the menu item.
+     */
+    badge?: string | ((user: AdminUser) => string),
   }