@reldens/cms 0.3.0 → 0.5.0

package/bin/reldens-cms.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  *

package/install/css/installer.css

@@ -103,8 +103,7 @@ input[type="submit"]:hover {
 }
 
 .install-loading {
-    width: 24px;
-    height: 24px;
+    width: 32px;
     margin-right: 10px;
     vertical-align: middle;
 }

package/install/index.html

@@ -35,13 +35,11 @@
                     </div>
                     <h3 class="form-title">- Database Configuration -</h3>
                     <div class="db-basic-config-notice">
-                        <span>
-                            Default configuration:
-                            <ul>
-                                <li>Client: mysql2 - Port: 3306</li>
-                                <li>Database Driver: prisma</li>
-                            </ul>
-                        </span>
+                        <span>Default configuration:</span>
+                        <ul>
+                            <li>Client: mysql - Port: 3306</li>
+                            <li>Database Driver: prisma</li>
+                        </ul>
                     </div>
                     <div class="input-box db-storage-driver">
                         <label for="db-storage-driver">Storage Driver</label>

package/lib/installer.js

@@ -66,12 +66,11 @@ class Installer
         if('' === req._parsedUrl.pathname || '/' === req._parsedUrl.pathname){
             let installerIndexPath = FileHandler.joinPaths(this.installerPath, 'index.html');
             if(!FileHandler.exists(installerIndexPath)){
-                return res.status(500).send('Installer template not found');
+                return res.status(500).send('Installer template not found.');
             }
-            let content = FileHandler.readFile(installerIndexPath, {
-                encoding: this.encoding
-            });
-            return res.send(mustache.render(content, req.session?.templateVariables || this.fetchDefaults()));
+            let content = FileHandler.readFile(installerIndexPath);
+            let contentParams = req.session?.templateVariables || this.fetchDefaults();
+            return res.send(mustache.render(content, contentParams));
         }
         next();
     }
@@ -111,27 +110,35 @@ class Installer
             return res.redirect('/?error=connection-failed');
         }
         if(!sc.isObjectFunction(dbDriver, 'rawQuery')){
-            Logger.error('Method "rawQuery" not found');
+            Logger.error('Method "rawQuery" not found.');
             return res.redirect('/?error=raw-query-not-found');
         }
         let installSqlPath = FileHandler.joinPaths(this.migrationsPath, 'install.sql');
         if(!FileHandler.exists(installSqlPath)){
-            Logger.error('SQL installation file not found');
+            Logger.error('SQL installation file not found.');
             return res.redirect('/?error=sql-file-not-found');
         }
-        await this.executeQueryFile(dbDriver, installSqlPath);
+        let queryTablesResult = await this.executeQueryFile(dbDriver, installSqlPath);
+        if(!queryTablesResult){
+            Logger.error('Tables creation failed.');
+            return res.redirect('/?error=sql-tables-creation-failed');
+        }
         Logger.info('Installed tables.');
         let defaultUserSqlPath = FileHandler.joinPaths(this.migrationsPath, 'default-user.sql');
         try {
             if(FileHandler.exists(defaultUserSqlPath)){
-                await this.executeQueryFile(dbDriver, defaultUserSqlPath);
+                let queryUserResult = await this.executeQueryFile(dbDriver, defaultUserSqlPath);
+                if(!queryUserResult){
+                    Logger.error('Default user creation failed.');
+                    return res.redirect('/?error=sql-default-user-error');
+                }
                 Logger.info('Created default user.');
             }
-            let connectionData = {
-                client: dbConfig.client,
-                connection: dbConfig.config
-            };
-            await this.generateEntities(connectionData);
+            let entitiesGenerationResult = await this.generateEntities(dbDriver);
+            if(!entitiesGenerationResult){
+                Logger.error('Entities generation error.');
+                return res.redirect('/?error=installation-entities-generation-failed');
+            }
             Logger.info('Generated entities.');
         } catch (error) {
             Logger.error('Installation error: '+error.message);
@@ -155,18 +162,16 @@ class Installer
 
     async executeQueryFile(dbDriver, filePath)
     {
-        let sqlContent = FileHandler.readFile(filePath, {
-            encoding: this.encoding
-        });
+        let sqlContent = FileHandler.readFile(filePath);
         if(!sqlContent){
             throw new Error('Could not read SQL file: '+filePath);
         }
         return await dbDriver.rawQuery(sqlContent.toString());
     }
 
-    async generateEntities(connectionData)
+    async generateEntities(server)
     {
-        let generator = new EntitiesGenerator({connectionData: connectionData, projectPath: this.projectRoot});
+        let generator = new EntitiesGenerator({server, projectPath: this.projectRoot});
         let success = await generator.generate();
         if(!success){
             Logger.error('Entities generation failed.');
@@ -197,9 +202,7 @@ class Installer
             Logger.error('ENV template not found: '+envTemplatePath);
             return false;
         }
-        let envTemplate = FileHandler.readFile(envTemplatePath, {
-            encoding: this.encoding
-        });
+        let envTemplate = FileHandler.readFile(envTemplatePath);
         let envContent = mustache.render(envTemplate, {
             dbClient: templateVariables['db-client'],
             dbHost: templateVariables['db-host'],
@@ -211,7 +214,7 @@ class Installer
             adminPath: templateVariables['app-admin-path'],
             adminSecret: Encryptor.generateSecretKey(),
             host: templateVariables['app-host'] || 'http://localhost',
-            port: templateVariables['app-port'] || '3000'
+            port: templateVariables['app-port'] || '8000'
         });
         return FileHandler.writeFile(this.envFilePath, envContent);
     }
@@ -267,10 +270,10 @@ class Installer
     {
         return {
             'app-host': process.env.RELDENS_CMS_HOST || 'http://localhost',
-            'app-port': process.env.RELDENS_CMS_PORT || '3000',
+            'app-port': process.env.RELDENS_CMS_PORT || '8000',
             'app-admin-path': process.env.RELDENS_CMS_ADMIN_PATH || '/reldens-admin',
             'db-storage-driver': 'prisma',
-            'db-client': process.env.RELDENS_CMS_DB_CLIENT || 'mysql2',
+            'db-client': process.env.RELDENS_CMS_DB_CLIENT || 'mysql',
             'db-host': process.env.RELDENS_CMS_DB_HOST || 'localhost',
             'db-port': process.env.RELDENS_CMS_DB_PORT || '3306',
             'db-name': process.env.RELDENS_CMS_DB_NAME || 'reldens_cms',

package/lib/manager.js

@@ -40,11 +40,11 @@ class Manager
     {
         return {
             host: process.env.RELDENS_CMS_HOST || 'http://localhost',
-            port: Number(process.env.RELDENS_CMS_PORT || 3000),
+            port: Number(process.env.RELDENS_CMS_PORT || 8000),
             adminPath: process.env.RELDENS_CMS_ADMIN_PATH || '/reldens-admin',
             adminSecret: process.env.RELDENS_CMS_ADMIN_SECRET || '',
             database: {
-                client: process.env.RELDENS_CMS_DB_CLIENT || 'mysql2',
+                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',

package/package.json

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