@appxdigital/appx-core-cli 1.0.7 → 1.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "@appxdigital/appx-core-cli",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "main": "index.js",
     "scripts": {
         "npm:publish": "npm publish --access public",

package/templates/admin.config.template.js

@@ -5,6 +5,7 @@ const componentLoader = new ComponentLoader();
 
 export const AdminConfig: AdminConfigType = {
     componentLoader,
+    adminRoles: ['ADMIN'],
     resources: [
         {
             name: 'User',

package/wizard.js

@@ -10,6 +10,7 @@ import { fileURLToPath } from 'url';
 import cliProgress from 'cli-progress';
 import { gatherFileUploadSettings, insertFileUploadConfiguration } from './utils/fileUploadConfig.js';
 import packageJson from './package.json' assert { type: 'json' };
+import crypto from 'crypto';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -24,7 +25,6 @@ const phaseDurations = {
     installDependencies: 80,
     installCore: 120,
     prismaSetup: 10,
-    adminSetup: 40,
     setupConcluded: 5,
     end: 5
 };
@@ -37,9 +37,6 @@ const calculateTotalETA = (includeBackoffice) => {
         phaseDurations.prismaSetup +
         phaseDurations.setupConcluded
         + phaseDurations.end;
-    if (includeBackoffice) {
-        totalTime += phaseDurations.adminSetup;
-    }
     return totalTime;
 };
 
@@ -151,12 +148,6 @@ async function promptUser() {
                 message: 'Database Name:',
                 default: 'generic'
             },
-            {
-                type: 'confirm',
-                name: 'backoffice',
-                message: 'Create backoffice?',
-                default: true
-            },
             {
                 type: 'confirm',
                 name: 'showOutput',
@@ -227,7 +218,7 @@ APP_PORT=3000
 USE_TRANSACTION=true
 
 #Session secret
-SESSION_SECRET="${require('crypto').randomBytes(32).toString('hex')}"
+SESSION_SECRET="${crypto.randomBytes(32).toString('hex')}"
 
 #Cookie name for the session token
 SESSION_COOKIE_NAME="APPXCORE"
@@ -236,8 +227,8 @@ SESSION_COOKIE_NAME="APPXCORE"
 SESSION_TTL=86400
 
 # JWT
-JWT_SECRET="${require('crypto').randomBytes(32).toString('hex')}"
-JWT_REFRESH_SECRET="${require('crypto').randomBytes(32).toString('hex')}"
+JWT_SECRET="${crypto.randomBytes(32).toString('hex')}"
+JWT_REFRESH_SECRET="${crypto.randomBytes(32).toString('hex')}"
 `;
 
         fs.writeFileSync(`${projectPath}/.env`, envContent);
@@ -315,13 +306,8 @@ function setupProjectStructure(projectPath, answers) {
     incrementProgress(answers?.showOutput, "prismaSetup");
     createPrismaModule(projectPath);
     createPermissionsConfig(projectPath);
+    createAdminConfig(projectPath);
     addScriptsToPackageJson(projectPath);
-
-    if (includeBackoffice) {
-        executeCommand('npm install adminjs @adminjs/express @adminjs/import-export @adminjs/nestjs @adminjs/prisma @prisma/sdk react express-formidable @adminjs/passwords', answers?.showOutput);
-        setupAdminJS(projectPath);
-        incrementProgress(answers?.showOutput, "adminSetup");
-    }
 }
 
 function ensureAndRunNestCli(projectPath, showOutput = false) {
@@ -355,52 +341,6 @@ function getAppModuleTemplate() {
     return fs.readFileSync(appModuleTemplatePath, 'utf8');
 }
 
-function setupAdminJS(projectPath) {
-    const backoffice = path.join(projectPath, 'src/backoffice');
-    fs.ensureDirSync(backoffice);
-
-    const backofficeComponents = path.join(backoffice, 'components');
-    fs.ensureDirSync(backofficeComponents);
-
-    const componentLoaderContent = getComponentLoaderTemplate();
-    fs.writeFileSync(path.join(backoffice, 'component-loader.ts'), componentLoaderContent);
-
-    const dashboardContent = getDashboardTemplate();
-    fs.writeFileSync(path.join(backofficeComponents, 'dashboard.tsx'), dashboardContent);
-
-    const utilsContent = getUtilsTemplate();
-    fs.writeFileSync(path.join(backoffice, 'utils.ts'), utilsContent);
-
-    const adminContent = getAdminTemplate();
-    fs.writeFileSync(path.join(backoffice, 'admin.ts'), adminContent);
-
-    const tsConfigPath = path.join(projectPath, 'tsconfig.json');
-    const tsConfig = fs.readJsonSync(tsConfigPath);
-
-    tsConfig.compilerOptions.jsx = 'react';
-    fs.writeJsonSync(tsConfigPath, tsConfig, { spaces: 2 });
-}
-
-function getComponentLoaderTemplate() {
-    const template = path.join(__dirname, 'templates', 'adminjs', 'component-loader.template.js');
-    return fs.readFileSync(template, 'utf8');
-}
-
-function getDashboardTemplate() {
-    const template = path.join(__dirname, 'templates', 'adminjs', 'dashboard.template.js');
-    return fs.readFileSync(template, 'utf8');
-}
-
-function getUtilsTemplate() {
-    const template = path.join(__dirname, 'templates', 'adminjs', 'utils.template.js');
-    return fs.readFileSync(template, 'utf8');
-}
-
-function getAdminTemplate() {
-    const template = path.join(__dirname, 'templates', 'adminjs', 'admin.template.js');
-    return fs.readFileSync(template, 'utf8');
-}
-
 function createPermissionsConfig(projectPath) {
     const configDir = path.join(projectPath, 'src/config');
     fs.ensureDirSync(configDir);