From d3b2da9d765974f2ff1e580e017fff7ab10993f9 Mon Sep 17 00:00:00 2001 From: Fibii Date: Sat, 7 Nov 2020 17:26:35 +0100 Subject: [PATCH] [B] add route to use react build, add script to start in PROD --- backend/app.js | 10 +++++++--- backend/package.json | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/app.js b/backend/app.js index bd9047d..954e3cd 100644 --- a/backend/app.js +++ b/backend/app.js @@ -8,7 +8,6 @@ const cors = require('cors') const cookieParser = require('cookie-parser') const middleware = require('./utils/middleware') -const indexRouter = require('./controllers/index') const usersRouter = require('./controllers/users') const questionRouter = require('./controllers/questions') const loginRouter = require('./controllers/login') @@ -62,13 +61,18 @@ app.use(cors({ app.use(express.json()) app.use(middleware.tokenExtractor) app.use(express.urlencoded({ extended: false })) -app.use(express.static(path.join(__dirname, 'public'))) +app.use(express.static(path.join(__dirname, '../frontend/build'))) -app.use('/', indexRouter) app.use('/api/users', usersRouter) app.use('/api/questions', questionRouter) app.use('/api/login', loginRouter) +if (process.env.NODE_ENV === 'PROD') { + app.get('*', (request, response) => { + response.sendFile(path.resolve(__dirname, '../frontend', 'build', 'index.html')) + }) +} + app.use(middleware.errorLogger) app.use(middleware.unknownEndpoint) app.use(middleware.errorHandler) diff --git a/backend/package.json b/backend/package.json index 44b9b5f..06c2afb 100644 --- a/backend/package.json +++ b/backend/package.json @@ -3,7 +3,8 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "NODE_ENV=ENV node index.js", + "start": "NODE_ENV=PROD node index.js", + "start-prod": "NODE_ENV=PROD node index.js", "test": "jest --runInBand --detectOpenHandles --forceExit" }, "dependencies": {