Merge branch 'main' of https://github.com/CA-G12/BMS into 44-review-t…

…ransactions-users

package.json

@@ -34,6 +34,7 @@
     "express": "^4.17.3",
     "joi": "^17.6.3",
     "jsonwebtoken": "^8.5.1",
+    "morgan": "^1.10.0",
     "pg": "^8.8.0",
     "pg-hstore": "^2.3.4",
     "sequelize": "^6.25.0",
@@ -47,6 +48,7 @@
     "@types/express": "^4.17.13",
     "@types/jest": "^27.4.1",
     "@types/jsonwebtoken": "^8.5.8",
+    "@types/morgan": "^1.9.3",
     "@types/node": "^17.0.25",
     "@types/nodemailer": "^6.4.4",
     "@types/pg": "^8.6.5",

server/app.ts

@@ -2,23 +2,35 @@ import express from 'express';
 import compression from 'compression';
 import dotenv from 'dotenv';
 import cookieParser from 'cookie-parser';
-// import router from './routes';
+import { join } from 'path';
+import morgan from 'morgan';
+
+dotenv.config();
 
 const app = express();
+
 const {
   env: { PORT, NODE_ENV },
 } = process;
 
-dotenv.config();
-app.set('port', PORT || 5000);
-
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(compression());
 app.use(cookieParser());
 
-app.use('/', (req, res) => {
-  res.send('hello bms');
-});
+if (NODE_ENV === 'development') {
+  app.use(morgan('dev'));
+}
+
+// app.use('/api/v1', router);
+
+if (NODE_ENV === 'production') {
+  app.use(express.static(join(__dirname, '..', 'client', 'build')));
+  app.get('*', (req, res) => {
+    res.sendFile(join(__dirname, '..', 'client', 'build', 'index.html'));
+  });
+}
+
+app.set('port', PORT || 5000);
 
 export default app;

server/index.ts

@@ -1,8 +1,14 @@
 import app from './app';
+import sequelize from './database/config/connection';
 
 const port = app.get('port') as number;
 
-app.listen(port, () => {
+sequelize.sync({ force: true }) // TODO: To be reomved later when DB is 100% ready
+  .then(() => {
+    app.listen(port, () => {
+      // eslint-disable-next-line no-console
+      console.log(`The Server is running on http://localhost:${port}`);
+    });
+  })
   // eslint-disable-next-line no-console
-  console.log(`http://localhost:${port}`);
-});
+  .catch(() => console.log('Error on synchronizing db'));