resolved merge conflicts

BackEnd/WebBackEnd/package.json

@@ -10,12 +10,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "axios": "^0.24.0",
+    "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
-    "mongoose": "^5.12.15"
+    "mongoose": "^5.12.15",
+    "morgan": "^1.10.0"
   },
   "devDependencies": {
+    "bluebird": "^3.7.2",
+    "cookie-parser": "^1.4.6",
+    "http-errors": "^1.8.1",
+    "method-override": "^3.0.0",
+    "multer": "^1.4.3",
+    "multer-gridfs-storage": "^5.0.2",
     "nodemailer": "^6.6.2"
   }
 }

BackEnd/WebBackEnd/routes/filteredListNew.route.js

@@ -6,7 +6,7 @@ let ALResults = require('../models/studentALResult.model');
 let classStudentList = require('../models/ClassStudentList.model');
 
 const axios = require('axios');
-const request = require('request');
+//const request = require('request');
 
 
 router.route('/getFilteredList').post((req, res) => {

BackEnd/WebBackEnd/server.js

@@ -13,7 +13,7 @@ const  bodyParser = require('body-parser');
 const mongoose =require('mongoose');
 require('dotenv').config();
 const app = express();
-const port = process.env.PORT || 5000;
+const port = process.env.PORT || 5001;
 
 
 app.use(bodyParser.urlencoded({ extended: true }));
@@ -86,6 +86,9 @@ const filteredList = require('./routes/filteredListNew.route');
 const createClassRoute = require('./routes/createClass.route');
 const studPerRoute = require('./routes/studper.route');
 
+const imageRouter = require('./routes/pdf.route');
+const answerManage = require('./routes/answer_route');
+
 app.use('/studentSingUp',studentRouter);
 app.use('/tutorSingUp',tutorRouter);
 app.use('/instituteSingUp',instituteRouter);
@@ -98,6 +101,7 @@ app.use('/tutorRatings', tutorRating);
 app.use('/filteredList', filteredList);
 app.use('/createClass', createClassRoute);
 app.use('/admin/studper',studPerRoute);
+app.use('/', imageRouter(upload));
 
 app.listen(port, () => {
     console.log(`Server is running on Port: ${port}`);

WebFrontEnd/smartcoach-frontend/package-lock.json

@@ -2374,8 +2374,7 @@
     "@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
-      "dev": true
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
     "@types/q": {
       "version": "1.5.4",
@@ -2386,13 +2385,20 @@
       "version": "17.0.26",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.26.tgz",
       "integrity": "sha512-MXxuXrH2xOcv5cp/su4oz69dNQnSA90JjFw5HBd5wifw6Ihi94j7dRJm7qNsB30tnruXSCPc9qmlhGop4nh9Hw==",
-      "dev": true,
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
+    "@types/react-transition-group": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
+      "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
     "@types/resolve": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
@@ -2404,8 +2410,7 @@
     "@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-      "dev": true
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -4074,6 +4079,11 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
     },
+    "chart.js": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz",
+      "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ=="
+    },
     "check-types": {
       "version": "11.1.2",
       "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
@@ -4872,8 +4882,7 @@
     "csstype": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
-      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==",
-      "dev": true
+      "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
     },
     "cyclist": {
       "version": "1.0.1",
@@ -12472,6 +12481,14 @@
         "object-assign": "^4.1.1"
       }
     },
+    "react-addons-shallow-compare": {
+      "version": "15.6.3",
+      "resolved": "https://registry.npmjs.org/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.3.tgz",
+      "integrity": "sha512-EDJbgKTtGRLhr3wiGDXK/+AEJ59yqGS+tKE6mue0aNXT6ZMR7VJbbzIiT6akotmHg1BLj46ElJSb+NBMp80XBg==",
+      "requires": {
+        "object-assign": "^4.1.0"
+      }
+    },
     "react-app-polyfill": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-2.0.0.tgz",
@@ -12485,14 +12502,6 @@
         "whatwg-fetch": "^3.4.1"
       }
     },
-    "react-chartjs-2": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-3.0.5.tgz",
-      "integrity": "sha512-fYr4E82agaZi9IFMe5GtOZ6WE/HWdxy/KywLNOzXsqgPkD2oo1IlrQLKMLUki/2UXko3p95TR2L8Q2rEss/opQ==",
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
     "react-bootstrap": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.2.tgz",
@@ -12535,6 +12544,14 @@
         "prop-types": "^15.7.2"
       }
     },
+    "react-chartjs-2": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-3.0.5.tgz",
+      "integrity": "sha512-fYr4E82agaZi9IFMe5GtOZ6WE/HWdxy/KywLNOzXsqgPkD2oo1IlrQLKMLUki/2UXko3p95TR2L8Q2rEss/opQ==",
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
     "react-dev-utils": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -15079,9 +15096,9 @@
       }
     },
     "typescript": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
-      "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="
     },
     "unbox-primitive": {
       "version": "1.0.1",

WebFrontEnd/smartcoach-frontend/package.json

@@ -7,13 +7,13 @@
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.3",
     "bootstrap": "^4.6.0",
-    "chart.js": "^3.5.1",
     "bootstrap-icons": "^1.5.0",
+    "chart.js": "^3.5.1",
     "moment": "^2.29.1",
     "react": "^17.0.2",
-    "react-chartjs-2": "^3.0.5",
     "react-bootstrap": "^2.0.2",
     "react-bootstrap-icons": "^1.5.0",
+    "react-chartjs-2": "^3.0.5",
     "react-dom": "^17.0.2",
     "react-dropdown": "^1.9.2",
     "react-icons": "^4.2.0",
@@ -23,7 +23,7 @@
     "react-star-rating-component": "^1.4.1",
     "react.pure.component": "^1.2.0",
     "sweetalert": "^2.1.2",
-    "typescript": "^4.4.3",
+    "typescript": "^4.5.2",
     "web-vitals": "^1.1.1"
   },
   "scripts": {