Merge pull request #86 from SpringRoll/release/1.8.0

Release/1.8.0

Author: chipbell4

.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "es6": true,
-    "node": true
+    "node": true,
+    "browser": true
   },
   "globals": {
     "browser": true,
@@ -14,7 +15,9 @@
     "after": true,
     "describe": true,
     "it": true,
-    "beforeEach": true
+    "beforeEach": true,
+    "$": true,
+    "jQuery": true
   },
   "parserOptions": {
     "ecmaVersion": 2018,

app/index.js

@@ -2,15 +2,16 @@
 
 // Include libraries
 var express = require('express'),
-	colors = require('colors'),
-	expressValidator = require('express-validator'),
-	bodyParser = require('body-parser'),
-	fs = require('fs'),
-	dotenv = require('dotenv');
-
-if(fs.existsSync('.env')) {
-	// Load the environment file
-	dotenv.load();
+  colors = require('colors'),
+  expressValidator = require('express-validator'),
+  bodyParser = require('body-parser'),
+  fs = require('fs'),
+  dotenv = require('dotenv'),
+  { exec } = require('child_process');
+
+if (fs.existsSync('.env')) {
+  // Load the environment file
+  dotenv.load();
 }
 
 // Create sever
@@ -22,25 +23,39 @@ process.chdir(__dirname);
 // Setup the app
 var port = process.env.PORT || 3000;
 app.listen(port);
-app.use(bodyParser.urlencoded({
-	extended: true
-}));
+app.use(
+  bodyParser.urlencoded({
+    extended: true
+  })
+);
 app.use(bodyParser.json());
 
 let spaces = 4;
-if(process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production') {
   spaces = 0;
 }
 app.set('json spaces', spaces);
 
 // Set the version
 app.set('version', require('../package.json').version);
 
+const log = require('./helpers/logger');
+exec(`git rev-list -n1 HEAD`, (err, stdout, stderr) => {
+  if (err) {
+    log.error(err);
+  } else {
+    log.info(stdout);
+    log.error(stderr);
+    app.set('commitID', stdout);
+  }
+});
+
 // Custom validators
-app.use(expressValidator(
-{
-	customValidators: require('./helpers/validators')
-}));
+app.use(
+  expressValidator({
+    customValidators: require('./helpers/validators')
+  })
+);
 
 // Rendering engine for mark-up
 app.set('views', __dirname + '/views');
@@ -49,12 +64,9 @@ app.set('view engine', 'jade');
 // Expose the "public" folder
 app.use(express.static(__dirname + '/public'));
 
-if (!process.env.MONGO_DATABASE)
-{
-	app.use(require('./routes/install'));
-}
-else
-{
-	// bootstrap the database connection
-	require('./helpers/database')(app);
+if (!process.env.MONGO_DATABASE) {
+  app.use(require('./routes/install'));
+} else {
+  // bootstrap the database connection
+  require('./helpers/database')(app);
 }