Fix clearn up expired code

merge

README.md

@@ -1,9 +1,6 @@
-### Ground rules
+### Some ground rules
-
+1. Add both node_modules from Slient and Server to your ```gitignore``` file
-<img class='fullimage' alt='Fin-Track Application Screenshot' src='./assets/CampusPlug.png'/>
+2. Make a brach with the following naming conventionp, prefix it with your name ```Your-Name Branch-Name```.
-
-1. Add both node_modules from Client and Server to your ```gitignore``` file
-2. Make a brach with the following naming convention, prefix it with your name ```Your-Name Branch-Name```.
 ---
 
 ### Frontend
@@ -22,19 +19,24 @@
 ```
 ---
 
-### Recommendation system
+### Recommendation
-1. Install the dependencies `pip install scikit-learn numpy mysql.connector flask flask-cors`
+1. `cd recommendation-engine` into the dir and then type command
-2. `cd recommendation-engine` into the dir and then type command
 ```Bash
     1. python3 server.py    #Start The Server
 ```
 ---
+### Recommendation system
+1. Install the dependencies
+```Bash
+  pip install mysql.connector
+```
+
 
 ### Database
 1. MySql Version 9.2.0
 2. To Create the DataBase use the command bellow:
 ```Bash
     1. mysql -u root
-    2. \. PathTo/Schema.sql
+    2. \. PathToYour/Schema.sql
-    3. \. PathTo/Init-Data.sql
+    3. \. PathToYour/Init-Data.sql
 ```

backend/controllers/category.js

@@ -7,7 +7,7 @@ exports.getAllCategoriesWithPagination = async (req, res) => {
   try {
     const [data, _] = await db.execute(
       "SELECT * FROM Category C ORDER BY C.CategoryID ASC LIMIT ? OFFSET ?",
-      [limit.toString(), offset.toString()]
+      [limit.toString(), offset.toString()],
     );
 
     const [result] = await db.execute("SELECT COUNT(*) AS count FROM Category");
@@ -24,7 +24,7 @@ exports.addCategory = async (req, res) => {
   try {
     const [result] = await db.execute(
       "INSERT INTO Category (Name) VALUES (?)",
-      [name]
+      [name],
     );
     res.json({ message: "Adding new category successfully!" });
   } catch (error) {
@@ -34,23 +34,15 @@ exports.addCategory = async (req, res) => {
 
 exports.removeCategory = async (req, res) => {
   const { id } = req.params;
-  try {
-    if (id == "1") throw Error("You're not allowed to delete this category!");
-    const [updateResult] = await db.execute(
-      "UPDATE Product SET CategoryID = 1 WHERE CategoryID = ?",
-      [id]
-    );
 
+  try {
     const [result] = await db.execute(
       `DELETE FROM Category WHERE CategoryID = ?`,
-      [id]
+      [id],
     );
-
     res.json({ message: "Delete category successfully!" });
   } catch (error) {
-    res.json({
+    res.json({ error: "Cannot remove category from database!" });
-      error: error.message || "Cannot remove category from database!",
-    });
   }
 };
 

backend/controllers/product.js

@@ -41,7 +41,12 @@ exports.removeProduct = async (req, res) => {
     await db.execute(`DELETE FROM Image_URL WHERE ProductID = ?`, [productID]);
     await db.execute(`DELETE FROM History WHERE ProductID = ?`, [productID]);
     await db.execute(`DELETE FROM Favorites WHERE ProductID = ?`, [productID]);
-
+    await db.execute(`DELETE FROM Product_Category WHERE ProductID = ?`, [
+      productID,
+    ]);
+    await db.execute(`DELETE FROM Product_Category WHERE ProductID = ?`, [
+      productID,
+    ]);
     await db.execute(`DELETE FROM Transaction WHERE ProductID = ?`, [
       productID,
     ]);
@@ -386,9 +391,9 @@ exports.getProductWithPagination = async (req, res) => {
   }
 };
 
-exports.removeAnyProduct = async (req, res) => {
+exports.removeProduct = async (req, res) => {
   const { id } = req.params;
-  console.log(id);
+
   try {
     const [result] = await db.execute(
       `DELETE FROM Product WHERE ProductID = ?`,

backend/controllers/transaction.js

@@ -11,11 +11,11 @@ exports.getTransactionWithPagination = async (req, res) => {
 			      LEFT JOIN User U ON T.UserID = U.UserID
             LEFT JOIN Product P ON T.ProductID = P.ProductID
             ORDER BY T.TransactionID ASC LIMIT ? OFFSET ?`,
-      [limit.toString(), offset.toString()],
+      [limit.toString(), offset.toString()]
     );
 
     const [result] = await db.execute(
-      "SELECT COUNT(*) AS count FROM Transaction",
+      "SELECT COUNT(*) AS count FROM Transaction"
     );
     const { count: total } = result[0];
     return res.json({ data, total });
