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

Author: Romper9

Changelog.md

@@ -5,8 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.5.11] - next
 
-## [v1.5.9] - next
+
+## [v1.5.10] 
 
 ### Changed
 
@@ -16,12 +18,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - show hook is now called as it was when user edits the page
 - fixed showRow in ShowTable.vue
 - if not ab le to connect postgres, don't crash the app
+- fix LastPass and other passowrd managers who try make autocomplete on user creation form
 
 ### Improved
-- reduce stdout output from AdminForths
+- reduce stdout output from AdminForth itself
 
 ### Added
 - AFCL Chart components
+- add requestUrl param to hooks extra
+- `npx adminforth create-app --app-name myadmin --db sqlite://.db.sqlite`
 
 ## [v1.5.8]
 

adminforth/commands/cli.js

@@ -3,16 +3,20 @@
 const args = process.argv.slice(2);
 const command = args[0];
 
-import generateModels from "./generateModels.js";
 import bundle from "./bundle.js";
+import createApp from "./createApp/main.js";
+import generateModels from "./generateModels.js";
 
 switch (command) {
+  case "create-app":
+    createApp(args);
+    break;
   case "generate-models":
     generateModels();
     break;
   case "bundle":
     bundle();
     break;
   default:
-    console.log("Unknown command. Available commands: generate-models, bundle");
-}
+    console.log("Unknown command. Available commands: create-app, generate-models, bundle");
+}

adminforth/commands/createApp/assets/favicon.png

@@ -0,0 +1,27 @@
+import chalk from 'chalk';
+
+import {
+  parseArgumentsIntoOptions,
+  prepareWorkflow,
+  promptForMissingOptions,
+} from './utils.js';
+
+
+export default async function createApp(args) {
+  // Step 1: Parse CLI arguments with `arg`
+  let options = parseArgumentsIntoOptions(args);
+
+  // Step 2: Ask for missing arguments via `inquirer`
+  options = await promptForMissingOptions(options);
+
+  // Step 3: Prepare a Listr-based workflow
+  const tasks = prepareWorkflow(options)
+
+  // Step 4: Run tasks
+  try {
+    await tasks.run();
+  } catch (err) {
+    console.error(chalk.red(`\n❌  ${err.message}\n`));
+    process.exit(1);
+  }
+}

adminforth/commands/createApp/assets/logo.svg

@@ -0,0 +1,6 @@
+ADMINFORTH_SECRET=123
+NODE_ENV=development
+DATABASE_URL={{dbUrl}}
+{{#if prismaDbUrl}}
+PRISMA_DATABASE_URL={{prismaDbUrl}}
+{{/if}}

adminforth/commands/createApp/main.js

@@ -0,0 +1,5 @@
+# Dependency directories
+node_modules/
+
+# dotenv environment variable files
+.env

adminforth/commands/createApp/templates/.env.sample.hbs

@@ -0,0 +1,12 @@
+{
+  "name": "custom",
+  "version": "1.0.0",
+  "main": "index.ts",
+  "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}

adminforth/commands/createApp/templates/.gitignore.hbs

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/": "../node_modules/adminforth/dist/spa/src/",
+      "": "../node_modules/adminforth/dist/spa/node_modules/",
+      "@@/*": "."
+    }
+  }
+}

adminforth/commands/createApp/templates/custom/package.json.hbs

@@ -0,0 +1,84 @@
+import express from 'express';
+import AdminForth, { Filters } from 'adminforth';
+import usersResource from "./resources/users";
+
+const ADMIN_BASE_URL = '';
+
+export const admin = new AdminForth({
+  baseUrl: ADMIN_BASE_URL,
+  auth: {
+    usersResourceId: 'users',
+    usernameField: 'email',
+    passwordHashField: 'password_hash',
+    rememberMeDays: 30,
+    loginBackgroundImage: 'https://images.unsplash.com/photo-1534239697798-120952b76f2b?q=80&w=3389&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
+    loginBackgroundPosition: '1/2',
+    demoCredentials: "adminforth:adminforth",
+    loginPromptHTML: "Use email <b>adminforth</b> and password <b>adminforth</b> to login",
+  },
+  customization: {
+    brandName: "{{appName}}",
+    title: "{{appName}}",
+    favicon: '@@/assets/favicon.png',
+    brandLogo: '@@/assets/logo.svg',
+    datesFormat: 'DD MMM',
+    timeFormat: 'HH:mm a',
+    showBrandNameInSidebar: true,
+    styles: {
+      colors: {
+        light: {
+          primary: '#B400B8',
+          sidebar: { main:'#571E58', text:'white' },
+        },
+        dark: {
+          primary: '#82ACFF',
+          sidebar: { main:'#1f2937', text:'#9ca3af' },
+        }
+      }
+    },
+  },
+  dataSources: [
+    {
+      id: 'maindb',
+      url: `${process.env.DATABASE_URL}`
+    },
+  ],
+  resources: [
+    usersResource
+  ],
+  menu: [
+    { type: 'heading', label: 'SYSTEM' },
+    {
+      label: 'Users',
+      icon: 'flowbite:user-solid',
+      resourceId: 'users'
+    }
+  ],
+});
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const app = express();
+  app.use(express.json());
+
+  const port = 3500;
+
+  await admin.bundleNow({ hotReload: process.env.NODE_ENV === 'development' });
+  console.log('Bundling AdminForth done. For faster serving consider calling bundleNow() from a build script.');
+
+  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',
+        password_hash: await AdminForth.Utils.generatePasswordHash('adminforth'),
+        role: 'superadmin',
+      });
+    }
+  });
+
+  admin.express.listen(port, () => {
+    console.log(`Example app listening at http://localhost:${port}`);
+    console.log(`\n⚡ AdminForth is available at http://localhost:${port}${ADMIN_BASE_URL}\n`);
+  });
+}