diff --git a/.gitignore b/.gitignore
index 27e4fb78b..7f5b38cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,4 +135,9 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
-package-lock.json
+# Ignore package-lock.json in all folders
+**/package-lock.json
+/package-lock.json
+/client/package-lock.json
+/server/package-lock.json
+
diff --git a/client/src/components/Layout.js b/client/src/components/Layout.js
index 2ff6d794f..670ad1c96 100644
--- a/client/src/components/Layout.js
+++ b/client/src/components/Layout.js
@@ -20,6 +20,9 @@ function Layout() {
             <li>
               <Link to="/contact">Contact</Link>
             </li>
+            <li>
+              <Link to="/weekly-report">Weekly Report</Link>
+            </li>
           </ul>
         </nav>
       </header>
diff --git a/client/src/pages/SignUp.js b/client/src/pages/SignUp.js
index 5f4a42166..23a4a282e 100644
--- a/client/src/pages/SignUp.js
+++ b/client/src/pages/SignUp.js
@@ -47,6 +47,8 @@ function SignUp() {
   const passwordsMatch = password === confirmPassword;
 
   const createUser = async (e) => {
+    console.log("createUser() called");
+
     e.preventDefault();
     try {
       const response = await axios.post(
@@ -60,16 +62,17 @@ function SignUp() {
           role,
         }
       );
-      
-
       console.log("Signup response:", response.data);
-      
+      // if (response.data && response.data.user) {
+      //   localStorage.setItem("user", JSON.stringify({ user: response.data.user }));
+      // }
+
       if (role === "student") {
         setResponseMessage("Token requested and email sent.");
       } else {
         setResponseMessage("Account created successfully.");
       }
-      
+
       // Reset form after successful submission
       setFullName("");
       setOuEmail("");
@@ -306,18 +309,18 @@ function SignUp() {
             </div>
 
             {role === "student" && (
-                  <div className="form-group">
-                    <label htmlFor="academicAdvisor">Academic Advisor</label>
-                    <input
-                      type="text"
-                      id="advisor"
-                      value={academicAdvisor}
-                      onChange={(e) => setAcademicAdvisor(e.target.value)}
-                      placeholder="Enter your academic advisor's name"
-                      required
-                    />
-                  </div>
-                )}
+              <div className="form-group">
+                <label htmlFor="academicAdvisor">Academic Advisor</label>
+                <input
+                  type="text"
+                  id="advisor"
+                  value={academicAdvisor}
+                  onChange={(e) => setAcademicAdvisor(e.target.value)}
+                  placeholder="Enter your academic advisor's name"
+                  required
+                />
+              </div>
+            )}
 
             <div className="form-group">
               <label>
@@ -354,4 +357,4 @@ function SignUp() {
   );
 }
 
-export default SignUp;
\ No newline at end of file
+export default SignUp;
diff --git a/client/src/pages/WeeklyProgressReportForm.css b/client/src/pages/WeeklyProgressReportForm.css
new file mode 100644
index 000000000..b8b8989fa
--- /dev/null
+++ b/client/src/pages/WeeklyProgressReportForm.css
@@ -0,0 +1,45 @@
+/* WeeklyProgressReportForm.css */
+
+.a2-form-container {
+    max-width: 700px;
+    margin: auto;
+    padding: 2rem;
+    border: 1px solid #ccc;
+    background: #f9f9f9;
+    border-radius: 8px;
+  }
+  
+  .form-row {
+    display: flex;
+    gap: 1rem;
+    margin-bottom: 1rem;
+    justify-content: space-between;
+  }
+  
+  .form-row label {
+    flex: 1;
+  }
+  
+  .form-group {
+    margin-bottom: 1rem;
+  }
+  
+  textarea {
+    width: 100%;
+    height: 100px;
+  }
+  
+  .submit-button {
+    background: maroon;
+    color: white;
+    padding: 0.7rem 1.5rem;
+    border: none;
+    border-radius: 6px;
+    cursor: pointer;
+  }
+  
+  .form-message {
+    margin-top: 1rem;
+    color: green;
+  }
+  
\ No newline at end of file
diff --git a/client/src/pages/WeeklyProgressReportForm.js b/client/src/pages/WeeklyProgressReportForm.js
new file mode 100644
index 000000000..2e9b8c54e
--- /dev/null
+++ b/client/src/pages/WeeklyProgressReportForm.js
@@ -0,0 +1,132 @@
+
+
+import React, { useState } from "react";
+import axios from "axios";
+import "./WeeklyProgressReportForm.css"; // optional: for clean styling
+
+const WeeklyProgressReportForm = () => {
+  const [formData, setFormData] = useState({
+    week: "Week 1",
+    hours: "",
+    tasks: "",
+    lessons: "",
+    supervisorComments: "",
+  });
+
+  const [message, setMessage] = useState("");
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+    setFormData((prev) => ({ ...prev, [name]: value }));
+  };
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+  
+    // Get the user ID from localStorage (ensure it exists)
+    // const user = JSON.parse(localStorage.getItem("user"));
+    // const studentId = user?.user?._id;
+  
+    // // Check if studentId exists in localStorage
+    // if (!studentId) {
+    //   setMessage("Student ID not found. Please log in again.");
+    //   return;
+    // }
+  
+    // Check that all required fields are filled
+    if (!formData.week || !formData.hours || !formData.tasks || !formData.lessons) {
+      setMessage("Please fill in all the fields.");
+      return;
+    }
+  
+    //const payload = { studentId, ...formData };
+    const payload = {  ...formData };
+  
+    try {
+      // Sending the form data to the backend
+      const res = await axios.post(`${process.env.REACT_APP_API_URL}/api/reports`, payload);
+  
+      // Display success message
+      setMessage(res.data.message || "Report submitted!");
+      setFormData({
+        week: "Week 1",
+        hours: "",
+        tasks: "",
+        lessons: "",
+        supervisorComments: "",
+      });
+    } catch (err) {
+      console.error(err);
+      setMessage("Submission failed. Try again.");
+    }
+  };
+  
+
+  return (
+    <div className="a2-form-container">
+      <h2>A.2 - Weekly Progress Report</h2>
+      <form onSubmit={handleSubmit} className="a2-form">
+        <div className="form-row">
+          <label>
+            Logbook Week:
+            <select name="week" value={formData.week} onChange={handleChange}>
+              {Array.from({ length: 15 }, (_, i) => (
+                <option key={i} value={`Week ${i + 1}`}>
+                  Week {i + 1}
+                </option>
+              ))}
+            </select>
+          </label>
+          <label>
+            Number of Hours:
+            <input
+              type="number"
+              name="hours"
+              value={formData.hours}
+              onChange={handleChange}
+              required
+              placeholder="e.g., 12"
+            />
+          </label>
+        </div>
+
+        <div className="form-group">
+          <label>Tasks Performed:</label>
+          <textarea
+            name="tasks"
+            value={formData.tasks}
+            onChange={handleChange}
+            required
+          />
+        </div>
+
+        <div className="form-group">
+          <label>Lessons Learned:</label>
+          <textarea
+            name="lessons"
+            value={formData.lessons}
+            onChange={handleChange}
+            required
+          />
+        </div>
+
+        <div className="form-group">
+          <label>Internship Supervisor Approval & Comments:</label>
+          <textarea
+            name="supervisorComments"
+            value={formData.supervisorComments}
+            onChange={handleChange}
+            placeholder="(Optional) If supervisor is filling directly"
+          />
+        </div>
+
+        <button type="submit" className="submit-button">
+          Submit Report
+        </button>
+      </form>
+      {message && <p className="form-message">{message}</p>}
+    </div>
+  );
+};
+
+export default WeeklyProgressReportForm;
diff --git a/client/src/router.js b/client/src/router.js
index 3664e5fcf..740942425 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -11,6 +11,7 @@ import Layout from "./components/Layout";
 import Home from "./pages/Home";
 import SignUp from "./pages/SignUp";
 import NotFound from "./pages/NotFound";
