Merge pull request #88 from agiledev-students-fall2023/anasofia

removed login and added css to feedback
agiledev-students-fall2023 · Nov 29, 2023 · 44126b1 · 44126b1
2 parents 2ce6d6f + 9205a3c
commit 44126b1
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 310 deletions.
diff --git a/back-end/app.js b/back-end/app.js
@@ -4,16 +4,8 @@ const app = express();
 const cors = require("cors");
 const morgan = require("morgan");
 require("dotenv").config({ silent: true });
-const jwt = require("jsonwebtoken");
-const passport = require("passport");
-
-const jwtStrategy = require("./config/jwt-config.js");
-passport.use(jwtStrategy);
-
-app.use(passport.initialize());
 
 const mongoose = require("mongoose");
-const User = require("./models/User.js");
 const Feedback = require("./models/Feedback.js");
 
 // connect to the database
@@ -32,10 +24,8 @@ app.use(express.urlencoded({ extended: true }));
 
 app.use(cors({ origin: process.env.FRONT_END_DOMAIN, credentials: true }));
 
-const authenticationRoutes = require("./routes/authentication-routes.js");
 const feedbackRoutes = require("./routes/feedback-routes.js");
 
-app.use("/auth", authenticationRoutes());
 app.use("/feedback", feedbackRoutes());
 
 

diff --git a/back-end/config/jwt-config.js b/back-end/config/jwt-config.js
diff --git a/back-end/models/User.js b/back-end/models/User.js
diff --git a/back-end/package.json b/back-end/package.json
@@ -4,7 +4,7 @@
   "description": "NYU Shuttle Backend",
   "main": "server.js",
   "scripts": {
-    "test": "mocha --timeout 10000000",
+    "test": "mocha --timeout 2000",
     "coverage": "nyc --reporter=html --reporter=text --reporter=lcov --reporter=clover mocha --timeout 10000 --exit",
     "coveralls": "nyc report --reporter=text-lcov | coveralls"
   },

diff --git a/back-end/routes/authentication-routes.js b/back-end/routes/authentication-routes.js
diff --git a/back-end/test/login.test.js b/back-end/test/login.test.js
diff --git a/back-end/test/logout.test.js b/back-end/test/logout.test.js
diff --git a/front-end/src/App.js b/front-end/src/App.js
@@ -63,7 +63,7 @@ function App() {
   };
 
   const devTools = (e) => {
-    if (e.keyCode === 82) {
+    if ((e.keyCode === 82 && e.metaKey) || (e.keyCode === 82 && e.ctrlKey)){
       // R key
       console.log('Resetting local storage...');
       localStorage.clear();

diff --git a/front-end/src/components/settings/FeedbackSupportPage.js b/front-end/src/components/settings/FeedbackSupportPage.js
@@ -16,7 +16,8 @@ const FeedbackSupportPage = () => {
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-    if (category === "" || feedback === "") {
+    if (userId == null || category === "" || feedback === "") {
+      setResponse({});
       setErrorMessage("Please fill out all fields");
       return;
     }
@@ -32,13 +33,15 @@ const FeedbackSupportPage = () => {
         requestData
       );
       console.log(`Server response: ${JSON.stringify(response.data, null, 0)}`);   
+      setErrorMessage("");
       setResponse(response.data);
     } catch (err) {
       console.log(err);
       setErrorMessage(err.message);
     } finally {
       setCategory("");
       setFeedback("");
+
     }
   };
 
@@ -50,6 +53,8 @@ const FeedbackSupportPage = () => {
       <div>
         <h1 className="settings-header">Feedback / Support</h1>
       </div>
+      {errorMessage && <div className="error-message">{errorMessage}</div>}
+      {response.message && <div className="success-message"> Thank you for the feedback!</div>}
       <div>
         <div className="feedback-item">
           <label htmlFor="category" className="feedback-label">