diff --git a/client/package.json b/client/package.json
index 75898d4e..f8e56288 100644
--- a/client/package.json
+++ b/client/package.json
@@ -9,6 +9,7 @@
     "@testing-library/user-event": "^13.5.0",
     "axios": "^1.8.2",
     "bootstrap": "^5.3.5",
+    "client": "file:",
     "react": "^19.0.0",
     "react-bootstrap": "^2.10.9",
     "react-dom": "^19.0.0",
@@ -18,7 +19,9 @@
     "react-signature-canvas": "^1.1.0-alpha.2",
     "react-toastify": "^11.0.5",
     "sweetalert2": "^11.17.2",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "date-fns": "^4.1.0",
+    "react-datepicker": "^8.3.0"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -42,6 +45,6 @@
       "last 1 chrome version",
       "last 1 firefox version",
       "last 1 safari version"
-        ]
+    ]
   }
 }
diff --git a/client/src/pages/A1InternshipRequestForm.js b/client/src/pages/A1InternshipRequestForm.js
index 350e0d4c..d5e08f69 100644
--- a/client/src/pages/A1InternshipRequestForm.js
+++ b/client/src/pages/A1InternshipRequestForm.js
@@ -1,11 +1,12 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import "../styles/A1InternshipRequestForm.css";
 
+
 const outcomeLabels = [
   "Problem Solving",
   "Solution Development",
   "Communication",
-  "Decision-Making",
+  "Decision Making",
   "Collaboration",
   "Application",
 ];
@@ -19,7 +20,75 @@ const outcomeDescriptions = [
   "Apply computer science algorithms to create practical solutions",
 ];
 
-const A1InternshipRequestForm = () => {
+// Signature font options
+const signatureFonts = [
+  { name: "Dancing Script", class: "font-dancing-script" },
+  { name: "Great Vibes", class: "font-great-vibes" },
+  { name: "Pacifico", class: "font-pacifico" },
+  { name: "Satisfy", class: "font-satisfy" },
+  { name: "Caveat", class: "font-caveat" }
+];
+
+// Signature Font Picker Component
+const SignatureInput = ({ id, value, onChange, disabled, placeholder }) => {
+  const [showFonts, setShowFonts] = useState(false);
+  const [selectedFont, setSelectedFont] = useState(signatureFonts[0].class);
+  const [nameInput, setNameInput] = useState(value);
+
+  useEffect(() => {
+    setNameInput(value);
+  }, [value]);
+
+  const handleNameChange = (e) => {
+    setNameInput(e.target.value);
+    onChange({ target: { id, value: e.target.value } });
+  };
+
+  const selectFont = (fontClass) => {
+    setSelectedFont(fontClass);
+    setShowFonts(false);
+  };
+
+  return (
+    <div className="signature-input-container">
+      <input
+        type="text"
+        value={nameInput}
+        onChange={handleNameChange}
+        placeholder={placeholder}
+        disabled={disabled}
+        className="signature-name-input"
+        onFocus={() => !disabled && setShowFonts(true)}
+      />
+      {showFonts && nameInput && (
+        <div className="signature-font-options">
+          <div className="signature-font-preview-header">Select a signature style:</div>
+          {signatureFonts.map((font) => (
+            <div 
+              key={font.class}
+              className={`signature-font-preview ${font.class}`}
+              onClick={() => selectFont(font.class)}
+            >
+              {nameInput}
+            </div>
+          ))}
+        </div>
+      )}
+      {nameInput && (
+        <div className={`signature-preview ${selectedFont}`}>
+          {nameInput}
+          <input 
+            type="hidden" 
+            id={id} 
+            value={nameInput} 
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+const A1InternshipRequestForm = ({ userRole = "student" }) => {
   const initialState = {
     interneeName: "",
     soonerId: "",
@@ -36,7 +105,9 @@ const A1InternshipRequestForm = () => {
     advisorSignature: "",
     coordinatorApproval: "",
     creditHours: "",
-    tasks: Array(5).fill({ description: "" }),
+    tasks: Array(5).fill({ description: "", outcomes: [] }), // Updated for outcomes
+    supervisorComments: "",
+    coordinatorComments: "",
   };
 
   const [formData, setFormData] = useState(initialState);
@@ -44,10 +115,22 @@ const A1InternshipRequestForm = () => {
   const [errors, setErrors] = useState({});
   const [dateError, setDateError] = useState("");
 
+  const isFieldEditable = (fieldType) => {
+    switch (userRole) {
+      case "student":
+        return !["advisorSignature", "coordinatorApproval", "supervisorComments", "coordinatorComments"].includes(fieldType);
+      case "supervisor":
+        return ["advisor", "supervisorComments"].includes(fieldType);
+      case "coordinator":
+        return ["coordinator", "coordinatorComments", "advisor"].includes(fieldType);
+      default:
+        return true;
+    }
+  };
+
   const handleInputChange = (e) => {
     const { id, value } = e.target;
     setFormData((prev) => ({ ...prev, [id]: value }));
-
     if (id === "startDate" || id === "endDate") {
       setDateError("");
       if (formData.startDate && formData.endDate) {
@@ -57,20 +140,24 @@ const A1InternshipRequestForm = () => {
         );
       }
     }
+    if (errors[id]) {
+      setErrors(prev => {
+        const newErrors = { ...prev };
+        delete newErrors[id];
+        return newErrors;
+      });
+    }
   };
 
   const validateDates = (start, end) => {
     const startDate = new Date(start);
     const endDate = new Date(end);
-    if (endDate <= startDate) {
-      setDateError("End date must be after start date");
-    } else {
-      setDateError("");
-    }
+    if (endDate <= startDate) setDateError("End date must be after start date");
+    else setDateError("");
   };
 
-  const handleCreditHourChange = (value) => {
-    setFormData((prev) => ({ ...prev, creditHours: value }));
+  const handleCreditHourChange = (e) => {
+    setFormData((prev) => ({ ...prev, creditHours: e.target.value }));
   };
 
   const handleTaskChange = (index, value) => {
@@ -79,56 +166,83 @@ const A1InternshipRequestForm = () => {
     setFormData((prev) => ({ ...prev, tasks: updatedTasks }));
   };
 
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      const descriptions = formData.tasks.map((task) => task.description.trim()).filter(Boolean);
+      if (descriptions.length > 0) {
+        fetch(`${process.env.REACT_APP_API_URL}/api/align-outcomes`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ tasks: descriptions }),
+        })
+          .then((res) => res.json())
+          .then((data) => {
+            const updatedTasks = formData.tasks.map((task) => {
+              const match = data.results.find((r) => r.task === task.description);
+              return match ? { ...task, outcomes: match.matched_outcomes } : { ...task, outcomes: [] };
+            });
+            setFormData((prev) => ({ ...prev, tasks: updatedTasks }));
+          })
+          .catch((err) => console.error("Outcome alignment error:", err));
+      }
+    }, 500);
+    return () => clearTimeout(timeout);
+  }, [formData.tasks]);
+
+  const renderOutcomeCell = (task, outcome, key) => {
+    const normalizedOutcome = outcome.charAt(0).toLowerCase() + outcome.replace(/\s+/g, "").slice(1);
+    const isMatched = task.outcomes.includes(normalizedOutcome);
+    return (
+      <td key={key} style={{ backgroundColor: isMatched ? "#c6f6d5" : "", padding: "4px" }}>
+        <input
+          type="text"
+          value={isMatched ? "✔" : ""}
+          readOnly
+          style={{
+            width: "100%",
+            boxSizing: "border-box",
+            border: "none",
+            textAlign: "center",
+            backgroundColor: "transparent",
+          }}
+        />
+      </td>
+    );
+  };
+
   const validateForm = () => {
     const namePattern = /^[A-Za-z\s]+$/;
     const numberPattern = /^[0-9]+$/;
     const phonePattern = /^[0-9]{10}$/;
     const emailPattern = /^[\w.-]+@([\w-]+\.)+[\w-]{2,4}$/;
-
     const newErrors = {};
 
     if (!formData.interneeName) newErrors.interneeName = "Internee name is required";
     else if (!namePattern.test(formData.interneeName)) newErrors.interneeName = "Name should contain only letters and spaces";
-
     if (!formData.soonerId) newErrors.soonerId = "Sooner ID is required";
     else if (!numberPattern.test(formData.soonerId)) newErrors.soonerId = "Sooner ID should be numeric";
-
     if (!formData.interneeEmail) newErrors.interneeEmail = "Email is required";
     else if (!emailPattern.test(formData.interneeEmail)) newErrors.interneeEmail = "Invalid email format";
-
     if (!formData.workplaceName) newErrors.workplaceName = "Workplace name is required";
     else if (!namePattern.test(formData.workplaceName)) newErrors.workplaceName = "Workplace name should contain only letters and spaces";
-
+    if (formData.website && !formData.website.includes('.')) newErrors.website = "Please enter a valid website address";
     if (!formData.phone) newErrors.phone = "Phone is required";
     else if (!phonePattern.test(formData.phone)) newErrors.phone = "Phone must be 10 digits";
-
     if (!formData.startDate) newErrors.startDate = "Start date is required";
     if (!formData.endDate) newErrors.endDate = "End date is required";
-    else if (formData.startDate && formData.endDate) {
-      const start = new Date(formData.startDate);
-      const end = new Date(formData.endDate);
-      if (end <= start) newErrors.endDate = "End date must be after start date";
-    }
-
-    if (!formData.advisorName) newErrors.advisorName = "Advisor name is required";
-    else if (!namePattern.test(formData.advisorName)) newErrors.advisorName = "Advisor name should contain only letters and spaces";
-
-    if (!formData.advisorEmail) newErrors.advisorEmail = "Advisor email is required";
-    else if (!emailPattern.test(formData.advisorEmail)) newErrors.advisorEmail = "Invalid advisor email format";
-
+    if (!formData.advisorName) newErrors.advisorName = "Supervisor name is required";
+    else if (!namePattern.test(formData.advisorName)) newErrors.advisorName = "Supervisor name should contain only letters and spaces";
+    if (!formData.advisorEmail) newErrors.advisorEmail = "Supervisor email is required";
+    else if (!emailPattern.test(formData.advisorEmail)) newErrors.advisorEmail = "Invalid supervisor email format";
     if (!formData.interneeSignature) newErrors.interneeSignature = "Internee signature is required";
     else if (!namePattern.test(formData.interneeSignature)) newErrors.interneeSignature = "Signature should contain only letters and spaces";
-
     if (formData.advisorSignature && !namePattern.test(formData.advisorSignature)) {
       newErrors.advisorSignature = "Signature should contain only letters and spaces";
     }
-
     if (formData.coordinatorApproval && !namePattern.test(formData.coordinatorApproval)) {
       newErrors.coordinatorApproval = "Approval should contain only letters and spaces";
     }
-
     if (!formData.creditHours) newErrors.creditHours = "Please select credit hours";
-
     const tasksFilled = formData.tasks.filter((task) => task.description.trim() !== "").length >= 3;
     if (!tasksFilled) newErrors.tasks = "At least 3 tasks are required";
 
@@ -173,7 +287,6 @@ const A1InternshipRequestForm = () => {
         throw new Error("Failed to submit form", {cause: response});
       }
       const data = await response.json();
-      console.log("Form submitted successfully:", data);
       return data;
     } catch (error) {
       console.error("Error submitting form:", error);
@@ -181,86 +294,67 @@ const A1InternshipRequestForm = () => {
     }
   };
 
-  // const handleSubmit = (e) => {
-  //   e.preventDefault();
-  //   if (validateForm()) {
-  //     // sending descriptions to backend to check if they align with CS outcomes
-  //     const taskDescriptions = formData.tasks
-  //     .map(task => task.description.trim())
-  //     .filter(Boolean);
-  //     sendTaskDescriptions(taskDescriptions);
-  //     //ending here
-  //     submitFormData().then(data => {
-  //       const recipient = data.manual ? "coordinator for manual review!" : "advisor!";
-  //       setSuccessMsg("Form submitted successfully and sent to " + recipient);
-  //       setTimeout(() => setSuccessMsg(""), 15000);
-  //     }).catch(err => setErrors("Form submission failed! " + err))
-  //       .finally(() => setFormData(initialState));
-  //   }
-  // };
-
+  const sendTaskDescriptions = async (descriptions) => {
+    try {
+      const response = await fetch(`${process.env.REACT_APP_API_URL}/api/align-outcomes`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ tasks: descriptions }),
+      });
+      if (!response.ok) throw new Error("Failed to send task descriptions");
+      const data = await response.json();
+      return data.results.map(({ task, matched_outcomes }) => ({
+        description: task,
+        outcomes: matched_outcomes,
+      }));
+    } catch (error) {
+      console.error("Error:", error);
+      return null;
+    }
+  };
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-  
     if (!validateForm()) return;
