Merge branch 'main' into team-a/development

Author: ICook094

client/src/pages/A1InternshipRequestForm.js

@@ -128,6 +128,17 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
     }
   };
 
+  useEffect(() => {
+    const storedUser = JSON.parse(localStorage.getItem("ipmsUser"));
+    if (storedUser) {
+      setFormData((prev) => ({
+        ...prev,
+        interneeName: storedUser.fullName || "",
+        interneeEmail: storedUser.email || ""
+      }));
+    }
+  }, []);
+
   const handleInputChange = (e) => {
     const { id, value } = e.target;
     setFormData((prev) => ({ ...prev, [id]: value }));
@@ -252,49 +263,19 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
 
   const submitFormData = async () => {
     try {
-      // Fetch logged-in student ID from localStorage or context
-      const studentId = localStorage.getItem("studentId"); // You must store this during login
-  
-      const payload = {
-        student: studentId,
-        workplace: {
-          name: formData.workplaceName,
-          website: formData.website,
-          phone: formData.phone
-        },
-        internshipAdvisor: {
-          name: formData.advisorName,
-          jobTitle: formData.advisorJobTitle,
-          email: formData.advisorEmail
-        },
-        creditHours: parseInt(formData.creditHours),
-        startDate: formData.startDate,
-        endDate: formData.endDate,
-        tasks: formData.tasks,
-        status: "submitted",
-        approvals: ["advisor"]
-      };
-  
       const response = await fetch(`${process.env.REACT_APP_API_URL}/api/form/submit`, {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(payload)
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(formData),
       });
-  
-      if (!response.ok) {
-        throw new Error("Failed to submit form", { cause: response });
-      }
-  
+      if (!response.ok) throw new Error("Failed to submit form");
       const data = await response.json();
       return data;
     } catch (error) {
       console.error("Error submitting form:", error);
       throw error;
     }
   };
-  
 
   const sendTaskDescriptions = async (descriptions) => {
     try {
@@ -379,7 +360,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
                   id="interneeName" 
                   value={formData.interneeName} 
                   onChange={handleInputChange} 
-                  disabled={!isFieldEditable("interneeName")} 
+                  // disabled={!isFieldEditable("interneeName")} 
+                  disabled
                 />
                 {errors.interneeName && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeName}</div>}
               </td>
@@ -448,7 +430,8 @@ const A1InternshipRequestForm = ({ userRole = "student" }) => {
                   id="interneeEmail" 
                   value={formData.interneeEmail} 
                   onChange={handleInputChange} 
-                  disabled={!isFieldEditable("interneeEmail")} 
+                  disabled
+                  // disabled={!isFieldEditable("interneeEmail")} 
                 />
                 {errors.interneeEmail && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeEmail}</div>}
               </td>

client/src/pages/Home.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import "../styles/App.css";
 import { FaEnvelope, FaLock, FaEye, FaEyeSlash } from "react-icons/fa";
@@ -13,20 +13,28 @@ function Home() {
   const [formData, setFormData] = useState({
     email: "",
     password: "",
+
     role: "student",
   });
   const [showPassword, setShowPassword] = useState(false);
+  const [role] = useState("student");
+
+  // Sync role into formData.role
+  useEffect(() => {
+    setFormData((prev) => ({ ...prev, role }));
+  }, [role]);
 
   const handleInputChange = (e) => {
     const { name, value } = e.target;
-    setFormData((prev) => ({
-      ...prev,
+    setFormData({
+      ...formData,
       [name]: value,
-    }));
+    });
   };
 
   const handleSubmit = async (e) => {
     e.preventDefault();
+
     const { email: ouEmail, password, role } = formData;
 
 
@@ -47,7 +55,7 @@ function Home() {
             "Content-Type": "application/json",
           },
           body: JSON.stringify({ ouEmail, password, role }),
-        }
+        },
       );
 
       const data = await response.json();
@@ -56,29 +64,22 @@ function Home() {
         const user = data.user;
         if(role === "student"){
            // Store only required fields
-          const limitedUserInfo = {
-            fullName: user.fullName,
-            id: user._id,
-            email:user.ouEmail
-          };
-
-          localStorage.setItem("ipmsUser", JSON.stringify(limitedUserInfo));
-          navigate("/student-dashboard");
-        } else if(role === "supervisor"){
+        const limitedUserInfo = {
+          fullName: user.fullName,
+          id: user._id,
+          email:user.ouEmail
+        };
+        
+        localStorage.setItem("ipmsUser", JSON.stringify(limitedUserInfo));
+        navigate("/student-dashboard");
+        }else if(role === "supervisor"){
           Swal.fire({
             icon: "success",
             title: "Login Successful 🌟",
             text: `Welcome back, ${role}!`,
           });
           navigate("/supervisor-dashboard");
-        } else if (role === "coordinator") {
-          Swal.fire({
-            icon: "success",
-            title: "Login Successful 🌟",
-            text: `Welcome back, ${role}!`,
-          });
-          navigate("/coordinator-dashboard");
-        } else{
+        }else{
           Swal.fire({
             icon: "success",
             title: "Login Successful 🌟",
@@ -100,7 +101,6 @@ function Home() {
         Swal.fire({
           icon: "error",
           title: "Login Failed",
-          text: data.message || "Something went wrong",
           html: data.message + " " + 
         (data.renewalLink 
          ? `Please click <a href="${data.renewalLink}" target="_blank" rel="noopener noreferrer">here</a> to request a new token.` 
@@ -125,7 +125,9 @@ function Home() {
         </div>
 
         <div className="login-options">
-          <h2 style={{ fontWeight: "600", fontSize: "1.9rem" }}>Welcome back</h2>
+          <h2 style={{ fontWeight: "600", fontSize: "1.9rem" }}>
+            Welcome back
+          </h2>
 
           <form className="login-form" onSubmit={handleSubmit}>
             <div className="form-group">
@@ -144,32 +146,27 @@ function Home() {
                       formData.role === r ? "selected" : ""
                     }`}
                     onClick={() =>
-                      setFormData((prev) => ({ ...prev, role: r }))
+                      setFormData({
+                        ...formData,
+                        role: r,
+                      })
                     }
 
                   >
                     <Icon />
                     <p className="role-label">
                       {r.charAt(0).toUpperCase() + r.slice(1)}
                     </p>
-                    <span
-                      className="info-icon"
-                      title={
-                        r === "student"
-                          ? "Students request internships and submit weekly reports."
-                          : r === "supervisor"
-                          ? "Supervisors review and approve student progress."
-                          : "Coordinators manage the internship workflow and approvals."
-                      }
-                    ></span>
                   </div>
                 ))}
               </div>
             </div>
 
             <div className="form-group clean-input">
               <label htmlFor="email">
-                <FaEnvelope style={{ marginRight: "6px", verticalAlign: "middle" }} />
+                <FaEnvelope
+                  style={{ marginRight: "6px", verticalAlign: "middle" }}
+                />
                 Email
               </label>
               <input
@@ -185,7 +182,9 @@ function Home() {
 
             <div className="form-group clean-input">
               <label htmlFor="password">
-                <FaLock style={{ marginRight: "6px", verticalAlign: "middle" }} />
+                <FaLock
+                  style={{ marginRight: "6px", verticalAlign: "middle" }}
+                />
                 Password
               </label>
               <div className="password-wrapper">
@@ -207,7 +206,15 @@ function Home() {
               </div>
             </div>
 
-            <div className="form-subtext">
+            <div
+              className="form-subtext"
+              style={{
+                display: "flex",
+                justifyContent: "space-between",
+                fontSize: "0.9rem",
+                marginBottom: "1rem",
+              }}
+            >
               <label className="d-flex align-items-center">
                 <input type="checkbox" style={{ marginRight: "6px" }} />
                 Remember me