Host static server

Author: callmekatootie

app-routes.js

@@ -1,6 +1,7 @@
 /**
  * Configure all routes for express app
  */
+const express = require('express')
 const _ = require('lodash')
 const config = require('config')
 const HttpStatus = require('http-status-codes')
@@ -115,6 +116,17 @@ module.exports = (app) => {
 
   app.use('/docs', swaggerUi.serve, swaggerUi.setup(swaggerDoc))
 
+  // Static file server
+  if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'development') {
+    // Serve any static files
+    app.use(express.static(path.join(__dirname, 'client/build')))
+
+    // Handle React routing, return all requests to React app
+    app.get('*', (req, res) => {
+      res.sendFile(path.join(__dirname, 'client/build', 'index.html'))
+    })
+  }
+
   // Check if the route is not found or HTTP method is not supported
   app.use('*', (req, res) => {
     const route = routes[req.baseUrl]

app.js

@@ -86,17 +86,6 @@ app.use((err, req, res, next) => {
   res.status(status).json(errorResponse)
 })
 
-// Static file server
-if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'development') {
-  // Serve any static files
-  app.use(express.static(path.join(__dirname, 'client/build')))
-
-  // Handle React routing, return all requests to React app
-  app.get('*', (req, res) => {
-    res.sendFile(path.join(__dirname, 'client/build', 'index.html'))
-  })
-}
-
 app.listen(app.get('port'), () => {
   logger.info(`Express server listening on port ${app.get('port')}`)
 })