-  
-    const taskDescriptions = formData.tasks
-      .map(task => task.description.trim())
-      .filter(Boolean);
-  
+    const taskDescriptions = formData.tasks.map((task) => task.description.trim()).filter(Boolean);
     try {
       const aligned = await sendTaskDescriptions(taskDescriptions);
-  
       if (aligned && aligned.length > 0) {
-        setFormData(prev => ({
-          ...prev,
-          tasks: aligned
-        }));
-  
+        setFormData((prev) => ({ ...prev, tasks: aligned }));
         const submissionResponse = await submitFormData();
-  
         const recipient = submissionResponse.manual ? "coordinator for manual review!" : "supervisor!";
-        setSuccessMsg("Form submitted successfully and sent to " + recipient);
+        setSuccessMsg(`Form submitted successfully and sent to ${recipient}`);
         setTimeout(() => setSuccessMsg(""), 15000);
         setFormData(initialState);
       } else {
         setErrors({ tasks: "Outcome alignment failed or returned no tasks." });
       }
     } catch (err) {
-      console.error("Error during submission:", err);
-      setErrors({ submit: "Form submission failed! " + err.message });
+      setErrors({ submit: `Form submission failed! ${err.message}` });
     }
   };
-  
-  //function to send description to backend
-  const sendTaskDescriptions = async (descriptions) => {
-    try {
-      const response = await fetch(`${process.env.REACT_APP_API_URL}/api/align-outcomes`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ tasks: descriptions }) 
-      });
-  
-      if (!response.ok) {
-        throw new Error("Failed to send task descriptions");
-      }
-  
-      const data = await response.json();
-      console.log("Alignment result:", data);
-      formData.tasks = data.results.map(({ task, matched_outcomes }) => ({
-        description: task,
-        outcomes: matched_outcomes
-      }));
 
-      return formData.tasks;
+  useEffect(() => {
+    const fonts = [
+      'https://fonts.googleapis.com/css2?family=Dancing+Script:wght@500&display=swap',
+      'https://fonts.googleapis.com/css2?family=Great+Vibes&display=swap',
+      'https://fonts.googleapis.com/css2?family=Pacifico&display=swap',
+      'https://fonts.googleapis.com/css2?family=Satisfy&display=swap',
+      'https://fonts.googleapis.com/css2?family=Caveat:wght@500&display=swap'
+    ];
+    const links = [];
+    fonts.forEach(font => {
+      const link = document.createElement('link');
+      link.href = font;
+      link.rel = 'stylesheet';
+      document.head.appendChild(link);
+      links.push(link);
+    });
+    return () => {
+      links.forEach(link => document.head.removeChild(link));
+    };
+  }, []);
 
-    } catch (error) {
-      console.error("Error:", error);
-    }
-  };
   return (
     <div className="form-container">
       <h2>A.1 - Internship Request Form</h2>
@@ -271,84 +365,164 @@ const A1InternshipRequestForm = () => {
             <tr>
               <th colSpan="3">Internee Details</th>
               <th colSpan="3">Workplace Details</th>
-              <th colSpan="2">Internship Advisor Details</th>
+              <th colSpan="2">Internship Supervisor Details</th>
             </tr>
           </thead>
           <tbody>
             <tr>
               <td colSpan="3">
                 Name<span className="required-asterisk">*</span>:<br />
-                <input type="text" id="interneeName" value={formData.interneeName} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="interneeName" 
+                  value={formData.interneeName} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("interneeName")} 
+                />
+                {errors.interneeName && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeName}</div>}
               </td>
               <td colSpan="3">
                 Name<span className="required-asterisk">*</span>:<br />
-                <input type="text" id="workplaceName" value={formData.workplaceName} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="workplaceName" 
+                  value={formData.workplaceName} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("workplaceName")} 
+                />
+                {errors.workplaceName && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.workplaceName}</div>}
               </td>
               <td colSpan="2">
                 Name<span className="required-asterisk">*</span>:<br />
-                <input type="text" id="advisorName" value={formData.advisorName} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="advisorName" 
+                  value={formData.advisorName} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("advisorName")} 
+                />
+                {errors.advisorName && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.advisorName}</div>}
               </td>
             </tr>
             <tr>
               <td colSpan="3">
                 Sooner ID<span className="required-asterisk">*</span>:<br />
-                <input type="text" id="soonerId" value={formData.soonerId} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="soonerId" 
+                  value={formData.soonerId} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("soonerId")} 
+                />
+                {errors.soonerId && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.soonerId}</div>}
               </td>
               <td colSpan="3">
                 Website:<br />
-                <input type="text" id="website" value={formData.website} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="website" 
+                  value={formData.website} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("website")} 
+                />
+                {errors.website && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.website}</div>}
               </td>
               <td colSpan="2">
                 Job Title:<br />
-                <input type="text" id="advisorJobTitle" value={formData.advisorJobTitle} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="advisorJobTitle" 
+                  value={formData.advisorJobTitle} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("advisorJobTitle")} 
+                />
               </td>
             </tr>
             <tr>
               <td colSpan="3">
                 Email<span className="required-asterisk">*</span>:<br />
-                <input type="email" id="interneeEmail" value={formData.interneeEmail} onChange={handleInputChange} />
+                <input 
+                  type="email" 
+                  id="interneeEmail" 
+                  value={formData.interneeEmail} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("interneeEmail")} 
+                />
+                {errors.interneeEmail && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeEmail}</div>}
               </td>
               <td colSpan="3">
                 Phone<span className="required-asterisk">*</span>:<br />
-                <input type="text" id="phone" value={formData.phone} onChange={handleInputChange} />
+                <input 
+                  type="text" 
+                  id="phone" 
+                  value={formData.phone} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("phone")} 
+                />
+                {errors.phone && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.phone}</div>}
               </td>
               <td colSpan="2">
                 Email<span className="required-asterisk">*</span>:<br />
-                <input type="email" id="advisorEmail" value={formData.advisorEmail} onChange={handleInputChange} />
+                <input 
+                  type="email" 
+                  id="advisorEmail" 
+                  value={formData.advisorEmail} 
+                  onChange={handleInputChange} 
+                  disabled={!isFieldEditable("advisorEmail")} 
+                />
+                {errors.advisorEmail && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.advisorEmail}</div>}
               </td>
             </tr>
             <tr>
-              <td colSpan="3" className="signature-cell">
-                <strong>Select the Number of Credit Hours<span className="required-asterisk">*</span></strong>
-              </td>
               <td colSpan="3">
-                Start Date<span className="required-asterisk">*</span>:<br />
-                <input type="date" id="startDate" value={formData.startDate} onChange={handleInputChange} />
+                Credit Hours<span className="required-asterisk">*</span>:<br />
+                <select 
+                  id="creditHours" 
+                  value={formData.creditHours} 
+                  onChange={handleCreditHourChange}
+                  disabled={!isFieldEditable("creditHours")}
+                >
+                  <option value="">Select Credit Hours</option>
+                  <option value="1">1 Credit</option>
+                  <option value="2">2 Credits</option>
+                  <option value="3">3 Credits</option>
+                </select>
+                {errors.creditHours && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.creditHours}</div>}
               </td>
-              <td colSpan="2">
-                End Date<span className="required-asterisk">*</span>:<br />
-                <input
-                  type="date"
-                  id="endDate"
-                  value={formData.endDate}
-                  min={formData.startDate}
-                  onChange={handleInputChange}
-                />
-                {dateError && <div className="date-error" style={{ color: "red", fontSize: "0.8rem" }}>{dateError}</div>}
-              </td>
-            </tr>
-            <tr>
-              {[1, 2, 3].map((val) => (
-                <td key={val} style={{ textAlign: "center" }}>
-                  {val}<br />
-                  <input
-                    type="checkbox"
-                    checked={formData.creditHours === val.toString()}
-                    onChange={() => handleCreditHourChange(val.toString())}
-                  />
-                </td>
-              ))}
-              <td colSpan="5"></td>
+              <td colSpan="3">
+  <label htmlFor="startDate">
+    Start Date<span className="required-asterisk">*</span>:
+  </label><br />
+  <div className="date-input-wrapper">
+    <input 
+      type="date"
+      id="startDate"
+      value={formData.startDate}
+      onChange={handleInputChange}
+      disabled={!isFieldEditable("startDate")}
+    />
+  </div>
+  {errors.startDate && <div className="error-text">{errors.startDate}</div>}
+</td>
+
+<td colSpan="2">
+  <label htmlFor="endDate">
+    End Date<span className="required-asterisk">*</span>:
+  </label><br />
+  <div className="date-input-wrapper">
+    <input
+      type="date"
+      id="endDate"
+      value={formData.endDate}
+      min={formData.startDate}
+      onChange={handleInputChange}
+      disabled={!isFieldEditable("endDate")}
+    />
+  </div>
+  {dateError && <div className="error-text">{dateError}</div>}
+  {errors.endDate && <div className="error-text">{errors.endDate}</div>}
+</td>
+
             </tr>
           </tbody>
         </table>
