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

connected frontend and fixed tests
agiledev-students-fall2023 · Nov 28, 2023 · 3fc2c52 · 3fc2c52
2 parents 84e4b47 + 626e143
commit 3fc2c52
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 15 deletions.
diff --git a/back-end/models/Feedback.js b/back-end/models/Feedback.js
@@ -4,8 +4,8 @@ const Schema = mongoose.Schema
 
 const FeedbackSchema = new Schema({
   user: {
-    type: String,
-    unique: true,
+    type: Number,
+    unique: false,
     required: true,
   },
   timestamp: {
@@ -19,7 +19,9 @@ const FeedbackSchema = new Schema({
   feedback:{
     type: String,
     required: true,
-  },
+  }, 
+}, { 
+    unique: false, 
 })
 
 const Feedback = mongoose.model("Feedback", FeedbackSchema)

diff --git a/back-end/test/feedback.test.js b/back-end/test/feedback.test.js
@@ -9,7 +9,7 @@ const server = require("../app");
 
 describe("Feedback Routes", () => {
     const formData = {
-      user: "blxyaaa",
+      user: 12345,
       timestamp: new Date(),
       category: "test_category",
       feedback: "Test feedback content",

diff --git a/front-end/package.json b/front-end/package.json
@@ -7,7 +7,7 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.2",
     "mongodb": "^6.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/front-end/src/App.js b/front-end/src/App.js
@@ -15,8 +15,8 @@ import PrivacyPolicyPage from './components/settings/PrivacyPolicyPage';
 import LoadingScreen from './components/LoadingScreen';
 import TutorialComponent from './components/TutorialComponent';
 
+
 // Import hooks and utilities
-import useDarkMode from './hooks/darkMode';
 import { registerService } from './utils/serviceRegister';
 import { getUserPos, loadGoogleMapsAPI } from './utils/mapUtility';
 
@@ -28,7 +28,6 @@ import './css/tutorialComponent.css';
 export const TutorialContext = createContext();
 
 function App() {
-  const [colorTheme, setTheme] = useDarkMode();
   const [isLoading, setIsLoading] = useState(true);
   const isFirstTimeUser = localStorage.getItem('isFirst') !== 'false';
   const [tutorialIndex, setTutorialIndex] = useState(0);
@@ -38,6 +37,7 @@ function App() {
     let key = localStorage.key(i);
     let value = localStorage.getItem(key);
     localStorageItems[key] = value;
+   //console.log(key, value)
   }
 
   useEffect(() => {

diff --git a/front-end/src/components/settings/FeedbackSupportPage.js b/front-end/src/components/settings/FeedbackSupportPage.js
@@ -1,13 +1,45 @@
-import { useState } from 'react';
-import { Link } from 'react-router-dom';
-import '../../css/settingsPage.css';
+import { useState } from "react";
+import { Link } from "react-router-dom";
+import {
+  localStorageLoad,
+} from "../../utils/localStorageSaveLoad.js";
+import "../../css/settingsPage.css";
+import axios from "axios";
 
 const FeedbackSupportPage = () => {
-  const [category, setCategory] = useState('');
-  const [feedback, setFeedback] = useState('');
+  const [response, setResponse] = useState({});
+  const [category, setCategory] = useState("");
+  const [feedback, setFeedback] = useState("");
+  const [errorMessage, setErrorMessage] = useState("");
 
-  const handleSubmit = () => {
-    // later link with backend
+  const userId = localStorageLoad("deviceId");
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    if (category === "" || feedback === "") {
+      setErrorMessage("Please fill out all fields");
+      return;
+    }
+    try {
+      const requestData = {
+        user: userId,
+        timestamp: Date.now(),
+        category: category,
+        feedback: feedback,
+      };
+      const response = await axios.post(
+        `${process.env.REACT_APP_BACKEND}/feedback/newfeedback`,
+        requestData
+      );
+      console.log(`Server response: ${JSON.stringify(response.data, null, 0)}`);   
+      setResponse(response.data);
+    } catch (err) {
+      console.log(err);
+      setErrorMessage(err.message);
+    } finally {
+      setCategory("");
+      setFeedback("");
+    }
   };
 
   return (
@@ -31,7 +63,9 @@ const FeedbackSupportPage = () => {
           >
             <option value="">--Select--</option>
             <option value="Bug Report">Bug Report</option>
-            <option value="User Experience Feedback">User Experience Feedback</option>
+            <option value="User Experience Feedback">
+              User Experience Feedback
+            </option>
             <option value="Bus Schedule Error">Bus Schedule Error</option>
           </select>
         </div>