Merge Conflicts

.github/workflows/Code_Formatter_and_Syntax_Check.yml

@@ -1,22 +1,20 @@
 name: Code Formatter and Syntax Check
 on:
   pull_request:
-    branches:
-      - master
+    branches: ["master"]
   push:
-    branches:
-      - master
+    branches: ["master"]
 jobs:
   test:
     name: Check the source code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install packages
         run: |
             cd Code/backend
             npm install
       - name: Lint
         run: |
             cd Code/backend
-            npx eslint ./dao
+            npx eslint ./controllers

.github/workflows/Style_Checker_and_Prettify_Code.yml

@@ -1,21 +1,21 @@
 name: Style Checker and Prettify Code
 on:
   pull_request:
+    branches: ["master"]
   push:
-    branches:
-    - master
+    branches: ["master"]
 
 jobs:
   prettier:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.head_ref }}
 
     - name: Prettify code
-      uses: creyD/prettier_action@v4.0
+      uses: creyD/prettier_action@v4.3
       with:
         prettier_options: --write **/*.{js,md}

.github/workflows/codeFormatter.yml

@@ -1,17 +1,15 @@
 name: Check the source code
 on:
   pull_request:
-    branches:
-      - master
+    branches: ["master"]
   push:
-    branches:
-      - master
+    branches: ["master"]
 jobs:
   test:
     name: Check the source code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install packages
         run: |
             cd Code/backend

.github/workflows/coverage.yml

@@ -1,6 +1,10 @@
 name: Running Code Coverage
 
-on: [push, pull_request]
+on: 
+  pull_request:
+    branches: ["master"]
+  push:
+    branches: ["master"]
 
 jobs:
   build:
@@ -9,16 +13,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [18.x]
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 2 
 
     - name: Set up Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -34,7 +38,7 @@ jobs:
 
           
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

.github/workflows/greetings.yml

@@ -1,6 +1,10 @@
 name: Greetings
 
-on: [pull_request, issues]
+on:
+  pull_request:
+    branches: ["master"]
+  issues:
+    branches: ["master"]
 
 jobs:
   greeting:

.github/workflows/label.yml

@@ -6,7 +6,9 @@
 # https://github.com/actions/labeler
 
 name: Labeler
-on: [pull_request]
+on:
+  pull_request:
+    branches: ["master"]
 
 jobs:
   label:

Code/backend/app.js

@@ -1,33 +1,38 @@
-const express = require('express');
-const dotenv = require('dotenv');
-const morgan = require('morgan');
+const express = require("express");
+const dotenv = require("dotenv");
+const morgan = require("morgan");
 const app = express();
 const colors = require("colors");
-const connectDB = require('./config/db.js');
-const {notFound, errorHandling} = require('./utils/errorhandling.js')
+const connectDB = require("./config/db.js");
+const { notFound, errorHandling } = require("./utils/errorhandling.js");
 
 colors.enable();
 
-const cors = require('cors');
+const cors = require("cors");
 app.use(express.json());
 
 dotenv.config();
 
 connectDB();
 
-app.use(express.urlencoded({extended:true}));
+app.use(express.urlencoded({ extended: true }));
 app.use(cors({ credentials: true }));
 app.use(cors());
 
-if (process.env.NODE_ENV === 'development') {
-  app.use(morgan('dev'));
+if (process.env.NODE_ENV === "development") {
+  app.use(morgan("dev"));
 }
 
-const {signInRouter, signUpRouter, signOutRouter, userProfileRouter } = require('./routes/user.js');
-const {getRecipe, getCuisine, postRecipe} = require('./routes/recipe.js')
-const parsingRecipeData = require('./utils/parsingRecipeData.js')
+const {
+  signInRouter,
+  signUpRouter,
+  signOutRouter,
+  userProfileRouter,
+} = require("./routes/user.js");
+const { getRecipe, getCuisine, postRecipe } = require("./routes/recipe.js");
+const parsingRecipeData = require("./utils/parsingRecipeData.js");
 
-app.get("/", async(req, res) => {
+app.get("/", async (req, res) => {
   console.log("Hello");
   res.send("Hello");
 });
@@ -37,20 +42,21 @@ app.use("/api/v4/signUp", signUpRouter);
 app.use("/api/v4/signOut", signOutRouter);
 app.use("/api/v4/userProfile", userProfileRouter);
 
-app.use("/api/v4/recipes", getRecipe)
-app.use("/api/v4/recipes/cuisines", getCuisine)
+app.use("/api/v4/recipes", getRecipe);
+app.use("/api/v4/recipes/cuisines", getCuisine);
 app.use("/api/v4/recipes/Addrecipes", parsingRecipeData, postRecipe);
 
-app.use(notFound, errorHandling)
+app.use(notFound, errorHandling);
 const PORT = process.env.PORT || 5000;
 
 app.listen(
   PORT,
   console.log(
-    `Server running in ${process.env.NODE_ENV} mode on port ${PORT}`.yellow.bold
-  )
+    `Server running in ${process.env.NODE_ENV} mode on port ${PORT}`.yellow
+      .bold,
+  ),
 );
 
 module.exports = {
-  app
-}
+  app,
+};

Code/backend/config/db.js

@@ -1,5 +1,5 @@
-const mongoose = require( 'mongoose');
-const colors = require('colors');
+const mongoose = require("mongoose");
+const colors = require("colors");
 
 const connectDB = async () => {
   try {
@@ -15,4 +15,4 @@ const connectDB = async () => {
   }
 };
 
-module.exports = connectDB;
+module.exports = connectDB;