Merge branch 'main' of github.com:devforth/adminforth into main

Author: ivictbor

adminforth/documentation/docs/tutorial/03-Customization/06-customPages.md

@@ -36,7 +36,7 @@ Create a Vue component in the `custom` directory of your project, e.g. `Dashboar
 
 ```html title="./custom/Dashboard.vue"
 <template>
-  <div class="px-4 py-8 bg-blue-50 dark:bg-gray-900 dark:shadow-none min-h-screen">
+  <div class="px-4 py-8 bg-blue-50 dark:bg-gray-900 dark:shadow-none min-h-[calc(100vh-56px)]">
     <h1 class="mb-4 text-xl font-extrabold text-gray-900 dark:text-white md:text-2xl lg:text-3xl"><span
         class="text-transparent bg-clip-text bg-gradient-to-r to-emerald-600 from-sky-400">{{ $t('Apartments') }}</span>
       Statistics.</h1>
@@ -431,7 +431,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
       const days = req.body.days || 7;
       const apartsByDays = await admin.resource('aparts').dataConnector.db.prepare(
         `SELECT 
-          strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+          strftime('%Y-%m-%d', created_at) as day, 
           COUNT(*) as count 
         FROM apartments 
         GROUP BY day 
@@ -445,7 +445,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
       // add listed, unlisted, listedPrice, unlistedPrice
       const listedVsUnlistedByDays = await admin.resource('aparts').dataConnector.db.prepare(
         `SELECT 
-          strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+          strftime('%Y-%m-%d', created_at) as day, 
           SUM(listed) as listed, 
           COUNT(*) - SUM(listed) as unlisted,
           SUM(listed * price) as listedPrice,
@@ -459,7 +459,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
 
       const listedVsUnlistedPriceByDays = await admin.resource('aparts').dataConnector.db.prepare(
         `SELECT 
-          strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+          strftime('%Y-%m-%d', created_at) as day, 
           SUM(listed * price) as listedPrice,
           SUM((1 - listed) * price) as unlistedPrice
         FROM apartments

adminforth/plugins/i18n/custom/LanguageInUserMenu.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="min-w-40">
     <div 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 select-none	"

adminforth/spa/src/i18n.ts

@@ -51,5 +51,5 @@ export function initI18n(app: ReturnType<typeof createApp>) {
   })
 
   app.use(i18n);
-
+  return i18n
 }

adminforth/spa/src/main.ts

@@ -13,7 +13,8 @@ export const app: ReturnType<typeof createApp> = createApp(App)
 app.use(createPinia())
 app.use(router)
 
-initI18n(app);
+// get access to i18n instance outside components
+window.i18n = initI18n(app);
 
 
 /* IMPORTANT:ADMINFORTH CUSTOM USES */

adminforth/spa/src/utils.ts

@@ -1,13 +1,12 @@
 import { onMounted, ref, resolveComponent } from 'vue';
 import type { CoreConfig } from './spa_types/core';
 import type { ValidationObject } from './types/AdminForthConfig';
-
-
 import router from "./router";
 import { useCoreStore } from './stores/core';
 import { useUserStore } from './stores/user';
 import { Dropdown } from 'flowbite';
 
+
 const LS_LANG_KEY = `afLanguage`;
 
 export async function callApi({path, method, body=undefined}: {
@@ -23,13 +22,18 @@ export async function callApi({path, method, body=undefined}: {
     body: JSON.stringify(body),
   };
   const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
-  const r = await fetch(fullPath, options);
-  if (r.status == 401 ) {
-    useUserStore().unauthorize();
-    await router.push({ name: 'login' });
-    return null;
-  } 
-  return await r.json();
+  try {
+    const r = await fetch(fullPath, options);
+    if (r.status == 401 ) {
+      useUserStore().unauthorize();
+      await router.push({ name: 'login' });
+      return null;
+    } 
+    return await r.json();
+  } catch(e){
+    window.adminforth.alert({variant:'danger', message:window.i18n?.global?.t('Something went wrong, please try again later'),})
+    console.error(`error in callApi ${path}`,e);
+  }
 }
 
 export async function callAdminForthApi({ path, method, body=undefined, headers=undefined }: {

dev-demo/custom/Dash.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="px-4 py-8 bg-blue-50 dark:bg-gray-900 dark:shadow-none min-h-screen">
+  <div class="px-4 py-8 bg-blue-50 dark:bg-gray-900 dark:shadow-none min-h-[calc(100vh-56px)]">
 
     <h1 class="mb-4 text-xl font-extrabold text-gray-900 dark:text-white md:text-2xl lg:text-3xl"
       v-html='$t("<span class=\"text-transparent bg-clip-text bg-gradient-to-r to-emerald-600 from-sky-400\">Apartments</span> Statistics.")'></h1>

dev-demo/index.ts

@@ -325,7 +325,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
         const days = req.body.days || 7;
         const apartsByDays = await db.prepare(
           `SELECT 
-            strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+            strftime('%Y-%m-%d', created_at) as day, 
             COUNT(*) as count 
           FROM apartments 
           GROUP BY day 
@@ -339,7 +339,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
         // add listed, unlisted, listedPrice, unlistedPrice
         const listedVsUnlistedByDays = await db.prepare(
           `SELECT 
-            strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+            strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed) as listed, 
             COUNT(*) - SUM(listed) as unlisted,
             SUM(listed * price) as listedPrice,
@@ -353,7 +353,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
 
         const listedVsUnlistedPriceByDays = await db.prepare(
           `SELECT 
-            strftime('%Y-%m-%d', created_at, 'unixepoch') as day, 
+            strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed * price) as listedPrice,
             SUM((1 - listed) * price) as unlistedPrice
           FROM apartments