Merge branch 'next' of https://github.com/devforth/adminforth into feat/bulkActionComponent

Author: NoOne7135

adapters/install-adapters.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
-ADAPTERS="adminforth-completion-adapter-open-ai-chat-gpt adminforth-email-adapter-aws-ses adminforth-email-adapter-mailgun adminforth-google-oauth-adapter adminforth-github-oauth-adapter adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-oauth-adapter adminforth-twitch-oauth-adapter adminforth-image-generation-adapter-openai adminforth-storage-adapter-amazon-s3 adminforth-storage-adapter-local"
+ADAPTERS="adminforth-completion-adapter-open-ai-chat-gpt adminforth-email-adapter-aws-ses \
+adminforth-email-adapter-mailgun adminforth-google-oauth-adapter adminforth-github-oauth-adapter \
+adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-oauth-adapter \
+adminforth-twitch-oauth-adapter adminforth-image-generation-adapter-openai adminforth-storage-adapter-amazon-s3 \
+adminforth-storage-adapter-local adminforth-image-vision-adapter-openai adminforth-key-value-adapter-ram \
+adminforth-login-captcha-adapter-cloudflare adminforth-login-captcha-adapter-recaptcha"
 
 # for each
 install_adapter() {

adminforth/auth.ts

@@ -99,13 +99,29 @@ class AdminForthAuth implements IAdminForthAuth {
   }
 
   setCustomCookie({ response, payload }: {
-    response: any, payload: {name: string, value: string, expiry: number, httpOnly: boolean}
+    response: any, payload: { name: string, value: string, expiry: number | undefined, expirySeconds: number | undefined, httpOnly: boolean }
   }) {
-    const {name, value, expiry, httpOnly} = payload;
+    const {name, value, expiry, httpOnly, expirySeconds } = payload;
+
+    let expiryMs = 24 * 60 * 60 * 1000; // default 1 day
+    if (expirySeconds !== undefined) {
+      expiryMs = expirySeconds * 1000;
+    } else if (expiry !== undefined) {
+      console.warn('setCustomCookie: expiry(in ms) is deprecated, use expirySeconds instead (seconds), traceback:', new Error().stack);
+      expiryMs = expiry;
+    }
+
     const brandSlug = this.adminforth.config.customization.brandNameSlug;
     response.setHeader('Set-Cookie', `adminforth_${brandSlug}_${name}=${value}; Path=${this.adminforth.config.baseUrl || '/'};${
       httpOnly ? ' HttpOnly;' : ''
-    } SameSite=Strict; Expires=${new Date(Date.now() + expiry).toUTCString() } `);
+    } SameSite=Strict; Expires=${new Date(Date.now() + expiryMs).toUTCString() } `);
+  }
+
+  getCustomCookie({ cookies, name }: {
+    cookies: {key: string, value: string}[], name: string
+  }): string | null {
+    const brandSlug = this.adminforth.config.customization.brandNameSlug;
+    return cookies.find((cookie) => cookie.key === `adminforth_${brandSlug}_${name}`)?.value || null;
   }
 
   issueJWT(payload: Object, type: string, expiresIn: string = '24h'): string {

adminforth/commands/createApp/templates/api.ts.hbs

@@ -0,0 +1,10 @@
+import { Express } from "express";
+import { IAdminForth } from "adminforth";
+
+export function initApi(app: Express, admin: IAdminForth) {
+  app.get(`${admin.config.baseUrl}/api/hello/`,
+    (req, res) => {
+      res.json({ message: "Hello from AdminForth API!" });
+    }
+  );
+}

adminforth/commands/createApp/templates/index.ts.hbs

@@ -4,7 +4,8 @@ import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { Filters } from 'adminforth';
- 
+import { initApi } from './api.js';
+
 const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({
@@ -30,7 +31,8 @@ export const admin = new AdminForth({
     brandLogo: '@@/assets/logo.svg',
     datesFormat: 'DD MMM',
     timeFormat: 'HH:mm a',
-    showBrandNameInSidebar: true,
+  showBrandNameInSidebar: true,
+  showBrandLogoInSidebar: true,
     emptyFieldPlaceholder: '-',
     styles: {
       colors: {
@@ -68,6 +70,8 @@ if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
   const app = express();
   app.use(express.json());
 
+  initApi(app, admin);
+
   const port = 3500;
 
   admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' }).then(() => {

adminforth/commands/createApp/utils.js

@@ -235,6 +235,11 @@ async function writeTemplateFiles(dirname, cwd, options) {
       dest: 'index.ts',
       data: { appName },
     },
+    {
+      src: 'api.ts.hbs',
+      dest: 'api.ts',
+      data: {},
+    },
     {
       src: '.gitignore.hbs',
       dest: '.gitignore',

adminforth/commands/createCustomComponent/configLoader.js

@@ -2,21 +2,20 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import jiti from 'jiti';
-import dotenv from "dotenv";
+import dotenv, { config } from "dotenv";
 
 dotenv.config({ path: '.env.local', override: true });
 dotenv.config({ path: '.env', override: true });
 
-export async function loadAdminForthConfig() {
+export async function getAdminInstance() {
   const configFileName = 'index.ts';
   const configPath = path.resolve(process.cwd(), configFileName);
-
   try {
     await fs.access(configPath);
   } catch (error) {
     console.error(chalk.red(`\nError: Configuration file not found at ${configPath}`));
     console.error(chalk.yellow(`Please ensure you are running this command from your project's root directory and the '${configFileName}' file exists.`));
-    process.exit(1);
+    return null;
   }
 
   try {
@@ -29,8 +28,19 @@ export async function loadAdminForthConfig() {
     const configModule = _require(configPath);
 
     const adminInstance = configModule.admin || configModule.default?.admin;
+    return { adminInstance, configPath, configFileName };
+  } catch (error) {
+    console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}`));
+    console.error(error);
+    return null;
+  }
+}
 
+export async function loadAdminForthConfig() {
+  
+  const { adminInstance, configPath, configFileName } = await getAdminInstance();
 
+  try {
     if (!adminInstance) {
         throw new Error(`Could not find 'admin' export in ${configFileName}. Please ensure your config file exports the AdminForth instance like: 'export const admin = new AdminForth({...});'`);
     }
@@ -53,7 +63,7 @@ export async function loadAdminForthConfig() {
     return config;
 
   } catch (error) {
-    console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath}`));
+    console.error(chalk.red(`\nError loading or parsing configuration file: ${configPath},  error: ${error}`));
     console.error(error);
     process.exit(1);
   }

