Merge pull request #195 from devforth/next

Next

Author: ivictbor

adminforth/commands/createApp/utils.js

@@ -96,29 +96,33 @@ function generateDbUrlForPrisma(connectionString) {
   return connectionString.toString();
 }
 
-function initialChecks() {
+function initialChecks(options) {
   return [
     {
       title: '👀 Checking Node.js version...',
       task: () => checkNodeVersion(20)
     },
     {
       title: '👀 Validating current working directory...',
-      task: () => checkForExistingPackageJson()
+      task: () => checkForExistingPackageJson(options)
     }
   ]
 }
 
-function checkForExistingPackageJson() {
-  if (fs.existsSync(path.join(process.cwd(), 'package.json'))) {
+function checkForExistingPackageJson(options) {
+  const projectDir = path.join(process.cwd(), options.appName);
+  if (fs.existsSync(projectDir)) {
     throw new Error(
-      `A package.json already exists in this directory.\n` +
-      `Please remove it or use an empty directory.`
+      `Directory "${options.appName}" already exists.\n` +
+      `Please remove it or use a different name.`
     );
   }
 }
 
 async function scaffoldProject(ctx, options, cwd) {
+  const projectDir = path.join(cwd, options.appName);
+  await fse.ensureDir(projectDir);
+
   const connectionString = parseConnectionString(options.db);
   const provider = detectDbProvider(connectionString.protocol);
   const prismaDbUrl = generateDbUrlForPrisma(connectionString);
@@ -130,9 +134,9 @@ async function scaffoldProject(ctx, options, cwd) {
   const dirname = path.dirname(filename);
 
   // Prepare directories
-  ctx.customDir = path.join(cwd, 'custom');
+  ctx.customDir = path.join(projectDir, 'custom');
   await fse.ensureDir(ctx.customDir);
-  await fse.ensureDir(path.join(cwd, 'resources'));
+  await fse.ensureDir(path.join(projectDir, 'resources'));
 
   // Copy static assets to `custom/assets`
   const sourceAssetsDir = path.join(dirname, 'assets');
@@ -141,13 +145,14 @@ async function scaffoldProject(ctx, options, cwd) {
   await fse.copy(sourceAssetsDir, targetAssetsDir);
 
   // Write templated files
-  writeTemplateFiles(dirname, cwd, {
+  writeTemplateFiles(dirname, projectDir, {
     dbUrl: connectionString.toString(),
     prismaDbUrl,
     appName,
     provider,
   });
 
+  return projectDir;  // Return the new directory path
 }
 
 async function writeTemplateFiles(dirname, cwd, options) {
@@ -241,9 +246,13 @@ async function installDependencies(ctx, cwd) {
   ]);
 }
 
-function generateFinalInstructions(skipPrismaSetup) {
+function generateFinalInstructions(skipPrismaSetup, options) {
   let instruction = '⏭️  Run the following commands to get started:\n';
   if (!skipPrismaSetup)
+    instruction += `
+  ${chalk.dim('// Go to the project directory')}
+  ${chalk.cyan(`$ cd ${options.appName}`)}\n`;
+
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.cyan('$ npm run makemigration -- --name init')}\n`;
@@ -272,33 +281,35 @@ export function prepareWorkflow(options) {
       title: '🔍 Initial checks...',
       task: (_, task) =>
         task.newListr(
-          initialChecks(),
+          initialChecks(options),
           { concurrent: true },
         )
     },
     {
       title: '🚀 Scaffolding your project...',
-      task: async (ctx) => scaffoldProject(ctx, options, cwd)
+      task: async (ctx) => {
+        ctx.projectDir = await scaffoldProject(ctx, options, cwd);
+      }
     },
     {
       title: '📦 Installing dependencies...',
-      task: async (ctx) => installDependencies(ctx, cwd)
+      task: async (ctx) => installDependencies(ctx, ctx.projectDir)
     },
     {
       title: '📝 Preparing final instructions...',
       task: (ctx) => {
-        console.log(chalk.green(`✅ Successfully created your new Adminforth project!\n`));
-        console.log(generateFinalInstructions(ctx.skipPrismaSetup));
+        console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
+        console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));
         console.log('\n\n');
+      }
     }
-  }],
+  ],
   {
     rendererOptions: {collapseSubtasks: false},
     concurrent: false,
     exitOnError: true,
     collectErrors: true,
-  }
-);
+  });
 
   return tasks;
 }

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

@@ -3,7 +3,7 @@ import type { IAdminForth, IHttpServer, AdminForthResourcePages, AdminForthResou
 import type { PluginOptions } from './types.js';
 
 
-export default class ChatGptPlugin extends AdminForthPlugin {
+export default class {{pluginName}} extends AdminForthPlugin {
   options: PluginOptions;
 
   constructor(options: PluginOptions) {

adminforth/spa/src/views/ListView.vue

@@ -331,7 +331,7 @@ async function init() {
   await coreStore.fetchResourceFull({
     resourceId: route.params.resourceId
   });
-
+  isPageLoaded.value = true;
   // !!! clear filters should be in same tick with sort assignment so that watch can catch it as one change
 
   // try to init filters from query params
@@ -446,8 +446,4 @@ watch([sort], async () => {
   setQuery({ sort: SortQuerySerializer.serialize(sort.value) });
 });
 
-watch(() => coreStore.resource, () => {
-  isPageLoaded.value = true;
-});
-
 </script>

adminforth/types/Adapters.ts

@@ -28,6 +28,21 @@ export interface CompletionAdapter {
   }>;
 }
 
+export interface ImageGenerationAdapter {
+
+  validate(): void;
+
+  generate(
+    prompt: string,
+    inputFiles: string[],
+  ): Promise<{
+    imageURL?: string;
+    error?: string;
+  }>;
+}
+
+
+
 export interface OAuth2Adapter {
   getAuthUrl(): string;
   getTokenFromCode(code: string, redirect_uri: string): Promise<{ email: string }>;

dev-demo/.env.local

@@ -2,5 +2,5 @@ KEYCLOAK_URL=http://localhost:8080
 
 ADMINFORTH_SECRET=123
 NODE_ENV=development
-DATABASE_URL=sqlite://.db.sqlite
-PRISMA_DATABASE_URL=file:.db.sqlite
+DATABASE_URL=sqlite://./.db.sqlite
+DATABASE_FILE_URL=file:.db.sqlite

dev-demo/index.ts

@@ -2,7 +2,6 @@ import betterSqlite3 from 'better-sqlite3';
 import express from 'express';
 import AdminForth, { AdminUser, Filters } from '../adminforth/index.js';
 
-import AuditLogPlugin from '../plugins/adminforth-audit-log/index.js';
 import clicksResource from './resources/clicks.js';
 import apartmentsResource from './resources/apartments.js';
 import apartmentBuyersResource from './resources/apartment_buyers.js';
@@ -18,15 +17,24 @@ import providersResource from './resources/providers.js';
 import apiKeysResource from './resources/api_keys.js';
 import CompletionAdapterOpenAIChatGPT from '../adapters/adminforth-completion-adapter-open-ai-chat-gpt/index.js';
 import pkg from 'pg';
+import I18nPlugin from '../plugins/adminforth-i18n/index.js';
 const { Client } = pkg;
 
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      NODE_ENV: string;
+      DATABASE_URL: string;
+      OPENAI_API_KEY: string;
+      PORT: string;
+    }
+  }
+}
+
 // const ADMIN_BASE_URL = '/portal';
 const ADMIN_BASE_URL = '';
 
-// create test1.db 
-const dbPath = 'db.sqlite';
-const db = betterSqlite3(dbPath)
-
 async function seedDatabase() {
 
   const adapter = new CompletionAdapterOpenAIChatGPT({
@@ -182,7 +190,7 @@ export const admin = new AdminForth({
   dataSources: [
     {
       id: 'maindb',
-      url: `sqlite://${dbPath}`
+      url: process.env.DATABASE_URL,
     },
     {
       id: 'pg',
@@ -353,7 +361,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
     admin.express.translatable(
       async (req: any, res: express.Response) => {
         const days = req.body.days || 7;
-        const apartsByDays = await db.prepare(
+        const apartsByDays = await admin.resource('aparts').dataConnector.client.prepare( 
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             COUNT(*) as count 
@@ -367,7 +375,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
         const totalAparts = apartsByDays.reduce((acc: number, { count }: { count:number }) => acc + count, 0);
 
         // add listed, unlisted, listedPrice, unlistedPrice
-        const listedVsUnlistedByDays = await db.prepare(
+        const listedVsUnlistedByDays = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed) as listed, 
@@ -381,7 +389,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all(days);
 
-        const apartsCountsByRooms = await db.prepare(
+        const apartsCountsByRooms = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             number_of_rooms, 
             COUNT(*) as count 
@@ -391,7 +399,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all();
 
-        const topCountries = await db.prepare(
+        const topCountries = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             country, 
             COUNT(*) as count 
@@ -402,14 +410,14 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
           `
         ).all();
 
-        const totalSquare = await db.prepare(
+        const totalSquare = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             SUM(square_meter) as totalSquare 
           FROM apartments;
           `
         ).get();
 
-        const listedVsUnlistedPriceByDays = await db.prepare(
+        const listedVsUnlistedPriceByDays = await admin.resource('aparts').dataConnector.client.prepare(
           `SELECT 
             strftime('%Y-%m-%d', created_at) as day, 
             SUM(listed * price) as listedPrice,

dev-demo/migrations/20250414182355_addapartment_source/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "apartments" ADD COLUMN "apartment_source" TEXT;

dev-demo/schema.prisma

@@ -34,6 +34,7 @@ model apartments {
     realtor_id      String?
     user_id         String?
     apartment_image String?
+    apartment_source String?
 }
 
 model audit_log {