@@ -358,7 +532,7 @@ const A1InternshipRequestForm = () => {
           <div className="job-description-box">
             <strong>Job Description Details:</strong>
             <ol>
-              <li>Tasks need to be filled by the Internship Advisor.</li>
+              <li>Tasks need to be filled by the Internship Supervisor.</li>
               <li>Only task description fields are editable.</li>
               <li>All tasks should cover a minimum of three outcomes.</li>
             </ol>
@@ -367,11 +541,10 @@ const A1InternshipRequestForm = () => {
             <thead>
               <tr>
                 <th style={{ width: "20%" }}>Task</th>
-                {outcomeLabels.map((label, i) => (
-                  <th key={label} style={{ width: "13.33%" }}>
-                    {label}
-                    <br />
-                    <small>({outcomeDescriptions[i]})</small>
+                {outcomeLabels.map((label, j) => (
+                  <th key={`label-${j}`} style={{ width: "13.33%" }}>
+                    {label}<br />
+                    <small>({outcomeDescriptions[j]})</small>
                   </th>
                 ))}
               </tr>
@@ -386,17 +559,15 @@ const A1InternshipRequestForm = () => {
                       value={task.description}
                       onChange={(e) => handleTaskChange(i, e.target.value)}
                       style={{ width: "100%", padding: "4px", boxSizing: "border-box" }}
+                      disabled={!isFieldEditable("task")}
                     />
                   </td>
-                  {outcomeLabels.map((_, j) => (
-                    <td key={j}>
-                      <input type="text" value="" readOnly style={{ width: "100%", padding: "4px", boxSizing: "border-box" }} />
-                    </td>
-                  ))}
+                  {outcomeLabels.map((label, j) => renderOutcomeCell(task, label, `${i}-${j}`))}
                 </tr>
               ))}
             </tbody>
           </table>
+          {errors.tasks && <div style={{ color: "red", fontSize: "0.8rem", marginTop: "5px" }}>{errors.tasks}</div>}
         </div>
 
         <h3 className="section-title">Signatures:</h3>
@@ -405,49 +576,90 @@ const A1InternshipRequestForm = () => {
             <tr>
               <td className="signature-cell" colSpan="3">
                 Internee Signature<span className="required-asterisk">*</span>:<br />
-                <input
-                  type="text"
-                  id="interneeSignature"
-                  value={formData.interneeSignature}
-                  onChange={handleInputChange}
-                  placeholder="Enter your full name"
-                  style={{ width: "100%", padding: "4px", boxSizing: "border-box" }}
-                />
+                <div className="signature-field">
+                  <SignatureInput 
+                    id="interneeSignature"
+                    value={formData.interneeSignature}
+                    onChange={handleInputChange}
+                    disabled={!isFieldEditable("interneeSignature")}
+                    placeholder="Enter your full name"
+                  />
+                </div>
+                {errors.interneeSignature && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.interneeSignature}</div>}
               </td>
               <td className="signature-cell" colSpan="3">
-                Internship Advisor Signature:<br />
-                <input
-                  type="text"
-                  id="advisorSignature"
-                  value={formData.advisorSignature}
-                  onChange={handleInputChange}
-                  placeholder="Enter your full name"
-                  style={{ width: "100%", padding: "4px", boxSizing: "border-box" }}
-                />
+                Internship Supervisor Signature:<br />
+                <div className="signature-field">
+                  <SignatureInput 
+                    id="advisorSignature"
+                    value={formData.advisorSignature}
+                    onChange={handleInputChange}
+                    disabled={!isFieldEditable("advisorSignature")}
+                    placeholder="Enter your full name"
+                  />
+                </div>
+                {errors.advisorSignature && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.advisorSignature}</div>}
               </td>
               <td className="signature-cell" colSpan="2">
                 Internship Coordinator Approval:<br />
-                <input
-                  type="text"
-                  id="coordinatorApproval"
-                  value={formData.coordinatorApproval}
+                <div className="signature-field">
+                  <SignatureInput 
+                    id="coordinatorApproval"
+                    value={formData.coordinatorApproval}
+                    onChange={handleInputChange}
+                    disabled={!isFieldEditable("coordinatorApproval")}
+                    placeholder="Enter your full name"
+                  />
+                </div>
+                {errors.coordinatorApproval && <div style={{ color: "red", fontSize: "0.8rem" }}>{errors.coordinatorApproval}</div>}
+              </td>
+            </tr>
+            {/* <tr>
+              <td colSpan="3">
+                <label htmlFor="supervisorComments" style={{ fontWeight: "bold" }}>Supervisor Comments:</label><br />
+                <textarea
+                  id="supervisorComments"
+                  value={formData.supervisorComments}
                   onChange={handleInputChange}
-                  placeholder="Enter your full name"
-                  style={{ width: "100%", padding: "4px", boxSizing: "border-box" }}
+                  placeholder="Enter any comments or feedback for this internship request"
+                  style={{ 
+                    width: "100%", 
+                    padding: "8px", 
+                    boxSizing: "border-box",
+                    minHeight: "80px",
+                    resize: "vertical",
+                    marginTop: "5px",
+                    border: "1px solid #ccc",
+                    borderRadius: "3px"
+                  }}
+                  disabled={!isFieldEditable("supervisorComments")}
                 />
               </td>
-            </tr>
+              <td colSpan="5">
+                <label htmlFor="coordinatorComments" style={{ fontWeight: "bold" }}>Coordinator Comments:</label><br />
+                <textarea
+                  id="coordinatorComments"
+                  value={formData.coordinatorComments}
+                  onChange={handleInputChange}
+                  placeholder="Enter any comments or feedback regarding this internship request"
+                  style={{ 
+                    width: "100%",
+                    padding: "8px", 
+                    boxSizing: "border-box",
+                    minHeight: "80px",
+                    resize: "vertical",
+                    marginTop: "5px",
+                    border: "1px solid #ccc",
+                    borderRadius: "3px"
+                  }}
+                  disabled={!isFieldEditable("coordinatorComments")}
+                />
+              </td>
+            </tr> */}
           </tbody>
         </table>
 
-        {Object.keys(errors).length > 0 && (
-          <div>
-            <div className="error-summary">Please correct the following errors:</div>
-            {Object.values(errors).map((err, i) => (
-              <div key={i} className="error-msg">{err}</div>
-            ))}
-          </div>
-        )}
+        {errors.submit && <div className="error-msg">{errors.submit}</div>}
 
         <div className="submit-section">
           <button type="submit">Submit Form</button>
diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js
index c8ed3df5..1c08db67 100644
--- a/client/src/pages/Home.js
+++ b/client/src/pages/Home.js
@@ -34,10 +34,10 @@ function Home() {
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-    console.log(`${formData.role} sign in attempted`, formData);
 
     const { email: ouEmail, password, role } = formData;
 
+
     if (!ouEmail || !password || !role) {
       return Swal.fire({
         icon: "warning",
@@ -61,25 +61,50 @@ function Home() {
       const data = await response.json();
 
       if (response.ok) {
-        Swal.fire({
-          icon: "success",
-          title: "Login Successful 🌟",
-          text: `Welcome back, ${role}!`,
-        });
-
-        // Redirect user based on role
-        if (role === "coordinator") {
-          navigate("/coordinator-dashboard");
-        } else if (role === "student") {
-          navigate("/student-dashboard");
-        } else if (role === "supervisor") {
+        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"){
+          Swal.fire({
+            icon: "success",
+            title: "Login Successful 🌟",
+            text: `Welcome back, ${role}!`,
+          });
           navigate("/supervisor-dashboard");
+        }else{
+          Swal.fire({
+            icon: "success",
+            title: "Login Successful 🌟",
+            text: `Welcome back, ${role}!`,
+          });
+          navigate("/coordinator-dashboard");
         }
+
+       
+
+        // Swal.fire({
+        //   icon: "success",
+        //   title: "Login Successful",
+        //   text: `Welcome back, `,
+        // });
+
+       
       } else {
         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.` 
+         : "Something went wrong."),
         });
       }
     } catch (error) {
@@ -126,6 +151,7 @@ function Home() {
                         role: r,
                       })
                     }
+                
                   >
                     <Icon />
                     <p className="role-label">
diff --git a/client/src/pages/ProtectedRouteStudent.jsx b/client/src/pages/ProtectedRouteStudent.jsx
new file mode 100644
index 00000000..02a0396e
--- /dev/null
+++ b/client/src/pages/ProtectedRouteStudent.jsx
@@ -0,0 +1,16 @@
+// src/components/ProtectedRouteStudent.js
+import React from "react";
+import { Navigate } from "react-router-dom";
+
+const ProtectedRouteStudent = ({ children }) => {
+    const user = JSON.parse(localStorage.getItem("ipmsUser"));
+  
+    // Check if user info is missing
+    if (!user || !user.id || !user.fullName) {
+      return <Navigate to="/" replace />;
+    }
+  
+    return children;
+  };
+
+export default ProtectedRouteStudent;
diff --git a/client/src/pages/SignUp.js b/client/src/pages/SignUp.js
index 34a9ac73..3346fac1 100644
--- a/client/src/pages/SignUp.js
+++ b/client/src/pages/SignUp.js
@@ -15,6 +15,7 @@ function SignUp() {
   const [step, setStep] = useState(1);
   const [fullName, setFullName] = useState("");
   const [ouEmail, setOuEmail] = useState("");
+  const [soonerId, setSoonerId] = useState("");
   const [password, setPassword] = useState("");
   const [confirmPassword, setConfirmPassword] = useState("");
   const [showPassword, setShowPassword] = useState(false);
@@ -61,12 +62,22 @@ function SignUp() {
       return;
     }
 
+    if (role=== "student" && !/^\d{9}$/.test(soonerId)) {
+      Swal.fire({
+        icon: "error",
+        title: "Invalid Sooner ID",
+        text: "Sooner ID must be a 9-digit number.",
+      });
+      return;
+    }
+
     try {
       const response = await axios.post(
         `${process.env.REACT_APP_API_URL}/api/token/request`,
         {
           fullName,
           ouEmail,
+          soonerId : role === "student" ? soonerId : "",
           password,
           semester,
           academicAdvisor: role === "student" ? academicAdvisor : "",
@@ -88,6 +99,7 @@ function SignUp() {
       // Clear form
       setFullName("");
       setOuEmail("");
+      setSoonerId("");
       setPassword("");
       setConfirmPassword("");
       setSemester("");
@@ -100,13 +112,22 @@ function SignUp() {
     } catch (error) {
       console.error("Error creating user:", error);
 
-      if (error.response && error.response.status === 400) {
+      if (error.response && error.response.status === 401) {
         Swal.fire({
           icon: "error",
           title: "Email Already Exists",
           text: "The provided email ID is already registered. Try logging in.",
         });
-      } else {
+      } 
+      else if(role=== "student" && error.response && error.response.status === 402){
+        Swal.fire({
+          icon: "error",
+          title: "Sooner ID Already Exists",
+          text: "The provided Sooner ID is already registered.",
+        });
+      }
+      else {
+        console.log("Error response:", error.response);
         Swal.fire({
           icon: "error",
           title: "Something went wrong",
@@ -255,6 +276,19 @@ function SignUp() {
                 required
               />
             </div>
+
+            {role === "student" && <div className="form-group">
+              <label htmlFor="soonerId">Sooner ID</label>
+              <input
+                type="text"
+                id="soonerId"
+                value={soonerId}
+                onChange={(e) => setSoonerId(e.target.value)}
+                placeholder="Enter your 9-digit Sooner ID"
+                required
+              />
+            </div>}
+
             <div className="password-row">
               <div className="form-group password-col">
                 <label htmlFor="password">New password</label>
diff --git a/client/src/pages/StudentDashboard.jsx b/client/src/pages/StudentDashboard.jsx
new file mode 100644
index 00000000..276bbb65
--- /dev/null
+++ b/client/src/pages/StudentDashboard.jsx
@@ -0,0 +1,141 @@
+import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import "../styles/StudentDashboard.css"; // Make sure you create this CSS
+
+const StudentDashboard = () => {
+  const navigate = useNavigate();
+
+  const user = JSON.parse(localStorage.getItem("ipmsUser"));
+  const ouEmail = user?.email;
+  const [approvalStatus, setApprovalStatus] = useState("not_submitted");
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const res = await fetch(`${process.env.REACT_APP_API_URL}/api/student`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({ ouEmail }),
+        });
+
+        const data = await res.json();
+        setApprovalStatus(data.approvalStatus);
+      } catch (err) {
+        console.error("Error fetching internship data", err);
+      }
+    };
+
+    if (ouEmail) {
+      fetchData();
+    }
+  }, [ouEmail]);
+  console.log(approvalStatus);
+
+  return (
+    <div className="student-dashboard">
+      <div className="dashboard-header">
+        <h2>Welcome, {user.fullName}</h2>
+      </div>
+
+      <div className="dashboard-card">
+        {/* ------ FORM A1 Card ------ */}
+        <div className="card-section">
+          <div className="card-content">
+            <h3>Request Internship (FORM A1)</h3>
+            <p>Track your internship journey</p>
+
+            {approvalStatus === "not_submitted" && (
+              <p style={{ fontSize: "0.85rem", color: "#888" }}>
+                You have not submitted the form yet
+              </p>
+            )}
+
+            {(approvalStatus === "submitted" ||
+              approvalStatus === "pending manual review") && (
+              <p style={{ fontSize: "0.85rem", color: "#888" }}>
+                Your form is submitted and under review
+              </p>
+            )}
+
+            {approvalStatus === "approved" && (
+              <p style={{ fontSize: "0.85rem", color: "green" }}>Approved</p>
+            )}
+          </div>
+
+          <button
+            className="card-button"
+            onClick={() => {
+              if (
+                approvalStatus === "draft" ||
+                approvalStatus === "not_submitted"
+              ) {
+                navigate("/a1-form");
+              }
+            }}
+            disabled={
+              approvalStatus !== "draft" && approvalStatus !== "not_submitted"
+            }
+            style={{
+              backgroundColor:
+                approvalStatus !== "draft" && approvalStatus !== "not_submitted"
+                  ? "#ccc"
+                  : "",
+              cursor:
+                approvalStatus !== "draft" && approvalStatus !== "not_submitted"
+                  ? "not-allowed"
+                  : "pointer",
+            }}
+          >
+            {approvalStatus === "approved" ? "Track" : "Request Internship"}
+          </button>
+        </div>
+
+        {/* ------ FORM A2 Card ------ */}
+        <div className="card-section">
+          <div className="card-content">
+            <h3>Weekly Report (Form A2)</h3>
+
+            {approvalStatus === "not_submitted" && (
+              <p style={{ fontSize: "0.85rem", color: "#888" }}>
+                Please fill your Form A1 first
+              </p>
+            )}
+
+            {approvalStatus === "draft" && (
+              <p style={{ fontSize: "0.85rem", color: "#888" }}>
+                Finish your Form A1 first
+              </p>
+            )}
+
+            {(approvalStatus === "submitted" ||
+              approvalStatus === "pending manual review") && (
+              <p style={{ fontSize: "0.85rem", color: "#888" }}>
+                Wait for your Form A1 to be approved
+              </p>
+            )}
+          </div>
+
+          <button
+            className="card-button"
+            disabled={approvalStatus !== "approved"}
+            onClick={() => {
+              if (approvalStatus === "approved") {
+                navigate("/weekly-report");
+              }
+            }}
+            style={{
+              backgroundColor: approvalStatus !== "approved" ? "#ccc" : "",
+              cursor: approvalStatus !== "approved" ? "not-allowed" : "pointer",
+            }}
+          >
+            Request
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default StudentDashboard;
diff --git a/client/src/pages/SupervisorDashboard.js b/client/src/pages/SupervisorDashboard.js
index d4a786a0..3609375b 100644
--- a/client/src/pages/SupervisorDashboard.js
+++ b/client/src/pages/SupervisorDashboard.js
@@ -8,8 +8,57 @@ const SupervisorDashboard = () => {
   const [selectedForm, setSelectedForm] = useState(null);
   const [loading, setLoading] = useState(true);
   const [message, setMessage] = useState("");
-
-  const token = localStorage.getItem("token") || "";
+  
+    useEffect(() => {
+
+      // Token used for authentication for future
+      // Now it will only be empty
+      const token = localStorage.getItem("token") || ""; 
+      
+      const fetchRequests = async () => {
+      try {
+          const res = await axios.get(`${process.env.REACT_APP_API_URL}/api/supervisor/forms`,
+          {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          const formatted = res.data.map(item => ({
+            _id: item._id,
+            name: item.student_id?.userName || item.student_id?.name || "N/A",
+            student_id: item.student?._id || item._id,
+            form_type: item.form_type,
+            createdAt: item.createdAt,
+            supervisor_status: item.supervisor_status || "pending",
+            fullForm: item,
+            workplace: {
+                name: item.workplace?.name || "N/A",
+                website: item.workplace?.website || "N/A",
+                phone: item.workplace?.phone || "N/A",
+            },
+            internshipAdvisor: {
+                name: item.internshipAdvisor?.name || "N/A",
+                jobTitle: item.internshipAdvisor?.jobTitle || "N/A",
+                email: item.internshipAdvisor?.email || "N/A",
+            },
+            creditHours: item.creditHours || 0,
+            startDate: item.startDate || "N/A",
+            endDate: item.endDate || "N/A",
+            tasks: item.tasks || [],
+            status: item.status || "pending",
+            supervisor_comment: item.supervisor_comment || "N/A"
+        }));
+        
+
+        setRequests(formatted);
+        setLoading(false);
+      } catch (err) {
+        console.error("Error fetching forms:", err);
+        setMessage("Error fetching forms.", err);
+        setLoading(false);
+      }
+    };
 
   const fetchRequests = async () => {
     try {
@@ -63,75 +112,93 @@ const SupervisorDashboard = () => {
       );
 
       setMessage(res.data.message || `${action} successful`);
-      setRequests((prev) => prev.filter((req) => req._id !== id));
-      setSelectedForm(null);
+      setRequests(prev => prev.filter(req => req._id !== id)); // remove from table
+      return true;
     } catch (err) {
       console.error(`Failed to ${action} request:`, err);
       setMessage(`Failed to ${action} request.`);
+      return false;
     }
   };
+  
 
   const openFormView = (form) => setSelectedForm(form);
   const closeFormView = () => setSelectedForm(null);
 
   const formatDate = (date) => new Date(date).toLocaleDateString();
 
-  let content;
+  const sortedRequests = [...requests]
+    .filter((res) => res.supervisor_status?.toLowerCase() === "pending")
+    .sort((a, b) => new Date(a.createdAt) - new Date(b.createdAt));
+  
+    let content;
 
-  if (loading) {
-    content = <p>Loading...</p>;
-  } else if (requests.length === 0) {
-    content = (
-      <div className="empty-message-container">
-        <div className="empty-message">No pending approvals.</div>
-      </div>
-    );
-  } else {
-    content = (
-      <table className="dashboard-table">
-        <thead>
-          <tr>
-            <th>Student Name</th>
-            <th>Student ID</th>
-            <th>Form Type</th>
-            <th>Date Submitted</th>
-            <th>Status</th>
-          </tr>
-        </thead>
-        <tbody>
-          {requests.map((req) => (
-            <tr key={req._id} className="clickable-row" onClick={() => openFormView(req.fullForm)}>
-              <td>{req.name}</td>
-              <td>{req.student_id}</td>
-              <td>{req.form_type}</td>
-              <td>{formatDate(req.createdAt)}</td>
-              <td>
-                <span className={`status-badge ${req.supervisor_status}`}>
-                  {req.supervisor_status}
-                </span>
-              </td>
+
+    if (loading) {
+      content = <p>Loading...</p>;
+    } else if (sortedRequests.length === 0) {
+      content = (
+        <div className="empty-message-container">
+          <div className="empty-message">No pending approvals.</div>
+        </div>
+      );
+    } else {
+      content = (
+        <table className="dashboard-table">
+          <thead>
+            <tr>
+              <th>Student Name</th>
+              <th>Sooner ID</th>
+              <th>Student Email</th>
+              <th>Form Type</th>
+              <th>Submitted</th>
+              <th>Status</th>
             </tr>
-          ))}
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+            {sortedRequests.map((req) => {
+              console.log(req); // Log the entire request object
+              console.log(req.Name); // Log the student's full name if populated
+              return (
+                <tr key={req._id}>
+                  <td>{req.interneeName || "N/A"}</td>
+                  <td>
+                    <button className="link-button" onClick={() => openFormView(req)}>
+                      {req.soonerId || "N/A"}
+                    </button>
+                  </td>
+                  <td>{req.interneeEmail || req.ouEmail || "N/A"}</td>
+                  <td>{req.form_type}</td>
+                  <td>{formatDate(req.createdAt)}</td>
+                  <td>
+                    <span className={`status-badge ${req.supervisor_status || req.status}`}>
+                      {req.supervisor_status || req.status}
+                    </span>
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      );
+    }
+    
+    return (
+      <div className="dashboard-container">
+        <h2>Supervisor Dashboard</h2>
+        {message && <p className="status-msg">{message}</p>}
+        {content}
+        {selectedForm && (
+          <ViewFormModal
+            formData={selectedForm}
+            onClose={closeFormView}
+            onAction={(id, action, comment, signature) =>
+              handleAction(selectedForm.form_type, id, action, comment, signature)
+            }
+          />
+        )}
+      </div>
     );
-  }
-
-  return (
-    <div className="dashboard-container">
-      <h2>Supervisor Dashboard</h2>
-      {message && <p className="status-msg">{message}</p>}
-      {content}
-      {selectedForm && (
-        <ViewFormModal
-          formData={selectedForm}
-          onClose={closeFormView}
-          onAction={handleAction}
-          onActionComplete={handleFormActionComplete}
-        />
-      )}
-    </div>
-  );
 };
 
 export default SupervisorDashboard;
diff --git a/client/src/pages/TokenRenewal.jsx b/client/src/pages/TokenRenewal.jsx
new file mode 100644
index 00000000..8db7edeb
--- /dev/null
+++ b/client/src/pages/TokenRenewal.jsx
@@ -0,0 +1,59 @@
+import React, { useEffect, useState } from 'react';
+import { useParams } from 'react-router-dom';
+
+const TokenRenewal = () => {
+  const { token } = useParams();
+  const [responseMessage, setResponseMessage] = useState('');
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    const renewToken = async () => {
+      try {
+        const response = await fetch(`${process.env.REACT_APP_API_URL}/api/token/renew`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({ token }),
+        });
+
+        const data = await response.json();
+
+        if (response.ok) {
+          setResponseMessage({ text: '✅ Success: Your token has been renewed!', success: true });
+        } else {
+          setResponseMessage({ text: `❌ Error: ${data.message}`, success: false });
+        }
+      } catch (error) {
+        setResponseMessage({ text: '❌ Error: Unable to process your request.', success: false });
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    if (token) {
+      renewToken();
+    } else {
+      setResponseMessage({ text: '❌ Error: No token found in the URL.', success: false });
+      setLoading(false);
+    }
+  }, [token]);
+
+  return (
+    <div className="token-renewal-container">
+      <h1>Token Renewal</h1>
+      {loading ? (
+        <p>⏳ Processing your token renewal...</p>
+      ) : (
+        <div
+          className={`response-message ${responseMessage.success ? 'success' : 'error'}`}
+          style={{ marginTop: '20px' }}
+        >
+          {responseMessage.text}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default TokenRenewal;
diff --git a/client/src/pages/ViewFormModal.js b/client/src/pages/ViewFormModal.js
index f8a467b9..ffb19bd6 100644
--- a/client/src/pages/ViewFormModal.js
+++ b/client/src/pages/ViewFormModal.js
@@ -5,47 +5,32 @@ const ViewFormModal = ({ formData, onClose, onAction, onActionComplete }) => {
   const [comment, setComment] = useState("");
   const [signature, setSignature] = useState("");
   const [error, setError] = useState("");
-
-  const handleAction = async (action) => {
-    if (!comment.trim()) {
-      setError("Comment is required before taking action.");
-      return;
-    }
-    if (!signature.trim()) {
-      setError("Signature is required before approval/rejection.");
-      return;
-    }
-
+  const handleDecision = (action) => {
+    if (!comment.trim()) return setError("Comment is required.");
+    if (!signature.trim()) return setError("Signature is required.");
     setError("");
-    const fullComment = `${comment.trim()} | Supervisor Signature: ${signature.trim()}`;
-    await onAction(formData._id, formData.form_type, action, fullComment);
-    onActionComplete(); // refresh table
-    onClose(); // close modal
+    onAction(formData._id, action, comment.trim(), signature.trim());
   };
 
-  return (
-    <div className="modal-overlay">
-      <div className="modal-box">
-        <h2>A.1 Internship Request Form</h2>
-
-        <table className="modal-details-table">
+  // ✅ Inserted rendering helpers
+  const renderA1 = () => (
+    <>
+      <h2>A1 – Internship Request Form</h2>
+     <table className="modal-details-table">
           <thead>
             <tr>
-              <th>Field</th>
-              <th>Details</th>
+              <th></th>
+              <th></th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td><strong>Student Name:</strong> {formData.student?.userName || formData.student?.name || "N/A"}</td>
-              <td><strong>Student ID:</strong> {formData.student?._id || "N/A"}</td>
-            </tr>
-            <tr>
-              <td><strong>Email:</strong> {formData.student?.email || "N/A"}</td>
-              <td><strong>Phone:</strong> {formData.workplace?.phone || "N/A"}</td>
+              <td><strong>Student Name:</strong> {formData.interneeName || "N/A"}</td>
+              <td><strong>Email:</strong> {formData.interneeEmail || "N/A"}</td>
             </tr>
             <tr>
               <td><strong>Workplace Name:</strong> {formData.workplace?.name || "N/A"}</td>
+              <td><strong>Phone:</strong> {formData.workplace?.phone || "N/A"}</td>
               <td><strong>Website:</strong> {formData.workplace?.website || "N/A"}</td>
             </tr>
             <tr>
@@ -74,39 +59,71 @@ const ViewFormModal = ({ formData, onClose, onAction, onActionComplete }) => {
             ))}
           </ul>
         </div>
+    </>
+  );
 
-        <div>
-          <label><strong>Supervisor Signature:</strong></label>
-          <input
-            type="text"
-            value={signature}
-            onChange={(e) => setSignature(e.target.value)}
-            placeholder="Enter your full name"
-            style={{ width: "100%", padding: "6px", marginTop: "5px", borderRadius: "4px" }}
-          />
-        </div>
+    const renderA3 = () => (
+        <>
+        <h2>A3 – Final Job Performance Evaluation</h2>
+        <p><strong>Name:</strong> {formData.interneeName}</p>
+        <p><strong>Email:</strong> {formData.interneeEmail}</p>
 
-        <div style={{ marginTop: "10px" }}>
-          <label><strong>Comment:</strong></label>
-          <textarea
-            value={comment}
-            onChange={(e) => setComment(e.target.value)}
-            placeholder="Add your comment before approval or rejection"
-            rows={4}
-            style={{ width: "100%", marginTop: "5px", borderRadius: "4px", padding: "8px" }}
-          />
-        </div>
+        <h3>Evaluation Items</h3>
+        <table className="dashboard-table">
+        <thead>
+        <tr>
+        <th>Category</th>
+        <th>Rating</th>
+        <th>Comment</th>
+        </tr>
+        </thead>
+        <tbody>
+        {formData.evaluations?.map((item, i) => (
+            <tr key={i}>
+            <td>{item.category}</td>
+            <td>{item.rating}</td>
+            <td>{item.comment || "-"}</td>
+            </tr>
+        ))}
+        </tbody>
+      </table>
+    </>
+  );
 
-        {error && <p style={{ color: "red", marginTop: "5px" }}>{error}</p>}
+  const renderSignaturesAndActions = () => (
+    <>
+      <h3>Supervisor Review</h3>
+      <label>Signature:</label>
+      <input
+        type="text"
+        value={signature}
+        onChange={(e) => setSignature(e.target.value)}
+        style={{ width: "100%", marginBottom: "8px" }}
+      />
+      <label>Comment:</label>
+      <textarea
+        value={comment}
+        onChange={(e) => setComment(e.target.value)}
+        rows={3}
+        style={{ width: "100%" }}
+      />
+      {error && <p style={{ color: "red" }}>{error}</p>}
+      <div style={{ marginTop: "10px", display: "flex", justifyContent: "center", gap: "10px" }}>
+        <button className="approve" onClick={() => handleDecision("approve")}>Approve</button>
+        <button className="reject" onClick={() => handleDecision("reject")}>Reject</button>
+        <button onClick={onClose}>Close</button>
+      </div>
+    </>
+  );
 
-        <div style={{ display: "flex", justifyContent: "center", gap: "10px", marginTop: "15px" }}>
-          <button className="approve" onClick={() => handleAction("approve")}>Approve</button>
-          <button className="reject" onClick={() => handleAction("reject")}>Reject</button>
-          <button onClick={onClose}>Close</button>
+    return (
+      <div className="modal-overlay">
+        <div className="modal-box" style={{ maxHeight: "90vh", overflowY: "auto" }}>
+          {formData.form_type === "A1" ? renderA1() : renderA3()}
+          {renderSignaturesAndActions()}
         </div>
       </div>
-    </div>
-  );
+    );
 };
 
 export default ViewFormModal;
diff --git a/client/src/router.js b/client/src/router.js
index c1bfe4ef..8fac8de1 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -17,9 +17,12 @@ import A4PresentationEvaluationForm from "./pages/A4PresentationEvaluationForm";
 import SupervisorDashboard from "./pages/SupervisorDashboard";
 import CoordinatorDashboard from "./pages/CoordinatorDashboard";
 import CoordinatorRequestDetailView from "./pages/CoordinatorRequestDetailView";
+import TokenRenewal from "./pages/TokenRenewal";
+import StudentDashboard from "./pages/StudentDashboard";
+import ProtectedRouteStudent from "./pages/ProtectedRouteStudent";
 
 // Create and export the router configuration
-const router = createBrowserRouter([
+const router = createBrowserRouter([  
   {
     path: "/",
     element: <Layout />,
@@ -32,11 +35,20 @@ const router = createBrowserRouter([
       {
         path: "signup",
         element: <SignUp />,
-      },
+      },  
       {
         path: "weekly-report",
         element: <WeeklyProgressReportForm />,
       },
+      {
+        path: "/student-dashboard",
+        element: (
+          <ProtectedRouteStudent>
+            <StudentDashboard />
+          </ProtectedRouteStudent>
+        )
+      },
+      
       {
         path: "a1-form",
         element: <A1InternshipRequestForm />,
@@ -65,6 +77,10 @@ const router = createBrowserRouter([
         path: "coordinator/request/:id",
         element: <CoordinatorRequestDetailView />,
       },
+      {
+        path: "renew-token/:token",
+        element: <TokenRenewal />,
+      },
     ],
   },
 ]);
diff --git a/client/src/styles/A1InternshipRequestForm.css b/client/src/styles/A1InternshipRequestForm.css
index 8486430b..42a8e8f9 100644
--- a/client/src/styles/A1InternshipRequestForm.css
+++ b/client/src/styles/A1InternshipRequestForm.css
@@ -1,110 +1,192 @@
+/* Layout Container */
 .form-container {
-    font-family: 'Roboto', sans-serif;
-    margin: 30px;
-    background-color: #f5f5f5;
-    padding: 20px;
-}
-
-h2 {
+    max-width: 1100px;
+    margin: 30px auto;
+    padding: 30px;
+    background-color: #ffffff;
+    border-radius: 12px;
+    box-shadow: 0 0 15px rgba(0, 0, 0, 0.08);
+    font-family: 'Segoe UI', sans-serif;
+  }
+  
+  /* Headings */
+  .form-container h2 {
     text-align: center;
-    color: #841617;
-}
-
-.section-title {
-    font-size: 16px;
-    color: #841617;
+    color: #333;
+    margin-bottom: 25px;
+  }
+  
+  .section-title {
     margin-top: 30px;
     margin-bottom: 10px;
+    font-size: 1.2rem;
     font-weight: bold;
-}
-
-table {
+    color: #444;
+    border-bottom: 1px solid #ddd;
+    padding-bottom: 6px;
+  }
+  
+  /* Table Styling */
+  table {
     width: 100%;
     border-collapse: collapse;
-    margin-bottom: 20px;
-    background-color: #fff;
-}
-
-th, td {
-    padding: 8px; /* Adjusted padding */
-    border: 1px solid #999;
+    margin-bottom: 25px;
+  }
+  
+  table th, table td {
+    padding: 10px;
     vertical-align: top;
-}
-
-input[type="text"],
-input[type="email"],
-input[type="date"] {
-    width: 95%;
-    padding: 6px;
-    font-size: 13px;
-    border: 1px solid #999;
-    border-radius: 3px;
-}
-
-input[type="checkbox"] {
+  }
+  
+  table th {
+    background-color: #f8f9fa;
+    text-align: left;
+    font-weight: 600;
+  }
+  
+  /* Inputs */
+  input[type="text"],
+  input[type="email"],
+  input[type="date"],
+  select,
+  textarea {
+    width: 100%;
+    padding: 8px 10px;
+    border: 1px solid #ccc;
+    border-radius: 6px;
+    box-sizing: border-box;
+    font-size: 0.95rem;
+    transition: border-color 0.3s;
+  }
+  
+  input:focus,
+  select:focus,
+  textarea:focus {
+    border-color: #4a90e2;
+    outline: none;
+  }
+  
+  /* Dropdowns */
+  select {
     appearance: none;
-    width: 16px;
-    height: 16px;
-    border: 2px solid #333;
-    background-color: white;
+    background-color: #fff;
+    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='14' viewBox='0 0 24 24' width='14' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
+    background-repeat: no-repeat;
+    background-position-x: 95%;
+    background-position-y: center;
+  }
+  
+  /* Error Messages */
+  .error-text,
+  .error-msg {
+    color: #d93025;
+    font-size: 0.85rem;
+    margin-top: 5px;
+  }
+  
+  /* Success Message */
+  .success-msg {
+    color: #0f9d58;
+    font-size: 1rem;
+    margin-top: 20px;
+    text-align: center;
+  }
+  
+  /* Signature Section */
+  .signature-input-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .signature-font-options {
+    position: absolute;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    z-index: 10;
+    max-height: 180px;
+    overflow-y: auto;
+    width: 100%;
+    top: 100%;
+    left: 0;
+    border-radius: 4px;
+    margin-top: 2px;
+  }
+  
+  .signature-font-preview-header {
+    font-size: 0.85rem;
+    padding: 5px 10px;
+    background-color: #f0f0f0;
+    font-weight: bold;
+  }
+  
+  .signature-font-preview {
+    padding: 6px 10px;
     cursor: pointer;
-}
-
-input[type="checkbox"]:checked {
-    background-color: #841617;
-}
-
-.signature-cell {
+    transition: background 0.2s ease;
+  }
+  
+  .signature-font-preview:hover {
+    background-color: #e6f2ff;
+  }
+  
+  .signature-preview {
+    margin-top: 5px;
+    font-size: 1.1rem;
+    padding: 6px 10px;
+    border: 1px dashed #aaa;
+    border-radius: 4px;
+    background-color: #fafafa;
+  }
+  
+  /* Date Picker Customization */
+  .custom-date-picker {
+    width: 100%;
+    padding: 8px 10px;
+    font-size: 0.95rem;
+    border: 1px solid #ccc;
+    border-radius: 6px;
+    box-sizing: border-box;
+  }
+  
+  /* Buttons */
+  .submit-section {
     text-align: center;
-    background-color: #841617;
-    color: #fff;
-}
-
-.signature-cell input {
-    margin-top: 6px;
-    padding: 6px;
-    width: 90%;
-}
-
-span.description {
-    font-size: 11.5px;
+    margin-top: 30px;
+  }
+  
+  button[type="submit"] {
+    background-color: #007bff;
     color: #fff;
-    display: block;
-    margin-top: 4px;
-}
-
-ol {
-    padding-left: 18px;
-    font-size: 13px;
-}
-
-.submit-section {
-    text-align: center;
-    margin-top: 20px;
-}
-
-button {
-    padding: 10px 25px;
-    background-color: #841617;
-    color: white;
+    padding: 10px 22px;
+    font-size: 1rem;
     border: none;
-    font-size: 14px;
-    border-radius: 5px;
+    border-radius: 6px;
     cursor: pointer;
-}
-
-button:hover {
-    background-color: #6e1212;
-}
-
-.success-msg {
-    color: green;
-    font-weight: bold;
-    text-align: center;
-    margin-top: 10px;
-}
-
-.error-msg {
+    transition: background 0.3s ease;
+  }
+  
+  button[type="submit"]:hover {
+    background-color: #0056b3;
+  }
+  .font-dancing-script {
+    font-family: 'Dancing Script', cursive;
+  }
+  .font-great-vibes {
+    font-family: 'Great Vibes', cursive;
+  }
+  .font-pacifico {
+    font-family: 'Pacifico', cursive;
+  }
+  .font-satisfy {
+    font-family: 'Satisfy', cursive;
+  }
+  .font-caveat {
+    font-family: 'Caveat', cursive;
+  }
+  
+  /* Asterisk */
+  .required-asterisk {
     color: red;
     font-weight: bold;
     text-align: center;
@@ -138,5 +220,4 @@ button:hover {
     width: 90%;
     max-width: 1200px;
     border-radius: 12px;
-  }
-  
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/client/src/styles/StudentDashboard.css b/client/src/styles/StudentDashboard.css
new file mode 100644
index 00000000..71975b3e
--- /dev/null
+++ b/client/src/styles/StudentDashboard.css
@@ -0,0 +1,71 @@
+.student-dashboard {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 2rem 1rem;
+    background-color: #f7f7f7;
+    min-height: 90vh;
+  }
+  
+  .dashboard-header {
+    width: 100%;
+    max-width: 900px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 2rem;
+  }
+  
+  .user-role {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #5c0a0a;
+  }
+  
+  .dashboard-card {
+    background-color: white;
+    border-radius: 10px;
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.08);
+    padding: 2rem;
+    width: 100%;
+    max-width: 900px;
+  }
+  
+  .card-section {
+    background-color: #842020;
+    border-radius: 10px;
+    padding: 1.5rem;
+    margin-bottom: 1.5rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: white;
+    box-shadow: 0 6px 18px rgba(0, 0, 0, 0.1);
+  }
+  
+  .card-content h3 {
+    margin: 0;
+    font-size: 1.2rem;
+    font-weight: 600;
+  }
+  
+  .card-content p {
+    margin: 5px 0 0;
+    font-size: 0.9rem;
+  }
+  
+  .card-button {
+    background-color: white;
+    color: #842020;
+    border: none;
+    padding: 8px 16px;
+    border-radius: 6px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: 0.3s ease-in-out;
+  }
+  
+  .card-button:hover {
+    background-color: #e6e6e6;
+  }
+  
\ No newline at end of file
diff --git a/server/controllers/approvalController.js b/server/controllers/approvalController.js
index b0eaa6ac..3687d0d4 100644
--- a/server/controllers/approvalController.js
+++ b/server/controllers/approvalController.js
@@ -2,6 +2,7 @@ const InternshipRequest = require("../models/InternshipRequest");
 const WeeklyReport = require("../models/WeeklyReport");
 const Evaluation = require("../models/Evaluation");
 const EmailService = require("../services/emailService");
+const UserTokenRequest = require("../models/TokenRequest");
 
 // =========================================== //
 //           Managing Supervisor Forms         //
@@ -13,7 +14,7 @@ exports.getSupervisorForms = async (req, res, filter) => {
         //      Fetching A1 Form
         // ----------------------------
         const requests = await InternshipRequest.find(filter)
-                                                .populate("student_id", "userName email");
+                                                .populate("_id", "fullName ouEmail soonerId");
 
         const typedRequests = requests.map(req => ({
             ...req.toObject(), // convert Mongoose doc to plain JS object
@@ -24,7 +25,7 @@ exports.getSupervisorForms = async (req, res, filter) => {
         //      Fetching A2 Form
         // ----------------------------
         const reports = await WeeklyReport.find(filter)
-                                          .populate("student_id", "userName email");
+                                          .populate("student_id", "fullName ouEmail soonerId");
 
         // Adding custom type to A2 Form
         const typedReports = reports.map(report => ({
@@ -36,7 +37,7 @@ exports.getSupervisorForms = async (req, res, filter) => {
         //      Fetching A3 Form
         // ----------------------------
         const evaluations = await Evaluation.find(filter)
-                                            .populate("student_id", "userName email");
+                                            .populate("student_id", "fullName ouEmail soonerId");
 
         // Adding custom type to A3 Form
         const typedEvaluations = evaluations.map(evaluation => ({
@@ -66,7 +67,7 @@ exports.handleSupervisorFormAction = async (req, res, action) => {
   try {
     const form_type = req.params.type;
     const formId = req.params.id;
-    const { comment = "" } = req.body;
+    const { comment = "", signature = "" } = req.body;
 
     const models = {
       A1: require("../models/InternshipRequest"),
@@ -94,17 +95,37 @@ exports.handleSupervisorFormAction = async (req, res, action) => {
       return res.status(404).json({ message: "Form not found" });
     }
 
-    const emailSubject = `Form ${action === "approve" ? "Approved" : "Rejected"}`;
-    let emailBody = `<p>Your ${form_type} form has been ${action}ed by the supervisor.</p>`;
-    if (comment) {
-      emailBody += `<p>Comment: ${comment}</p>`;
+    const studentEmail =
+      form.student_id?.email ||
+      form.interneeEmail ||
+      form.studentEmail ||
+      null;
+
+    if (!studentEmail) {
+      console.warn("⚠️ No student email found for form:", form._id);
+    } else {
+      const emailSubject = `Form ${action === "approve" ? "Approved" : "Rejected"}`;
+      let emailBody = `<p>Your ${form_type} form has been ${action}ed by the supervisor.</p>`;
+      if (comment) {
+        emailBody += `<p>Comment: ${comment}</p>`;
+      }
     }
 
-    await EmailService.sendEmail({
-      to: form.student_id.email,
-      subject: emailSubject,
-      html: emailBody,
-    });
+    const student_id = form.student_id || form.internee_id || form.student;
+    const student = await UserTokenRequest.findById(student_id);
+    const student_mail = student?.ouEmail || form?.interneeEmail;
+
+    try {  
+        await EmailService.sendEmail({
+            to: student_mail,
+            subject: emailSubject,
+            html: emailBody,
+        });
+    } catch (err) {
+        console.error("Email sending error:", err);
+    }
+
+    console.log("Email sent to:", student_mail);
 
     res.status(200).json({
       message: `Form ${action}ed successfully`,
@@ -116,16 +137,14 @@ exports.handleSupervisorFormAction = async (req, res, action) => {
   }
 };
 
-
 // =========================================== //
 //           Coordinator Dashboard             //
 // =========================================== //
 
-// Coordinator Dashboard: Get All Internship Requests
 exports.getCoordinatorRequests = async (req, res) => {
     try {
     const requests = await InternshipRequest.find({
-      status: "submitted",
+      coordinator_status: "pending",
     }).populate("student", "userName email");
     res.status(200).json(requests);
   } catch (err) {
@@ -137,7 +156,6 @@ exports.getCoordinatorRequests = async (req, res) => {
 exports.getCoordinatorRequestDetails = async (req, res) => {
   try {
     const requestData = await InternshipRequest.findById(req.params.id).lean();
-
     if (!requestData) {
       return res.status(404).json({ message: "Request not found" });
     }
@@ -153,7 +171,7 @@ exports.coordinatorApproveRequest = async (req, res) => {
   try {
     const request = await InternshipRequest.findByIdAndUpdate(
       req.params.id,
-      { status: "approved" },
+      { coordinator_status: "approved" },
       { new: true }
     );
 
@@ -181,7 +199,7 @@ exports.coordinatorRejectRequest = async (req, res) => {
   try {
     const request = await InternshipRequest.findByIdAndUpdate(
       req.params.id,
-      { status: "rejected" },
+      { coordinator_status: "rejected" },
       { new: true }
     );
 
diff --git a/server/index.js b/server/index.js
index 45104393..d6be7775 100644
--- a/server/index.js
+++ b/server/index.js
@@ -10,6 +10,7 @@ const formRoutes = require("./routes/formRoutes");
 const emailRoutes = require("./routes/emailRoutes");
 const tokenRoutes = require("./routes/token");
 const approvalRoutes = require("./routes/approvalRoutes");
+const studentRoutes = require("./routes/studentRoutes")
 
 const outcomeRoutes = require("./routes/outcomeRoutes");
 
@@ -18,6 +19,7 @@ const cronJobManager = require("./utils/cronUtils");
 const { registerAllJobs } = require("./jobs/registerCronJobs");
 const Evaluation = require("./models/Evaluation");
 
+
 const app = express();
 app.use(express.json());
 app.use(cors());
@@ -78,6 +80,7 @@ app.use("/api/token", tokenRoutes);
 app.use("/api", approvalRoutes);
 
 app.use("/api/reports", weeklyReportRoutes);
+app.use("/api/student",studentRoutes)
 app.post("/api/createUser", async (req, res) => {
   try {
     const { userName, email, password, role } = req.body;
@@ -143,4 +146,4 @@ process.on("SIGINT", async () => {
 });
 
 const PORT = process.env.PORT || 5001;
-app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
+app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
\ No newline at end of file
diff --git a/server/jobs/autoDeactivateCronjobs.js b/server/jobs/autoDeactivateCronjobs.js
new file mode 100644
index 00000000..1a27f2a7
--- /dev/null
+++ b/server/jobs/autoDeactivateCronjobs.js
@@ -0,0 +1,30 @@
+const TokenRequest = require("../models/TokenRequest");
+
+const autoDeactivateCronjobs = async () => {
+  try {
+    const now = new Date();
+    const startOfToday = new Date(now.setHours(0, 0, 0, 0));
+    const endOfToday = new Date(now.setHours(23, 59, 59, 999));
+
+    const result = await TokenRequest.updateMany(
+      {
+        expiresAt: { 
+          $gte: startOfToday,
+          $lt: endOfToday, },
+        status: "activated",
+      },
+      {
+        $set: {
+          status: "deactivated",
+          deactivationReason: "token_expired",
+        },
+      }
+    );
+
+    console.log(`Auto-deactivated ${result.modifiedCount} users`);
+  } catch (error) {
+    console.error("Error in auto-deactivation:", error);
+  }
+};
+
+module.exports = autoDeactivateCronjobs;
diff --git a/server/jobs/cronJobsConfig.js b/server/jobs/cronJobsConfig.js
index 2cb9e5c6..3946910f 100644
--- a/server/jobs/cronJobsConfig.js
+++ b/server/jobs/cronJobsConfig.js
@@ -1,10 +1,14 @@
 const CronJob = require("../models/CronJob");
 const { coordinatorReminder, supervisorReminder } = require("./reminderEmail");
+const { checkAndSendReminders } = require("./tokenExpiryCheck");
+const autoDeactivateCronjobs = require("./autoDeactivateCronjobs");
 
 // Map of job names to their corresponding functions
 const jobFunctions = {
   coordinatorApprovalReminder: coordinatorReminder,
   supervisorApprovalReminder: supervisorReminder,  
+  tokenExpiryReminder: checkAndSendReminders,
+  autoDeactivateCronjobs: autoDeactivateCronjobs,
   // Add more job functions here as needed
 };
 
diff --git a/server/jobs/tokenExpiryCheck.js b/server/jobs/tokenExpiryCheck.js
new file mode 100644
index 00000000..ebdc6374
--- /dev/null
+++ b/server/jobs/tokenExpiryCheck.js
@@ -0,0 +1,57 @@
+const mongoose = require("mongoose");
+const UserTokenRequest = require("../models/TokenRequest"); // Adjust the path if needed
+const emailService = require("../services/emailService");
+require("dotenv").config();
+
+const checkAndSendReminders = async () => {
+  try {
+    await mongoose.connect(process.env.MONGO_URI);
+    const now = new Date();
+
+    // Tokens expiring in 3 and 7 days
+    const daysToCheck = [3, 7];
+
+    for (const days of daysToCheck) {
+      const targetDate = new Date(now);
+      targetDate.setDate(now.getDate() + days);
+
+      const expiringTokens = await UserTokenRequest.find({
+        isActivated: true,
+        status: "activated",
+        expiresAt: {
+          $gte: new Date(targetDate.setHours(0, 0, 0, 0)),
+          $lt: new Date(targetDate.setHours(23, 59, 59, 999)),
+        },
+      });
+
+      for (const token of expiringTokens) {
+        const subject = `Reminder: Your Internship Token Expires in ${days} Day${days > 1 ? "s" : ""}`;
+        const renewalLink = `${process.env.FRONTEND_URL}/renew-token/${token.token}`; // Update with actual renewal path
+
+        const html = `
+          <p>Hello ${token.fullName},</p>
+          <p>This is a reminder that your internship access token will expire in <strong>${days} day${days > 1 ? "s" : ""}</strong> on <strong>${token.expiresAt.toDateString()}</strong>.</p>
+          <p>If your token expires, you will lose access to the internship management system.</p>
+          <p><a href="${renewalLink}">Click here to renew your token securely</a>.</p>
+          <p>Thank you,<br/>Internship Program Management Team</p>
+        `;
+
+        const emailResponse = await emailService.sendEmail({
+          to: token.ouEmail,
+          subject,
+          html,
+        });
+
+        console.log(`Email sent to ${token.ouEmail} for ${days}-day reminder:`, emailResponse);
+      }
+    }
+
+    await mongoose.disconnect();
+  } catch (error) {
+    console.error("Error during token expiry check:", error);
+  }
+}
+
+module.exports = {
+    checkAndSendReminders,
+};
diff --git a/server/models/Evaluation.js b/server/models/Evaluation.js
index 29a8f7e1..4f838107 100644
--- a/server/models/Evaluation.js
+++ b/server/models/Evaluation.js
@@ -61,4 +61,4 @@ const evaluationSchema = new mongoose.Schema({
 
 evaluationSchema.index({ interneeID: 1, internshipId: 1 });
 
-module.exports = mongoose.model('Evaluation', evaluationSchema);
+module.exports = mongoose.model('Evaluation', evaluationSchema);
\ No newline at end of file
diff --git a/server/models/FormMetadata.js b/server/models/FormMetadata.js
index 027a2f56..0e54089e 100644
--- a/server/models/FormMetadata.js
+++ b/server/models/FormMetadata.js
@@ -1,16 +1,17 @@
 const mongoose = require("mongoose");
+const UserTokenRequest = require("../models/TokenRequest");
 
 const formMetadata = {
   student_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
   supervisor_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
   coordinator_id: { type: mongoose.Schema.Types.ObjectId, ref: "UserTokenRequest"},
 
-  supervisor_status: { type: String, enum: ["pending", "approved", "rejected"], default: "pending" },
+  supervisor_status: { type: String, default: "pending" },
   supervisor_comment: String,
   supervisor_reminder_count: { type: Number, default: 0 },
   last_supervisor_reminder_at: Date,
 
-  coordinator_status: { type: String, enum: ["pending", "approved", "rejected"], default: "pending" },
+  coordinator_status: { type: String, default: "pending" },
   coordinator_comment: String,
   coordinator_reminder_count: { type: Number, default: 0 },
   last_coordinator_reminder_at: Date,
diff --git a/server/models/InternshipRequest.js b/server/models/InternshipRequest.js
index c67655da..bbb4ee7e 100644
--- a/server/models/InternshipRequest.js
+++ b/server/models/InternshipRequest.js
@@ -21,60 +21,51 @@ const Task = new mongoose.Schema({
   }]
   
 });
-const formA1 = new mongoose.Schema(
-  {
+const formA1 = new mongoose.Schema({
     ...formMetadata,
-    student: {
-      // get student's name, email, id from User
-      type: ObjectId,
-      required: true,
-      ref: "User",
+    student: { 
+        type: ObjectId,
+        required: true,
+        ref: 'UserTokenRequest'
     },
     workplace: {
-      name: {
-        type: String,
-        required: true,
-      },
-      website: String,
-      phone: String, // TODO how to validate this?
+        name: {
+            type: String,
+            required: true,
+        },
+        website: String,
+        phone: String, // TODO how to validate this?
     },
     internshipAdvisor: {
-      name: String,
-      jobTitle: String,
-      email: {
-        type: String,
-        required: true,
-      },
+        name: String,
+        jobTitle: String,
+        email: {
+            type: String,
+            required: true
+        }
     },
     creditHours: {
-      type: Number,
-      required: true,
-      enum: [1, 2, 3],
+        type: Number,
+        required: true,
+        enum: [1, 2, 3]
     },
     startDate: {
-      type: Date,
-      required: true,
+        type: Date,
+        required: true
     },
-    endDate: {
-      // TODO how to make sure endDate is later than startDate?
-      type: Date,
-      required: true,
+    endDate: { // TODO how to make sure endDate is later than startDate?
+        type: Date,
+        required: true
     },
     tasks: {
-      type: [Task],
-      required: true,
-    },
-    status: {
-      type: String,
-      required: true,
-      enum: ["draft", "submitted", "pending manual review", "approved"],
-    },
-    supervisor_status: {
-      type: String,
-    },
-    supervisor_comment: {
-      type: String,
+        type: [Task],
+        required: true
     },
+    // status: {
+    //     type: String,
+    //     required: true,
+    //     enum: ['draft', 'submitted','pending manual review' ,'approved']
+    // },
     approvals: {
       type: [String],
       enum: ["advisor", "coordinator"],
@@ -82,12 +73,10 @@ const formA1 = new mongoose.Schema(
     reminders: [Date],
     // requiredHours is an easily derived attribute
     // TODO needs to be a virtual getter that checks this student's WeeklyReports
-    completedHours: Number,
-  },
-  { timestamps: true }
-);
-formA1.virtual("requiredHours").get(function () {
-  return this.creditHours * 60;
-});
+    completedHours: Number
+}, { timestamps: true });
+formA1.virtual("requiredHours").get(function() {
+    return this.creditHours * 60;
+})
 
 module.exports = mongoose.model("InternshipRequest", formA1);
diff --git a/server/models/TokenRequest.js b/server/models/TokenRequest.js
index 32eeb74d..d7b52670 100644
--- a/server/models/TokenRequest.js
+++ b/server/models/TokenRequest.js
@@ -1,5 +1,3 @@
-// models/UserTokenRequest.js
-
 const mongoose = require('mongoose');
 
 /**
@@ -12,6 +10,7 @@ const mongoose = require('mongoose');
  * - fullName: Student's full name.
  * - password: Encrypted password for login authentication.
  * - ouEmail: Unique OU email for login.
+ * - soonerId: Unique 9-character ID assigned to the student.
  * - semester: The semester in which the internship is active.
  * - academicAdvisor: Reference to the academic advisor (if using a separate collection).
  * - token: Unique access token used for login.
@@ -23,7 +22,7 @@ const mongoose = require('mongoose');
  * - status: Optional string enum for tracking token state.
  * - activationLinkSentAt: Timestamp when the activation email was sent.
  * - password: Encrypted password for login authentication.
- *
+
  * Additional Features:
  * - Automatically sets `expiresAt` to 6 months from `requestedAt`.
  * - Uses `timestamps` to auto-generate `createdAt` and `updatedAt`.
@@ -51,6 +50,14 @@ const userTokenRequestSchema = new mongoose.Schema(
       lowercase: true,
       match: [/^[\w-.]+@ou\.edu$/, 'Email must be a valid OU address'],
     },
+    soonerId: {
+      type: String,
+      required: function () {
+        return this.role === 'student';
+      },
+      unique: true,
+      match: [/^\d{9}$/, 'Sooner ID must be exactly 9 digits'],
+    },
     role: {
       type: String,
       required: true,
@@ -98,7 +105,7 @@ const userTokenRequestSchema = new mongoose.Schema(
     },
     status: {
       type: String,
-      enum: ['pending', 'activated', 'expired', 'deleted'],
+      enum: ['pending', 'activated', 'expired', 'deleted','deactivated'],
       default: 'pending',
     },
   },
diff --git a/server/package.json b/server/package.json
index 20f54234..2e950867 100644
--- a/server/package.json
+++ b/server/package.json
@@ -24,7 +24,8 @@
     "mongodb": "^6.14.2",
     "mongoose": "^8.13.2",
     "node-cron": "^3.0.3",
-    "nodemailer": "^6.10.0"
+    "nodemailer": "^6.10.0",
+    "server": "file:"
   },
   "devDependencies": {
     "jest": "^29.7.0"
diff --git a/server/routes/approvalRoutes.js b/server/routes/approvalRoutes.js
index 223e74f3..0913ac09 100644
--- a/server/routes/approvalRoutes.js
+++ b/server/routes/approvalRoutes.js
@@ -56,4 +56,4 @@ router.post(
   coordinatorRejectRequest
 );
 
-module.exports = router;
+module.exports = router;
\ No newline at end of file
diff --git a/server/routes/formRoutes.js b/server/routes/formRoutes.js
index 43f2e845..8fe44896 100644
--- a/server/routes/formRoutes.js
+++ b/server/routes/formRoutes.js
@@ -3,11 +3,14 @@ const router = express.Router();
 const InternshipRequest = require("../models/InternshipRequest");
 const { insertFormData } = require("../services/insertData");
 
-// GET route to fetch internship requests pending supervisor action
+// router.post("/internshiprequests/:id/approve", approveSubmission);
+// router.post("/internshiprequests/:id/reject", rejectSubmission);
+
+// UPDATED: GET route to fetch internship requests pending supervisor action
 router.get("/internshiprequests", async (req, res) => {
   try {
     const requests = await InternshipRequest.find({
-      status: "submitted",
+      supervisor_status: "pending",
       // approvals: "advisor", // advisor has approved
       supervisor_status: { $in: [null, "pending"] } // not yet reviewed by supervisor
     }).sort({ createdAt: 1 })  .populate("student", "userName")  // oldest first
@@ -19,54 +22,74 @@ router.get("/internshiprequests", async (req, res) => {
   }
 });
 
-// Validate and submit form
+// Validate required fields
 function validateFormData(formData) {
   const requiredFields = [
-    "workplaceName",
-    "website",
-    "phone",
-    "advisorName",
-    "advisorJobTitle",
-    "advisorEmail",
-    "creditHours",
-    "startDate",
-    "endDate",
-    "tasks"
+    'soonerId',
+    'workplaceName',
+    'website',
+    'phone',
+    'advisorName',
+    'advisorJobTitle',
+    'advisorEmail',
+    'creditHours',
+    'startDate',
+    'endDate',
+    'tasks'
   ];
 
   for (const field of requiredFields) {
-    if (!formData[field] || formData[field] === "") {
+    if (!formData[field] || formData[field] === '') {
       return `Missing or empty required field: ${field}`;
     }
   }
 
+  if (!/^[0-9]{9}$/.test(formData.soonerId))
+    return `Sooner ID must be a 9-digit number, not ${formData.soonerId}`;
+
   if (!Array.isArray(formData.tasks) || formData.tasks.length === 0) {
-    return "Tasks must be a non-empty array";
+    return 'Tasks must be a non-empty array';
   }
+  // for (const [index, task] of formData.tasks.entries()) {
+  //   if (!task.description || !task.outcomes) {
+  //     return `Task at index ${index} is missing description or outcomes`;
+  //   }
+  // }
 
-  const outcomes = new Set();
-  formData.tasks.forEach((task) => {
-    task.outcomes?.forEach(o => outcomes.add(o));
-  });
+  // uncomment below if student has to fill in task outcomes
+  // const filledTasks = formData.tasks.filter((task) => task.description && task.outcomes );  
+  // if (filledTasks.length < 3)
+  //   return `At least 3 tasks must have description and outcomes; only ${filledTasks.length} do`;
 
-  formData.status = outcomes.size < 3 ? "pending manual review" : "submitted";
+  const tasks = formData.tasks;
+  console.log(tasks);
+  if (tasks.filter((task) => task.description && task.description.trim() !== '').length < 3)
+    return 'At least 3 tasks must be provided';
+  const uniqueOutcomes = new Set();
+  tasks.forEach((task) => {
+    if (Array.isArray(task.outcomes)) {
+      task.outcomes.forEach(outcome => uniqueOutcomes.add(outcome));
+    } 
+  });
+  formData.status = uniqueOutcomes.size < 3 ? 'pending manual review' : 'submitted';
   return null;
 }
 
-router.post("/submit", async (req, res) => {
-  const formData = req.body;
 
-  if (!formData.studentId) {
-    return res.status(400).json({ message: "Missing studentId in form data" });
+router.post('/submit', async (req, res) => {
+  const formData = req.body;
+  const validationError = validateFormData(formData);
+  if (validationError) {
+    return res.status(400).json({ message: validationError });
   }
 
   try {
-    await insertFormData(formData);  // pass studentId through
-    res.status(200).json({ message: "Form received and stored." });
+    await insertFormData(formData);
+    res.status(200).json({ message: 'Form received and handled!', manual: formData.status !== 'submitted'});
   } catch (error) {
-    res.status(500).json({ message: "Something went wrong" });
+    console.error('Error handling form data:', error);
+    res.status(500).json({ message: 'Something went wrong' });
   }
 });
 
-
 module.exports = router;
diff --git a/server/routes/studentRoutes.js b/server/routes/studentRoutes.js
new file mode 100644
index 00000000..26716b7c
--- /dev/null
+++ b/server/routes/studentRoutes.js
@@ -0,0 +1,38 @@
+const express = require("express");
+const router = express.Router();
+const InternshipRequest = require("../models/InternshipRequest");
+const User = require("../models/User");
+const TokenRequest = require("../models/TokenRequest");
+
+
+// GET internship request by student's ouEmail
+router.post("/", async (req, res) => {
+  const { ouEmail } = req.body;
+  console.log("Received email:", ouEmail);
+
+  try {
+    const studentUser = await TokenRequest.findOne({ ouEmail });
+
+    if (!studentUser) {
+      return res.status(404).json({ message: "Student not found in TokenRequest" });
+    }
+
+    const internshipData = await InternshipRequest.findOne({ student: studentUser._id });
+
+    if (!internshipData) {
+      // No record found, return a specific flag
+      return res.status(200).json({ message: "No internship request found", approvalStatus: "not_submitted" });
+    }
+
+    const approvalStatus = internshipData.status;
+
+    return res.status(200).json({ message: "Success", approvalStatus });
+  } catch (error) {
+    console.error("Error fetching internship request:", error);
+    return res.status(500).json({ message: "Server error" });
+  }
+});
+
+  
+
+module.exports = router;
\ No newline at end of file
diff --git a/server/routes/token.js b/server/routes/token.js
index 247fda86..5b663911 100644
--- a/server/routes/token.js
+++ b/server/routes/token.js
@@ -5,6 +5,7 @@ const crypto = require("crypto");
 const bcrypt = require("bcrypt");
 const TokenRequest = require("../models/TokenRequest");
 const emailService = require("../services/emailService");
+const User = require("../models/User")
 
 const JWT_SECRET = process.env.JWT_SECRET;
 const FRONTEND_URL = process.env.FRONTEND_URL;
@@ -16,18 +17,21 @@ const hashToken = (token) => {
 
 router.post("/request", async (req, res) => {
   try {
-    const { fullName, ouEmail, password, semester, academicAdvisor, role } =
-      req.body;
-
+    const { fullName, ouEmail, soonerId, password, semester, academicAdvisor, role } = req.body;
     if (!fullName || !ouEmail || !password || !semester) {
       return res.status(400).json({ error: "All fields are required." });
     }
 
     const existing = await TokenRequest.findOne({ ouEmail });
     if (existing) {
-      return res
-        .status(400)
-        .json({ error: "Token request already exists for this email." });
+      return res.status(401).json({ error: "Token request already exists for this email." });
+    }
+
+    if(role==="student"){
+      const existingSoonerId = await TokenRequest.findOne({ soonerId });
+      if(existingSoonerId){
+        return res.status(402).json({ error: "Token request already exists for this Sooner ID." });
+      }
     }
 
     const plainToken = jwt.sign({ ouEmail }, JWT_SECRET, { expiresIn: "180d" });
@@ -35,11 +39,12 @@ router.post("/request", async (req, res) => {
     const hashedPassword = await bcrypt.hash(password, SALT_ROUNDS);
 
     const requestedAt = new Date();
-    const expiresAt = new Date(requestedAt.getTime() + 5 * 24 * 60 * 60 * 1000); // 5 days
+    const expiresAt = new Date(requestedAt.getTime() + 5 * 24 * 60 * 60 * 1000);
 
     const request = new TokenRequest({
       fullName,
       ouEmail,
+      soonerId: role === "student" ? soonerId : "",
       password: hashedPassword,
       semester,
       role,
@@ -51,7 +56,10 @@ router.post("/request", async (req, res) => {
       activationLinkSentAt: new Date(),
     });
 
+    
+
     await request.save();
+   
 
     const activationLink = `${FRONTEND_URL}/activate/${plainToken}`;
     const emailBody = `
@@ -85,16 +93,12 @@ router.post("/activate", async (req, res) => {
     const { token } = req.body;
     if (!token) return res.status(400).json({ error: "Token is missing." });
     const hashedToken = hashToken(token);
-    console.log("Received token:", token);
     const user = await TokenRequest.findOne({ token: hashedToken });
 
     if (!user) return res.status(404).json({ error: "Token not found." });
-    if (user.deletedAt)
-      return res.status(403).json({ error: "Token has been deactivated." });
-    if (user.isActivated)
-      return res.status(400).json({ error: "Token already activated." });
-    if (new Date() > user.expiresAt)
-      return res.status(400).json({ error: "Token has expired." });
+    if (user.deletedAt) return res.status(403).json({ error: "Token has been deactivated." });
+    if (user.isActivated) return res.status(400).json({ error: "Token already activated." });
+    if (new Date() > user.expiresAt) return res.status(400).json({ error: "Token has expired." });
 
     user.isActivated = true;
     user.activatedAt = new Date();
@@ -120,10 +124,8 @@ router.post("/login", async (req, res) => {
     const user = await TokenRequest.findOne({ token: hashedToken });
 
     if (!user) return res.status(404).json({ error: "Invalid token." });
-    if (user.deletedAt)
-      return res.status(403).json({ error: "Token is deactivated." });
-    if (!user.isActivated)
-      return res.status(403).json({ error: "Token not activated." });
+    if (user.deletedAt) return res.status(403).json({ error: "Token is deactivated." });
+    if (!user.isActivated) return res.status(403).json({ error: "Token not activated." });
 
     res.json({ message: "Login successful", user });
   } catch (err) {
@@ -131,57 +133,54 @@ router.post("/login", async (req, res) => {
   }
 });
 
-// login api
 router.post("/user-login", async (req, res) => {
   const { ouEmail, password, role } = req.body;
-  console.log(role);
+
   if (!ouEmail || !password || !role) {
     return res.status(400).json({ message: "All fields are required" });
   }
+
   try {
     const user = await TokenRequest.findOne({ ouEmail });
 
     if (!user) {
-      return res
-        .status(401)
-        .json({ message: "Email or password is incorrect" });
+      return res.status(401).json({ message: "Email or password is incorrect" });
     }
 
     const isMatch = await bcrypt.compare(password, user.password);
     if (!isMatch) {
-      return res
-        .status(401)
-        .json({ message: "Email or password is incorrect" });
+      return res.status(401).json({ message: "Email or password is incorrect" });
     }
 
-    // First, check if the entered role matches the user's actual role
     if (user.role.toLowerCase() !== role.toLowerCase()) {
       return res.status(403).json({ message: "User role mismatch." });
     }
 
-    // If the role is student, do additional token checks
     if (role.toLowerCase() === "student") {
       if (!user.isStudent) {
-        return res
-          .status(403)
-          .json({ message: "User is not registered as a student." });
+        return res.status(403).json({ message: "User is not registered as a student." });
       }
 
       if (!user.token || user.token === "") {
         return res.status(403).json({ message: "Token not issued yet." });
       }
 
-      if (user.status !== "activated") {
+      if (!user.isActivated) {
         return res.status(403).json({ message: "Token is not activated yet." });
       }
 
       const now = new Date();
       const tokenExpiry = new Date(user.expiresAt);
 
-      if (tokenExpiry < now) {
-        return res
-          .status(403)
-          .json({ message: "Token has expired. Please request a new one." });
+      if (tokenExpiry < now || user.status === "deactivated") {
+        if(!user.status === "deactivated"){
+          user.status = "deactivated";
+          await user.save();
+        }
+        return res.status(403).json({
+          message : "Your account is deactivated due to token expiry.",
+          renewalLink: `${FRONTEND_URL}/renew-token/${user.token}`
+        });
       }
     }
 
@@ -196,14 +195,11 @@ router.delete("/deactivate", async (req, res) => {
   try {
     const { token, ouEmail } = req.body;
     if (!token && !ouEmail) {
-      return res
-        .status(400)
-        .json({ error: "Token or Email is required for deactivation." });
+      return res.status(400).json({ error: "Token or Email is required for deactivation." });
     }
 
     let filter = {};
 
-    // Only hash the token if it exists
     if (token) {
       if (typeof token !== "string") {
         return res.status(400).json({ error: "Token must be a string." });
@@ -213,6 +209,7 @@ router.delete("/deactivate", async (req, res) => {
     } else {
       filter = { ouEmail };
     }
+
     const user = await TokenRequest.findOne(filter);
     if (!user) {
       return res.status(404).json({ error: "Token not found." });
@@ -233,4 +230,46 @@ router.delete("/deactivate", async (req, res) => {
   }
 });
 
+router.post("/renew", async (req, res) => {
+  try {
+    const { token } = req.body;
+
+    if (!token) {
+      return res.status(400).json({ message: "Token is required." });
+    }
+
+    const user = await TokenRequest.findOne({ token: token });
+
+    if (!user) {
+      return res.status(404).json({ message: "Token not found." });
+    }
+
+    if (user.deletedAt || user.status === "deleted") {
+      return res.status(403).json({ message: "Token has been deleted." });
+    }
+
+    const newToken = jwt.sign({ ouEmail: user.ouEmail }, JWT_SECRET, { expiresIn: "180d" });
+    const hashedNewToken = hashToken(newToken);
+
+    const newExpiresAt = new Date();
+    newExpiresAt.setMonth(newExpiresAt.getMonth() + 6);
+
+    user.token = hashedNewToken;
+    user.expiresAt = newExpiresAt;
+    user.status = "activated";
+
+    await user.save();
+
+    res.status(200).json({
+      message: "Your token has been updated. You can now securely login.",
+      redirectUrl: `${FRONTEND_URL}/renewal-success`,
+      token: newToken,
+      expiresAt: newExpiresAt,
+    });
+  } catch (error) {
+    console.error("Token renewal error:", error);
+    res.status(500).json({ message: "Internal server error." });
+  }
+});
+
 module.exports = router;
diff --git a/server/services/insertData.js b/server/services/insertData.js
index d0572b8c..8d0e9541 100644
--- a/server/services/insertData.js
+++ b/server/services/insertData.js
@@ -6,12 +6,20 @@ async function insertFormData(formData) {
     console.log("Received Form Data:\n", JSON.stringify(formData, null, 2));
 
     // Assumes global mongoose connection is already established elsewhere in app
-
-    // Determine final status based on outcome analysis
-    const finalStatus = formData.status || "submitted";
+    if (formData.status === "submitted") {
+      // if tasks are aligned , form will be sent to the supervisor. 
+      formData.supervisor_status="pending" 
+      formData.coordinator_status="not submitted"  //TBD
+      console.log("Submission sent to Supervisor Dashboard.");
+    } else if (formData.status === "pending manual review") {
+      //if tasks are not aligned, form will be sent to coordinator. coordinator approves -> coordinator should forward to supervisor for further approval
+      formData.coordinator_status="pending"
+      formData.supervisor_status="not submitted"
+      console.log("Task not aligned with CS Outcomes. Sent to coordinator for manual review.");
+    }
 
     const formattedData = {
-      student: new mongoose.Types.ObjectId(formData.studentId), // ✅ use the actual student
+      student: new mongoose.Types.ObjectId(), // TODO: Replace with actual signed-in student ID
       workplace: {
         name: formData.workplaceName,
         website: formData.website,
@@ -26,28 +34,25 @@ async function insertFormData(formData) {
       startDate: new Date(formData.startDate),
       endDate: new Date(formData.endDate),
       tasks: formData.tasks
-        .map(task => ({
-          description: task.description,
-          outcomes: task.outcomes,
-        }))
-        .filter(task => task.description.trim() !== ""), // remove empty tasks
-      status: finalStatus,
-      approvals: finalStatus === "submitted" ? ["advisor"] : [], // 👈 KEY FIX
-      reminders: [],
+      .map(task => ({
+        description: task.description,
+        outcomes: task.outcomes,
+      })).filter(task => task.description.trim() !== ''), // remove empty tasks
+      // status: "submitted", // Default status — adjust as needed
+      // status: formData.status, // Default status — adjust as needed
+
+      supervisor_status: formData.supervisor_status ,//function based on if tasks are aligned/not aligned with outcomes
+      coordinator_status: formData.coordinator_status,
+      approvals: ["advisor", "coordinator"], // TODO: Might be dynamic later
+      reminders: [], // Placeholder for future reminder logic
       completedHours: parseInt(formData.creditHours) * 60, // Assuming 1 credit = 60 hours
     };
 
     const savedForm = await InternshipRequest.create(formattedData);
     console.log("Form saved successfully with ID:", savedForm._id);
-
-    if (finalStatus === "submitted") {
-      // optionally create submission doc if needed
-      console.log("Submission sent to Supervisor Dashboard.");
-    } else if (finalStatus === "pending manual review") {
-      console.log("Task not aligned with CS Outcomes. Sent to coordinator for manual review.");
-    }
-
+    console.log("saved form",savedForm)
     return savedForm;
+
   } catch (error) {
     console.error("Error saving form:", error.message);
     throw error;
@@ -56,4 +61,4 @@ async function insertFormData(formData) {
 
 module.exports = {
   insertFormData,
-};
+};
\ No newline at end of file