Simplify start page

README.md

@@ -1,7 +1,7 @@
 <img src="https://dadi.tech/assets/products/dadi-web-full.png" alt="DADI Web" height="65"/>
 
 [![npm (scoped)](https://img.shields.io/npm/v/@dadi/web.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/web)
-[![coverage](https://img.shields.io/badge/coverage-81%25-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/web)
+[![coverage](https://img.shields.io/badge/coverage-80%2525-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/web)
 [![Build Status](https://travis-ci.org/dadi/web.svg?branch=master)](https://travis-ci.org/dadi/web)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
 [![Greenkeeper badge](https://badges.greenkeeper.io/dadi/web.svg)](https://greenkeeper.io/)

dadi/lib/help.js

@@ -89,7 +89,9 @@ module.exports.isApiAvailable = function (done) {
   }
 
   request.on('error', function (e) {
-    e.message = `Error connecting to API: ${e.message}. Check the 'api' settings in config file 'config/config.${config.get(
+    e.message = `Error connecting to API: ${
+      e.message
+    }. Check the 'api' settings in config file 'config/config.${config.get(
       'env'
     )}.json`
     e.remoteIp = options.hostname
@@ -106,9 +108,9 @@ module.exports.isApiAvailable = function (done) {
  * @param {res} res - the HTTP response
  */
 module.exports.validateRequestCredentials = function (req, res) {
-  var authConfig = config.get('auth')
-  var clientId = req.body.clientId
-  var secret = req.body.secret
+  const authConfig = config.get('auth')
+  const clientId = req.body.clientId
+  const secret = req.body.secret
 
   if (!clientId || !secret) {
     res.statusCode = 401
@@ -360,16 +362,16 @@ module.exports.sortBy = function (field, primer) {
 }
 
 /**
-  * Lists all files in a directory.
-  *
-  * @param {string} directory Full directory path.
-  * @param {object} options
-  * @param {array} options.extensions A list of extensions to filter files by.
-  * @param {boolean} options.failIfNotFound Whether to throw an error if the directory doesn't exist.
-  * @param {boolean} options.recursive Whether to read sub-directories.
-  *
-  * @return {array} A list of full paths to the discovered files.
-  */
+ * Lists all files in a directory.
+ *
+ * @param {string} directory Full directory path.
+ * @param {object} options
+ * @param {array} options.extensions A list of extensions to filter files by.
+ * @param {boolean} options.failIfNotFound Whether to throw an error if the directory doesn't exist.
+ * @param {boolean} options.recursive Whether to read sub-directories.
+ *
+ * @return {array} A list of full paths to the discovered files.
+ */
 function readDirectory (directory, options) {
   options = options || {}
 
@@ -421,15 +423,15 @@ function readDirectory (directory, options) {
 module.exports.readDirectory = readDirectory
 
 /**
-  * Executes a callback for each file on a list of paths.
-  *
-  * @param {array} files The file paths.
-  * @param {object} options
-  * @param {function} options.callback The callback to be executed.
-  * @param {array} options.extensions A list of extensions to filter files by.
-  *
-  * @return {array} A Promise that resolves after all callbacks have executed.
-  */
+ * Executes a callback for each file on a list of paths.
+ *
+ * @param {array} files The file paths.
+ * @param {object} options
+ * @param {function} options.callback The callback to be executed.
+ * @param {array} options.extensions A list of extensions to filter files by.
+ *
+ * @return {array} A Promise that resolves after all callbacks have executed.
+ */
 function readFiles (files, options) {
   options = options || {}
 

dadi/lib/index.js

@@ -454,45 +454,43 @@ Server.prototype.loadApi = function (options, reload, callback) {
   this.initMiddleware(options.middlewarePath, options)
 
   // Load routes
-  return this.updatePages(
-    options.pagePath,
-    options,
-    reload || false
-  ).then(() => {
-    this.addMonitor(options.datasourcePath, dsFile => {
-      this.updatePages(options.pagePath, options, true)
-    })
-
-    this.addMonitor(options.eventPath, eventFile => {
-      // Delete the existing cached events
-      Object.keys(require.cache).forEach(i => {
-        if (i.includes(options.eventPath)) delete require.cache[i]
+  return this.updatePages(options.pagePath, options, reload || false).then(
+    () => {
+      this.addMonitor(options.datasourcePath, dsFile => {
+        this.updatePages(options.pagePath, options, true)
       })
 
-      // Reload
-      this.updatePages(options.pagePath, options, true)
-    })
+      this.addMonitor(options.eventPath, eventFile => {
+        // Delete the existing cached events
+        Object.keys(require.cache).forEach(i => {
+          if (i.includes(options.eventPath)) delete require.cache[i]
+        })
 
-    this.addMonitor(options.pagePath, pageFile => {
-      this.updatePages(options.pagePath, options, true)
-      this.compile(options)
-      templateStore.reInitialise()
-    })
+        // Reload
+        this.updatePages(options.pagePath, options, true)
+      })
 
-    this.addMonitor(options.routesPath, file => {
-      if (this.app.Router) {
-        this.app.Router.loadRewrites(options, () => {
-          this.app.Router.loadRewriteModule()
-        })
-      }
-    })
+      this.addMonitor(options.pagePath, pageFile => {
+        this.updatePages(options.pagePath, options, true)
+        this.compile(options)
+        templateStore.reInitialise()
+      })
+
+      this.addMonitor(options.routesPath, file => {
+        if (this.app.Router) {
+          this.app.Router.loadRewrites(options, () => {
+            this.app.Router.loadRewriteModule()
+          })
+        }
+      })
 
-    debug('load complete')
+      debug('load complete')
 
-    if (typeof callback === 'function') {
-      callback()
+      if (typeof callback === 'function') {
+        callback()
+      }
     }
-  })
+  )
 }
 
 Server.prototype.initMiddleware = function (directoryPath, options) {
@@ -665,8 +663,12 @@ Server.prototype.addComponent = function (options, reload) {
         debug('use %s', route.path)
         if (options.component[req.method.toLowerCase()]) {
           // a matching route found, validate it
-          return this.app.Router
-            .validate(route, options.component.options, req, res)
+          return this.app.Router.validate(
+            route,
+            options.component.options,
+            req,
+            res
+          )
             .then(() => {
               return options.component[req.method.toLowerCase()](req, res, next)
             })
@@ -926,9 +928,9 @@ function onListening (e) {
 
 function onError (err) {
   if (err.code === 'EADDRINUSE') {
-    let message = `Can't connect to local address, is something already listening on ${`${config.get(
-      'server.host'
-    )}:${config.get('server.port')}`.underline}?`
+    let message = `Can't connect to local address, is something already listening on ${
+      `${config.get('server.host')}:${config.get('server.port')}`.underline
+    }?`
     err.localIp = config.get('server.host')
     err.localPort = config.get('server.port')
     err.message = message