Merge pull request #30 from yale-swe/michal-new-branch

pushing profiles out of the way and fixing the course search feature

backend/app.py

@@ -144,19 +144,19 @@ def verify_course_code():
         try:
             data = request.get_json()
 
-            uid = data.get("uid")
-            if not uid:
-                return jsonify({"error": "No uid provided"}), 400
+            # uid = data.get("uid")
+            # if not uid:
+            #     return jsonify({"error": "No uid provided"}), 400
 
             course_code = data["search"]
             course_collection = app.config["courses"]
             user_collection = app.config["profiles"]
             course = course_collection.find_one({"course_code": course_code})
             if course:
                 # insert into database
-                result = user_collection.update_one(
-                    {"uid": uid}, {"$addToSet": {"courses": course_code}}
-                )
+                # result = user_collection.update_one(
+                #     {"uid": uid}, {"$addToSet": {"courses": course_code}}
+                # )
                 return jsonify(
                     {"status": "success", "course": course["course_code"]}
                 ), 200

frontend/src/app/page.module.css

@@ -289,8 +289,8 @@
 
 .floatingProfileButton {
   position: fixed;
-  bottom: 20px;
-  right: 70px;
+  bottom: 770px;
+  right: 20px;
   width: 50px; 
   height: 50px; 
   padding: 10px 15px;
@@ -310,8 +310,8 @@
 
 .profileContainer {
   position: fixed;
-  bottom: 70px; /* Adjust based on your design */
-  right: 10px;
+  bottom: 600px; /* Adjust based on your design */
+  right: 20px;
   width: 300px; /* Adjust size as needed */
   background: white;
   box-shadow: 0 4px 6px rgba(0,0,0,0.1);

frontend/src/app/profiles.tsx

@@ -2,12 +2,12 @@
 
 import React, { useState } from "react";
 import styles from "./page.module.css"; 
+import { json } from "stream/consumers";
 
 const ProfilePopup = () => {
     const [popupVisible, setPopupVisible] = useState(false);
     const [chatHistoryVisible, setChatHistoryVisible] = useState(false);
-    const [username, setUsername] = useState("JohnDoe");
-    const [email, setEmail] = useState("[email protected]");
+    const [username, setUsername] = useState("");
     const [courses, setCourses] = useState<string[]>([]);
     const [search, setSearch] = useState("");
     const [chatHistories, setChatHistories] = useState<{ id: number; summary: string }[]>([]);
@@ -24,7 +24,7 @@ const ProfilePopup = () => {
         const response = await fetch('/api/save_profile', {
             method: 'POST',
             headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({ username, email }),
+            body: JSON.stringify({ username }),
         });
         if (!response.ok) {
             console.error("Failed to save profile");
@@ -40,8 +40,21 @@ const ProfilePopup = () => {
             });
             if (response.ok) {
                 const data = await response.json();
-                setCourses(prevCourses => [...prevCourses, data]);
+                setCourses(prevCourses => {
+                    // Check if the course already exists based on the course code
+                    const exists = prevCourses.some(course => course === data['course']);
+                    if (!exists) {
+                        return [...prevCourses, data['course']];
+                    } else {
+                        // alert the user that the course is already added
+                        alert('This course is already added.');
+                        return prevCourses;
+                    }
+                });
                 setSearch('');
+            } else {
+                // Handle cases where the course code is not found or invalid
+                alert('Invalid course code');
             }
         }
     };
@@ -74,7 +87,6 @@ const ProfilePopup = () => {
                     <div className={styles.profileHeader}>User Profile</div>
                     <div className={styles.profileDetails}>
                         <input type="text" value={username} onChange={(e) => setUsername(e.target.value)} placeholder="Username" />
-                        <input type="email" value={email} onChange={(e) => setEmail(e.target.value)} placeholder="Email" />
                         <button onClick={handleSaveProfile}>Save</button>
                     </div>
                     <div className={styles.courseSearch}>