+import WeeklyProgressReportForm from "./pages/WeeklyProgressReportForm";
 import A3JobEvaluationForm from "./pages/A3JobEvaluationForm";
 import SupervisorDashboard from "./pages/SupervisorDashboard";
 import CoordinatorDashboard from "./pages/CoordinatorDashboard";
@@ -30,10 +31,14 @@ const router = createBrowserRouter([
         path: "signup",
         element: <SignUp />,
       },
+      {
+        path: "weekly-report",
+        element: <WeeklyProgressReportForm />,
+      },
       {
         path: "a1-form",
         element: <A1InternshipRequestForm />,
-      },      
+      },
       {
         path: "evaluation",
         element: <A3JobEvaluationForm />,
@@ -46,9 +51,9 @@ const router = createBrowserRouter([
         path: "coordinator-dashboard",
         element: <CoordinatorDashboard />,
       },
-      // Add more routes as needed
     ],
   },
 ]);
 
+
 export default router;
diff --git a/client/src/utils/emailUtils.js b/client/src/utils/emailUtils.js
index 9ba56af3b..64efd679e 100644
--- a/client/src/utils/emailUtils.js
+++ b/client/src/utils/emailUtils.js
@@ -3,7 +3,7 @@
  */
 
 // Define the API base URL
-const API_BASE_URL = process.env.REACT_APP_API_URL || "http://localhost:5000";
+const API_BASE_URL = process.env.REACT_APP_API_URL;
 
 /**
  * Send an email with custom content
diff --git a/server/.env b/server/.env
index db7ef5551..a7af28870 100644
--- a/server/.env
+++ b/server/.env
@@ -2,8 +2,6 @@
 PORT=5001
 MONGO_URI=mongodb://localhost:27017/IPMS
 
-
-
 # Email Configuration
 EMAIL_HOST=smtp.gmail.com
 EMAIL_PORT=587
@@ -13,4 +11,4 @@ EMAIL_PASSWORD=rmrl msnq kflk uimr
 EMAIL_DEFAULT_SENDER=sep.ipms.spring2025@gmail.com
 
 # Secret
-JWT_SECRET=supersecretkey123
\ No newline at end of file
+JWT_SECRET=supersecretkey123
diff --git a/server/controllers/reportController.js b/server/controllers/reportController.js
new file mode 100644
index 000000000..d14e0ff18
--- /dev/null
+++ b/server/controllers/reportController.js
@@ -0,0 +1,88 @@
+const User = require("../models/User");
+const WeeklyReport = require("../models/WeeklyReport");
+
+/**
+ * Report Controller – handles weekly report submissions and retrieval
+ */
+
+const reportController = {
+  // POST /api/reports
+  createReport: async (req, res) => {
+    try {
+      const {
+        studentId,
+        week,
+        hours,
+        tasks,
+        lessons,
+        supervisorComments
+      } = req.body;
+       
+
+      // Role-check: Only students can submit (based on their ID)
+      // const user = await User.findById(studentId);
+      // if (!user || user.role.toLowerCase() !== "student") {
+      //   return res.status(403).json({
+      //     success: false,
+      //     message: "Only students can submit reports.",
+      //   });
+      // }
+
+      // Basic field validation
+      if (!week || hours === undefined || isNaN(hours) || !tasks || !lessons) {
+        return res.status(400).json({
+          success: false,
+          message: "All required fields must be valid.",
+        });
+      }
+      
+
+      // Save the report
+      const newReport = new WeeklyReport({
+        //studentId,
+        week,
+        hours,
+        tasks,
+        lessons,
+        supervisorComments: supervisorComments || "",
+      });
+      
+
+      await newReport.save();
+
+      res.status(201).json({
+        success: true,
+        message: "Report submitted successfully.",
+      });
+    } catch (error) {
+      console.error("Error in createReport:", error);
+      res.status(500).json({
+        success: false,
+        message: "Internal server error.",
+      });
+    }
+  },
+
+  // GET /api/reports/:userId
+  getReportsByStudent: async (req, res) => {
+    try {
+      const { userId } = req.params;
+
+      const reports = await WeeklyReport.find({ studentId: userId }).sort({
+        createdAt: -1,
+      });
+
+      res.status(200).json({
+        success: true,
+        reports,
+      });
+    } catch (error) {
+      console.error("Error in getReportsByStudent:", error);
+      res
+        .status(500)
+        .json({ success: false, message: "Failed to retrieve reports." });
+    }
+  },
+};
+
+module.exports = reportController;
diff --git a/server/index.js b/server/index.js
index d431a6aaf..8b71ee0cc 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,3 +1,5 @@
+const weeklyReportRoutes = require("./routes/weeklyReportRoutes");
+
 const express = require("express");
 const mongoose = require("mongoose");
 const cors = require("cors");
