@reldens/cms 0.5.0 → 0.6.0

package/lib/manager.js

@@ -8,13 +8,14 @@ const { AppServerFactory, FileHandler, Encryptor } = require('@reldens/server-ut
 const { DriversMap } = require('@reldens/storage');
 const { AdminManager } = require('./admin-manager');
 const { Installer } = require('./installer');
-const { Storefront } = require('./storefront');
-const { Logger, sc } = require('@reldens/utils');
+const { Frontend } = require('./frontend');
+const { EventsManagerSingleton, Logger, sc } = require('@reldens/utils');
 const dotenv = require('dotenv');
 const mustache = require('mustache');
 
 class Manager
 {
+
     constructor(props = {})
     {
         this.projectRoot = sc.get(props, 'projectRoot', './');
@@ -23,34 +24,40 @@ class Manager
         dotenv.config({path: this.envFilePath});
         this.config = this.loadConfigFromEnv();
         this.entities = sc.get(props, 'entities', {});
+        this.rawEntities = sc.get(props, 'rawEntities', {});
+        this.entitiesConfig = sc.get(props, 'entitiesConfig', {});
+        this.entitiesTranslations = sc.get(props, 'entitiesTranslations', {});
         this.authenticationMethod = sc.get(props, 'authenticationMethod', 'db-users');
         this.authenticationCallback = sc.get(props, 'authenticationCallback', false);
+        this.events = sc.get(props, 'events', EventsManagerSingleton);
         this.appServerFactory = new AppServerFactory();
         this.installer = new Installer({
-            projectRoot: this.projectRoot
+            projectRoot: this.projectRoot,
+            postInstallCallback: this.initializeCmsAfterInstall.bind(this)
         });
         this.dataServer = false;
         this.app = false;
         this.appServer = false;
         this.adminManager = false;
-        this.storefront = false;
+        this.frontend = false;
     }
 
     loadConfigFromEnv()
     {
+        let envVars = process.env;
         return {
-            host: process.env.RELDENS_CMS_HOST || 'http://localhost',
-            port: Number(process.env.RELDENS_CMS_PORT || 8000),
-            adminPath: process.env.RELDENS_CMS_ADMIN_PATH || '/reldens-admin',
-            adminSecret: process.env.RELDENS_CMS_ADMIN_SECRET || '',
+            host: sc.get(envVars, 'RELDENS_CMS_HOST', 'http://localhost'),
+            port: Number(sc.get(envVars, 'RELDENS_CMS_PORT', 8000)),
+            adminPath: sc.get(envVars, 'RELDENS_CMS_ADMIN_PATH', '/reldens-admin'),
+            adminSecret: sc.get(envVars, 'RELDENS_CMS_ADMIN_SECRET', ''),
             database: {
-                client: process.env.RELDENS_CMS_DB_CLIENT || 'mysql',
-                host: process.env.RELDENS_CMS_DB_HOST || 'localhost',
-                port: Number(process.env.RELDENS_CMS_DB_PORT || 3306),
-                name: process.env.RELDENS_CMS_DB_NAME || 'reldens_cms',
-                user: process.env.RELDENS_CMS_DB_USER || '',
-                password: process.env.RELDENS_CMS_DB_PASSWORD || '',
-                driver: process.env.RELDENS_CMS_DB_DRIVER || 'prisma'
+                client: sc.get(envVars, 'RELDENS_CMS_DB_CLIENT', 'mysql'),
+                host: sc.get(envVars, 'RELDENS_CMS_DB_HOST', 'localhost'),
+                port: Number(sc.get(envVars, 'RELDENS_CMS_DB_PORT', 3306)),
+                name: sc.get(envVars, 'RELDENS_CMS_DB_NAME', 'reldens_cms'),
+                user: sc.get(envVars, 'RELDENS_CMS_DB_USER', ''),
+                password: sc.get(envVars, 'RELDENS_CMS_DB_PASSWORD', ''),
+                driver: sc.get(envVars, 'RELDENS_CMS_DB_DRIVER', 'prisma')
             }
         };
     }
@@ -71,7 +78,7 @@ class Manager
         this.appServer = createdAppServer.appServer;
         if(!this.isInstalled()){
             Logger.info('CMS not installed, preparing setup');
-            await this.installer.prepareSetup(this.app, this.appServerFactory);
+            await this.installer.prepareSetup(this.app, this.appServer, this.appServerFactory);
             await this.appServer.listen(this.config.port);
             Logger.info('Installer running on '+this.config.host+':'+this.config.port);
             return true;
@@ -79,7 +86,7 @@ class Manager
         try {
             await this.initializeDataServer();
             await this.initializeAdminManager();
-            await this.initializeStorefront();
+            await this.initializeFrontend();
             await this.appServer.listen(this.config.port);
             Logger.info('CMS running on '+this.config.host+':'+this.config.port);
             return true;
@@ -89,6 +96,32 @@ class Manager
         }
     }
 
+    async initializeCmsAfterInstall(entitiesData)
+    {
+        try {
+            if(entitiesData){
+                this.entities = sc.get(entitiesData, 'entities', this.entities);
+                this.rawEntities = sc.get(entitiesData, 'rawEntities', this.rawEntities);
+                this.entitiesConfig = sc.get(entitiesData, 'entitiesConfig', this.entitiesConfig);
+                this.entitiesTranslations = sc.get(entitiesData, 'entitiesTranslations', this.entitiesTranslations);
+            }
+            this.config = this.loadConfigFromEnv();
+            if(this.appServerFactory.error.message){
+                Logger.critical('App server creation failed: '+this.appServerFactory.error.message);
+                return false;
+            }
+            await this.initializeDataServer();
+            await this.initializeAdminManager();
+            await this.initializeFrontend();
+            await this.appServer.listen(this.config.port);
+            Logger.info('CMS initialized after installation on '+this.config.host+':'+this.config.port);
+            return true;
+        } catch (error) {
+            Logger.critical('Failed to initialize CMS after installation: '+error.message);
+            return false;
+        }
+    }
+
     async initializeDataServer()
     {
         let dbConfig = {
@@ -99,15 +132,18 @@ class Manager
                 database: this.config.database.name,
                 user: this.config.database.user,
                 password: this.config.database.password
-            }
+            },
+            rawEntities: this.rawEntities
         };
         let DriverClass = DriversMap[this.config.database.driver];
         if(!DriverClass){
-            throw new Error('Invalid database driver: '+this.config.database.driver);
+            Logger.critical('Invalid database driver: '+this.config.database.driver);
+            return false;
         }
         this.dataServer = new DriverClass(dbConfig);
         if(!await this.dataServer.connect()){
-            throw new Error('Failed to connect to database');
+            Logger.critical('Failed to connect to database.');
+            return false;
         }
         await this.dataServer.generateEntities();
         return true;
@@ -133,7 +169,7 @@ class Manager
             };
         }
         let adminConfig = {
-            events: false,
+            events: this.events,
             renderCallback: this.renderCallback.bind(this),
             dataServer: this.dataServer,
             authenticationCallback,
@@ -142,7 +178,9 @@ class Manager
             secret: this.config.adminSecret,
             rootPath: this.config.adminPath,
             adminRoleId: 99,
-            entities: this.entities
+            entities: this.entities,
+            entitiesConfig: this.entitiesConfig,
+            translations: this.entitiesTranslations
         };
         this.adminManager = new AdminManager(adminConfig);
         await this.adminManager.setupAdmin();
