Merge pull request #234 from devforth/next

Next

Author: SerVitasik

adapters/install-adapters.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-ADAPTERS="adminforth-completion-adapter-open-ai-chat-gpt adminforth-email-adapter-aws-ses adminforth-google-oauth-adapter adminforth-github-oauth-adapter adminforth-facebook-oauth-adapter adminforth-keycloak-oauth-adapter adminforth-microsoft-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"
 
 # for each
 install_adapter() {

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

@@ -1,6 +1,8 @@
 import express from 'express';
 import AdminForth from 'adminforth';
 import usersResource from "./resources/adminuser.js";
+import { fileURLToPath } from 'url';
+import path from 'path';
 
 const ADMIN_BASE_URL = '';
 
@@ -55,7 +57,7 @@ export const admin = new AdminForth({
   ],
 });
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (fileURLToPath(import.meta.url) === path.resolve(process.argv[1])) {
   const app = express();
   app.use(express.json());
 

adminforth/commands/createApp/utils.js

@@ -284,14 +284,22 @@ async function writeTemplateFiles(dirname, cwd, options) {
 }
 
 async function installDependencies(ctx, cwd) {
-  const nodeBinary = process.execPath; // Path to the Node.js binary running this script
-  const npmPath = path.join(path.dirname(nodeBinary), 'npm'); // Path to the npm executable
+  const isWindows = process.platform === 'win32';
 
+  const nodeBinary = process.execPath; 
+  const npmPath = path.join(path.dirname(nodeBinary), 'npm');
   const customDir = ctx.customDir;
-  const res = await Promise.all([
-    await execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
-    await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
-  ]);
+  if (isWindows) {
+    const res = await Promise.all([
+      await execAsync(`npm install`, { cwd, env: { PATH: process.env.PATH } }),
+      await execAsync(`npm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      await execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  }
   // console.log(chalk.dim(`Dependencies installed in ${cwd} and ${customDir}: \n${res[0].stdout}${res[1].stdout}`));
 }
 

adminforth/commands/createCustomComponent/configUpdater.js

@@ -254,7 +254,7 @@ export async function updateResourceConfig(resourceId, columnName, fieldType, co
 }
 
 
-export async function injectLoginComponent(indexFilePath, componentPath) {
+export async function injectLoginComponent(indexFilePath, componentPath, injectionType) {
     console.log(chalk.dim(`Reading file: ${indexFilePath}`));
     const content = await fs.readFile(indexFilePath, 'utf-8');
     const ast = recast.parse(content, {
@@ -263,6 +263,7 @@ export async function injectLoginComponent(indexFilePath, componentPath) {
 
     let updated = false;
     let injectionLine = null;
+    let targetProperty = null;
 
     recast.visit(ast, {
       visitNewExpression(path) {
@@ -293,20 +294,23 @@ export async function injectLoginComponent(indexFilePath, componentPath) {
           const loginPageInjections = getOrCreateProp(customization, 'loginPageInjections');
           if (!n.ObjectExpression.check(loginPageInjections)) return false;
 
-          let underInputsProp = loginPageInjections.properties.find(
-            p => n.ObjectProperty.check(p) && n.Identifier.check(p.key) && p.key.name === 'underInputs'
+          // Determine target property based on injection type
+          targetProperty = injectionType === 'beforeLogin' ? 'panelHeader' : 'underInputs';
+          
+          let targetProp = loginPageInjections.properties.find(
+            p => n.ObjectProperty.check(p) && n.Identifier.check(p.key) && p.key.name === targetProperty
           );
 
-          if (underInputsProp) {
-            const currentVal = underInputsProp.value;
-            injectionLine = underInputsProp.loc?.start.line ?? null;
+          if (targetProp) {
+            const currentVal = targetProp.value;
+            injectionLine = targetProp.loc?.start.line ?? null;
             if (n.StringLiteral.check(currentVal)) {
               if (currentVal.value !== componentPath) {
-                underInputsProp.value = b.arrayExpression([
+                targetProp.value = b.arrayExpression([
                   b.stringLiteral(currentVal.value),
                   b.stringLiteral(componentPath),
                 ]);
-                console.log(chalk.dim(`Converted 'underInputs' to array with existing + new path.`));
+                console.log(chalk.dim(`Converted '${targetProperty}' to array with existing + new path.`));
               } else {
                 console.log(chalk.dim(`Component path already present as string. Skipping.`));
               }
@@ -316,26 +320,26 @@ export async function injectLoginComponent(indexFilePath, componentPath) {
               );
               if (!exists) {
                 currentVal.elements.push(b.stringLiteral(componentPath));
-                console.log(chalk.dim(`Appended new component path to existing 'underInputs' array.`));
+                console.log(chalk.dim(`Appended new component path to existing '${targetProperty}' array.`));
               } else {
                 console.log(chalk.dim(`Component path already present in array. Skipping.`));
               }
             } else {
-              console.warn(chalk.yellow(`⚠️ 'underInputs' is not a string or array. Skipping.`));
+              console.warn(chalk.yellow(`⚠️ '${targetProperty}' is not a string or array. Skipping.`));
               return false;
             }
           } else {
             const newProperty = b.objectProperty(
-                b.identifier('underInputs'), 
-                b.stringLiteral(componentPath)
-              );
-              
-              if (newProperty.loc) {
-                console.log(chalk.dim(`Adding 'underInputs' at line: ${newProperty.loc.start.line}`));
-              }
-              
-              loginPageInjections.properties.push(newProperty);
-              console.log(chalk.dim(`Added 'underInputs': ${componentPath}`));
+              b.identifier(targetProperty), 
+              b.stringLiteral(componentPath)
+            );
+            
+            if (newProperty.loc) {
+              console.log(chalk.dim(`Adding '${targetProperty}' at line: ${newProperty.loc.start.line}`));
+            }
+            
+            loginPageInjections.properties.push(newProperty);
+            console.log(chalk.dim(`Added '${targetProperty}': ${componentPath}`));
           }
 
           updated = true;
@@ -353,7 +357,7 @@ export async function injectLoginComponent(indexFilePath, componentPath) {
     await fs.writeFile(indexFilePath, outputCode, 'utf-8');
     console.log(
       chalk.green(
-        `✅ Successfully updated CRUD injection in resource file: ${indexFilePath}` +
+        `✅ Successfully updated login ${targetProperty} injection in: ${indexFilePath}` +
         (injectionLine !== null ? `:${injectionLine}` : '')
       )
     );

adminforth/commands/createCustomComponent/fileGenerator.js

@@ -129,7 +129,7 @@ export async function generateLoginOrGlobalComponentFile(componentFileName, inje
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
     let templatePath;
-    if (injectionType === 'afterLogin') {
+    if (injectionType === 'afterLogin' || injectionType === 'beforeLogin') {
       templatePath = path.join(__dirname, 'templates', 'login', `${injectionType}.vue.hbs`);
     } else {
       templatePath = path.join(__dirname, 'templates', 'global', `${injectionType}.vue.hbs`);

adminforth/commands/createCustomComponent/main.js

@@ -50,6 +50,7 @@ async function handleFieldComponentCreation(config, resources) {
           { name: '📃 show', value: 'show' },
           { name: '✏️ edit', value: 'edit' },
           { name: '➕ create', value: 'create' },
+          { name: '🔍 filter', value: 'filter'},
           new Separator(),
           { name: '🔙 BACK', value: '__BACK__' },
       ]
@@ -256,6 +257,7 @@ async function handleLoginPageInjectionCreation(config) {
   const injectionType = await select({
     message: 'Select injection type:',
     choices: [
+      { name: 'Before Login and password inputs', value: 'beforeLogin' },
       { name: 'After Login and password inputs', value: 'afterLogin' },
       { name: '🔙 BACK', value: '__BACK__' },
     ],
@@ -286,7 +288,7 @@ async function handleLoginPageInjectionCreation(config) {
       console.log(chalk.dim(`Component generation successful: ${absoluteComponentPath}`));
       const configFilePath = path.resolve(process.cwd(), 'index.ts');
       console.log(chalk.dim(`Injecting component: ${configFilePath}, ${componentFileName}`));
-      await injectLoginComponent(configFilePath, `@@/${componentFileName}`);
+      await injectLoginComponent(configFilePath, `@@/${componentFileName}`, injectionType);
 
       console.log(
         chalk.bold.greenBright('You can now open the component in your IDE:'),

adminforth/commands/createCustomComponent/templates/customFields/filter.vue.hbs

@@ -0,0 +1,34 @@
+<template>
+  <input
+    type="text"
+    :value="localValue"
+    @input="onInput"
+    placeholder="Search"
+    aria-describedby="helper-text-explanation"
+    class="inline-flex bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-0 focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 placeholder-gray-500 dark:placeholder-gray-400 dark:text-white translate-y-0 rounded-l-md rounded-r-md w-full"
+  />
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+const emit = defineEmits(['update:modelValue']);
+
+const props = defineProps<{
+  column: any;
+  meta?: any;
+  modelValue: Array<{ operator: string; value: string }> | null;
+}>();
+
+const localValue = ref(props.modelValue?.[0]?.value || '');
+
+watch(() => props.modelValue, (val) => {
+  localValue.value = val?.[0]?.value || '';
+});
+
+function onInput(event: Event) {
+  const target = event.target as HTMLInputElement;
+  localValue.value = target.value;
+  emit('update:modelValue', [{ operator: 'ilike', value: target.value }]);
+}
+</script>

adminforth/commands/createCustomComponent/templates/login/beforeLogin.vue.hbs

@@ -0,0 +1,18 @@
+<template>
+  <div class="text-center text-gray-500 text-sm mt-4">
+    Login Page Text
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+const props = defineProps<{
+  reason: String
+}>();
+
+onMounted(() => {
+  // Logic on mount if needed
+});
+</script>
+

adminforth/commands/postinstall.js

@@ -0,0 +1,15 @@
+import fs from 'fs';
+import path from 'path';
+
+import { execSync } from 'child_process'; 
+const spaPath = path.join(import.meta.dirname, 'dist', 'spa');
+
+
+if (fs.existsSync(spaPath)){ 
+    console.log('Installing SPA dependencies...');
+    execSync('npm ci', { cwd: spaPath, stdio: 'inherit' });
+    console.log('Installed spa dependencies');
+} else {
+    console.log('SPA dependencies not found');
+    console.log('current directory', import.meta.dirname);
+}

adminforth/documentation/blog/2024-10-01-ai-blog/index.md

@@ -199,7 +199,7 @@ model ContentImage {
 Create a migration:
 
 ```bash
-npm run makemigration -- --name add-posts
+npm run makemigration -- --name add-posts && npm run migrate:local
 ```