corefwnode 3.0.2 → 3.0.4

package/.eslintrc.js

@@ -1,40 +1,40 @@
-module.exports = {
-  env: {
-    es6: true,
-    node: true,
-  },
-  extends: [
-    'airbnb-base',
-  ],
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly',
-  },
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-  },
-  rules: {
-    'indent': ['error', 4],
-    'brace-style': ['error', 'allman'],
-    'no-throw-literal': 0,
-    'max-len': ['error', 120],
-    'object-shorthand': ['error', 'always'],
-    'curly': ["error", "all"],
-    'quotes': ['error', 'single'],
-    'no-restricted-syntax': [ 
-        'error',
-        { 
-            selector: 'LabeledStatement', 
-            message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.', 
-        }, 
-        { 
-            selector: 'WithStatement', 
-            message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.', 
-        }, 
-    ],
-    'no-continue': 0,
-    'no-console': 0,
-    'no-param-reassign': ['error', { 'props': false }]
-  },
-};
+module.exports = {
+  env: {
+    es6: true,
+    node: true,
+  },
+  extends: [
+    'airbnb-base',
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  rules: {
+    'indent': ['error', 4],
+    'brace-style': ['error', 'allman'],
+    'no-throw-literal': 0,
+    'max-len': ['error', 120],
+    'object-shorthand': ['error', 'always'],
+    'curly': ["error", "all"],
+    'quotes': ['error', 'single'],
+    'no-restricted-syntax': [ 
+        'error',
+        { 
+            selector: 'LabeledStatement', 
+            message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.', 
+        }, 
+        { 
+            selector: 'WithStatement', 
+            message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.', 
+        }, 
+    ],
+    'no-continue': 0,
+    'no-console': 0,
+    'no-param-reassign': ['error', { 'props': false }]
+  },
+};

package/build.js

@@ -1,266 +1,266 @@
-var inquirer = require("inquirer"),
-  fs = require('fs'),
-  path = require('path'),
-  mysql = require('mysql'),
-  md5 = require('md5'),
-  exec = require('child_process').exec;
-
-console.log('Hi, welcome to CoreFw for node.js installation, this script will install serverside template with express.js, clientside template with basic admin features written in Vue.js');
-
-console.log('Please, create an empty database and user credentials, this will be needed to continue with installation');
-
-var questions = [
-    {
-      type: 'input',
-      name: 'serverSideLocation',
-      message: 'Enter server side location (relative to CoreFw location)',
-      default: '../newprojectserver'
-    },
-    {
-      type: 'input',
-      name: 'clientSideLocation',
-      message: 'Enter client side location (relative to CoreFw location)',
-      default: '../newprojectclient'
-    },
-    {
-      type: 'input',
-      name: 'mysqlHost',
-      message: 'Enter mysql host',
-      default: 'localhost'
-    },
-    {
-      type: 'input',
-      name: 'mysqlUsername',
-      message: 'Enter mysql username',
-      default: 'root'
-    },
-    {
-      type: 'input',
-      name: 'mysqlPassword',
-      message: 'Enter mysql password',
-      default: ''
-    },
-    {
-      type: 'input',
-      name: 'mysqlPort',
-      message: 'Enter mysql port',
-      default: '3306'
-    },
-    {
-      type: 'input',
-      name: 'mysqlDbname',
-      message: 'Enter mysql database name',
-      default: 'newproject'
-    },
-    {
-      type: 'input',
-      name: 'siteUrl',
-      message: 'Enter site url',
-      default: 'http://www.newproject.loc'
-    },
-    {
-      type: 'input',
-      name: 'siteName',
-      message: 'Enter site name',
-      default: 'NewProject'
-    },
-    {
-      type: 'input',
-      name: 'adminUsername',
-      message: 'Enter administrator username',
-      default: 'mirko'
-    },
-    {
-      type: 'input',
-      name: 'adminPassword',
-      message: 'Enter administrator password',
-      default: 'mirko'
-    },
-    {
-      type: 'input',
-      name: 'adminEmail',
-      message: 'Enter administrator E-mail',
-      default: 'mirko@slavko.com'
-    }
-];
-
-inquirer.prompt(questions).then(answers =>
-{
-  if(!fs.existsSync(answers.serverSideLocation))
-  {
-    var folders = answers.serverSideLocation.split('/');
-    var finFolder = [];
-    for(var i=0;i<folders.length;i++)
-    {
-      var folder = folders[i];
-      finFolder.push(folder);
-      if(folder == '..') continue;
-      if(!fs.existsSync(finFolder.join('/')))
-      {
-        fs.mkdirSync(finFolder.join('/'));
-      }
-    }
-  }
-
-  console.log('Copying server side to: '+answers.serverSideLocation)
-  copyFolderRecursiveSync('./serverside/.', answers.serverSideLocation);
-
-
-  if(!fs.existsSync(answers.clientSideLocation))
-  {
-    var folders = answers.clientSideLocation.split('/');
-    var finFolder = [];
-    for(var i=0;i<folders.length;i++)
-    {
-      var folder = folders[i];
-      finFolder.push(folder);
-      if(folder == '..') continue;
-      if(!fs.existsSync(finFolder.join('/')))
-      {
-        fs.mkdirSync(finFolder.join('/'));
-      }
-    }
-  }
-
-  console.log('Copying client side to: '+answers.clientSideLocation)
-  copyFolderRecursiveSync('./clientside/.', answers.clientSideLocation);
-
-  var connection = mysql.createConnection({
-    host: answers.mysqlHost,
-    user: answers.mysqlUsername,
-    password: answers.mysqlPassword,
-    database: answers.mysqlDbname,
-    port: answers.mysqlPort,
-    multipleStatements: true
-  });
-
-  var salt = md5(new Date().getTime());
-
-  var configStr = `module.exports =
-  {
-  	mysql: {
-  		host: '`+answers.mysqlHost+`',
-  		username: '`+answers.mysqlUsername+`',
-  		password: '`+answers.mysqlPassword+`',
-  		port: '`+answers.mysqlPort+`',
-  		dbname: '`+answers.mysqlDbname+`',
-      connectionLimit: 100
-  	},
-    clientSideLocation: '`+answers.clientSideLocation+`',
-    serverSideLocation: '`+answers.serverSideLocation+`',
-  	cookieName: '`+answers.siteName+`',
-  	cookieLenght: 57600000,
-  	salt: '`+salt+`',
-  	siteUrl: '`+answers.siteUrl+`',
-  	siteName: '`+answers.siteName+`',
-  	siteEmail: 'info@coreaplikacije.hr'
-  };`;
-
-  if(!fs.existsSync(answers.serverSideLocation+'/config'))
-  {
-    fs.mkdirSync(answers.serverSideLocation+'/config');
-  }
-
-  fs.writeFileSync(answers.serverSideLocation+'/config/dev.js', configStr);
-
-  var data = fs.readFileSync(answers.clientSideLocation+'/package.json').toString('UTF-8');
-  var re = new RegExp("SERVERSIDEPATH", "g");
-  data = data.replace(re, answers.serverSideLocation);
-
-  fs.writeFileSync(answers.clientSideLocation+'/package.json', data);
-
-  console.log('Installing server side dependencies in: '+answers.serverSideLocation)
-  exec('npm install',
-  {
-    cwd: answers.serverSideLocation
-  }, function (error, stdout, stderr)
-  {
-    console.log(error);
-    console.log(stdout);
-    console.log(stderr);
-    if(error !== null)
-    {
-      console.log('exec error: ' + error);
-      return;
-    }
-
-    console.log('Installing client side dependencies in: '+answers.clientSideLocation)
-    exec('npm install',
-    {
-      cwd: answers.clientSideLocation
-    }, function (error, stdout, stderr)
-    {
-      console.log(stdout);
-      if(error !== null)
-      {
-        console.log('exec error: ' + error);
-        return;
-      }
-
-      console.log('Importing default database')
-
-      var data = fs.readFileSync('./data/dump.sql');
-
-      connection.query(data.toString('UTF-8'), function(err, results)
-      {
-        if(err)
-        {
-          throw err;
-          return;
-        }
-
-        var password = md5(answers.adminPassword+salt);
-
-        connection.query("UPDATE users SET username=?, password=?, userEmail=? WHERE userId=1", [answers.adminUsername, password, answers.adminEmail], function(err, results)
-        {
-          if(err)
-          {
-            throw err;
-            return;
-          }
-
-          connection.end();
-          console.log('Finished, start your application by running \'npm run dev\' in serverside directory and \'npm run serve\' in clientside directory')
-          return;
-        });
-      });
-    });
-  });
-});
-
-function copyFileSync( source, target ) {
-
-    var targetFile = target;
-
-    //if target is a directory a new file with the same name will be created
-    if ( fs.existsSync( target ) ) {
-        if ( fs.lstatSync( target ).isDirectory() ) {
-            targetFile = path.join( target, path.basename( source ) );
-        }
-    }
-
-    fs.writeFileSync(targetFile, fs.readFileSync(source));
-}
-
-function copyFolderRecursiveSync( source, target ) {
-    var files = [];
-
-    //check if folder needs to be created or integrated
-    var targetFolder = path.join( target, path.basename( source ) );
-    if ( !fs.existsSync( targetFolder ) ) {
-        fs.mkdirSync( targetFolder );
-    }
-
-    //copy
-    if ( fs.lstatSync( source ).isDirectory() ) {
-        files = fs.readdirSync( source );
-        files.forEach( function ( file ) {
-            var curSource = path.join( source, file );
-            if ( fs.lstatSync( curSource ).isDirectory() ) {
-                copyFolderRecursiveSync( curSource, targetFolder );
-            } else {
-                copyFileSync( curSource, targetFolder );
-            }
-        } );
-    }
-}
+var inquirer = require("inquirer"),
+  fs = require('fs'),
+  path = require('path'),
+  mysql = require('mysql'),
+  md5 = require('md5'),
+  exec = require('child_process').exec;
+
+console.log('Hi, welcome to CoreFw for node.js installation, this script will install serverside template with express.js, clientside template with basic admin features written in Vue.js');
+
+console.log('Please, create an empty database and user credentials, this will be needed to continue with installation');
+
+var questions = [
+    {
+      type: 'input',
+      name: 'serverSideLocation',
+      message: 'Enter server side location (relative to CoreFw location)',
+      default: '../newprojectserver'
+    },
+    {
+      type: 'input',
+      name: 'clientSideLocation',
+      message: 'Enter client side location (relative to CoreFw location)',
+      default: '../newprojectclient'
+    },
+    {
+      type: 'input',
+      name: 'mysqlHost',
+      message: 'Enter mysql host',
+      default: 'localhost'
+    },
+    {
+      type: 'input',
+      name: 'mysqlUsername',
+      message: 'Enter mysql username',
+      default: 'root'
+    },
+    {
+      type: 'input',
+      name: 'mysqlPassword',
+      message: 'Enter mysql password',
+      default: ''
+    },
+    {
+      type: 'input',
+      name: 'mysqlPort',
+      message: 'Enter mysql port',
+      default: '3306'
+    },
+    {
+      type: 'input',
+      name: 'mysqlDbname',
+      message: 'Enter mysql database name',
+      default: 'newproject'
+    },
+    {
+      type: 'input',
+      name: 'siteUrl',
+      message: 'Enter site url',
+      default: 'http://www.newproject.loc'
+    },
+    {
+      type: 'input',
+      name: 'siteName',
+      message: 'Enter site name',
+      default: 'NewProject'
+    },
+    {
+      type: 'input',
+      name: 'adminUsername',
+      message: 'Enter administrator username',
+      default: 'mirko'
+    },
+    {
+      type: 'input',
+      name: 'adminPassword',
+      message: 'Enter administrator password',
+      default: 'mirko'
+    },
+    {
+      type: 'input',
+      name: 'adminEmail',
+      message: 'Enter administrator E-mail',
+      default: 'mirko@slavko.com'
+    }
+];
+
+inquirer.prompt(questions).then(answers =>
+{
+  if(!fs.existsSync(answers.serverSideLocation))
+  {
+    var folders = answers.serverSideLocation.split('/');
+    var finFolder = [];
+    for(var i=0;i<folders.length;i++)
+    {
+      var folder = folders[i];
+      finFolder.push(folder);
+      if(folder == '..') continue;
+      if(!fs.existsSync(finFolder.join('/')))
+      {
+        fs.mkdirSync(finFolder.join('/'));
+      }
+    }
+  }
+
+  console.log('Copying server side to: '+answers.serverSideLocation)
+  copyFolderRecursiveSync('./serverside/.', answers.serverSideLocation);
+
+
+  if(!fs.existsSync(answers.clientSideLocation))
+  {
+    var folders = answers.clientSideLocation.split('/');
+    var finFolder = [];
+    for(var i=0;i<folders.length;i++)
+    {
+      var folder = folders[i];
+      finFolder.push(folder);
+      if(folder == '..') continue;
+      if(!fs.existsSync(finFolder.join('/')))
+      {
+        fs.mkdirSync(finFolder.join('/'));
+      }
+    }
+  }
+
+  console.log('Copying client side to: '+answers.clientSideLocation)
+  copyFolderRecursiveSync('./clientside/.', answers.clientSideLocation);
+
+  var connection = mysql.createConnection({
+    host: answers.mysqlHost,
+    user: answers.mysqlUsername,
+    password: answers.mysqlPassword,
+    database: answers.mysqlDbname,
+    port: answers.mysqlPort,
+    multipleStatements: true
+  });
+
+  var salt = md5(new Date().getTime());
+
+  var configStr = `module.exports =
+  {
+  	mysql: {
+  		host: '`+answers.mysqlHost+`',
+  		username: '`+answers.mysqlUsername+`',
+  		password: '`+answers.mysqlPassword+`',
+  		port: '`+answers.mysqlPort+`',
+  		dbname: '`+answers.mysqlDbname+`',
+      connectionLimit: 100
+  	},
+    clientSideLocation: '`+answers.clientSideLocation+`',
+    serverSideLocation: '`+answers.serverSideLocation+`',
+  	cookieName: '`+answers.siteName+`',
+  	cookieLenght: 57600000,
+  	salt: '`+salt+`',
+  	siteUrl: '`+answers.siteUrl+`',
+  	siteName: '`+answers.siteName+`',
+  	siteEmail: 'info@coreaplikacije.hr'
+  };`;
+
+  if(!fs.existsSync(answers.serverSideLocation+'/config'))
+  {
+    fs.mkdirSync(answers.serverSideLocation+'/config');
+  }
+
+  fs.writeFileSync(answers.serverSideLocation+'/config/dev.js', configStr);
+
+  var data = fs.readFileSync(answers.clientSideLocation+'/package.json').toString('UTF-8');
+  var re = new RegExp("SERVERSIDEPATH", "g");
+  data = data.replace(re, answers.serverSideLocation);
+
+  fs.writeFileSync(answers.clientSideLocation+'/package.json', data);
+
+  console.log('Installing server side dependencies in: '+answers.serverSideLocation)
+  exec('npm install',
+  {
+    cwd: answers.serverSideLocation
+  }, function (error, stdout, stderr)
+  {
+    console.log(error);
+    console.log(stdout);
+    console.log(stderr);
+    if(error !== null)
+    {
+      console.log('exec error: ' + error);
+      return;
+    }
+
+    console.log('Installing client side dependencies in: '+answers.clientSideLocation)
+    exec('npm install',
+    {
+      cwd: answers.clientSideLocation
+    }, function (error, stdout, stderr)
+    {
+      console.log(stdout);
+      if(error !== null)
+      {
+        console.log('exec error: ' + error);
+        return;
+      }
+
+      console.log('Importing default database')
+
+      var data = fs.readFileSync('./data/dump.sql');
+
+      connection.query(data.toString('UTF-8'), function(err, results)
+      {
+        if(err)
+        {
+          throw err;
+          return;
+        }
+
+        var password = md5(answers.adminPassword+salt);
+
+        connection.query("UPDATE users SET username=?, password=?, userEmail=? WHERE userId=1", [answers.adminUsername, password, answers.adminEmail], function(err, results)
+        {
+          if(err)
+          {
+            throw err;
+            return;
+          }
+
+          connection.end();
+          console.log('Finished, start your application by running \'npm run dev\' in serverside directory and \'npm run serve\' in clientside directory')
+          return;
+        });
+      });
+    });
+  });
+});
+
+function copyFileSync( source, target ) {
+
+    var targetFile = target;
+
+    //if target is a directory a new file with the same name will be created
+    if ( fs.existsSync( target ) ) {
+        if ( fs.lstatSync( target ).isDirectory() ) {
+            targetFile = path.join( target, path.basename( source ) );
+        }
+    }
+
+    fs.writeFileSync(targetFile, fs.readFileSync(source));
+}
+
+function copyFolderRecursiveSync( source, target ) {
+    var files = [];
+
+    //check if folder needs to be created or integrated
+    var targetFolder = path.join( target, path.basename( source ) );
+    if ( !fs.existsSync( targetFolder ) ) {
+        fs.mkdirSync( targetFolder );
+    }
+
+    //copy
+    if ( fs.lstatSync( source ).isDirectory() ) {
+        files = fs.readdirSync( source );
+        files.forEach( function ( file ) {
+            var curSource = path.join( source, file );
+            if ( fs.lstatSync( curSource ).isDirectory() ) {
+                copyFolderRecursiveSync( curSource, targetFolder );
+            } else {
+                copyFileSync( curSource, targetFolder );
+            }
+        } );
+    }
+}