Convert codebase to ES6

bin/admin/trshell.js

@@ -1,5 +1,3 @@
-'use strict'
-
 // Ensuring that we're in the right directory
 process.chdir(__dirname);
 process.chdir('../../');

bin/db-drop.js

@@ -6,7 +6,7 @@ if (process.env.NODE_ENV === 'production') {
 }
 
 // Use mongoose configuration
-var mongooseService = require('../config/lib/mongoose.js');
+const mongooseService = require('../config/lib/mongoose.js');
 
 mongooseService.connect(function (db) {
   mongooseService.dropDatabase(db, function () {

bin/db-maintenance/archive-done-agenda-jobs.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-'use strict';
 
 /**
  * Archive done Agenda jobs from `agendaJobs` collection by moving them
@@ -16,23 +15,23 @@
  *  npm run agenda-maintenance -- reverse
  */
 
-var MongoClient = require('mongodb').MongoClient,
-    path = require('path'),
-    chalk = require('chalk'),
-    async = require('async'),
-    config = require(path.resolve('./config/config'));
+const MongoClient = require('mongodb').MongoClient;
+const path = require('path');
+const chalk = require('chalk');
+const async = require('async');
+const config = require(path.resolve('./config/config'));
 
-var dbConnection,
-    sourceCollection,
-    targetCollection,
-    filter = { nextRunAt: null, lockedAt: null },
-    total;
+let dbConnection;
+let sourceCollection;
+let targetCollection;
+const filter = { nextRunAt: null, lockedAt: null };
+let total;
 
-var isReverse = process.argv[2] === 'reverse';
+const isReverse = process.argv[2] === 'reverse';
 
 // By default from live to achived, but if requested "reverse" do Archived → back to live
-var sourceCollectionName = isReverse ? 'agendaJobsArchived' : 'agendaJobs';
-var targetCollectionName = isReverse ? 'agendaJobs' : 'agendaJobsArchived';
+const sourceCollectionName = isReverse ? 'agendaJobsArchived' : 'agendaJobs';
+const targetCollectionName = isReverse ? 'agendaJobs' : 'agendaJobsArchived';
 
 if (isReverse) {
   console.log(chalk.red('🚨 Reverse action! Movind docs from archive back to live.'));
@@ -150,12 +149,12 @@ async.waterfall([
     //
     // settings how often the progress will be printed to console
     // every PROGRESS_INTERVAL %
-    var PROGRESS_INTERVAL = 0.1; // percent
-    var keepGoing = true;
-    var progress = 1; // progress counter
+    const PROGRESS_INTERVAL = 0.1; // percent
+    let keepGoing = true;
+    let progress = 1; // progress counter
 
     // this is the test for async.doWhilst
-    var testKeepGoing = function () {
+    const testKeepGoing = function () {
       return keepGoing;
     };
 
@@ -170,7 +169,7 @@ async.waterfall([
         // showing the progress sometimes
         if (progress % Math.ceil(total / 100 * PROGRESS_INTERVAL) === 0) {
           // update the progress instead of logging to newline
-          var progressPercent = (progress / total * 100).toFixed(1);
+          const progressPercent = (progress / total * 100).toFixed(1);
           process.stdout.clearLine();
           process.stdout.cursorTo(0);
           process.stdout.write(

bin/db-maintenance/ensure-indexes.js

@@ -22,7 +22,7 @@ if (process.argv[2]) {
   predefinedModel = process.argv[2];
 } else {
   console.log('Ensuring indexes for all Mongo collections');
-};
+}
 
 mongooseService.connect(async (connection) => {
   await mongooseService.loadModels();

bin/fillTestData/Messages.js

@@ -1,16 +1,14 @@
-'use strict';
-
 /**
  * Required dependencies
  */
-const _ = require('lodash'),
-      path = require('path'),
-      mongooseService = require(path.resolve('./config/lib/mongoose')),
-      chalk = require('chalk'),
-      yargs = require('yargs'),
-      faker = require('faker'),
-      mongoose = require('mongoose'),
-      config = require(path.resolve('./config/config'));
+const _ = require('lodash');
+const path = require('path');
+const mongooseService = require(path.resolve('./config/lib/mongoose'));
+const chalk = require('chalk');
+const yargs = require('yargs');
+const faker = require('faker');
+const mongoose = require('mongoose');
+const config = require(path.resolve('./config/config'));
 
 
 /**
@@ -115,6 +113,8 @@ function seedThreads() {
        *  successfully been added.
        */
       function addThreads(initialThreadCount) {
+        // @TODO: valid lint issue that should be fixed
+        // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
           let threadsSaved = 0;
 
@@ -132,7 +132,7 @@ function seedThreads() {
           }
 
           // Get the users
-          let users = await User.find();
+          const users = await User.find();
 
           // If we don't have enough users in the database
           if (users.length < 2) {
@@ -144,13 +144,15 @@ function seedThreads() {
           while (index < numThreads) {
             const messageCount = random(maxMessages) + 1;
             let messageIndex = messageCount;
-            let to,
-                from;
+            let to;
+            let from;
 
             // Add messages until we reach the total
             while (messageIndex > 0) {
+              // @TODO: valid lint issue that should be fixed
+              // eslint-disable-next-line no-inner-declarations
               function addMessage(depth, userTo, userFrom) {
-                let message = new Message();
+                const message = new Message();
 
                 message.created = addDays(Date.now(), -depth + 1);
                 message.content = faker.lorem.sentences();
@@ -193,7 +195,7 @@ function seedThreads() {
 
                     // Add thread for the most recent message
                     if (depth === 1) {
-                      let messageThread = new Thread;
+                      const messageThread = new Thread;
 
                       // seed the message thread data
                       seedThread(messageThread, message);

bin/fillTestData/Tribes.js

@@ -1,16 +1,14 @@
-'use strict';
-
 /**
  * Required dependencies
  */
-const _ = require('lodash'),
-      path = require('path'),
-      mongooseService = require(path.resolve('./config/lib/mongoose')),
-      chalk = require('chalk'),
-      yargs = require('yargs'),
-      faker = require('faker'),
-      mongoose = require('mongoose'),
-      config = require(path.resolve('./config/config'));
+const _ = require('lodash');
+const path = require('path');
+const mongooseService = require(path.resolve('./config/lib/mongoose'));
+const chalk = require('chalk');
+const yargs = require('yargs');
+const faker = require('faker');
+const mongoose = require('mongoose');
+const config = require(path.resolve('./config/config'));
 
 /**
  * Configure the script usage using yargs to obtain parameters and enforce usage.
@@ -155,7 +153,7 @@ function seedTribes() {
 
           // Add tribes until we reach the total
           while (index < max) {
-            let tribe = new Tribe();
+            const tribe = new Tribe();
 
             // seed the tribe data
             seedTribe(tribe, initialTribeCount + index);

bin/fillTestData/Users.js

@@ -1,18 +1,16 @@
-'use strict';
-
 /**
  * Required dependencies
  */
-const _ = require('lodash'),
-      path = require('path'),
-      mongooseService = require(path.resolve('./config/lib/mongoose')),
-      chalk = require('chalk'),
-      yargs = require('yargs'),
-      faker = require('faker'),
-      moment = require('moment'),
-      mongoose = require('mongoose'),
-      config = require(path.resolve('./config/config')),
-      cities = require(path.resolve('./bin/fillTestData/data/Cities.json'));
+const _ = require('lodash');
+const path = require('path');
+const mongooseService = require(path.resolve('./config/lib/mongoose'));
+const chalk = require('chalk');
+const yargs = require('yargs');
+const faker = require('faker');
+const moment = require('moment');
+const mongoose = require('mongoose');
+const config = require(path.resolve('./config/config'));
+const cities = require(path.resolve('./bin/fillTestData/data/Cities.json'));
 
 require(path.resolve('./modules/offers/server/models/offer.server.model'));
 
@@ -50,8 +48,8 @@ const argv = yargs.usage('$0 <numberOfUsers>', 'Seed database with number of tri
 /**
  * Globals
  */
-let savedUsers = 0,
-    savedOffers = 0;
+let savedUsers = 0;
+let savedOffers = 0;
 const Offer = mongoose.model('Offer');
 
 
@@ -108,7 +106,7 @@ function printSummary(countExisting, countSaved) {
  * @param {function} callback
  */
 function addOffer(userID, maxUsers, initialUserCount, limit, callback) {
-  let offer = new Offer();
+  const offer = new Offer();
 
   const city = cities[random(cities.length)];
   const lat = city.lat + randomizeLocation();
@@ -223,7 +221,7 @@ function addUsers() {
 
           while (index < max) {
             (function addNextUser(){
-              let user = new User();
+              const user = new User();
               let admin;
 
               // Check if this is an admin user
@@ -255,7 +253,7 @@ function addUsers() {
                 // non admin user
                 user.email = index + faker.internet.email();
                 user.password = faker.internet.password();
-                user.username = index + user.displayName.toLowerCase().replace(/\'/g, '').replace(/\s/g, '');
+                user.username = index + user.displayName.toLowerCase().replace(/'/g, '').replace(/\s/g, '');
               }
 
               // Add the user to tribes
@@ -271,7 +269,7 @@ function addUsers() {
 
                 // Add the tribes using the random indecies
                 for (let j = 0; j < userNumTribes; j++) {
-                  let rand = randomTribes[j];
+                  const rand = randomTribes[j];
                   user.member.push({ tribe: tribes[rand]._id, since: Date.now() });
                   tribes[rand].count += 1;
                 }
@@ -360,6 +358,6 @@ function addUsers() {
       }
     });
   });
-}; // addUsers()
+} // addUsers()
 
 addUsers();

config/assets/default.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = {
   client: {
     lib: {

config/assets/development.js

@@ -1,8 +1,6 @@
-'use strict';
-
-var _ = require('lodash'),
-    path = require('path'),
-    defaultAssets = require(path.resolve('./config/assets/default'));
+const _ = require('lodash');
+const path = require('path');
+const defaultAssets = require(path.resolve('./config/assets/default'));
 
 module.exports = {
   // Override any default asset blocks here or add new blocks

config/assets/production.js

@@ -1,8 +1,6 @@
-'use strict';
-
-var _ = require('lodash'),
-    path = require('path'),
-    defaultAssets = require(path.resolve('./config/assets/default'));
+const _ = require('lodash');
+const path = require('path');
+const defaultAssets = require(path.resolve('./config/assets/default'));
 
 module.exports = {
   // Override any default asset blocks here or add new blocks

config/assets/test.js

@@ -1,8 +1,6 @@
-'use strict';
-
-var _ = require('lodash'),
-    path = require('path'),
-    defaultAssets = require(path.resolve('./config/assets/default'));
+const _ = require('lodash');
+const path = require('path');
+const defaultAssets = require(path.resolve('./config/assets/default'));
 
 module.exports = {
   // Override any default asset blocks here or add new blocks
@@ -11,7 +9,7 @@ module.exports = {
       uibModuleTemplates: defaultAssets.client.lib.uibModuleTemplates,
       css: defaultAssets.client.lib.css,
       js: _.union(defaultAssets.client.lib.js, [
-        'testutils/angulartics-null.testutil.js'
+        'testutils/client/angulartics-null.testutil.js'
       ]),
       less: defaultAssets.client.lib.less,
       tests: defaultAssets.client.lib.tests