Add .env file to server to avoid hardcoding values

server/.env.example

@@ -0,0 +1,4 @@
+DB_NAME=
+DB_USER=
+DB_PASSWORD=
+DB_HOST=

server/package.json

@@ -13,6 +13,7 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
+    "dotenv": "^16.4.5",
     "express": "^4.19.1",
     "js-yaml": "^4.1.0",
     "mysql2": "^3.9.2",

server/src/models/index.js

@@ -1,26 +1,36 @@
+require('dotenv').config();
 const Sequelize = require('sequelize');
 const UserModel = require('./user');
 
-const sequelize = new Sequelize('cs304_project', 'root', '123qweasd', {
-  host: 'localhost',
-  dialect: 'mysql',
-  logging: (msg) => {
-    if (msg.startsWith('Executing')) {
-      console.log(msg);
-    }
+const sequelize = new Sequelize(
+  process.env.DB_NAME,
+  process.env.DB_USER,
+  process.env.DB_PASSWORD,
+  {
+    host: process.env.DB_HOST,
+    dialect: 'mysql',
+    logging: (msg) => {
+      if (msg.startsWith('Executing')) {
+        console.log(msg);
+      }
+    },
   },
-});
-sequelize
-  .authenticate()
-  .then(() =>
-    console.log('Connection to database has been established successfully.'),
-  )
-  .catch((err) => console.error('Unable to connect to the database:', err));
-const User = UserModel(sequelize, Sequelize);
+);
+
+const initializeDatabase = async () => {
+  try {
+    await sequelize.authenticate();
+    console.log('Connection to database has been established successfully.');
+    await sequelize.sync({force: false});
+    console.log(`Database & tables created!`);
+  } catch (err) {
+    console.error('Unable to connect to the database:', err);
+  }
+};
 
-sequelize.sync({force: false}).then(() => {
-  console.log(`Database & tables created!`);
-});
+initializeDatabase();
+
+const User = UserModel(sequelize, Sequelize);
 
 module.exports = {
   User,

server/src/routes/index.js

@@ -4,4 +4,3 @@ const router = express.Router();
 router.use('/users', require('./users'));
 
 module.exports = router;
-//