adminforth/commands/createCustomComponent/main.js

@@ -189,6 +189,7 @@ async function handleCrudPageInjectionCreation(config, resources) {
     message: 'Where exactly do you want to inject the component?',
     choices: [
       { name: '⬆️ Before Breadcrumbs', value: 'beforeBreadcrumbs' },
+      { name: '➡️ Before Action Buttons', value: 'beforeActionButtons' },
       { name: '⬇️ After Breadcrumbs', value: 'afterBreadcrumbs' },
       { name: '📄 After Page', value: 'bottom' },
       { name: '⋯ threeDotsDropdownItems', value: 'threeDotsDropdownItems' },

adminforth/commands/createCustomComponent/templates/customCrud/beforeActionButtons.vue.hbs

@@ -0,0 +1,38 @@
+<template>
+  <div class="flex items-center p-4 md:p-5 gap-2">
+    <button
+      type="button"
+      @click="handleClick"
+      class="text-white bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-4 py-2.5 text-center dark:bg-blue-500 dark:hover:bg-blue-600 dark:focus:ring-blue-800"
+    >
+      {{ '{{' }} $t('Example') {{ '}}' }}
+    </button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import adminforth from '@/adminforth';
+import { AdminForthResourceCommon, AdminUser } from "@/types/Common";
+
+const { t } = useI18n();
+
+const props = defineProps<{
+  record: any
+  resource: AdminForthResourceCommon
+  adminUser: AdminUser
+  meta?: any
+}>();
+
+onMounted(() => {
+  // Logic on mount if needed
+});
+
+function handleClick() {
+  adminforth.alert({
+    message: t('Confirmed'),
+    variant: 'success',
+  });
+}
+</script>

adminforth/commands/createPlugin/templates/custom/tsconfig.json.hbs

@@ -3,15 +3,12 @@
     "baseUrl": ".", // This should point to your project root
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../node_modules/adminforth/dist/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../node_modules/adminforth/dist/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

adminforth/commands/createPlugin/templates/package.json.hbs

@@ -5,7 +5,7 @@
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/ && npm version patch"
+    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/"
   },
   "keywords": [],
   "author": "",