@@ -29,7 +29,7 @@ exports.removeTransation = async (req, res) => {
   try {
     const [result] = await db.execute(
       "DELETE FROM Transaction WHERE TransactionID = ?;",
-      [id.toString()],
+      [id.toString()]
     );
     return res.json({ message: "Remove transaction successfully!" });
   } catch (error) {
@@ -38,189 +38,3 @@ exports.removeTransation = async (req, res) => {
       .json({ error: "Cannot remove transactions from database!" });
   }
 };
-// Create a new transaction
-exports.createTransaction = async (req, res) => {
-  const { userID, productID, date, paymentStatus } = req.body;
-
-  try {
-    // Check if the transaction already exists for the same user and product
-    const [existingTransaction] = await db.execute(
-      `SELECT TransactionID FROM Transaction WHERE UserID = ? AND ProductID = ?`,
-      [userID, productID],
-    );
-
-    if (existingTransaction.length > 0) {
-      return res.status(400).json({
-        success: false,
-        message: "Transaction already exists for this user and product",
-      });
-    }
-
-    // Format the date
-    const formattedDate = new Date(date)
-      .toISOString()
-      .slice(0, 19)
-      .replace("T", " ");
-
-    // Insert the new transaction
-    const [result] = await db.execute(
-      `INSERT INTO Transaction (UserID, ProductID, Date, PaymentStatus)
-       VALUES (?, ?, ?, ?)`,
-      [userID, productID, formattedDate, paymentStatus],
-    );
-
-    res.json({
-      success: true,
-      message: "Transaction created successfully",
-      transactionID: result.insertId,
-    });
-  } catch (error) {
-    console.error("Error creating transaction:", error);
-    res.status(500).json({ error: "Could not create transaction" });
-  }
-};
-
-// Get all transactions for a given product
-exports.getTransactionsByProduct = async (req, res) => {
-  const { productID } = req.params;
-
-  try {
-    const [transactions] = await db.execute(
-      `SELECT
-         T.TransactionID,
-         T.UserID,
-         T.ProductID,
-         T.Date,
-         T.PaymentStatus,
-         P.Name AS ProductName,
-         MIN(I.URL) AS Image_URL
-       FROM Transaction T
-       JOIN Product P ON T.ProductID = P.ProductID
-       JOIN Image_URL I ON I.ProductID = T.ProductID
-       GROUP BY T.TransactionID, T.UserID, T.ProductID, T.Date, T.PaymentStatus, P.Name`,
-    );
-
-    res.json({
-      success: true,
-      transactions,
-    });
-  } catch (error) {
-    console.error("Error fetching transactions by product:", error);
-    res.status(500).json({ error: "Could not retrieve transactions" });
-  }
-};
-
-// Get all transactions for a given user
-exports.getTransactionsByUser = async (req, res) => {
-  const { userID } = req.body;
-
-  try {
-    const [transactions] = await db.execute(
-      `SELECT
-         T.TransactionID,
-         T.UserID,
-         T.ProductID,
-         T.Date,
-         T.PaymentStatus,
-         P.Name AS ProductName,
-         MIN(I.URL) AS Image_URL
-       FROM Transaction T
-       JOIN Product P ON T.ProductID = P.ProductID
-       JOIN Image_URL I ON I.ProductID = T.ProductID
-       WHERE T.UserID = ?
-   GROUP BY
-   T.TransactionID,
-   T.UserID,
-   T.ProductID,
-   T.Date,
-   T.PaymentStatus,
-   P.Name;
-       `,
-      [userID],
-    );
-
-    res.json({
-      success: true,
-      transactions,
-    });
-  } catch (error) {
-    console.error("Error fetching transactions by user:", error);
-    res.status(500).json({ error: "Could not retrieve transactions" });
-  }
-};
-
-// Get all transactions in the system
-exports.getAllTransactions = async (req, res) => {
-  try {
-    const [transactions] = await db.execute(
-      `SELECT
-         T.TransactionID,
-         T.UserID,
-         T.ProductID,
-         T.Date,
-         T.PaymentStatus,
-         P.Name AS ProductName,
-         MIN(I.URL) AS Image_URL
-       FROM Transaction T
-       JOIN Product P ON T.ProductID = P.ProductID
-      JOIN Image_URL I ON P.ProductID = I.ProductID
-       GROUP BY T.TransactionID, T.UserID, T.ProductID, T.Date, T.PaymentStatus, P.Name`,
-    );
-
-    res.json({
-      success: true,
-      transactions,
-    });
-  } catch (error) {
-    console.error("Error fetching all transactions:", error);
-    res.status(500).json({ error: "Could not retrieve transactions" });
-  }
-};
-
-// Delete a transaction
-exports.deleteTransaction = async (req, res) => {
-  const { transactionID } = req.body;
-
-  try {
-    const [result] = await db.execute(
-      `DELETE FROM Transaction
-       WHERE TransactionID = ?`,
-      [transactionID],
-    );
-
-    if (result.affectedRows === 0) {
-      return res
-        .status(404)
-        .json({ success: false, message: "Transaction not found" });
-    }
-
-    res.json({
-      success: true,
-      message: "Transaction deleted successfully",
-    });
-  } catch (error) {
-    console.error("Error deleting transaction:", error);
-    res.status(500).json({ error: "Could not delete transaction" });
-  }
-};
-
-exports.updateTransactionStatus = async (req, res) => {
-  const { transactionID } = req.body;
-
-  try {
-    const [result] = await db.execute(
-      `UPDATE Transaction
-      SET PaymentStatus = 'completed'
-      WHERE TransactionID = ?;`,
-      [transactionID],
-    );
-
-    res.json({
-      success: true,
-      message: "Transaction updated successfully",
-    });
-  } catch (error) {
-    console.error("Error deleting transaction:", error);
-    res.status(500).json({ error: "Could not delete transaction" });
-  }
-};

backend/index.js

@@ -9,9 +9,7 @@ const searchRouter = require("./routes/search");
 const recommendedRouter = require("./routes/recommendation");
 const history = require("./routes/history");
 const review = require("./routes/review");
-
 const categoryRouter = require("./routes/category");
-
 const transactionRouter = require("./routes/transaction");
 
 const { generateEmailTransporter } = require("./utils/mail");
@@ -46,9 +44,9 @@ app.use("/api/search", searchRouter);
 app.use("/api/engine", recommendedRouter);
 app.use("/api/history", history);
 app.use("/api/review", review);
-app.use("/api/transaction", transactionRouter);
 app.use("/api/category", categoryRouter);
 app.use("/api/transaction", transactionRouter);
+app.use("/api/category", categoryRouter);
 
 // Set up a scheduler to run cleanup every hour
 clean_up_time = 30 * 60 * 1000;

backend/routes/product.js

@@ -8,7 +8,6 @@ const {
   getProductById,
   addProduct,
   removeProduct,
-  removeAnyProduct,
   getProductWithPagination,
   myProduct,
   updateProduct,
@@ -31,7 +30,7 @@ router.post("/addProduct", addProduct);
 router.get("/getProduct", getAllProducts);
 
 //Remove product
-router.delete("/any/:id", removeAnyProduct);
+router.delete("/:id", removeProduct);
 //Get products with pagination
 router.get("/getProductWithPagination", getProductWithPagination);
 

backend/routes/transaction.js

@@ -1,29 +1,11 @@
-// routes/transaction.js
 const express = require("express");
 const {
-  createTransaction,
-  getTransactionsByProduct,
-  getTransactionsByUser,
-  getAllTransactions,
-  deleteTransaction,
   getTransactionWithPagination,
   removeTransation,
-  updateTransactionStatus,
 } = require("../controllers/transaction");
+
 const router = express.Router();
 
-// logging middleware
-router.use((req, res, next) => {
-  console.log(`Incoming ${req.method} ${req.originalUrl}`);
-  next();
-});
-
-router.post("/createTransaction", createTransaction);
-router.get("/getTransactionsByProduct/:productID", getTransactionsByProduct);
-router.post("/getTransactionsByUser", getTransactionsByUser);
-router.post("/updateStatus", updateTransactionStatus);
-router.post("/getAllTransactions", getAllTransactions);
-router.delete("/deleteTransaction", deleteTransaction);
 router.get("/getTransactions", getTransactionWithPagination);
 router.delete("/:id", removeTransation);
 

backend/utils/database.js

@@ -4,6 +4,7 @@ const pool = mysql.createPool({
   host: "localhost",
   user: "root",
   database: "Marketplace",
+  password: "12345678",
 });
 
 // const pool = mysql.createPool(

backend/utils/helper.js

@@ -1,4 +1,5 @@
 const { generateEmailTransporter } = require("./mail");
+const db = require("../utils/database");
 
 // Helper function to send email
 async function sendVerificationEmail(email, verificationCode) {
@@ -17,18 +18,17 @@ async function sendVerificationEmail(email, verificationCode) {
 }
 
 // Clean up expired verification codes (run this periodically)
-function cleanupExpiredCodes() {
+const cleanupExpiredCodes = () => {
-  db.query(
+  db.execute(
-    "DELETE FROM AuthVerification WHERE Date < DATE_SUB(NOW(), INTERVAL 15 MINUTE) AND Authenticated = 0",
+    "DELETE FROM AuthVerification WHERE Date < DATE_SUB(NOW(), INTERVAL 15 MINUTE) AND Authenticated = 0"
-    (err, result) => {
+  )
-      if (err) {
+    .then((res) => {
+      console.log(`Cleaned up expired verification codes`);
+    })
+    .catch((err) => {
       console.error("Error cleaning up expired codes:", err);
-      } else {
+    });
-        console.log(`Cleaned up ${result} expired verification codes`);
+};
-      }
-    }
-  );
-}
 
 const checkDatabaseConnection = async (db) => {
   try {

frontend/src/App.jsx

@@ -4,7 +4,6 @@ import {
   Routes,
   Route,
   Navigate,
-  useLocation,
 } from "react-router-dom";
 import Navbar from "./components/Navbar";
 import Home from "./pages/Home";
@@ -13,10 +12,14 @@ import Selling from "./pages/Selling";
 import Transactions from "./pages/Transactions";
 import Favorites from "./pages/Favorites";
 import ProductDetail from "./pages/ProductDetail";
-import SearchPage from "./pages/SearchPage";
+import SearchPage from "./pages/SearchPage"; // Make sure to import the SearchPage
-import Dashboard from "./pages/Dashboard"; // The single consolidated dashboard component
+import Dashboard from "./pages/Dashboard";
+import UserDashboard from "./pages/UserDashboard";
+import ProductDashboard from "./pages/ProductDashboard";
 import DashboardNav from "./components/DashboardNav";
+import CategoryDashboard from "./pages/CategoryDashboard";
 import { verifyIsAdmin } from "./api/admin";
+import TransactionDashboard from "./pages/TransactionDashboard";
 
 function App() {
   // Authentication state - initialize from localStorage if available
@@ -39,18 +42,6 @@ function App() {
     useState(false);
   const [recommendations, setRecommendations] = useState([]);
 
-  // Admin state
-  const [isAdmin, setIsAdmin] = useState(false);
-  const [showAdminDashboard, setShowAdminDashboard] = useState(false);
-
-  // Check URL to determine if we're in admin mode
-  useEffect(() => {
-    // If URL contains /admin, set showAdminDashboard to true
-    if (window.location.pathname.includes("/admin")) {
-      setShowAdminDashboard(true);
-    }
-  }, []);
-
   // New verification states
   const [verificationStep, setVerificationStep] = useState("initial"); // 'initial', 'code-sent', 'verifying'
   const [tempUserData, setTempUserData] = useState(null);
@@ -86,11 +77,59 @@ function App() {
 
   // Generate product recommendations
   const generateProductRecommendations = async () => {
+    try {
       setIsGeneratingRecommendations(true);
+
+      // Add a short delay to simulate calculation time
       await new Promise((resolve) => setTimeout(resolve, 500));
+
+      console.log("Generating product recommendations for user:", user.ID);
+
+      // Make API call to get recommendations
+      const response = await fetch(
+        "http://localhost:3030/api/recommendations/generate",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            userId: user.ID,
+          }),
+        },
+      );
+
+      if (!response.ok) {
+        throw new Error("Failed to generate recommendations");
+      }
+
+      const result = await response.json();
+
+      if (result.success) {
+        console.log(
+          "Recommendations generated successfully:",
+          result.recommendations,
+        );
+        setRecommendations(result.recommendations);
+
+        // Store recommendations in session storage for access across the app
+        sessionStorage.setItem(
+          "userRecommendations",
+          JSON.stringify(result.recommendations),
+        );
+      } else {
+        console.error("Error generating recommendations:", result.message);
+      }
+    } catch (err) {
+      console.error("Error generating product recommendations:", err);
+    } finally {
       setIsGeneratingRecommendations(false);
+    }
   };
 
+  const [isAdmin, setIsAdmin] = useState(false);
+  const [showAdminDashboard, setShowAdminDashboard] = useState(false);
+
   useEffect(() => {
     const userInfo = sessionStorage.getItem("user")
       ? JSON.parse(sessionStorage.getItem("user"))
@@ -103,14 +142,9 @@ function App() {
 
   const handleShowAdminDashboard = () => {
     setShowAdminDashboard(true);
-    // Update URL without reloading page
-    window.history.pushState({}, "", "/admin");
   };
-
   const handleCloseAdminDashboard = () => {
     setShowAdminDashboard(false);
-    // Update URL without reloading page
-    window.history.pushState({}, "", "/");
   };
 
   // Send verification code
@@ -211,6 +245,7 @@ function App() {
   // Complete signup
   const completeSignUp = async (userData) => {
     try {
+      setIsLoading(true);
       setError("");
 
       console.log("Completing signup for:", userData.email);
@@ -246,8 +281,7 @@ function App() {
 
         // Set authenticated user
         setUser(newUser);
-        setIsSignUp(false);
+        setIsAuthenticated(true);
-        //setIsAuthenticated(true);
 
         // Save to localStorage to persist across refreshes
         sessionStorage.setItem("isAuthenticated", "true");
@@ -293,11 +327,12 @@ function App() {
       setError("Email and password are required");
       setIsLoading(false);
       return;
-    } else if (!formValues.email.endsWith("@ucalgary.ca")) {
-      setError("Please use your UCalgary email address (@ucalgary.ca)");
-      setIsLoading(false);
-      return;
     }
+    // else if (!formValues.email.endsWith("@ucalgary.ca")) {
+    //   setError("Please use your UCalgary email address (@ucalgary.ca)");
+    //   setIsLoading(false);
+    //   return;
+    // }
     try {
       if (isSignUp) {
         // Handle Sign Up with verification
@@ -401,7 +436,6 @@ function App() {
     setVerificationStep("initial");
     setTempUserData(null);
     setRecommendations([]);
-    setShowAdminDashboard(false);
 
     // Clear localStorage
     sessionStorage.removeItem("user");
@@ -471,7 +505,7 @@ function App() {
   // Loading overlay component
   const LoadingOverlay = () => (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="animate-spin rounded-full h-12 w-12 border-4 border-emerald-600 border-t-transparent"></div>
+      <div className="animate-spin rounded-full h-12 w-12 border-4 border-green-500 border-t-transparent"></div>
     </div>
   );
 
@@ -538,7 +572,7 @@ function App() {
                       id="name"
                       name="name"
                       placeholder="Enter your name"
-                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                       required={isSignUp}
                     />
                   </div>
@@ -557,7 +591,7 @@ function App() {
                       id="ucid"
                       name="ucid"
                       placeholder="1234567"
-                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                       required={isSignUp}
                     />
                   </div>
@@ -575,7 +609,7 @@ function App() {
                     id="email"
                     name="email"
                     placeholder="your.email@ucalgary.ca"
-                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                     required
                   />
                 </div>
@@ -593,7 +627,7 @@ function App() {
                       id="phone"
                       name="phone"
                       placeholder="+1(123)456 7890"
-                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                       required={isSignUp}
                     />
                   </div>
@@ -612,7 +646,7 @@ function App() {
                       id="address"
                       name="address"
                       placeholder="Your address"
-                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                      className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                       required={isSignUp}
                     />
                   </div>
@@ -634,7 +668,7 @@ function App() {
                         ? "Create a secure password"
                         : "Enter your password"
                     }
-                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                     required
                   />
                 </div>
@@ -643,7 +677,7 @@ function App() {
                   <button
                     type="submit"
                     disabled={isLoading}
-                    className="w-full px-6 py-2 text-base font-medium text-white bg-emerald-600 hover:bg-emerald-700 focus:outline-none focus:ring-2 focus:ring-emerald-400 focus:ring-offset-2 transition-colors disabled:bg-emerald-300"
+                    className="w-full px-6 py-2 text-base font-medium text-white bg-green-500 hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-400 focus:ring-offset-2 transition-colors disabled:bg-green-300"
                   >
                     {isLoading
                       ? "Please wait..."
@@ -670,7 +704,7 @@ function App() {
                     id="verificationCode"
                     name="verificationCode"
                     placeholder="Enter the 6-digit code"
-                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-emerald-600 focus:ring-1 focus:ring-emerald-600"
+                    className="w-full px-4 py-2 border border-gray-300 bg-white text-gray-800 focus:outline-none focus:border-green-500 focus:ring-1 focus:ring-green-500"
                     required
                   />
                   <p className="mt-1 text-xs text-gray-500">
@@ -682,7 +716,7 @@ function App() {
                   <button
                     type="submit"
                     disabled={isLoading}
-                    className="w-full px-6 py-2 text-base font-medium text-white bg-emerald-600 hover:bg-emerald-700 focus:outline-none focus:ring-2 focus:ring-emerald-400 focus:ring-offset-2 transition-colors disabled:bg-emerald-300"
+                    className="w-full px-6 py-2 text-base font-medium text-white bg-green-500 hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-400 focus:ring-offset-2 transition-colors disabled:bg-green-300"
                   >
                     {isLoading ? "Please wait..." : "Verify Code"}
                   </button>
@@ -700,7 +734,7 @@ function App() {
                     type="button"
                     onClick={handleResendCode}
                     disabled={isLoading}
-                    className="text-sm text-emerald-600 hover:text-emerald-700"
+                    className="text-sm text-green-500 hover:text-green-700"
                   >
                     Resend code
                   </button>
@@ -718,7 +752,7 @@ function App() {
                   <button
                     onClick={toggleAuthMode}
                     type="button"
-                    className="text-emerald-600 font-medium hover:text-emerald-700"
+                    className="text-green-500 font-medium hover:text-green-700"
                   >
                     {isSignUp ? "Sign in" : "Sign up"}
                   </button>
@@ -740,21 +774,31 @@ function App() {
     return children;
   };
 
+  // If user is admin, show admin naviagtion
+  if (showAdminDashboard) {
     return (
       <Router>
-      {/* If admin dashboard should be shown */}
-      {showAdminDashboard ? (
         <div className="flex">
           <DashboardNav handleCloseAdminDashboard={handleCloseAdminDashboard} />
           <Routes>
-            {/* Single admin route for consolidated dashboard */}
+            {/* Admin routes */}
-            <Route path="/admin/*" element={<Dashboard />} />
+            <Route path="/admin" element={<Dashboard />} />
-            {/* Any other path in admin mode should go to dashboard */}
+            <Route path="/admin/user" element={<UserDashboard />} />
-            <Route path="*" element={<Navigate to="/admin" />} />
+            <Route path="/admin/product" element={<ProductDashboard />} />
+            <Route path="/admin/category" element={<CategoryDashboard />} />
+            <Route
+              path="/admin/transaction"
+              element={<TransactionDashboard />}
+            />
+            <Route path="*" element={<Dashboard />} />
           </Routes>
         </div>
-      ) : (
+      </Router>
-        /* Normal user interface */
+    );
+  }
+
+  return (
+    <Router>
       <div className="min-h-screen bg-gray-50">
         {/* Show loading overlay when generating recommendations */}
         {isGeneratingRecommendations && <LoadingOverlay />}
@@ -772,9 +816,7 @@ function App() {
           {/* Public routes */}
           <Route
             path="/login"
-              element={
+            element={isAuthenticated ? <Navigate to="/" /> : <LoginComponent />}
-                isAuthenticated ? <Navigate to="/" /> : <LoginComponent />
-              }
           />
           {/* Protected routes */}
           <Route
@@ -852,7 +894,6 @@ function App() {
           />
         </Routes>
       </div>
-      )}
     </Router>
   );
 }

frontend/src/api/admin.js

@@ -1,20 +1,77 @@
-// api.js
+import client from "./client";
 
-import axios from "axios";
+export const getUsers = async (page, limit = 10) => {
-
-const client = axios.create({
-  baseURL: "http://localhost:3030/api",
-});
-
-// Users
-export const getUsers = async (page = 1, limit = 10) => {
   try {
     const { data } = await client.get(
       `/user/getUserWithPagination?page=${page}&limit=${limit}`
     );
     return { users: data.users, total: data.total };
   } catch (error) {
-    return handleError(error);
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const getProducts = async (page, limit = 10) => {
+  try {
+    const { data } = await client.get(
+      `/product/getProductWithPagination?limit=${limit}&page=${page}`
+    );
+
+    return { products: data.products, total: data.totalProd };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const getCategories = async (page, limit = 10) => {
+  try {
+    const { data } = await client.get(
+      `/category/getCategories?page=${page}&limit=${limit}`
+    );
+    return { data: data.data, total: data.total };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const getTransactions = async (page, limit = 10) => {
+  try {
+    const { data } = await client.get(
+      `/transaction/getTransactions?limit=${limit}&page=${page}`
+    );
+    return { transactions: data.data, total: data.total };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const addCategory = async (name) => {
+  try {
+    const { data } = await client.post(`/category/addCategory`, { name: name });
+    return { message: data.message };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const removeCategory = async (id) => {
+  try {
+    const { data } = await client.delete(`/category/${id}`);
+    return { message: data.message };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
   }
 };
 
@@ -23,7 +80,20 @@ export const removeUser = async (id) => {
     const { data } = await client.post(`/user/delete`, { userId: id });
     return { message: data.message };
   } catch (error) {
-    return handleError(error);
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
+  }
+};
+
+export const removeProduct = async (id) => {
+  try {
+    const { data } = await client.delete(`/product/${id}`);
+    return { message: data.message };
+  } catch (error) {
+    const { response } = error;
+    if (response?.data) return response.data;
+    return { error: error.message || error };
   }
 };
 
@@ -32,71 +102,9 @@ export const verifyIsAdmin = async (id) => {
     const { data } = await client.get(`/user/isAdmin/${id}`);
     return { isAdmin: data.isAdmin };
   } catch (error) {
-    return handleError(error);
+    const { response } = error;
-  }
+    if (response?.data) return response.data;
-};
+    return { error: error.message || error };
-
-// Products
-export const getProducts = async (page = 1, limit = 10) => {
-  try {
-    const { data } = await client.get(
-      `/product/getProductWithPagination?limit=${limit}&page=${page}`
-    );
-    return { products: data.products, total: data.totalProd };
-  } catch (error) {
-    return handleError(error);
-  }
-};
-
-export const removeProduct = async (id) => {
-  try {
-    const { data } = await client.delete(`/product/any/${id}`);
-    return { message: data.message };
-  } catch (error) {
-    return handleError(error);
-  }
-};
-
-// Categories
-export const getCategories = async (page, limit = 10) => {
-  try {
-    const { data } = await client.get(
-      `/category/getCategories?page=${page}&limit=${limit}`
-    );
-    return { data: data.data, total: data.total };
-  } catch (error) {
-    return handleError(error);
-  }
-};
-
-export const addCategory = async (name) => {
-  try {
-    const { data } = await client.post(`/category/addCategory`, { name });
-    return { message: data.message };
-  } catch (error) {
-    return handleError(error);
-  }
-};
-
-export const removeCategory = async (id) => {
-  try {
-    const { data } = await client.delete(`/category/${id}`);
-    if (data.error) throw Error(data.error);
-    return { message: data.message };
-  } catch (error) {
-    return handleError(error);
-  }
-};
-
-// Transactions
-export const getTransactions = async (page = 1, limit = 10) => {
-  try {
-    const { data } = await client.get(
-      `/transaction/getTransactions?limit=${limit}&page=${page}`
-    );
-    return { transactions: data.data, total: data.total };
-  } catch (error) {
-    return handleError(error);
   }
 };
 
@@ -105,16 +113,8 @@ export const removeTransaction = async (id) => {
     const { data } = await client.delete(`/transaction/${id}`);
     return { message: data.message };
   } catch (error) {
-    return handleError(error);
-  }
-};
-
-// Shared Error Handler
-const handleError = (error) => {
     const { response } = error;
     if (response?.data) return response.data;
-  return alert(error.message || error);
+    return { error: error.message || error };
+  }
 };
-
-// Optional: export client if you want to use it elsewhere
-export default client;

frontend/src/api/client.js

@@ -0,0 +1,3 @@
+import axios from "axios";
+const client = axios.create({ baseURL: "http://localhost:3030/api" });
+export default client;

frontend/src/components/CategoryForm.jsx

@@ -22,7 +22,7 @@ export default function CategoryForm({ visible, onAddCategory }) {
           .classList.remove("opacity-0", "bg-red-200", "text-red-500");
         document
           .getElementById("noti")
-          .classList.add("bg-emerald-200", "text-emerald-800");
+          .classList.add("bg-green-200", "text-green-800");
         document.getElementById("noti").innerHTML = `${message.message}`;
         setCategory("");
         onAddCategory();
@@ -42,18 +42,18 @@ export default function CategoryForm({ visible, onAddCategory }) {
 
   return (
     <form onSubmit={handleSubmit} action="" className="flex p-2 items-center">
-      <label htmlFor="category" className="text-emerald-700">
+      <label htmlFor="category" className="text-green-700">
         Category:
       </label>
       <input
         type="text"
-        className="border border-emerald-700 ml-2 rounded-sm focus:bg-emerald-100 text-emerald-900"
+        className="border border-green-700 ml-2 rounded-sm focus:bg-green-100 text-green-900"
         name="category"
         id="category"
         onChange={handleChange}
         value={category}
       />
-      <button type="submit" className="text-2xl pl-1 text-emerald-700">
+      <button type="submit" className="text-2xl pl-1 text-green-700">
         <MdAddBox className="text-3xl" />
       </button>
       <p

frontend/src/components/DashboardNav.jsx

@@ -1,16 +1,98 @@
+import { Link, NavLink } from "react-router-dom";
+import { FaUserTag } from "react-icons/fa";
+import { FaBoxArchive } from "react-icons/fa6";
+import { MdOutlineCategory } from "react-icons/md";
 import { FaArrowLeft } from "react-icons/fa";
+import { FaMoneyBillTransfer } from "react-icons/fa6";
 
 export default function DashboardNav({ handleCloseAdminDashboard }) {
+  const handleClick = () => {
+    handleCloseAdminDashboard();
+  };
+
   return (
-    <div className="w-48 min-w-[12rem] bg-gray-100 text-emerald-600 flex flex-col p-4 shadow-md">
+    <div>
-      <h2 className="text-lg font-semibold mb-4">Admin Dashboard</h2>
+      <div className="w-3xs h-screen bg-green-700 border border-green-700">
-      <button
+        <ul>
-        onClick={handleCloseAdminDashboard}
+          <li>
-        className="flex items-center gap-2 text-sm font-medium hover:text-emerald-700 underline underline-offset-4 transition"
+            <div className="flex-shrink-0 p-6 bg-green-200">
+              <Link to="/admin" className="flex items-center">
+                <img
+                  src="/icon/icon-512.png"
+                  alt="Campus Plug"
+                  className="h-8 px-2 "
+                />
+                <span className="hidden md:block text-green-700 font-bold text-2xl">
+                  Campus Plug
+                </span>
+              </Link>
+            </div>
+          </li>
+          <li className="w-fit pl-10">
+            <NavLink
+              to="/admin/user"
+              className={({ isActive }) =>
+                (isActive
+                  ? " text-green-400"
+                  : "text-white transition-all hover:text-green-200") +
+                " flex items-center px-5 text-lg pt-5 "
+              }
             >
-        <FaArrowLeft className="text-xs mt-[1px]" />
+              <FaUserTag />
-        Back to User Page
+              <span className="pl-3">Users</span>
-      </button>
+            </NavLink>
+          </li>
+          <li className="w-fit pl-10">
+            <NavLink
+              to="/admin/product"
+              className={({ isActive }) =>
+                (isActive
+                  ? "text-green-400"
+                  : "text-white transition-all hover:text-green-200") +
+                " flex items-center px-5 text-lg pt-5"
+              }
+            >
+              <FaBoxArchive />
+              <span className="pl-3">Products</span>
+            </NavLink>
+          </li>
+          <li className="w-fit pl-10">
+            <NavLink
+              to="/admin/category"
+              className={({ isActive }) =>
+                (isActive
+                  ? "text-green-400"
+                  : "text-white transition-all hover:text-green-200") +
+                " flex items-center px-5 text-lg pt-5"
+              }
+            >
+              <MdOutlineCategory />
+              <span className="pl-3">Categories</span>
+            </NavLink>
+          </li>
+          <li className="w-fit pl-10">
+            <NavLink
+              to="/admin/transaction"
+              className={({ isActive }) =>
+                (isActive
+                  ? "text-green-400"
+                  : "text-white transition-all hover:text-green-200") +
+                " flex items-center px-5 text-lg pt-5"
+              }
+            >
+              <FaMoneyBillTransfer />
+              <span className="pl-3">Transaction</span>
+            </NavLink>
+          </li>
+        </ul>
+        <div
+          onClick={handleClick}
+          className=" text-center my-8 underline text-white underline-offset-4 flex justify-center items-center hover:cursor-pointer h-fit w-fit mx-auto hover:text-green-200 transition"
+        >
+          <FaArrowLeft className="text-sm mx-2 mt-1" />
+          <span>Go back to user page</span>
+        </div>
+      </div>
     </div>
   );
 }

frontend/src/components/FloatingAlert.jsx

@@ -11,7 +11,7 @@ const FloatingAlert = ({ message, onClose, duration = 3000 }) => {
   }, [onClose, duration]);
 
   return (
-    <div className="fixed top-4 left-1/2 transform -translate-x-1/2 bg-emerald-600 text-white px-4 py-2 rounded-xl shadow-lg z-50 text-center">
+    <div className="fixed top-4 left-1/2 transform -translate-x-1/2 bg-emerald-500 text-white px-4 py-2 rounded-xl shadow-lg z-50 text-center">
       {message}
     </div>
   );

frontend/src/components/Navbar.jsx

@@ -35,7 +35,7 @@ const Navbar = ({ onLogout, userName, isAdmin, handleShowAdminDashboard }) => {
                 alt="Campus Plug"
                 className="h-8 px-2"
               />
-              <span className="hidden md:block text-emerald-700 font-bold text-xl">
+              <span className="hidden md:block text-emerald-600 font-bold text-xl">
                 Campus Plug
               </span>
             </Link>

frontend/src/components/Pagination.jsx

@@ -32,7 +32,7 @@ export default function Pagination({ pageNum, onChange }) {
               onClick={() => {
                 handleTogglePage("previous");
               }}
-              className=" flex items-center justify-center px-3 h-8 ms-0 leading-tight border-e-0 border-gray-300 rounded-s-lg hover:bg-gray-100 text-white bg-emerald-700 border border-gray-300 hover:bg-emerald-700 hover:text-white"
+              className=" flex items-center justify-center px-3 h-8 ms-0 leading-tight border-e-0 border-gray-300 rounded-s-lg hover:bg-gray-100 text-white bg-green-700 border border-gray-300 hover:bg-green-600 hover:text-white"
             >
               <span className="sr-only">Previous</span>
               <svg
@@ -56,9 +56,9 @@ export default function Pagination({ pageNum, onChange }) {
             <li key={page}>
               <NavLink
                 className={`${
-                  currentPage == page ? "bg-emerald-700" : "bg-emerald-700"
+                  currentPage == page ? "bg-green-600" : "bg-green-700"
                 } +
-                  " flex items-center justify-center px-3 h-8 leading-tight text-white  border border-gray-300 hover:bg-emerald-700 hover:text-white"`}
+                  " flex items-center justify-center px-3 h-8 leading-tight text-white  border border-gray-300 hover:bg-green-600 hover:text-white"`}
                 onClick={() => {
                   handleClick(page);
                 }}
@@ -72,7 +72,7 @@ export default function Pagination({ pageNum, onChange }) {
               onClick={() => {
                 handleTogglePage("next");
               }}
-              className="flex items-center justify-center px-3 h-8 leading-tight border border-gray-300 rounded-e-lg text-white bg-emerald-700 border border-gray-300 hover:bg-emerald-700 hover:text-white"
+              className="flex items-center justify-center px-3 h-8 leading-tight border border-gray-300 rounded-e-lg text-white bg-green-700 border border-gray-300 hover:bg-green-600 hover:text-white"
             >
               <span className="sr-only">Next</span>
               <svg

frontend/src/components/UserDropdown.jsx

@@ -55,7 +55,7 @@ const UserDropdown = ({
         onClick={toggleDropdown}
       >
         <div className="h-8 w-8 rounded-full bg-emerald-100 flex items-center justify-center">
-          <User className="h-5 w-5 text-emerald-700" />
+          <User className="h-5 w-5 text-emerald-600" />
         </div>
       </button>
 

frontend/src/pages/CategoryDashboard.jsx

@@ -0,0 +1,105 @@
+import { useEffect, useState } from "react";
+import { getCategories, removeCategory } from "../api/admin";
+import { MdDelete } from "react-icons/md";
+import Pagination from "../components/Pagination";
+import { IoAddCircleSharp } from "react-icons/io5";
+import CategoryForm from "../components/CategoryForm";
+
+export default function CategoryDashboard() {
+  const [categories, setCategories] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [currentPage, setCurrentPage] = useState(1);
+
+  let pageLimit = 10;
+
+  const [visible, setVisible] = useState(false);
+
+  const onChangePage = (page, limit = 10) => {
+    setCurrentPage(page);
+    fetchCategory(page, limit);
+  };
+
+  const fetchCategory = (page = 1, limit = 10) => {
+    getCategories(page, limit).then(({ data, total }) => {
+      setCategories(data);
+      setTotal(total);
+    });
+  };
+
+  const notiChange = () => {
+    fetchCategory(currentPage);
+  };
+
+  const handleToggleForm = () => {
+    setVisible((curr) => !curr);
+  };
+
+  const handleRemove = (id) => {
+    removeCategory(id)
+      .then(() => {
+        fetchCategory(currentPage);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  };
+
+  //Get user when initialize the component
+  useEffect(fetchCategory, []);
+
+  return (
+    <div className="pt-10 p-20 w-full">
+      <h1 className="text-4xl pb-3 font-bold text-green-800 underline">
+        CATEGORIES
+      </h1>
+      <button
+        onClick={handleToggleForm}
+        className="flex justify-end items-center bg-blue-500 rounded-md px-2 text-white text-sm p-1 mb-1 ml-auto hover:cursor-pointer hover:bg-blue-600 transtion"
+      >
+        <span className="pr-1 text-xs">Add</span>
+        <IoAddCircleSharp />
+      </button>
+      <CategoryForm onAddCategory={notiChange} visible={visible} />
+      {categories.length > 0 ? (
+        <>
+          <table className="table-fixed w-full text-center border border-green-600">
+            <thead className="bg-green-600 h-10">
+              <tr>
+                <th>CategoryID</th>
+                <th>Name</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              {categories.map((category) => (
+                <tr
+                  key={category.UserID}
+                  className="border border-green-600 h-10"
+                >
+                  <td>{category.CategoryID}</td>
+                  <td>{category.Name}</td>
+                  <td className="flex justify-center pt-2">
+                    <MdDelete
+                      onClick={() => {
+                        handleRemove(category.CategoryID);
+                      }}
+                      className="hover:text-red-600 cursor-pointer transition-all text-xl"
+                    />
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+          <Pagination
+            pageNum={Math.ceil(total / pageLimit)}
+            onChange={onChangePage}
+          />
+        </>
+      ) : (
+        <p className="text-red-700 text-xl bg-red-200 px-3 rounded-md py-1 w-fit">
+          No category exists!
+        </p>
+      )}
+    </div>
+  );
+}

frontend/src/pages/Dashboard.jsx

@@ -1,366 +1,7 @@
-import { useEffect, useState, useCallback, useRef } from "react";
+export default function Dashboard() {
-import {
-  getUsers,
-  removeUser,
-  getTransactions,
-  removeTransaction,
-  getProducts,
-  removeProduct,
-  getCategories,
-  removeCategory,
-} from "../api/admin";
-import { MdDelete } from "react-icons/md";
-import { IoAddCircleSharp } from "react-icons/io5";
-import Pagination from "../components/Pagination";
-import CategoryForm from "../components/CategoryForm";
-import { useNavigate } from "react-router-dom";
-
-// Spinner Component
-const Spinner = () => (
-  <div className="flex justify-center items-center h-40 w-full">
-    <div className="w-12 h-12 border-4 border-emerald-600 border-dashed rounded-full animate-spin"></div>
-  </div>
-);
-
-// Empty State Component
-const EmptyState = () => (
-  <div className="flex flex-col items-center justify-center bg-gray-50 py-10 rounded-lg w-full">
-    <svg
-      className="w-16 h-16 text-gray-400"
-      fill="none"
-      stroke="currentColor"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth="2"
-        d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
-      ></path>
-    </svg>
-    <p className="mt-4 text-lg font-medium text-gray-600">No data found</p>
-    <p className="mt-1 text-sm text-gray-500">
-      No records are currently available.
-    </p>
-  </div>
-);
-
-// Generic Dashboard Component
-const Dashboard = ({
-  fetchDataFn,
-  deleteFn,
-  columns,
-  idKey,
-  refreshKey = 0,
-  headerAction = null,
-}) => {
-  const navigate = useNavigate();
-  const [items, setItems] = useState([]);
-  const [total, setTotal] = useState(0);
-  const [currentPage, setCurrentPage] = useState(1);
-  const [loading, setLoading] = useState(true);
-  const pageLimit = 10;
-
-  const currentTab = useRef();
-
-  //Reset the current page to 1 whenever we switch between tab
-  useEffect(() => {
-    if (currentTab.current != idKey) setCurrentPage(1);
-    currentTab.current = idKey;
-  }, [idKey]);
-
-  const fetchItems = useCallback(
-    (page = 1, limit = 10) => {
-      fetchDataFn(page, limit)
-        .then((res) => {
-          console.log(res);
-
-          const data =
-            res.users || res.products || res.transactions || res.data || [];
-          setItems(data);
-          setTotal(res.total);
-        })
-        .catch((error) => {
-          setItems([]);
-          setTotal(0);
-        })
-        .finally(() => setLoading(false));
-    },
-    [fetchDataFn],
-  );
-
-  const handleRemove = (id) => {
-    if (window.confirm("Are you sure you want to delete this item?")) {
-      setLoading(true);
-      deleteFn(id)
-        .then(() => fetchItems(currentPage))
-        .catch((error) => {
-          console.error("Error removing item:", error);
-          setLoading(false);
-        });
-    }
-  };
-
-  useEffect(() => {
-    fetchItems(currentPage);
-  }, [fetchItems, currentPage, refreshKey]);
-
-  const onChangePage = (page) => {
-    setCurrentPage(page);
-  };
-
-  if (loading) return <Spinner />;
-
   return (
-    <div className="w-full mt-6">
+    <div className="text-3xl font-bold p-3 text-green-800">
-      <div className="flex flex-col md:flex-row justify-between items-center mb-4 w-full">
+      Welcome to admin dashboard
-        <h2 className="text-xl font-semibold text-gray-700 mb-2 md:mb-0">
-          Total: <span className="text-emerald-700">{total}</span>
-        </h2>
-        {headerAction && <div>{headerAction}</div>}
-      </div>
-
-      {items.length > 0 ? (
-        <div className="w-full overflow-x-auto bg-white rounded-lg shadow">
-          <table className="min-w-full divide-y divide-gray-200 table-fixed">
-            <thead className="bg-emerald-700">
-              <tr>
-                {columns.map((col) => (
-                  <th
-                    key={col.label}
-                    scope="col"
-                    className="px-6 py-3 text-left text-xs font-medium text-white uppercase tracking-wider"
-                  >
-                    {col.label}
-                  </th>
-                ))}
-                <th
-                  scope="col"
-                  className="px-6 py-3 text-center text-xs font-medium text-white uppercase tracking-wider w-20"
-                >
-                  Action
-                </th>
-              </tr>
-            </thead>
-            <tbody className="bg-white divide-y divide-gray-200">
-              {items.map((item) => (
-                <tr
-                  key={item[idKey]}
-                  className="hover:bg-gray-50 transition-colors"
-                >
-                  {columns.map((col) => (
-                    <td
-                      key={`${item[idKey]}-${col.key}`}
-                      className="px-6 py-4 whitespace-nowrap text-sm text-gray-700 overflow-hidden text-ellipsis"
-                    >
-                      {item[col.key] || "—"}
-                    </td>
-                  ))}
-                  <td className="px-6 py-4 whitespace-nowrap text-center text-sm font-medium">
-                    <button
-                      onClick={() => handleRemove(item[idKey])}
-                      className="text-red-500 hover:text-red-700 transition-colors"
-                      title="Delete"
-                    >
-                      <MdDelete size={20} />
-                    </button>
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </table>
-        </div>
-      ) : (
-        <EmptyState />
-      )}
-
-      {total > pageLimit && (
-        <div className="mt-4 w-full">
-          <Pagination
-            pageNum={Math.ceil(total / pageLimit)}
-            onChange={onChangePage}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
-
-// Main Admin Tabs
-export default function AdminDashboardTabs() {
-  const [activeTab, setActiveTab] = useState(0);
-  const [tabData, setTabData] = useState({
-    users: { loaded: false, data: null },
-    products: { loaded: false, data: null },
-    transactions: { loaded: false, data: null },
-    categories: { loaded: false, data: null },
-  });
-
-  const [visible, setVisible] = useState(false);
-  const [categoryRefreshKey, setCategoryRefreshKey] = useState(0);
-  const toggleForm = () => setVisible((v) => !v);
-
-  // Preload all tab data
-  useEffect(() => {
-    const tabKeys = ["users", "products", "transactions", "categories"];
-    const loadTabData = async (index) => {
-      if (index === tabKeys.length) return;
-
-      setTabData((prev) => ({
-        ...prev,
-        [tabKeys[index]]: { ...prev[tabKeys[index]], loaded: true },
-      }));
-
-      // Load next tab after a short delay
-      setTimeout(() => loadTabData(index + 1), 100);
-    };
-
-    loadTabData(0);
-  }, []);
-
-  const tabs = [
-    {
-      title: "Users",
-      icon: "👥",
-      key: "users",
-      component: () => (
-        <Dashboard
-          fetchDataFn={getUsers}
-          deleteFn={removeUser}
-          idKey="UserID"
-          columns={[
-            { label: "ID", key: "UserID" },
-            { label: "UCID", key: "UCID" },
-            { label: "Name", key: "Name" },
-            { label: "Email", key: "Email" },
-            { label: "Phone", key: "Phone" },
-            { label: "Address", key: "Address" },
-          ]}
-        />
-      ),
-    },
-    {
-      title: "Products",
-      icon: "📦",
-      key: "products",
-      component: () => (
-        <Dashboard
-          fetchDataFn={getProducts}
-          deleteFn={removeProduct}
-          idKey="ProductID"
-          columns={[
-            { label: "ID", key: "ProductID" },
-            { label: "Name", key: "ProductName" },
-            { label: "Price", key: "Price" },
-            { label: "Category", key: "Category" },
-            { label: "Seller", key: "SellerName" },
-          ]}
-        />
-      ),
-    },
-    {
-      title: "Transactions",
-      icon: "💰",
-      key: "transactions",
-      component: () => (
-        <Dashboard
-          fetchDataFn={getTransactions}
-          deleteFn={removeTransaction}
-          idKey="TransactionID"
-          columns={[
-            { label: "ID", key: "TransactionID" },
-            { label: "User", key: "UserName" },
-            { label: "Product", key: "ProductName" },
-            { label: "Date", key: "Date" },
-            { label: "Status", key: "PaymentStatus" },
-          ]}
-        />
-      ),
-    },
-    {
-      title: "Categories",
-      icon: "🏷️",
-      key: "categories",
-      component: () => (
-        <>
-          <Dashboard
-            fetchDataFn={getCategories}
-            deleteFn={removeCategory}
-            idKey="CategoryID"
-            columns={[
-              { label: "ID", key: "CategoryID" },
-              { label: "Name", key: "Name" },
-            ]}
-            refreshKey={categoryRefreshKey}
-            headerAction={
-              <button
-                onClick={toggleForm}
-                className="flex items-center bg-emerald-600 rounded-md px-4 py-2 text-white text-sm hover:bg-emerald-700 transition-colors font-medium shadow"
-              >
-                <IoAddCircleSharp className="mr-1" size={18} />
-                Add Category
-              </button>
-            }
-          />
-          <CategoryForm
-            visible={visible}
-            onAddCategory={() => {
-              setCategoryRefreshKey((prev) => prev + 1);
-              toggleForm();
-            }}
-          />
-        </>
-      ),
-    },
-  ];
-
-  return (
-    <div className="w-full min-h-screen bg-gray-50">
-      <div className="w-full px-4 py-8">
-        {/* Mobile Tabs */}
-        <div className="md:hidden w-full mb-4">
-          <select
-            className="w-full rounded-md border-gray-300 shadow-sm focus:border-emerald-600 focus:ring focus:ring-emerald-600 focus:ring-opacity-50 p-2"
-            value={activeTab}
-            onChange={(e) => {
-              setActiveTab(parseInt(e.target.value));
-            }}
-          >
-            {tabs.map((tab, index) => (
-              <option key={tab.key} value={index}>
-                {tab.icon} {tab.title}
-              </option>
-            ))}
-          </select>
-        </div>
-
-        {/* Desktop Tabs */}
-        <div className="hidden md:flex space-x-1 border-b border-gray-200 w-full overflow-x-auto">
-          {tabs.map((tab, index) => (
-            <button
-              key={tab.key}
-              className={`px-6 py-3 font-medium text-sm rounded-t-lg transition-colors ${
-                index === activeTab
-                  ? "text-emerald-700 bg-white border-l border-t border-r border-gray-200 border-b-0"
-                  : "text-gray-600 hover:text-emerald-700 bg-gray-50"
-              }`}
-              onClick={() => {
-                setActiveTab(index);
-              }}
-            >
-              <span className="inline-block mr-2">{tab.icon}</span>
-              {tab.title}
-            </button>
-          ))}
-        </div>
-
-        <div className="bg-white p-4 md:p-6 rounded-lg shadow-sm border border-gray-200 mt-4 w-full">
-          <div className="w-full">
-            {tabData[tabs[activeTab].key].loaded && tabs[activeTab].component()}
-          </div>
-        </div>
-      </div>
     </div>
   );
 }

frontend/src/pages/Favorites.jsx

@@ -119,7 +119,7 @@ const Favorites = () => {
           </p>
           <Link
             to="/"
-            className="inline-block bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-4"
+            className="inline-block bg-emerald-500 hover:bg-emerald-600 text-white font-medium py-2 px-4"
           >
             Browse Listings
           </Link>
@@ -161,7 +161,7 @@ const Favorites = () => {
                     </button>
                   </div>
 
-                  <p className="text-emerald-700 font-bold mt-1">
+                  <p className="text-emerald-600 font-bold mt-1">
                     ${product.price.toFixed(2)}
                   </p>
 
@@ -200,8 +200,56 @@ const Favorites = () => {
       )}
 
       <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
+        <div className="container mx-auto px-4">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
+          <div className="flex flex-col md:flex-row justify-between items-center">
+            <div className="mb-4 md:mb-0">
+              <h3 className="text-lg font-semibold mb-2">Campus Marketplace</h3>
+              <p className="text-gray-400 text-sm">
+                Your trusted university trading platform
+              </p>
+            </div>
+
+            <div className="flex space-x-6">
+              <div>
+                <h4 className="font-medium mb-2">Quick Links</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">
+                    <Link to="/" className="hover:text-white transition">
+                      Home
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link to="/selling" className="hover:text-white transition">
+                      Sell an Item
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link
+                      to="/favorites"
+                      className="hover:text-white transition"
+                    >
+                      My Favorites
+                    </Link>
+                  </li>
+                </ul>
+              </div>
+
+              <div>
+                <h4 className="font-medium mb-2">Contact</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">support@campusmarket.com</li>
+                  <li className="mb-1">University of Calgary</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+
+          <div className="border-t border-gray-700 mt-6 pt-6 text-center text-sm text-gray-400">
+            <p>
+              © {new Date().getFullYear()} Campus Marketplace. All rights
+              reserved.
+            </p>
+          </div>
         </div>
       </footer>
     </div>

frontend/src/pages/Home.jsx

@@ -219,7 +219,7 @@ const Home = () => {
   // Loading indicator component
   const LoadingSection = () => (
     <div className="flex justify-center items-center h-48">
-      <Loader className="animate-spin text-emerald-700 h-8 w-8" />
+      <Loader className="animate-spin text-emerald-600 h-8 w-8" />
     </div>
   );
 
@@ -243,7 +243,7 @@ const Home = () => {
             e.preventDefault();
             toggleFavorite(product.id);
           }}
-          className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-700 hover:bg-emerald-600 transition shadow-sm"
+          className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
         >
           <Bookmark className="text-white w-5 h-5" />
         </button>
@@ -253,7 +253,7 @@ const Home = () => {
         <h3 className="text-lg font-medium text-gray-800 leading-tight">
           {product.title}
         </h3>
-        <span className="font-semibold text-emerald-700 block mt-1">
+        <span className="font-semibold text-emerald-600 block mt-1">
           ${product.price}
         </span>
 
@@ -353,7 +353,7 @@ const Home = () => {
             </p>
             <button
               onClick={handleSelling}
-              className="bg-emerald-700 hover:bg-emerald-700 text-white font-medium py-2 px-6 focus:outline-none focus:ring-2 focus:ring-emerald-400 transition-colors"
+              className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-6 focus:outline-none focus:ring-2 focus:ring-emerald-400 transition-colors"
             >
               Post an Item
             </button>
@@ -405,9 +405,59 @@ const Home = () => {
           </ScrollableProductList>
         )}
       </div>
+
+      {/* Footer */}
       <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
+        <div className="container mx-auto px-4">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
+          <div className="flex flex-col md:flex-row justify-between items-center">
+            <div className="mb-4 md:mb-0">
+              <h3 className="text-lg font-semibold mb-2">Campus Marketplace</h3>
+              <p className="text-gray-400 text-sm">
+                Your trusted university trading platform
+              </p>
+            </div>
+
+            <div className="flex space-x-6">
+              <div>
+                <h4 className="font-medium mb-2">Quick Links</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">
+                    <Link to="/" className="hover:text-white transition">
+                      Home
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link to="/selling" className="hover:text-white transition">
+                      Sell an Item
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link
+                      to="/favorites"
+                      className="hover:text-white transition"
+                    >
+                      My Favorites
+                    </Link>
+                  </li>
+                </ul>
+              </div>
+
+              <div>
+                <h4 className="font-medium mb-2">Contact</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">support@campusmarket.com</li>
+                  <li className="mb-1">University of Calgary</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+
+          <div className="border-t border-gray-700 mt-6 pt-6 text-center text-sm text-gray-400">
+            <p>
+              © {new Date().getFullYear()} Campus Marketplace. All rights
+              reserved.
+            </p>
+          </div>
         </div>
       </footer>
     </div>

frontend/src/pages/ProductDashboard.jsx

@@ -0,0 +1,91 @@
+import { useEffect, useState } from "react";
+import { getProducts, removeProduct } from "../api/admin";
+import { MdDelete } from "react-icons/md";
+import Pagination from "../components/Pagination";
+
+export default function ProductDashboard() {
+  const [products, setProducts] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [currentPage, setCurrentPage] = useState(1);
+
+  let pageLimit = 10;
+
+  const onChangePage = (page, limit = 10) => {
+    setCurrentPage(page);
+    fetchProducts(page, limit);
+  };
+
+  const fetchProducts = (page = 1, limit = 10) => {
+    getProducts(page, limit).then(({ products, total }) => {
+      setTotal(total);
+      setProducts(products);
+    });
+  };
+
+  const handleRemoveProduct = (id) => {
+    removeProduct(id)
+      .then((res) => {
+        fetchProducts(currentPage);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  };
+
+  //Get user when initialize the component
+  useEffect(fetchProducts, []);
+
+  return (
+    <div className="pt-10 p-20">
+      <h1 className="text-4xl pb-3 font-bold text-green-800 underline">
+        PRODUCTS
+      </h1>
+      {products.length > 0 ? (
+        <>
+          <table className="table-fixed w-full text-center border border-green-600">
+            <thead className="bg-green-600 h-10">
+              <tr>
+                <th>ProductID</th>
+                <th>Name</th>
+                <th>Price</th>
+                <th>Category</th>
+                <th>Seller</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              {products.map((product) => (
+                <tr
+                  key={product.ProductID}
+                  className="border border-green-600 h-10"
+                >
+                  <td>{product.ProductID}</td>
+                  <td>{product.ProductName}</td>
+                  <td>{product.Price}</td>
+                  <td>{product.Category ? product.Category : "N/A"}</td>
+                  <td>{product.SellerName ? product.SellerName : "N/A"}</td>
+                  <td className="flex justify-center pt-2">
+                    <MdDelete
+                      onClick={() => {
+                        handleRemoveProduct(product.ProductID);
+                      }}
+                      className="hover:text-red-600 cursor-pointer transition-all text-xl"
+                    />
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+          <Pagination
+            onChange={onChangePage}
+            pageNum={Math.ceil(total / pageLimit)}
+          />
+        </>
+      ) : (
+        <p className="text-red-700 text-xl bg-red-200 px-3 rounded-md py-1 w-fit">
+          No product exists!
+        </p>
+      )}
+    </div>
+  );
+}

frontend/src/pages/ProductDetail.jsx

@@ -30,8 +30,6 @@ const ProductDetail = () => {
   const [reviews, setReviews] = useState([]);
   const [showReviewForm, setShowReviewForm] = useState(false);
   const [showAlert, setShowAlert] = useState(false);
-  const [showAlert1, setShowAlert1] = useState(false);
-
   const storedUser = JSON.parse(sessionStorage.getItem("user"));
 
   const toggleFavorite = async (id) => {
@@ -247,7 +245,7 @@ const ProductDetail = () => {
   if (loading.product) {
     return (
       <div className="flex justify-center items-center h-screen">
-        <div className="animate-spin h-32 w-32 border-t-2 border-emerald-700"></div>
+        <div className="animate-spin h-32 w-32 border-t-2 border-emerald-600"></div>
       </div>
     );
   }
@@ -261,7 +259,7 @@ const ProductDetail = () => {
           <p className="text-gray-600">{error.product}</p>
           <Link
             to="/"
-            className="mt-4 inline-block bg-emerald-700 text-white px-4 py-2 hover:bg-emerald-700"
+            className="mt-4 inline-block bg-emerald-600 text-white px-4 py-2 hover:bg-emerald-700"
           >
             Back to Listings
           </Link>
@@ -278,7 +276,7 @@ const ProductDetail = () => {
           <h2 className="text-2xl text-red-500 mb-4">Product Not Found</h2>
           <Link
             to="/"
-            className="mt-4 inline-block bg-emerald-700 text-white px-4 py-2  hover:bg-emerald-700"
+            className="mt-4 inline-block bg-emerald-600 text-white px-4 py-2  hover:bg-emerald-700"
           >
             Back to Listings
           </Link>
@@ -305,12 +303,6 @@ const ProductDetail = () => {
           onClose={() => setShowAlert(false)}
         />
       )}
-      {showAlert1 && (
-        <FloatingAlert
-          message="Product added to transaction!"
-          onClose={() => setShowAlert1(false)}
-        />
-      )}
 
       <div className="flex flex-col md:flex-row gap-8">
         <div className="md:w-3/5">
@@ -356,7 +348,7 @@ const ProductDetail = () => {
               {product.images.map((image, index) => (
                 <div
                   key={index}
-                  className={`bg-white border ${currentImage === index ? "border-emerald-700 border-2" : "border-gray-200"} min-w-[100px] cursor-pointer`}
+                  className={`bg-white border ${currentImage === index ? "border-emerald-600 border-2" : "border-gray-200"} min-w-[100px] cursor-pointer`}
                   onClick={() => selectImage(index)}
                 >
                   <img
@@ -386,7 +378,7 @@ const ProductDetail = () => {
                   e.preventDefault();
                   toggleFavorite(product.ProductID);
                 }}
-                className="top-0 p-2 rounded-bl-md bg-emerald-700 hover:bg-emerald-700 transition shadow-sm"
+                className="top-0 p-2 rounded-bl-md bg-emerald-700 hover:bg-emerald-600 transition shadow-sm"
               >
                 <Bookmark className="text-white w-5 h-5" />
               </button>
@@ -422,40 +414,8 @@ const ProductDetail = () => {
 
             <div className="relative">
               <button
-                onClick={async () => {
+                onClick={() => setShowContactOptions(!showContactOptions)}
-                  try {
+                className="w-full bg-emerald-700 hover:bg-emerald-700 text-white font-medium py-3 px-4 mb-3"
-                    // Create a transaction record
-                    const transactionData = {
-                      userID: storedUser.ID, // User ID from session storage
-                      productID: product.ProductID, // Product ID from the product details
-                      date: new Date().toISOString(), // Current date in ISO format
-                      paymentStatus: "Pending", // Default payment status
-                    };
-
-                    const response = await fetch(
-                      "http://localhost:3030/api/transaction/createTransaction",
-                      {
-                        method: "POST",
-                        headers: {
-                          "Content-Type": "application/json",
-                        },
-                        body: JSON.stringify(transactionData),
-                      },
-                    );
-
-                    const result = await response.json();
-
-                    if (result.success) {
-                      setShowAlert1(true);
-                    }
-                    // Toggle contact options visibility
-                    setShowContactOptions(!showContactOptions);
-                  } catch (error) {
-                    console.error("Error creating transaction:", error);
-                    alert(`Error: ${error.message}`);
-                  }
-                }}
-                className="w-full bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-3 px-4 mb-3"
               >
                 Contact Seller
               </button>
@@ -467,7 +427,7 @@ const ProductDetail = () => {
                       href={`tel:${product.SellerPhone}`}
                       className="flex items-center gap-2 p-3 hover:bg-gray-50 border-b border-gray-100"
                     >
-                      <Phone className="h-5 w-5 text-emerald-700" />
+                      <Phone className="h-5 w-5 text-emerald-600" />
                       <span>Call Seller</span>
                     </a>
                   )}
@@ -477,7 +437,7 @@ const ProductDetail = () => {
                       href={`mailto:${product.SellerEmail}`}
                       className="flex items-center gap-2 p-3 hover:bg-gray-50"
                     >
-                      <Mail className="h-5 w-5 text-emerald-700" />
+                      <Mail className="h-5 w-5 text-emerald-600" />
                       <span>Email Seller</span>
                     </a>
                   )}
@@ -498,10 +458,7 @@ const ProductDetail = () => {
                     {product.SellerName || "Unknown Seller"}
                   </h3>
                   <p className="text-sm text-gray-500">
-                    Product listed since{" "}
+                    Member since {product.SellerJoinDate || "N/A"}
-                    {product.Date
-                      ? new Date(product.Date).toLocaleDateString()
-                      : "N/A"}
                   </p>
                 </div>
               </div>
@@ -517,7 +474,7 @@ const ProductDetail = () => {
         <div className="bg-white border border-gray-200 p-6">
           {loading.reviews ? (
             <div className="flex justify-center py-8">
-              <div className="animate-spin h-8 w-8 border-t-2 border-emerald-700"></div>
+              <div className="animate-spin h-8 w-8 border-t-2 border-emerald-600"></div>
             </div>
           ) : error.reviews ? (
             <div className="text-red-500 mb-4">
@@ -564,7 +521,7 @@ const ProductDetail = () => {
         <div className="mt-4">
           <button
             onClick={() => setShowReviewForm(true)}
-            className="bg-emerald-700 hover:bg-emerald-700 text-white font-medium py-2 px-4"
+            className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-4"
           >
             Write a Review
           </button>
@@ -622,7 +579,7 @@ const ProductDetail = () => {
                     id="comment"
                     value={reviewForm.comment}
                     onChange={handleReviewInputChange}
-                    className="w-full p-3 border border-gray-300 focus:outline-none focus:border-emerald-700"
+                    className="w-full p-3 border border-gray-300 focus:outline-none focus:border-emerald-600"
                     rows="4"
                     required
                   ></textarea>
@@ -638,7 +595,7 @@ const ProductDetail = () => {
                   </button>
                   <button
                     type="submit"
-                    className="px-4 py-2 bg-emerald-700 text-white  hover:bg-emerald-700"
+                    className="px-4 py-2 bg-emerald-600 text-white  hover:bg-emerald-700"
                     disabled={loading.submitting}
                   >
                     {loading.submitting ? "Submitting..." : "Submit Review"}

frontend/src/pages/SearchPage.jsx

@@ -146,7 +146,7 @@ const SearchPage = () => {
             <div className="flex space-x-2">
               <button
                 onClick={applyFilters}
-                className="w-full bg-emerald-600 text-white p-3 hover:bg-emerald-700 transition-colors"
+                className="w-full bg-emerald-500 text-white p-3 hover:bg-emerald-600 transition-colors"
               >
                 Apply Filters
               </button>
@@ -187,7 +187,7 @@ const SearchPage = () => {
                   <h3 className="text-lg font-medium text-gray-800">
                     {listing.title}
                   </h3>
-                  <p className="text-emerald-700 font-semibold">
+                  <p className="text-emerald-600 font-semibold">
                     ${Number(listing.price).toFixed(2)}
                   </p>
                 </div>
@@ -196,9 +196,58 @@ const SearchPage = () => {
           </div>
         </div>
       </div>
+      {/* Footer - Added here */}
       <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
+        <div className="container mx-auto px-4">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
+          <div className="flex flex-col md:flex-row justify-between items-center">
+            <div className="mb-4 md:mb-0">
+              <h3 className="text-lg font-semibold mb-2">Campus Marketplace</h3>
+              <p className="text-gray-400 text-sm">
+                Your trusted university trading platform
+              </p>
+            </div>
+
+            <div className="flex space-x-6">
+              <div>
+                <h4 className="font-medium mb-2">Quick Links</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">
+                    <Link to="/" className="hover:text-white transition">
+                      Home
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link to="/selling" className="hover:text-white transition">
+                      Sell an Item
+                    </Link>
+                  </li>
+                  <li className="mb-1">
+                    <Link
+                      to="/favorites"
+                      className="hover:text-white transition"
+                    >
+                      My Favorites
+                    </Link>
+                  </li>
+                </ul>
+              </div>
+
+              <div>
+                <h4 className="font-medium mb-2">Contact</h4>
+                <ul className="text-sm text-gray-400">
+                  <li className="mb-1">support@campusmarket.com</li>
+                  <li className="mb-1">University of Calgary</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+
+          <div className="border-t border-gray-700 mt-6 pt-6 text-center text-sm text-gray-400">
+            <p>
+              © {new Date().getFullYear()} Campus Marketplace. All rights
+              reserved.
+            </p>
+          </div>
         </div>
       </footer>
     </div>

frontend/src/pages/Selling.jsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { useLocation, Link } from "react-router-dom";
-import { X, ChevronLeft, Trash2 } from "lucide-react";
+import { X, ChevronLeft, Plus, Trash2 } from "lucide-react";
 
 const Selling = () => {
   const [products, setProducts] = useState([]);
@@ -8,13 +8,14 @@ const Selling = () => {
   const storedUser = JSON.parse(sessionStorage.getItem("user"));
   const [categories, setCategories] = useState([]);
   const [categoryMapping, setCategoryMapping] = useState({});
+  const [selectedCategory, setSelectedCategory] = useState("");
   const [originalProduct, setOriginalProduct] = useState(null);
 
   const [editingProduct, setEditingProduct] = useState({
     name: "",
     price: "",
     description: "",
-    category: "",
+    categories: [],
     images: [],
   });
 
@@ -58,7 +59,7 @@ const Selling = () => {
     fetchCategories();
   }, []);
 
-  // Fetch products from API/database on component mount
+  // Simulate fetching products from API/database on component mount
   useEffect(() => {
     const fetchProducts = async () => {
       try {
@@ -88,87 +89,61 @@ const Selling = () => {
     };
 
     fetchProducts();
-  });
+  }, []); // Add userId to dependency array if it might change
 
+  // When editing a product, save the original product properly
   const handleEditProduct = (product) => {
+    // Save the original product completely
     setOriginalProduct(product);
 
+    // Convert category ID to category name if needed
     const categoryName = getCategoryNameById(product.CategoryID);
 
     setEditingProduct({
       ...product,
-      category: categoryName || "", // Single category string
+      categories: categoryName ? [categoryName] : [],
-      images: product.images || [],
+      images: product.images || [], // Ensure images array exists
     });
 
     setShowForm(true);
   };
 
-  // Upload images to server and get their paths
+  // Then update the handleSaveProduct function to properly merge values
-  const uploadImages = async (images) => {
-    console.log(images);
-    const uploadedImagePaths = [];
-
-    // Filter out only File objects (new images to upload)
-    const filesToUpload = images.filter((img) => img instanceof File);
-
-    for (const file of filesToUpload) {
-      // Create a FormData object to send the file
-      const formData = new FormData();
-      formData.append("image", file);
-
-      try {
-        // Send the file to your upload endpoint
-        const response = await fetch("http://localhost:3030/api/upload", {
-          method: "POST",
-          body: formData,
-        });
-
-        if (!response.ok) {
-          throw new Error(`Failed to upload image: ${file.name}`);
-        }
-
-        const result = await response.json();
-        // Assuming the server returns the path where the file was saved
-        uploadedImagePaths.push(`/public/uploads/${file.name}`);
-      } catch (error) {
-        console.error("Error uploading image:", error);
-        // If upload fails, still add the expected path (this is a fallback)
-        uploadedImagePaths.push(`/public/uploads/${file.name}`);
-      }
-    }
-
-    // Also include any existing image URLs that are strings, not File objects
-    const existingImages = images.filter((img) => typeof img === "string");
-    if (existingImages.length > 0) {
-      uploadedImagePaths.push(...existingImages);
-    }
-
-    return uploadedImagePaths;
-  };
-
-  // Handle saving product with updated image logic
   const handleSaveProduct = async () => {
-    if (!editingProduct.category) {
+    if (!(editingProduct.categories || []).length) {
-      alert("Please select a category");
+      alert("Please select at least one category");
       return;
     }
 
     try {
-      let imagePaths = [];
+      const imagePaths = [];
 
-      // Handle image uploads and get their paths
+      // Handle images properly
       if (editingProduct.images && editingProduct.images.length > 0) {
-        imagePaths = await uploadImages(editingProduct.images);
+        // If there are new images uploaded (File objects)
+        const newImages = editingProduct.images.filter(
+          (img) => img instanceof File,
+        );
+        newImages.forEach((file) => {
+          const simulatedPath = `/public/uploads/${file.name}`;
+          imagePaths.push(simulatedPath);
+        });
+
+        // Also include any existing image URLs that are strings, not File objects
+        const existingImages = editingProduct.images.filter(
+          (img) => typeof img === "string",
+        );
+        if (existingImages.length > 0) {
+          imagePaths.push(...existingImages);
+        }
       } else if (originalProduct?.image_url) {
         // If no new images but there was an original image URL
-        imagePaths = [originalProduct.image_url];
+        imagePaths.push(originalProduct.image_url);
       }
 
+      const categoryName = (editingProduct.categories || [])[0];
       const categoryID =
-        categoryMapping[editingProduct.category] ||
+        categoryMapping[categoryName] || originalProduct?.CategoryID || 1;
-        originalProduct?.CategoryID ||
-        1;
 
       // Create payload with proper fallback to original values
       const payload = {
@@ -191,7 +166,12 @@ const Selling = () => {
           originalProduct?.Description ||
           "",
         category: categoryID,
-        images: imagePaths.length > 0 ? imagePaths : [],
+        images:
+          imagePaths.length > 0
+            ? imagePaths
+            : originalProduct?.image_url
+              ? [originalProduct.image_url]
+              : [],
       };
 
       console.log("Sending payload:", payload);
@@ -226,7 +206,7 @@ const Selling = () => {
         name: "",
         price: "",
         description: "",
-        category: "",
+        categories: [],
         images: [],
       });
 
@@ -263,7 +243,7 @@ const Selling = () => {
         throw new Error("Network response was not ok");
       }
     } catch (error) {
-      console.error("Error deleting product:", error);
+      console.error("Error fetching products:", error);
       // You might want to set an error state here
     }
   };
@@ -287,18 +267,53 @@ const Selling = () => {
       name: "",
       price: "",
       description: "",
-      category: "",
+      categories: [],
       images: [],
     });
     setShowForm(true);
   };
 
-  // Handle category change
+  const addCategory = () => {
-  const handleCategoryChange = (e) => {
+    if (
-    setEditingProduct({
+      selectedCategory &&
-      ...editingProduct,
+      !(editingProduct.categories || []).includes(selectedCategory)
-      category: e.target.value,
+    ) {
-    });
+      setEditingProduct((prev) => ({
+        ...prev,
+        categories: [...(prev.categories || []), selectedCategory],
+      }));
+      setSelectedCategory("");
+    }
+  };
+
+  const removeCategory = (categoryToRemove) => {
+    setEditingProduct((prev) => ({
+      ...prev,
+      categories: (prev.categories || []).filter(
+        (cat) => cat !== categoryToRemove,
+      ),
+    }));
+  };
+
+  const markAsSold = async () => {
+    // This would call an API to move the product to the transaction table
+    try {
+      // API call would go here
+      console.log(
+        "Moving product to transaction table:",
+        editingProduct.ProductID,
+      );
+
+      // Toggle the sold status in the UI
+      setEditingProduct((prev) => ({
+        ...prev,
+        isSold: !prev.isSold,
+      }));
+
+      // You would add your API call here to update the backend
+    } catch (error) {
+      console.error("Error marking product as sold:", error);
+    }
   };
 
   return (
@@ -308,7 +323,7 @@ const Selling = () => {
         {!showForm && (
           <button
             onClick={handleAddProduct}
-            className="bg-emerald-700 text-white px-4 py-2 hover:bg-emerald-700"
+            className="bg-emerald-600 text-white px-4 py-2 hover:bg-emerald-700"
           >
             + Add New Product
           </button>
@@ -320,7 +335,7 @@ const Selling = () => {
           {/* Back Button */}
           <button
             onClick={() => setShowForm(false)}
-            className="mb-4 text-emerald-700 hover:text-emerald-800 flex items-center gap-1"
+            className="mb-4 text-emerald-600 hover:text-emerald-800 flex items-center gap-1"
           >
             <ChevronLeft size={16} />
             <span>Back to Listings</span>
@@ -348,7 +363,7 @@ const Selling = () => {
                     name: e.target.value,
                   })
                 }
-                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-600 focus:outline-none"
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
               />
             </div>
 
@@ -367,33 +382,78 @@ const Selling = () => {
                     price: e.target.value,
                   })
                 }
-                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-600 focus:outline-none"
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
               />
             </div>
 
-            {/* Category - Single Selection Dropdown */}
+            {/* Sold Status */}
+            <div className="md:col-span-2">
+              <div className="flex items-center mt-2">
+                {editingProduct.isSold && (
+                  <span className="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-red-100 text-red-800">
+                    Sold
+                  </span>
+                )}
+              </div>
+            </div>
+
+            {/* Categories */}
             <div className="md:col-span-2">
               <label className="block text-sm font-medium text-gray-700 mb-1">
-                Category
+                Categories
               </label>
+              <div className="flex gap-2">
                 <select
-                value={editingProduct.category || ""}
+                  value={selectedCategory}
-                onChange={handleCategoryChange}
+                  onChange={(e) => setSelectedCategory(e.target.value)}
-                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-600 focus:outline-none"
+                  className="flex-1 px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
-                required
                 >
                   <option value="" disabled>
                     Select a category
                   </option>
-                {categories.map((category, index) => (
+                  {categories
+                    .filter(
+                      (cat) => !(editingProduct.categories || []).includes(cat),
+                    )
+                    .map((category, index) => (
                       <option key={index} value={category}>
                         {category}
                       </option>
                     ))}
                 </select>
-              {!editingProduct.category && (
+                <button
+                  type="button"
+                  onClick={addCategory}
+                  disabled={!selectedCategory}
+                  className="px-3 py-2 bg-emerald-600 text-white hover:bg-emerald-700 disabled:bg-gray-300 disabled:cursor-not-allowed flex items-center gap-1"
+                >
+                  <Plus size={16} />
+                  <span>Add</span>
+                </button>
+              </div>
+
+              {/* Selected Categories */}
+              {(editingProduct.categories || []).length > 0 ? (
+                <div className="mt-2 flex flex-wrap gap-2">
+                  {(editingProduct.categories || []).map((category, index) => (
+                    <span
+                      key={index}
+                      className="inline-flex items-center px-2 py-1 bg-emerald-100 text-emerald-800"
+                    >
+                      {category}
+                      <button
+                        type="button"
+                        onClick={() => removeCategory(category)}
+                        className="ml-1 text-emerald-600 hover:text-emerald-800"
+                      >
+                        <X size={14} />
+                      </button>
+                    </span>
+                  ))}
+                </div>
+              ) : (
                 <p className="text-xs text-gray-500 mt-1">
-                  Please select a category
+                  Please select at least one category
                 </p>
               )}
             </div>
@@ -415,7 +475,7 @@ const Selling = () => {
                   })
                 }
                 rows="4"
-                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-600 focus:outline-none"
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
                 placeholder="Describe your product in detail..."
               ></textarea>
             </div>
@@ -444,8 +504,8 @@ const Selling = () => {
                 htmlFor="image-upload"
                 className="block w-full p-3 border border-gray-300 bg-gray-50 text-center cursor-pointer hover:bg-gray-100"
               >
-                <span className="text-emerald-700 font-medium">
+                <span className="text-emerald-600 font-medium">
-                  Click to upload images (will be saved to /public/uploads)
+                  Click to upload images
                 </span>
               </label>
 
@@ -475,11 +535,7 @@ const Selling = () => {
                         className="relative w-20 h-20 border border-gray-200 overflow-hidden"
                       >
                         <img
-                          src={
+                          src={URL.createObjectURL(img)}
-                            typeof img === "string"
-                              ? img
-                              : URL.createObjectURL(img)
-                          }
                           alt={`Product ${idx + 1}`}
                           className="w-full h-full object-cover"
                         />
@@ -503,8 +559,7 @@ const Selling = () => {
               )}
 
               {/* Show current image if editing */}
-              {editingProduct.image_url &&
+              {editingProduct.image_url && (
-                !(editingProduct.images || []).length && (
                 <div className="mt-3">
                   <p className="text-sm text-gray-600 mb-2">Current image:</p>
                   <div className="relative w-20 h-20 border border-gray-200 overflow-hidden">
@@ -528,9 +583,22 @@ const Selling = () => {
               Cancel
             </button>
 
+            {editingProduct.ProductID && (
+              <button
+                onClick={markAsSold}
+                className={`px-4 py-2 rounded-md transition-colors ${
+                  editingProduct.isSold
+                    ? "bg-green-600 text-white hover:bg-green-700"
+                    : "bg-red-600 text-white hover:bg-red-700"
+                }`}
+              >
+                Mark as {editingProduct.isSold ? "Available" : "Sold"}
+              </button>
+            )}
+
             <button
               onClick={handleSaveProduct}
-              className="bg-emerald-700 text-white px-6 py-2 hover:bg-emerald-700 rounded-md"
+              className="bg-emerald-600 text-white px-6 py-2 hover:bg-emerald-700 rounded-md"
             >
               {editingProduct.ProductID ? "Update Product" : "Add Product"}
             </button>
@@ -545,7 +613,7 @@ const Selling = () => {
               </p>
               <button
                 onClick={handleAddProduct}
-                className="bg-emerald-700 text-white px-4 py-2 hover:bg-emerald-700"
+                className="bg-emerald-600 text-white px-4 py-2 hover:bg-emerald-700"
               >
                 Create Your First Listing
               </button>
@@ -577,7 +645,7 @@ const Selling = () => {
                         </h3>
                       </div>
 
-                      <p className="text-emerald-700 font-bold mt-1">
+                      <p className="text-emerald-600 font-bold mt-1">
                         ${product.Price}
                       </p>
 
@@ -611,7 +679,7 @@ const Selling = () => {
                             e.preventDefault();
                             handleEditProduct(product);
                           }}
-                          className="text-emerald-700 hover:text-emerald-800 font-medium"
+                          className="text-emerald-600 hover:text-emerald-800 font-medium"
                         >
                           Edit
                         </button>
@@ -624,11 +692,6 @@ const Selling = () => {
           )}
         </>
       )}
-      <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
-        </div>
-      </footer>
     </div>
   );
 };

frontend/src/pages/Settings.jsx

@@ -190,7 +190,7 @@ const Settings = () => {
   if (isLoading) {
     return (
       <div className="flex justify-center items-center h-64">
-        <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-emerald-600"></div>
+        <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-emerald-500"></div>
       </div>
     );
   }
@@ -234,7 +234,7 @@ const Settings = () => {
                   id="name"
                   value={userData.name}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                   required
                 />
               </div>
@@ -251,7 +251,7 @@ const Settings = () => {
                   id="email"
                   value={userData.email}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                   required
                   readOnly // Email is often used as identifier and not changeable
                 />
@@ -269,7 +269,7 @@ const Settings = () => {
                   id="phone"
                   value={userData.phone}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                 />
               </div>
 
@@ -285,7 +285,7 @@ const Settings = () => {
                   id="UCID"
                   value={userData.UCID}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                   required
                 />
               </div>
@@ -302,7 +302,7 @@ const Settings = () => {
                   id="address"
                   value={userData.address}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                 />
               </div>
               <div>
@@ -317,14 +317,14 @@ const Settings = () => {
                   id="password"
                   value={userData.password}
                   onChange={handleInputChange}
-                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-600"
+                  className="w-full p-2 border border-gray-300 focus:outline-none focus:border-emerald-500"
                 />
               </div>
             </div>
 
             <button
               type="submit"
-              className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-4"
+              className="bg-emerald-500 hover:bg-emerald-600 text-white font-medium py-2 px-4"
             >
               Update Profile
             </button>
@@ -395,11 +395,6 @@ const Settings = () => {
           </div>
         </div>
       </div>
-      <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
-        </div>
-      </footer>
     </div>
   );
 };

frontend/src/pages/TransactionDashboard.jsx

@@ -0,0 +1,91 @@
+import { useEffect, useState } from "react";
+import { getTransactions, removeTransaction } from "../api/admin";
+import { MdDelete } from "react-icons/md";
+import Pagination from "../components/Pagination";
+
+export default function TransactionDashboard() {
+  const [transactions, setTransactions] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [currentPage, setCurrentPage] = useState(1);
+
+  let pageLimit = 10;
+
+  const onChangePage = (page, limit = 10) => {
+    setCurrentPage(page);
+    fetchTransactions(page, limit);
+  };
+
+  const fetchTransactions = (page = 1, limit = 10) => {
+    getTransactions(page, limit).then(({ transactions, total }) => {
+      setTotal(total);
+      setTransactions(transactions);
+    });
+  };
+
+  const handleRemoveTransaction = (id) => {
+    removeTransaction(id)
+      .then(() => {
+        fetchTransactions(currentPage);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  };
+
+  //Get user when initialize the component
+  useEffect(fetchTransactions, []);
+
+  return (
+    <div className="pt-10 p-20">
+      <h1 className="text-4xl pb-3 font-bold text-green-800 underline">
+        TRANSACTIONS
+      </h1>
+      {transactions.length > 0 ? (
+        <>
+          <table className="table-fixed w-full text-center border border-green-600">
+            <thead className="bg-green-600 h-10">
+              <tr>
+                <th>TransactionID</th>
+                <th>User</th>
+                <th>Product</th>
+                <th>Date</th>
+                <th>Status</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              {transactions.map((t) => (
+                <tr
+                  key={t.TransactionID}
+                  className="border border-green-600 h-10"
+                >
+                  <td>{t.TransactionID}</td>
+                  <td>{t.UserName ? t.UserName : "N/A"}</td>
+                  <td>{t.ProductName ? t.ProductName : "N/A"}</td>
+                  <td>{t.Date}</td>
+                  <td>{t.PaymentStatus}</td>
+                  <td className="flex justify-center pt-2">
+                    <MdDelete
+                      onClick={() => {
+                        handleRemoveTransaction(t.TransactionID);
+                      }}
+                      className="hover:text-red-600 cursor-pointer transition-all text-xl"
+                    />
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+          <Pagination
+            onChange={onChangePage}
+            pageNum={Math.ceil(total / pageLimit)}
+          />
+        </>
+      ) : (
+        <p className="text-red-700 text-xl bg-red-200 px-3 rounded-md py-1 w-fit">
+          No transaction exists!
+        </p>
+      )}
+    </div>
+  );
+}

frontend/src/pages/Transactions.jsx

@@ -1,209 +1,8 @@
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { Link } from "react-router-dom";
-import { Calendar, CreditCard, Trash2 } from "lucide-react";
-import FloatingAlert from "../components/FloatingAlert"; // adjust path if needed
 
 const Transactions = () => {
-  const [transactions, setTransactions] = useState([]);
+  return <div></div>;
-  const [showAlert, setShowAlert] = useState(false);
-  const storedUser = JSON.parse(sessionStorage.getItem("user"));
-
-  function reloadPage() {
-    const docTimestamp = new Date(performance.timing.domLoading).getTime();
-    const now = Date.now();
-    if (now > docTimestamp) {
-      location.reload();
-    }
-  }
-
-  useEffect(() => {
-    const fetchTransactions = async () => {
-      try {
-        const response = await fetch(
-          "http://localhost:3030/api/transaction/getTransactionsByUser",
-          {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ userID: storedUser.ID }),
-          },
-        );
-        if (!response.ok) throw new Error(`HTTP ${response.status}`);
-        const { transactions: txData } = await response.json();
-        if (!Array.isArray(txData)) return;
-
-        console.log(txData);
-
-        setTransactions(
-          txData.map((tx) => ({
-            id: tx.TransactionID,
-            productId: tx.ProductID,
-            name: tx.ProductName,
-            price: tx.Price != null ? parseFloat(tx.Price) : null,
-            image: tx.Image_URL,
-            date: tx.Date,
-            status: tx.PaymentStatus,
-          })),
-        );
-      } catch (error) {
-        console.error("Failed to fetch transactions:", error);
-      }
-    };
-
-    fetchTransactions();
-  }, []);
-
-  const deleteTransaction = async (id) => {
-    try {
-      const res = await fetch(
-        "http://localhost:3030/api/transaction/deleteTransaction",
-        {
-          method: "DELETE",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ transactionID: id }),
-        },
-      );
-      const data = await res.json();
-      if (data.success) {
-        setTransactions((prev) => prev.filter((tx) => tx.id !== id));
-        reloadPage();
-      } else {
-        console.error("Delete failed:", data.message);
-      }
-    } catch (err) {
-      console.error("Error deleting transaction:", err);
-    }
-  };
-
-  const updateTransaction = async (id) => {
-    try {
-      const res = await fetch(
-        "http://localhost:3030/api/transaction/updateStatus",
-        {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ transactionID: id }),
-        },
-      );
-      const data = await res.json();
-      if (data) {
-        setShowAlert(true);
-        reloadPage();
-      }
-    } catch (err) {
-      console.error("Error deleting transaction:", err);
-    }
-  };
-
-  const formatDate = (dateString) => {
-    const d = new Date(dateString);
-    return d.toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    });
-  };
-
-  return (
-    <div className="max-w-6xl mx-auto">
-      {showAlert && (
-        <FloatingAlert
-          message="Status Updated"
-          onClose={() => setShowAlert(false)}
-        />
-      )}
-      <div className="flex justify-between items-center mb-6">
-        <h1 className="text-2xl font-bold text-gray-800">My Transactions</h1>
-      </div>
-
-      {transactions.length === 0 ? (
-        <div className="bg-white border border-gray-200 p-8 text-center">
-          <CreditCard className="h-12 w-12 text-gray-300 mx-auto mb-4" />
-          <h3 className="text-xl font-medium text-gray-700 mb-2">
-            No transactions found
-          </h3>
-          <p className="text-gray-500 mb-4">
-            Once transactions are created, they’ll appear here.
-          </p>
-          <Link
-            to="/"
-            className="inline-block bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-4"
-          >
-            Browse Listings
-          </Link>
-        </div>
-      ) : (
-        <>
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-            {transactions.map((tx) => (
-              <div
-                key={tx.id}
-                className="relative border-2 border-gray-200 overflow-hidden hover:shadow-md transition-shadow"
-              >
-                <div className="absolute bottom-2 right-2 flex gap-2 z-10">
-                  <button
-                    onClick={(e) => {
-                      e.preventDefault();
-                      updateTransaction(tx.id);
-                    }}
-                    className="text-emerald-600 hover:text-emerald-700 text-sm font-medium"
-                  >
-                    Complete
-                  </button>
-                  <button
-                    onClick={(e) => {
-                      e.preventDefault();
-                      deleteTransaction(tx.id);
-                    }}
-                    className="text-red-500 hover:text-red-600"
-                  >
-                    <Trash2 size={20} />
-                  </button>
-                </div>
-
-                <Link to={`/product/${tx.productId}`}>
-                  <div className="h-48 bg-gray-200 flex items-center justify-center">
-                    <img
-                      src={tx.image}
-                      alt={tx.name}
-                      className="w-full h-full object-cover"
-                    />
-                  </div>
-                  <div className="p-4">
-                    <h3 className="text-lg font-semibold text-gray-800">
-                      {tx.name}
-                    </h3>
-                    {tx.price !== null && (
-                      <p className="text-emerald-700 font-bold mt-1">
-                        ${tx.price.toFixed(2)}
-                      </p>
-                    )}
-                    <div className="flex items-center text-gray-500 text-sm mt-2">
-                      <Calendar className="mr-1" size={16} />
-                      {formatDate(tx.date)}
-                    </div>
-                    <p className="text-gray-600 text-sm mt-1">
-                      Status: <span className="font-medium">{tx.status}</span>
-                    </p>
-                  </div>
-                </Link>
-              </div>
-            ))}
-          </div>
-
-          <div className="mt-6 text-sm text-gray-500">
-            Showing {transactions.length}{" "}
-            {transactions.length === 1 ? "transaction" : "transactions"}
-          </div>
-        </>
-      )}
-
-      <footer className="bg-gray-800 text-white py-6 mt-12">
-        <div className="border-t border-gray-700  text-center text-sm text-gray-400">
-          <p>© 2025 Campus Marketplace. All rights reserved.</p>
-        </div>
-      </footer>
-    </div>
-  );
 };
 
 export default Transactions;

frontend/src/pages/UserDashboard.jsx

@@ -0,0 +1,91 @@
+import { useEffect, useState } from "react";
+import { getUsers, removeUser } from "../api/admin";
+import { MdDelete } from "react-icons/md";
+import Pagination from "../components/Pagination";
+
+export default function UserDashboard() {
+  const [users, setUsers] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [currentPage, setCurrentPage] = useState(1);
+
+  let pageLimit = 10;
+
+  const onChangePage = (page, limit = 10) => {
+    setCurrentPage(page);
+    fetchUsers(page, limit);
+  };
+
+  const fetchUsers = (page = 1, limit = 10) => {
+    getUsers(page, limit).then(({ users, total }) => {
+      setUsers(users);
+      setTotal(total);
+    });
+  };
+
+  const handleRemoveUser = (id) => {
+    removeUser(id)
+      .then((res) => {
+        fetchUsers(currentPage);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  };
+
+  //Get user when initialize the component
+  useEffect(fetchUsers, []);
+
+  return (
+    <div className="pt-10 p-20">
+      <h1 className="text-4xl pb-3 font-bold text-green-800 underline">
+        USERS
+      </h1>
+      {users.length > 0 ? (
+        <>
+          {" "}
+          <table className="table-fixed w-full text-center border border-green-600">
+            <thead className="bg-green-600 h-10">
+              <tr>
+                <th>UserID</th>
+                <th>UCID</th>
+                <th>Name</th>
+                <th>Email</th>
+                <th>Phone</th>
+                <th>Address</th>
+                <th>Action</th>
+              </tr>
+            </thead>
+            <tbody>
+              {users.map((user) => (
+                <tr key={user.UserID} className="border border-green-600 h-10">
+                  <td>{user.UserID}</td>
+                  <td>{user.UCID}</td>
+                  <td>{user.Name}</td>
+                  <td>{user.Email}</td>
+                  <td>{user.Phone}</td>
+                  <td>{user.Address}</td>
+                  <td className="flex justify-center pt-2">
+                    <MdDelete
+                      onClick={() => {
+                        handleRemoveUser(user.UserID);
+                      }}
+                      className="hover:text-red-600 cursor-pointer transition-all text-xl"
+                    />
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+          <Pagination
+            pageNum={Math.ceil(total / pageLimit)}
+            onChange={onChangePage}
+          />
+        </>
+      ) : (
+        <p className="text-red-700 text-xl bg-red-200 px-3 rounded-md py-1">
+          No user exists!
+        </p>
+      )}
+    </div>
+  );
+}

frontend/src/schema.sql

@@ -1,124 +0,0 @@
--- MySql Version 9.2.0
-CREATE DATABASE Marketplace;
-
-USE Marketplace;
-
--- User Entity
-CREATE TABLE User (
-    UserID INT AUTO_INCREMENT PRIMARY KEY,
-    Name VARCHAR(100) NOT NULL,
-    Email VARCHAR(100) UNIQUE NOT NULL,
-    UCID VARCHAR(20) UNIQUE NOT NULL,
-    Password VARCHAR(255) NOT NULL,
-    Phone VARCHAR(20),
-    Address VARCHAR(255)
-);
-
-CREATE TABLE UserRole (
-    UserID INT,
-    Client BOOLEAN DEFAULT True,
-    Admin BOOLEAN DEFAULT FALSE,
-    PRIMARY KEY (UserID),
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE
-);
-
--- Category Entity (must be created before Product or else error)
-CREATE TABLE Category (
-    CategoryID INT AUTO_INCREMENT PRIMARY KEY,
-    Name VARCHAR(255) NOT NULL
-);
-
--- Product Entity
-CREATE TABLE Product (
-    ProductID INT AUTO_INCREMENT PRIMARY KEY,
-    Name VARCHAR(255) NOT NULL,
-    Price DECIMAL(10, 2) NOT NULL,
-    StockQuantity INT,
-    UserID INT,
-    Description TEXT,
-    CategoryID INT NOT NULL,
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (CategoryID) REFERENCES Category (CategoryID) ON DELETE SET NULL
-);
-
--- Fixed Image_URL table
-CREATE TABLE Image_URL (
-    URL VARCHAR(255),
-    ProductID INT,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
-);
-
--- Fixed Review Entity (Many-to-One with User, Many-to-One with Product)
-CREATE TABLE Review (
-    ReviewID INT AUTO_INCREMENT PRIMARY KEY,
-    UserID INT,
-    ProductID INT,
-    Comment TEXT,
-    Rating INT CHECK (
-        Rating >= 1
-        AND Rating <= 5
-    ),
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
-);
-
--- Transaction Entity (Many-to-One with User, Many-to-One with Product)
-CREATE TABLE Transaction (
-    TransactionID INT PRIMARY KEY,
-    UserID INT,
-    ProductID INT,
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    PaymentStatus VARCHAR(50),
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE 
-);
-
--- Recommendation Entity (Many-to-One with User, Many-to-One with Product)
-CREATE TABLE Recommendation (
-    RecommendationID_PK INT AUTO_INCREMENT PRIMARY KEY,
-    UserID INT,
-    RecommendedProductID INT,
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (RecommendedProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
-);
-
--- History Entity (Many-to-One with User, Many-to-One with Product)
-CREATE TABLE History (
-    HistoryID INT AUTO_INCREMENT PRIMARY KEY,
-    UserID INT,
-    ProductID INT,
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
-);
-
--- Favorites Entity (Many-to-One with User, Many-to-One with Product)
-CREATE TABLE Favorites (
-    FavoriteID INT AUTO_INCREMENT PRIMARY KEY,
-    UserID INT,
-    ProductID INT,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE,
-    UNIQUE (UserID, ProductID)
-);
-
--- Product-Category Junction Table (Many-to-Many)
-CREATE TABLE Product_Category (
-    ProductID INT,
-    CategoryID INT,
-    PRIMARY KEY (ProductID, CategoryID),
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE,
-    FOREIGN KEY (CategoryID) REFERENCES Category (CategoryID) ON DELETE CASCADE
-);
-
--- Login Authentication table
-CREATE TABLE AuthVerification (
-    UserID INT AUTO_INCREMENT PRIMARY KEY,
-    Email VARCHAR(100) UNIQUE NOT NULL,
-    VerificationCode VARCHAR(6) NOT NULL,
-    Authenticated BOOLEAN DEFAULT FALSE,
-    Date DATETIME DEFAULT CURRENT_TIMESTAMP
-);

mysql-code/Init-Data.sql

@@ -2,6 +2,8 @@
 SET
     FOREIGN_KEY_CHECKS = 0;
 
+TRUNCATE TABLE Product_Category;
+
 TRUNCATE TABLE Favorites;
 
 TRUNCATE TABLE History;
@@ -42,7 +44,7 @@ VALUES
     (
         1,
         'John Doe',
-        'john.doe@ucalgary.ca',
+        'john.doe@example.com',
         'U123456',
         'hashedpassword1',
         '555-123-4567',
@@ -51,7 +53,7 @@ VALUES
     (
         2,
         'Jane Smith',
-        'jane.smith@ucalgary.ca',
+        'jane.smith@example.com',
         'U234567',
         'hashedpassword2',
         '555-234-5678',
@@ -70,7 +72,6 @@ VALUES
 INSERT INTO
     Category (Name)
 VALUES
-    ('Other'),
     ('Textbooks'),
     ('Electronics'),
     ('Furniture'),
@@ -99,7 +100,8 @@ VALUES
     ('Winter Clothing'),
     ('Photography Equipment'),
     ('Event Tickets'),
-    ('Software Licenses');
+    ('Software Licenses'),
+    ('Transportation (Car Pool)');
 
 -- Insert Products
 INSERT INTO
@@ -342,6 +344,62 @@ VALUES
     ('/Uploads/Bluetooth-Speaker.jpg', 19),
     ('/Uploads/Backpack.jpg', 20);
 
+-- Insert Product-Category relationships (products with multiple categories)
+INSERT INTO
+    Product_Category (ProductID, CategoryID)
+VALUES
+    (1, 1),
+    (1, 17),
+    (1, 20), -- Calculus book: Textbooks, School Supplies, Math Resources
+    (2, 2),
+    (2, 11),
+    (2, 25), -- Laptop: Electronics, Computer Accessories, Smartphones & Tablets
+    (3, 3),
+    (3, 18),
+    (3, 24), -- Desk: Furniture, Office Furniture, Dorm Essentials
+    (4, 4),
+    (4, 26), -- Hoodie: Clothing, Winter Clothing
+    (5, 5),
+    (5, 13), -- Basketball: Sports Equipment, Fitness Equipment
+    (6, 6),
+    (6, 23), -- Guitar: Musical Instruments, Audio Equipment
+    (7, 1),
+    (7, 15),
+    (7, 20), -- Physics book: Textbooks, Lab Equipment, Math & Science Resources
+    (8, 8),
+    (8, 24), -- Mini Fridge: Kitchen Appliances, Dorm Essentials
+    (9, 9),
+    (9, 2), -- PS5 Controller: Gaming, Electronics
+    (10, 10),
+    (10, 5),
+    (10, 13), -- Mountain Bike: Bicycles, Sports Equipment, Fitness Equipment
+    (11, 11),
+    (11, 2), -- Mouse: Computer Accessories, Electronics
+    (12, 15),
+    (12, 17), -- Lab Coat: Lab Equipment, School Supplies
+    (13, 12),
+    (13, 17),
+    (13, 20), -- Calculator: Stationery, School Supplies, Math & Science Resources
+    (14, 13),
+    (14, 5), -- Yoga Mat: Fitness Equipment, Sports Equipment
+    (15, 26),
+    (15, 4),
+    (15, 14), -- Winter Jacket: Winter Clothing, Clothing, Winter Sports
+    (16, 1),
+    (16, 17),
+    (16, 19), -- CS Book: Textbooks, School Supplies, Books (Non-textbook)
+    (17, 24),
+    (17, 2), -- Desk Lamp: Dorm Essentials, Electronics
+    (18, 12),
+    (18, 17),
+    (18, 20), -- Scientific Calculator: Stationery, School Supplies, Math & Science
+    (19, 23),
+    (19, 2),
+    (19, 24), -- Bluetooth Speaker: Audio Equipment, Electronics, Dorm Essentials
+    (20, 22),
+    (20, 17),
+    (20, 24);
+
 -- Insert History records
 INSERT INTO
     History (HistoryID, UserID, ProductID)
@@ -370,6 +428,7 @@ VALUES
     (1, 5), -- User 4 likes Basketball
     (2, 8);
 
+-- User 5 likes Mini Fridge
 -- Insert Transactions
 INSERT INTO
     Transaction (
@@ -394,5 +453,4 @@ VALUES
         1,
         'This is a great fake product! Totally recommend it.',
         5,
-        '2024-10-02 16:00:00'
+    );
-    )

mysql-code/Schema.sql

@@ -36,10 +36,10 @@ CREATE TABLE Product (
     StockQuantity INT,
     UserID INT,
     Description TEXT,
-    CategoryID INT,
+    CategoryID INT NOT NULL,
     Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
+    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE SET NULL,
-    FOREIGN KEY (CategoryID) REFERENCES Category (CategoryID)
+    FOREIGN KEY (CategoryID) REFERENCES Category (CategoryID) ON DELETE SET NULL
 );
 
 -- Fixed Image_URL table
@@ -60,19 +60,19 @@ CREATE TABLE Review (
         AND Rating <= 5
     ),
     Date DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
+    FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE SET NULL,
     FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
 );
 
 -- Transaction Entity (Many-to-One with User, Many-to-One with Product)
 CREATE TABLE Transaction (
-    TransactionID INT AUTO_INCREMENT PRIMARY KEY,
+    TransactionID INT PRIMARY KEY,
     UserID INT,
     ProductID INT,
     Date DATETIME DEFAULT CURRENT_TIMESTAMP,
     PaymentStatus VARCHAR(50),
     FOREIGN KEY (UserID) REFERENCES User (UserID) ON DELETE CASCADE,
-    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE
+    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE SET NULL 
 );
 
 -- Recommendation Entity (Many-to-One with User, Many-to-One with Product)
@@ -105,6 +105,15 @@ CREATE TABLE Favorites (
     UNIQUE (UserID, ProductID)
 );
 
+-- Product-Category Junction Table (Many-to-Many)
+CREATE TABLE Product_Category (
+    ProductID INT,
+    CategoryID INT,
+    PRIMARY KEY (ProductID, CategoryID),
+    FOREIGN KEY (ProductID) REFERENCES Product (ProductID) ON DELETE CASCADE,
+    FOREIGN KEY (CategoryID) REFERENCES Category (CategoryID) ON DELETE CASCADE
+);
+
 -- Login Authentication table
 CREATE TABLE AuthVerification (
     UserID INT AUTO_INCREMENT PRIMARY KEY,

recommondation-engine/app.py

@@ -19,9 +19,9 @@ def delete_user_recommendations(user_id):
     cursor = db_con.cursor()
 
     try:
-        print(f"Deleted existing recommendations for user {user_id}")
+        cursor.execute("DELETE FROM Recommendation WHERE UserID = %s", (user_id,))
-        cursor.execute(f"DELETE FROM Recommendation WHERE UserID = {user_id}")
         db_con.commit()
+        print(f"Deleted existing recommendations for user {user_id}")
         logging.info(f"Deleted existing recommendations for user {user_id}")
         return True
     except Exception as e:
@@ -32,12 +32,14 @@ def delete_user_recommendations(user_id):
         cursor.close()
         db_con.close()
 
-def get_random_products(count=0, exclude_list=None):
+def get_random_products(count=10, exclude_list=None):
+    """Get random products from the database, excluding any in the exclude_list"""
     db_con = database()
     cursor = db_con.cursor()
 
     try:
         if exclude_list and len(exclude_list) > 0:
+            # Convert exclude_list to string for SQL IN clause
             exclude_str = ', '.join(map(str, exclude_list))
             cursor.execute(f"SELECT ProductID FROM Product WHERE ProductID NOT IN ({exclude_str}) ORDER BY RAND() LIMIT {count}")
         else:
@@ -53,11 +55,13 @@ def get_random_products(count=0, exclude_list=None):
         cursor.close()
         db_con.close()
 
-def get_popular_products(count=5):
+def get_popular_products(count=10):
+    """Get popular products based on history table frequency"""
     db_con = database()
     cursor = db_con.cursor()
 
     try:
+        # Get products that appear most frequently in history
         cursor.execute("""
             SELECT ProductID, COUNT(*) as count
             FROM History
@@ -68,6 +72,7 @@ def get_popular_products(count=5):
 
         popular_products = [row[0] for row in cursor.fetchall()]
 
+        # If not enough popular products, supplement with random ones
         if len(popular_products) < count:
             random_products = get_random_products(count - len(popular_products), popular_products)
             popular_products.extend(random_products)
@@ -76,20 +81,23 @@ def get_popular_products(count=5):
 
     except Exception as e:
         logging.error(f"Error getting popular products: {str(e)}")
-        return get_random_products(count)
+        return get_random_products(count)  # Fallback to random products
     finally:
         cursor.close()
         db_con.close()
 
 def has_user_history_or_recommendations(user_id):
+    """Check if user exists in History or Recommendation table"""
     db_con = database()
     cursor = db_con.cursor()
 
     try:
-        cursor.execute(f"SELECT COUNT(*) FROM History WHERE UserID = {user_id}" )
+        # Check if user has history
+        cursor.execute("SELECT COUNT(*) FROM History WHERE UserID = %s", (user_id,))
         history_count = cursor.fetchone()[0]
 
-        cursor.execute(f"SELECT COUNT(*) FROM Recommendation WHERE UserID = {user_id}")
+        # Check if user has recommendations
+        cursor.execute("SELECT COUNT(*) FROM Recommendation WHERE UserID = %s", (user_id,))
         recommendation_count = cursor.fetchone()[0]
 
         return history_count > 0 or recommendation_count > 0
@@ -112,11 +120,13 @@ def get_all_products():
         select_clause = "SELECT p.ProductID"
         for category in categories:
             category_id = category[0]
-            select_clause += f", MAX(CASE WHEN p.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
+            select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
 
         final_query = f"""
             {select_clause}
             FROM Product p
+            LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
+            LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
             GROUP BY p.ProductID;
             """
 
@@ -127,13 +137,13 @@ def get_all_products():
         product_ids = []
         for row in results:
             text_list = list(row)
-            product_id = text_list.pop(0)
+            product_id = text_list.pop(0)  # Save the product ID before removing it
             final.append(text_list)
             product_ids.append(product_id)
 
         cursor.close()
         db_con.close()
-        return final, product_ids
+        return final, product_ids  # Return both feature vectors and product IDs
     except Exception as e:
         logging.error(f"Error getting all products: {str(e)}")
         cursor.close()
@@ -150,13 +160,15 @@ def get_user_history(user_id):
 
         select_clause = "SELECT p.ProductID"
         for category in categories:
-            category_id = category[0]
+            category_id = category[0] # get the uid of the category and then append that to the new column
-            select_clause += f", MAX(CASE WHEN p.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
+            select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
 
         final_query = f"""
             {select_clause}
             FROM Product p
-            WHERE p.ProductID IN (SELECT ProductID FROM History WHERE UserID = {user_id})
+            LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
+            LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
+            where p.ProductID in (select ProductID from History where UserID = {user_id})
             GROUP BY p.ProductID;
             """
 
@@ -179,63 +191,82 @@ def get_user_history(user_id):
 
 def get_recommendations(user_id, top_n=5):
     try:
+        # Always delete existing recommendations first
         delete_user_recommendations(user_id)
 
+        # Check if user has history or recommendations
         if not has_user_history_or_recommendations(user_id):
+            # Cold start: return random products
             random_recs = get_random_products(top_n)
-            recommendation_upload(user_id, random_recs)
+            # Store these random recommendations
+            history_upload(user_id, random_recs)
 
+            # Add 5 more unique random products
             additional_random = get_random_products(5, random_recs)
-            recommendation_upload(user_id, additional_random)
+            history_upload(user_id, additional_random)
 
             return random_recs + additional_random
 
+        # Get all products and user history with their category vectors
         all_product_features, all_product_ids = get_all_products()
         user_history = get_user_history(user_id)
 
         if not user_history:
+            # User exists but has no history yet
             popular_recs = get_popular_products(top_n)
-            recommendation_upload(user_id, popular_recs)
+            history_upload(user_id, popular_recs)
 
+            # Add 5 more unique random products
             additional_random = get_random_products(5, popular_recs)
-            recommendation_upload(user_id, additional_random)
+            history_upload(user_id, additional_random)
 
             return popular_recs + additional_random
 
-        user_profile = np.mean(user_history, axis=0)
+        # Calculate similarity between all products and user history
+        user_profile = np.mean(user_history, axis=0)  # Average user preferences
         similarities = cosine_similarity([user_profile], all_product_features)
+        print(similarities)
 
+        # Get indices of the top N products sorted by similarity
         product_indices = similarities[0].argsort()[-top_n:][::-1]
 
+        # Get the actual product IDs using the indices
         recommended_product_ids = [all_product_ids[i] for i in product_indices]
-        print(recommended_product_ids)
 
-        recommendation_upload(user_id, recommended_product_ids)
+        # Upload the core recommendations to the database
+        history_upload(user_id, recommended_product_ids)
 
+        # Add 5 more unique random products that aren't in the recommendations
         additional_random = get_random_products(5, recommended_product_ids)
-        recommendation_upload(user_id, additional_random)
+        history_upload(user_id, additional_random)
 
+        # Return both the similarity-based recommendations and the random ones
         return recommended_product_ids + additional_random
 
     except Exception as e:
         logging.error(f"Recommendation error for user {user_id}: {str(e)}")
+        # Fallback to random products
         random_products = get_random_products(top_n + 5)
         return random_products
 
-def recommendation_upload(userID, products):
+def history_upload(userID, products):
+    """Upload product recommendations to the database"""
     db_con = database()
     cursor = db_con.cursor()
 
     try:
         for product_id in products:
+            # Use parameterized queries to prevent SQL injection
             cursor.execute("INSERT INTO Recommendation (UserID, RecommendedProductID) VALUES (%s, %s)",
                           (userID, product_id))
 
+        # Commit the changes
         db_con.commit()
 
     except Exception as e:
         logging.error(f"Error uploading recommendations: {str(e)}")
         db_con.rollback()
     finally:
+        # Close the cursor and connection
         cursor.close()
         db_con.close()