@@ -15,6 +17,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());
@@ -70,7 +73,7 @@ app.get("/api/message", (req, res) => {
 app.use("/api/email", emailRoutes);
 app.use("/api/token", tokenRoutes);
 app.use("/api", approvalRoutes);
-
+app.use("/api/reports", weeklyReportRoutes);
 app.post("/api/createUser", async (req, res) => {
   try {
     const { userName, email, password, role } = req.body;
diff --git a/server/models/WeeklyReport.js b/server/models/WeeklyReport.js
new file mode 100644
index 000000000..4c60e2aff
--- /dev/null
+++ b/server/models/WeeklyReport.js
@@ -0,0 +1,41 @@
+const mongoose = require("mongoose");
+
+const weeklyReportSchema = new mongoose.Schema({
+  // studentId: {
+  //   type: mongoose.Schema.Types.ObjectId,
+  //   ref: "User",
+  //   required: true,
+  // },
+
+  week: {
+    type: String,
+    required: true,
+  },
+
+  hours: {
+    type: Number,
+    required: true,
+  },
+
+  tasks: {
+    type: String,
+    required: true,
+  },
+
+  lessons: {
+    type: String,
+    required: true,
+  },
+
+  supervisorComments: {
+    type: String,
+    default: "",
+  },
+
+  submittedAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+module.exports = mongoose.model("WeeklyReport", weeklyReportSchema);
diff --git a/server/routes/weeklyReportRoutes.js b/server/routes/weeklyReportRoutes.js
new file mode 100644
index 000000000..ecc133dfa
--- /dev/null
+++ b/server/routes/weeklyReportRoutes.js
@@ -0,0 +1,13 @@
+const express = require("express");
+const router = express.Router();
+const reportController = require("../controllers/reportController");
+
+// Routing weekly report actions
+
+// POST - Submit a new weekly report
+router.post("/", reportController.createReport);
+
+// GET - Fetch all reports by a specific student
+router.get("/:userId", reportController.getReportsByStudent);
+
+module.exports = router;