Merge pull request #35 from devforth/cli

improved imports

Author: ivictbor

adminforth/commands/utils.js

@@ -58,7 +58,7 @@ export const findInstance = (fileContent) => {
 
 export async function getInstance(file, currentDirectory) {
   const initialFilePath = path.join(currentDirectory, file);
-  let filePath = path.join(currentDirectory, file);
+  let filePath = initialFilePath;
 
   if (file.endsWith(".ts")) {
     console.log(`Compiling TypeScript file: ${file}`);
@@ -76,11 +76,26 @@ export async function getInstance(file, currentDirectory) {
     filePath = filePath
       .replace(".ts", ".js")
       .replace(currentDirectory, path.join(currentDirectory, "dist"));
+
+    try {
+      const compiledContent = fs.readFileSync(filePath, "utf-8");
+      const updatedContent = compiledContent.replace(
+        /import (.+?) from ["'](.+?)["'];/g,
+        (match, imports, modulePath) => {
+          if (!modulePath.endsWith(".js") && (modulePath.startsWith("./") || modulePath.startsWith("../"))) {
+            return `import ${imports} from "${modulePath}.js";`; // Append .js to local imports
+          }
+          return match;
+        }
+      );
+      fs.writeFileSync(filePath, updatedContent, "utf-8");
+    } catch (error) {
+      console.error("Error during post-processing:", error);
+    }
   }
 
   const fileContent = fs.readFileSync(initialFilePath, "utf-8");
   const instanceName = findInstance(fileContent);
-
   if (instanceName) {
     try {
       const module = await import(`file://${filePath}`);

cli-demo/index.ts

@@ -1,118 +1,36 @@
 import express from 'express';
-import AdminForth, { AdminForthDataTypes, AdminUser, Filters } from 'adminforth';
+import AdminForth, { Filters } from 'adminforth';
+import usersResource from "./resources/users";
+import apartmentsResource from "./resources/apartments";
+import auditLogsResource from "./resources/auditLogs"
+
+
+const ADMIN_BASE_URL = '';
 
 export const admin = new AdminForth({
-  baseUrl: '',
+  baseUrl : ADMIN_BASE_URL,
   auth: {
     usersResourceId: 'users',  // resource to get user during login
     usernameField: 'email',  // field where username is stored, should exist in resource
-    passwordHashField: 'passwordHash',
+    passwordHashField: 'password_hash',
+    rememberMeDays: 30, // users who will check "remember me" will stay logged in for 30 days
   },
   customization: {
     brandName: 'My Admin',
     datesFormat: 'D MMM YY',
     timeFormat: 'HH:mm:ss',
     emptyFieldPlaceholder: '-',
   },
-  dataSources: [{
-    id: 'maindb',
-    url: `sqlite://${process.env.DATABASE_FILE}`,
-  }],
-  resources: [
+  dataSources: [
     {
-      dataSource: 'maindb',
-      table: 'user',
-      resourceId: 'users',
-      label: 'Users',
-      recordLabel: (r: any) => `👤 ${r.email}`,
-      columns: [
-        {
-          name: 'id',
-          primaryKey: true,
-          fillOnCreate: () => Math.random().toString(36).substring(7),
-          showIn: ['list', 'filter', 'show'],
-        },
-        {
-          name: 'email',
-          required: true,
-          isUnique: true,
-          enforceLowerCase: true,
-          validation: [
-            AdminForth.Utils.EMAIL_VALIDATOR,
-          ]
-        },
-        {
-          name: 'createdAt',
-          type: AdminForthDataTypes.DATETIME,
-          showIn: ['list', 'filter', 'show'],
-          fillOnCreate: () => (new Date()).toISOString(),
-        },
-        {
-          name: 'role',
-          enum: [
-            { value: 'superadmin', label: 'Super Admin' },
-            { value: 'user', label: 'User' },
-          ]
-        },
-        {
-          name: 'password',
-          virtual: true,
-          required: { create: true },
-          editingNote: { edit: 'Leave empty to keep password unchanged' },
-          minLength: 8,
-          type: AdminForthDataTypes.STRING,
-          showIn: ['create', 'edit'],
-          masked: true,
-        },
-        { name: 'passwordHash', backendOnly: true, showIn: [] }
-      ],
+      id: 'maindb',
+      url: `sqlite://${process.env.DATABASE_FILE}`
     },
-    {
-      table: 'post',
-      resourceId: 'posts',
-      dataSource: 'maindb',
-      label: 'Posts',
-      recordLabel: (r: any) => `📝 ${r.title}`,
-      columns: [
-        {
-          name: 'id',
-          primaryKey: true,
-          fillOnCreate: () => Math.random().toString(36).substring(7),
-          showIn: ['list', 'filter', 'show'],
-        },
-        {
-          name: 'title',
-          type: AdminForthDataTypes.STRING,
-          required: true,
-          showIn: ['list', 'create', 'edit', 'filter', 'show'],
-          maxLength: 255,
-          minLength: 3,
-        },
-        {
-          name: 'content',
-          showIn: ['list', 'create', 'edit', 'filter', 'show'],
-        },
-        {
-          name: 'createdAt',
-          showIn: ['list', 'filter', 'show',],
-          fillOnCreate: () => (new Date()).toISOString(),
-        },
-        {
-          name: 'published',
-          required: true,
-        },
-        {
-          name: 'authorId',
-          foreignResource: {
-            resourceId: 'users',
-          },
-          showIn: ['list', 'filter', 'show'],
-          fillOnCreate: ({ adminUser }: { adminUser: AdminUser }) => {
-            return adminUser.dbUser.id;
-          }
-        }
-      ],
-    }
+  ],
+  resources: [
+    apartmentsResource,
+    usersResource,
+    auditLogsResource
   ],
   menu: [
     {
@@ -122,15 +40,27 @@ export const admin = new AdminForth({
       children: [
         {
           homepage: true,
-          label: 'Posts',
+          label: 'Apartments',
           icon: 'flowbite:home-solid',
-          resourceId: 'posts',
+          resourceId: 'aparts',
         },
+        {
+          label: 'Audit Logs',
+          icon: 'flowbite:search-outline',
+          resourceId: 'audit_logs',
+        }
       ]
     },
-    { type: 'gap' },
-    { type: 'divider' },
-    { type: 'heading', label: 'SYSTEM' },
+    {
+      type: 'gap'
+    },
+    {
+      type: 'divider'
+    },
+    {
+      type: 'heading',
+      label: 'SYSTEM',
+    },
     {
       label: 'Users',
       icon: 'flowbite:user-solid',
@@ -139,32 +69,53 @@ export const admin = new AdminForth({
   ],
 });
 
+async function seedDatabase() {
+  if (await admin.resource('aparts').count() > 0) {
+    return
+  }
+  for (let i = 0; i <= 50; i++) {
+    await admin.resource('aparts').create({
+      id: `${i}`,
+      title: `Apartment ${i}`,
+      square_meter: (Math.random() * 100).toFixed(1),
+      price: (Math.random() * 10000).toFixed(2),
+      number_of_rooms: Math.floor(Math.random() * 4) + 1,
+      description: 'Next gen apartments',
+      created_at: (new Date(Date.now() - Math.random() * 60 * 60 * 24 * 14 * 1000)).toISOString(),
+      listed: i % 2 == 0,
+      country: `${['US', 'DE', 'FR', 'GB', 'NL', 'IT', 'ES', 'DK', 'PL', 'UA'][Math.floor(Math.random() * 10)]}`
+    });
+  };
+};
 
 if (import.meta.url === `file://${process.argv[1]}`) {
   // if script is executed directly e.g. node index.ts or npm start
 
+
   const app = express()
   app.use(express.json());
   const port = 3500;
 
   // needed to compile SPA. Call it here or from a build script e.g. in Docker build time to reduce downtime
-  await admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' });
+  await admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development'});
   console.log('Bundling AdminForth done. For faster serving consider calling bundleNow() from a build script.');
 
+
   // serve after you added all api
   admin.express.serve(app)
 
   admin.discoverDatabases().then(async () => {
     if (!await admin.resource('users').get([Filters.EQ('email', 'adminforth')])) {
       await admin.resource('users').create({
         email: 'adminforth',
-        passwordHash: await AdminForth.Utils.generatePasswordHash('adminforth'),
+        password_hash: await AdminForth.Utils.generatePasswordHash('adminforth'),
         role: 'superadmin',
       });
     }
+    await seedDatabase();
   });
 
-  admin.express.listen(port, () => {
-    console.log(`\n⚡ AdminForth is available at http://localhost:${port}\n`)
+  admin.express.expressApp.listen(port, () => {
+    console.log(`\n⚡ AdminForth is available at http://localhost:${port}${ADMIN_BASE_URL}\n`)
   });
 }

…ations/20241105114215_init/migration.sql …ations/20241212132417_init/migration.sqlcli-demo/migrations/20241105114215_init/migration.sql renamed to cli-demo/migrations/20241212132417_init/migration.sql cli-demo/migrations/20241105114215_init/migration.sql renamed to cli-demo/migrations/20241212132417_init/migration.sql

@@ -0,0 +1,42 @@
+/*
+  Warnings:
+
+  - You are about to drop the `Post` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `User` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropTable
+PRAGMA foreign_keys=off;
+DROP TABLE "Post";
+PRAGMA foreign_keys=on;
+
+-- DropTable
+PRAGMA foreign_keys=off;
+DROP TABLE "User";
+PRAGMA foreign_keys=on;
+
+-- CreateTable
+CREATE TABLE "users" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "created_at" DATETIME NOT NULL,
+    "email" TEXT NOT NULL,
+    "role" TEXT NOT NULL,
+    "password_hash" TEXT NOT NULL
+);
+
+-- CreateTable
+CREATE TABLE "apartments" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "created_at" DATETIME,
+    "title" TEXT NOT NULL,
+    "square_meter" REAL,
+    "price" DECIMAL NOT NULL,
+    "number_of_rooms" INTEGER,
+    "description" TEXT,
+    "country" TEXT,
+    "listed" BOOLEAN NOT NULL,
+    "realtor_id" TEXT
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "users_email_key" ON "users"("email");

cli-demo/migrations/20241212132656_init/migration.sql

@@ -0,0 +1,10 @@
+-- CreateTable
+CREATE TABLE "audit_logs" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "created_at" DATETIME NOT NULL,
+    "resource_id" TEXT NOT NULL,
+    "user_id" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "diff" TEXT,
+    "record_id" TEXT
+);