@@ -157,14 +195,15 @@ class Manager
         return mustache.render(template, params);
     }
 
-    async initializeStorefront()
+    async initializeFrontend()
     {
-        this.storefront = new Storefront({
+        this.frontend = new Frontend({
             app: this.app,
             dataServer: this.dataServer,
-            projectRoot: this.projectRoot
+            projectRoot: this.projectRoot,
+            appServerFactory: this.appServerFactory
         });
-        return await this.storefront.initialize();
+        return await this.frontend.initialize();
     }
 }
 

package/migrations/default-user.sql

@@ -1,8 +1,9 @@
 
 -- Default admin user:
 
-INSERT IGNORE INTO `users` (`email`, `username`, `password`, `role_id`, `status`)
+REPLACE INTO `users` (`id`, `email`, `username`, `password`, `role_id`, `status`)
 VALUES (
+    1,
    'root@cms-admin.com',
    'root',
    'd35ed1c81c3ff00de15309fe40a90c32:a39a9231a69fefef274c13c1780a7447672a5fee8250ce22a51bb20275039dda63a54faa1e5fd775becb3ac424f571d5b996001305bb7d63e038111dce08d45b',

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@reldens/server-utils": "^0.16.0",
-        "@reldens/storage": "^0.38.0",
+        "@reldens/storage": "^0.43.0",
         "@reldens/utils": "^0.47.0",
         "dotenv": "^16.5.0",
         "mustache": "^4.2.0"

package/templates/.env.dist

@@ -1,16 +1,16 @@
 # Database Configuration
-RELDENS_CMS_DB_CLIENT={{dbClient}}
-RELDENS_CMS_DB_HOST={{dbHost}}
-RELDENS_CMS_DB_PORT={{dbPort}}
-RELDENS_CMS_DB_NAME={{dbName}}
-RELDENS_CMS_DB_USER={{dbUser}}
-RELDENS_CMS_DB_PASSWORD={{dbPassword}}
-RELDENS_CMS_DB_DRIVER={{dbDriver}}
+RELDENS_CMS_DB_CLIENT={{&dbClient}}
+RELDENS_CMS_DB_HOST={{&dbHost}}
+RELDENS_CMS_DB_PORT={{&dbPort}}
+RELDENS_CMS_DB_NAME={{&dbName}}
+RELDENS_CMS_DB_USER={{&dbUser}}
+RELDENS_CMS_DB_PASSWORD={{&dbPassword}}
+RELDENS_CMS_DB_DRIVER={{&dbDriver}}
 
 # Admin Panel Configuration
-RELDENS_CMS_ADMIN_PATH={{adminPath}}
-RELDENS_CMS_ADMIN_SECRET={{adminSecret}}
+RELDENS_CMS_ADMIN_PATH={{&adminPath}}
+RELDENS_CMS_ADMIN_SECRET={{&adminSecret}}
 
 # Server Configuration
-RELDENS_CMS_HOST={{host}}
-RELDENS_CMS_PORT={{port}}
+RELDENS_CMS_HOST={{&host}}
+RELDENS_CMS_PORT={{&port}}

package/templates/css/styles.css

@@ -1,4 +1,4 @@
-/* Storefront styles */
+/* Frontend styles */
 body {
     font-family: 'Open Sans', sans-serif;
     line-height: 1.6;

package/templates/index.js.dist

@@ -0,0 +1,32 @@
+/**
+ *
+ * Reldens - CMS
+ *
+ */
+
+const { Manager } = require('@reldens/cms');
+const { Logger } = require('@reldens/utils');
+const { rawRegisteredEntities, entitiesConfig, entitiesTranslations } = require('./generated-entities/models/{{driverKey}}/registered-models-{{driverKey}}');
+
+let args = process.argv.slice(2);
+let projectRoot = args[0] || process.cwd();
+
+let manager = new Manager({
+    projectRoot,
+    entities: rawRegisteredEntities,
+    entitiesConfig,
+    entitiesTranslations
+});
+Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
+
+manager.start().then((result) => {
+    if(!result){
+        Logger.info('Reldens CMS started by command failed.');
+        return false;
+    }
+    Logger.info('Reldens CMS started by command.');
+    return true;
+}).catch((error) => {
+    Logger.error('Failed to start CMS: '+error.message);
+    process.exit();
+});

package/templates/js/scripts.js

@@ -1,4 +1,4 @@
-// Storefront JavaScript
+// Frontend JavaScript
 document.addEventListener('DOMContentLoaded', function() {
     // Add active class to current navigation item
     const currentPath = window.location.pathname;