From 7c5b3f96e7d25251392c71e206d56253d39b1658 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Thu, 24 Apr 2025 21:35:31 -0700
Subject: [PATCH 01/11] added profile page

---
 backend/package-lock.json           | 14 +++---
 backend/package.json                |  2 +-
 backend/src/controllers/products.ts |  4 +-
 backend/src/controllers/users.ts    |  2 +-
 backend/src/models/user.ts          | 11 ++--
 frontend/src/App.tsx                |  9 ++++
 frontend/src/components/Navbar.tsx  |  5 ++
 frontend/src/pages/ProfilePage.tsx  | 78 +++++++++++++++++++++++++++++
 8 files changed, 109 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/pages/ProfilePage.tsx

diff --git a/backend/package-lock.json b/backend/package-lock.json
index 3efc828..1814cb4 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -22,7 +22,7 @@
         "mongodb": "^5.7.0",
         "mongoose": "^8.9.5",
         "multer": "^1.4.5-lts.1",
-        "nodemailer": "^6.10.0",
+        "nodemailer": "^6.10.1",
         "uuid": "^11.0.5"
       },
       "devDependencies": {
@@ -5018,9 +5018,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
-      "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz",
+      "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==",
       "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
@@ -10344,9 +10344,9 @@
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "nodemailer": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
-      "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA=="
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz",
+      "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA=="
     },
     "nodemon": {
       "version": "3.0.1",
diff --git a/backend/package.json b/backend/package.json
index 548f9ab..cfb70bf 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -13,7 +13,7 @@
     "mongodb": "^5.7.0",
     "mongoose": "^8.9.5",
     "multer": "^1.4.5-lts.1",
-    "nodemailer": "^6.10.0",
+    "nodemailer": "^6.10.1",
     "uuid": "^11.0.5"
   },
   "name": "backend",
diff --git a/backend/src/controllers/products.ts b/backend/src/controllers/products.ts
index bab3c55..d1063e9 100644
--- a/backend/src/controllers/products.ts
+++ b/backend/src/controllers/products.ts
@@ -122,7 +122,7 @@ export const deleteProductById = async (req: AuthenticatedRequest, res: Response
     if (!user) {
       return res.status(404).json({ message: "User not found" });
     }
-    if (!user.productList.includes(id)) {
+    if (!user.productList.includes(new mongoose.Types.ObjectId(id))) {
       return res.status(400).json({ message: "User does not own this product" });
     }
 
@@ -162,7 +162,7 @@ export const updateProductById = [
 
       console.log("in the terminal4");
 
-      if (!user.productList.includes(id)) {
+      if (!user.productList.includes(new mongoose.Types.ObjectId(id))) {
         return res.status(400).json({ message: "User does not own this product" });
       }
 
diff --git a/backend/src/controllers/users.ts b/backend/src/controllers/users.ts
index 7ddbf5b..2d122c9 100644
--- a/backend/src/controllers/users.ts
+++ b/backend/src/controllers/users.ts
@@ -16,7 +16,7 @@ export const getUserById = async (req: Request, res: Response) => {
   try {
     const firebaseUid = req.params.firebaseUid;
 
-    const user = await UserModel.findOne({ firebaseUid: firebaseUid });
+    const user = await UserModel.findOne({ firebaseUid: firebaseUid }).populate("productList");
 
     if (!user) {
       return res.status(404).json({ message: "User not found" });
diff --git a/backend/src/models/user.ts b/backend/src/models/user.ts
index 640b18a..9ab3628 100644
--- a/backend/src/models/user.ts
+++ b/backend/src/models/user.ts
@@ -16,11 +16,12 @@ const userSchema = new Schema({
     type: Date,
     required: true,
   },
-  productList: {
-    type: [String],
-    required: true,
-    default: [],
-  },
+  productList: [
+    {
+      type: Schema.Types.ObjectId,
+      ref: "Product",
+    },
+  ],
   firebaseUid: {
     type: String,
     required: true,
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index b93157e..ae3cd27 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -10,6 +10,7 @@ import { AddProduct } from "../src/pages/AddProduct";
 import { EditProduct } from "../src/pages/EditProduct";
 import { IndividualProductPage } from "../src/pages/Individual-product-page";
 import { PageNotFound } from "../src/pages/PageNotFound";
+import { ProfilePage } from "../src/pages/ProfilePage";
 import FirebaseProvider from "../src/utils/FirebaseProvider";
 
 const router = createBrowserRouter([
@@ -53,6 +54,14 @@ const router = createBrowserRouter([
     path: "*",
     element: <PageNotFound />,
   },
+  {
+    path: "/user-profile",
+    element: (
+      <PrivateRoute>
+        <ProfilePage />
+      </PrivateRoute>
+    ),
+  },
 ]);
 
 export default function App() {
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index a94ed2d..3becdbb 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -65,6 +65,11 @@ export function Navbar() {
               Products
             </button>
           </li>
+          <li>
+            {user ? (
+              <button onClick={() => (window.location.href = "/user-profile")}>Your Profile</button>
+            ) : null}
+          </li>
           <li>
             {user ? (
               <button
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
new file mode 100644
index 0000000..c14abb6
--- /dev/null
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -0,0 +1,78 @@
+import { useEffect, useState, useContext } from "react";
+import { useParams } from "react-router-dom";
+import { Helmet } from "react-helmet-async";
+import Product from "src/components/Product";
+import { FirebaseContext } from "src/utils/FirebaseProvider";
+import { get } from "src/api/requests";
+interface Product {
+  _id: string;
+  name: string;
+  price: number;
+  image: string;
+}
+
+interface UserProfile {
+  displayName?: string;
+  email: string;
+  productList: Product[];
+}
+
+export function ProfilePage() {
+  const [profile, setProfile] = useState<UserProfile | null>(null);
+  const [error, setError] = useState<string>("");
+  const { user } = useContext(FirebaseContext);
+  useEffect(() => {
+    const userUid = user?.uid;
+    const fetchUser = async () => {
+      await get(`/api/users/${userUid}`)
+        .then(async (res) => setProfile(await res.json()))
+        .catch(() => setError("user not found"));
+    };
+    fetchUser();
+  }, [user]);
+  console.log("profile.productList:", profile?.productList);
+  return (
+    <>
+      <Helmet>
+        <title>
+          {profile ? `${profile.displayName || profile.email}'s Profile` : "Profile"} - Low-Price
+          Center
+        </title>
+      </Helmet>
+      <main className="w-full flex justify-center items-center mt-12 mb-20">
+        <div className="max-w-[80%] w-full">
+          {error && <p className="text-red-800">{error}</p>}
+          {!error && (
+            <>
+              <div className="flex justify-between mb-2 px-3">
+                <p className="text-lg sm:text-3xl font-jetbrains font-medium">
+                  {profile?.displayName || profile?.email}'s Listings
+                </p>
+              </div>
+              {profile?.productList.length === 0 && (
+                <p className="font-inter text-lg px-3 pt-3">No posted products yet.</p>
+              )}
+
+              <div className="grid sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 xxl:grid-cols-4">
+                {profile?.productList.map(
+                  (product: { _id: string; name: string; price: number; image: string }) => (
+                    <div key={product._id} className="px-3 py-3">
+                      <Product
+                        productId={product._id}
+                        productName={product.name}
+                        productPrice={product.price}
+                        productImage={
+                          product.image ? product.image : "/productImages/product-placeholder.webp"
+                        }
+                      />
+                    </div>
+                  ),
+                )}
+              </div>
+            </>
+          )}
+        </div>
+      </main>
+    </>
+  );
+}

From ff85d83f2774e3049d4863a45e0e3b32b9e85a4c Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Thu, 1 May 2025 23:29:06 -0700
Subject: [PATCH 02/11] added Return to Marketplace button

---
 frontend/src/components/Navbar.tsx | 19 ++++++++++++++++++-
 frontend/src/pages/ProfilePage.tsx | 22 +++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 3becdbb..11b9590 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -67,7 +67,13 @@ export function Navbar() {
           </li>
           <li>
             {user ? (
-              <button onClick={() => (window.location.href = "/user-profile")}>Your Profile</button>
+              <button
+                onClick={() => (window.location.href = "/user-profile")}
+                className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+              >
+                <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                Your Profile
+              </button>
             ) : null}
           </li>
           <li>
@@ -120,6 +126,17 @@ export function Navbar() {
                 Products
               </button>
             </li>
+            <li className="mb-2">
+              {user ? (
+                <button
+                  onClick={() => (window.location.href = "/user-profile")}
+                  className="font-inter w-full text-center px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+                >
+                  <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                  Your Profile
+                </button>
+              ) : null}
+            </li>
             <li>
               {user ? (
                 <button
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index c14abb6..b91ae32 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState, useContext } from "react";
-import { useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { Helmet } from "react-helmet-async";
 import Product from "src/components/Product";
 import { FirebaseContext } from "src/utils/FirebaseProvider";
@@ -18,6 +18,7 @@ interface UserProfile {
 }
 
 export function ProfilePage() {
+  const navigate = useNavigate();
   const [profile, setProfile] = useState<UserProfile | null>(null);
   const [error, setError] = useState<string>("");
   const { user } = useContext(FirebaseContext);
@@ -39,16 +40,27 @@ export function ProfilePage() {
           Center
         </title>
       </Helmet>
-      <main className="w-full flex justify-center items-center mt-12 mb-20">
-        <div className="max-w-[80%] w-full">
+      <main className="w-full flex flex-col items-center mt-12 mb-20">
+        <div className="max-w-[80%] w-full justify-center">
           {error && <p className="text-red-800">{error}</p>}
           {!error && (
             <>
               <div className="flex justify-between mb-2 px-3">
-                <p className="text-lg sm:text-3xl font-jetbrains font-medium">
-                  {profile?.displayName || profile?.email}'s Listings
+                <button
+                  className="text-lg mb-4 font-inter hover:underline"
+                  onClick={() => navigate("/products")}
+                >
+                  &larr; Return to Marketplace
+                </button>
+              </div>
+              <div className="flex justify-between mb-2 px-3">
+                <p className="text-lg sm:text-3xl font-jetbrains font-bold">
+                  {profile?.displayName || profile?.email}
                 </p>
               </div>
+              <div className="flex justify-between mb-2 px-3">
+                <p className="text-lg sm:text-3xl font-jetbrains font-medium">Products</p>
+              </div>
               {profile?.productList.length === 0 && (
                 <p className="font-inter text-lg px-3 pt-3">No posted products yet.</p>
               )}

From 13f96c938116d95bbb89b5a573cdbd5527bb8146 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Mon, 5 May 2025 13:49:13 -0700
Subject: [PATCH 03/11] added profile picture and biography

---
 backend/src/models/user.ts              |   6 +++++
 frontend/public/profile-pic-default.png | Bin 0 -> 21133 bytes
 frontend/src/components/Navbar.tsx      |   6 ++---
 frontend/src/pages/ProfilePage.tsx      |  28 +++++++++++++++++++-----
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 frontend/public/profile-pic-default.png

diff --git a/backend/src/models/user.ts b/backend/src/models/user.ts
index 9ab3628..42320e4 100644
--- a/backend/src/models/user.ts
+++ b/backend/src/models/user.ts
@@ -26,6 +26,12 @@ const userSchema = new Schema({
     type: String,
     required: true,
   },
+  profilePic: {
+    type: String,
+  },
+  biography: {
+    type: String,
+  },
 });
 
 export type User = HydratedDocument<InferSchemaType<typeof userSchema>>;
diff --git a/frontend/public/profile-pic-default.png b/frontend/public/profile-pic-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a12fef5659c6cc5a9eb99b0dc565ae5ba9d8f63
GIT binary patch
literal 21133
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

literal 0
HcmV?d00001

diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 11b9590..df6b0be 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -116,7 +116,7 @@ export function Navbar() {
               <button
                 hidden={user === null}
                 onClick={() => (window.location.href = "/products")}
-                className="font-inter w-full text-center px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+                className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
               >
                 <FontAwesomeIcon
                   className="text-lg pr-2"
@@ -130,7 +130,7 @@ export function Navbar() {
               {user ? (
                 <button
                   onClick={() => (window.location.href = "/user-profile")}
-                  className="font-inter w-full text-center px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+                  className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >
                   <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
                   Your Profile
@@ -141,7 +141,7 @@ export function Navbar() {
               {user ? (
                 <button
                   onClick={signOutFromFirebase}
-                  className="font-inter w-full text-center px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+                  className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >
                   <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
                   Sign Out
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index b91ae32..a9dae9b 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -15,6 +15,8 @@ interface UserProfile {
   displayName?: string;
   email: string;
   productList: Product[];
+  profilePic?: string;
+  biography?: string;
 }
 
 export function ProfilePage() {
@@ -53,16 +55,32 @@ export function ProfilePage() {
                   &larr; Return to Marketplace
                 </button>
               </div>
-              <div className="flex justify-between mb-2 px-3">
-                <p className="text-lg sm:text-3xl font-jetbrains font-bold">
-                  {profile?.displayName || profile?.email}
-                </p>
+              <div className="flex justify-between mb-2 px-3 gap-10">
+                <div className="flex-1">
+                  <p className="text-2xl sm:text-3xl font-jetbrains font-bold mb-6">
+                    {profile?.displayName || profile?.email}
+                  </p>
+                  {/* Biography */}
+                  <div className="bg-[#F5F0E6] p-5 mb-6">
+                    <p className="font-inter text-black text-base md:text-xl font-normal break-words">
+                      {profile?.biography || "Welcome to my profile!"}
+                    </p>
+                  </div>
+                </div>
+                {/* Profile Image */}
+                <div>
+                  <img
+                    src={profile?.profilePic ? profile?.profilePic : "/profile-pic-default.png"}
+                    alt="Product Image"
+                    className="w-full h-full object-cover"
+                  />
+                </div>
               </div>
               <div className="flex justify-between mb-2 px-3">
                 <p className="text-lg sm:text-3xl font-jetbrains font-medium">Products</p>
               </div>
               {profile?.productList.length === 0 && (
-                <p className="font-inter text-lg px-3 pt-3">No posted products yet.</p>
+                <p className="font-inter text-lg px-3 pt-3">No listed products yet.</p>
               )}
 
               <div className="grid sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 xxl:grid-cols-4">

From c755b9aaf6379afbfa3398f184356b3c88594140 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Mon, 5 May 2025 17:38:24 -0700
Subject: [PATCH 04/11] added edit profile feature

---
 backend/src/controllers/users.ts   | 112 ++++++++++++++------
 backend/src/routes/user.ts         |   2 +-
 frontend/src/App.tsx               |  11 +-
 frontend/src/components/Navbar.tsx |   8 +-
 frontend/src/pages/EditProfile.tsx | 159 +++++++++++++++++++++++++++++
 frontend/src/pages/ProfilePage.tsx |  37 +++++--
 6 files changed, 283 insertions(+), 46 deletions(-)
 create mode 100644 frontend/src/pages/EditProfile.tsx

diff --git a/backend/src/controllers/users.ts b/backend/src/controllers/users.ts
index 2d122c9..1e14c01 100644
--- a/backend/src/controllers/users.ts
+++ b/backend/src/controllers/users.ts
@@ -1,6 +1,15 @@
 import { Request, Response } from "express";
 import UserModel from "src/models/user";
 import { getAuth } from "firebase-admin/auth";
+import multer from "multer";
+import { v4 as uuidv4 } from "uuid";
+import { bucket } from "src/config/firebase";
+import { initializeApp } from "firebase/app";
+import { firebaseConfig } from "src/config/firebaseConfig";
+import { getStorage, ref, getDownloadURL } from "firebase/storage";
+import user from "src/models/user";
+
+const upload = multer({ storage: multer.memoryStorage() });
 
 export const getUsers = async (req: Request, res: Response) => {
   try {
@@ -94,37 +103,74 @@ export const deleteUserById = async (req: Request, res: Response) => {
 };
 
 // id: firebase user id
-export const updateUserById = async (req: Request, res: Response) => {
-  try {
-    const { displayName, deactivateAccount } = req.body;
-    const firebaseUid = req.params.firebaseUid;
-    const updatedUser = await UserModel.findOne({ firebaseUid: firebaseUid });
-    if (!updatedUser) {
-      throw new Error("User not found");
-    }
-
-    // Update fields if provided
-    if (displayName != undefined) {
-      updatedUser.displayName = displayName;
-    }
-
-    if (deactivateAccount != undefined) {
-      updatedUser.activeUser = false;
+export const updateUserById = [
+  upload.single("profilePic"),
+  async (req: Request, res: Response) => {
+    try {
+      const { displayName, deactivateAccount, biography } = req.body;
+      const firebaseUid = req.params.firebaseUid;
+      const updatedUser = await UserModel.findOne({ firebaseUid: firebaseUid });
+      if (!updatedUser) {
+        throw new Error("User not found");
+      }
+
+      let newProfilePic;
+
+      // Handle optional image uplaod
+      if (req.file) {
+        const fileName = `${uuidv4()}-${req.file.originalname}`;
+        const file = bucket.file(fileName);
+
+        await file.save(req.file.buffer, {
+          metadata: { contentType: req.file.mimetype },
+        });
+
+        const app = initializeApp(firebaseConfig);
+        const storage = getStorage(app);
+        newProfilePic = await getDownloadURL(ref(storage, fileName));
+      }
+
+      // Update fields if provided
+      if (displayName !== undefined) {
+        updatedUser.displayName = displayName;
+      }
+
+      if (deactivateAccount !== undefined) {
+        updatedUser.activeUser = false;
+      }
+
+      if (biography !== undefined) {
+        updatedUser.biography = biography;
+      }
+
+      if (newProfilePic) {
+        updatedUser.profilePic = newProfilePic;
+      }
+
+      // Update Firebase user
+      const firebaseUser = await getAuth().getUserByEmail(updatedUser.userEmail);
+      if (deactivateAccount) {
+        if (firebaseUser) {
+          await getAuth().updateUser(firebaseUser.uid, { disabled: true });
+        }
+      } else {
+        if (firebaseUser) {
+          await getAuth().updateUser(firebaseUser.uid, { disabled: false });
+        }
+      }
+
+      await updatedUser.save();
+
+      res.status(200).json({
+        message: "User successfully updated",
+        updatedUser,
+      });
+    } catch (error) {
+      console.error(error);
+      res.status(500).json({
+        message: "Error updating user",
+        error: error instanceof Error ? error.message : error,
+      });
     }
-
-    // Update Firebase user
-    const firebaseUser = await getAuth().getUserByEmail(updatedUser.userEmail);
-    if (firebaseUser) {
-      await getAuth().updateUser(firebaseUser.uid, { disabled: true });
-    }
-
-    await updatedUser.save();
-
-    res.status(200).json({
-      message: "User successfully updated",
-      updatedUser,
-    });
-  } catch (error) {
-    res.status(500).json({ message: "Error updating user", error });
-  }
-};
+  },
+];
diff --git a/backend/src/routes/user.ts b/backend/src/routes/user.ts
index 754a31f..52e126f 100644
--- a/backend/src/routes/user.ts
+++ b/backend/src/routes/user.ts
@@ -13,6 +13,6 @@ router.get("/", getUsers);
 router.get("/:firebaseUid", getUserById);
 router.post("/", addUser);
 router.delete("/:id", deleteUserById);
-router.patch("/:id", updateUserById);
+router.patch("/:firebaseUid", updateUserById);
 
 export default router;
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index ae3cd27..dfd3452 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -11,6 +11,7 @@ import { EditProduct } from "../src/pages/EditProduct";
 import { IndividualProductPage } from "../src/pages/Individual-product-page";
 import { PageNotFound } from "../src/pages/PageNotFound";
 import { ProfilePage } from "../src/pages/ProfilePage";
+import { EditProfile } from "../src/pages/EditProfile";
 import FirebaseProvider from "../src/utils/FirebaseProvider";
 
 const router = createBrowserRouter([
@@ -55,13 +56,21 @@ const router = createBrowserRouter([
     element: <PageNotFound />,
   },
   {
-    path: "/user-profile",
+    path: "/user-profile/:id",
     element: (
       <PrivateRoute>
         <ProfilePage />
       </PrivateRoute>
     ),
   },
+  {
+    path: "/edit-profile",
+    element: (
+      <PrivateRoute>
+        <EditProfile />
+      </PrivateRoute>
+    ),
+  },
 ]);
 
 export default function App() {
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index df6b0be..01277a3 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -68,7 +68,9 @@ export function Navbar() {
           <li>
             {user ? (
               <button
-                onClick={() => (window.location.href = "/user-profile")}
+                onClick={() => {
+                  if (user.uid) window.location.href = `/user-profile/${user.uid}`;
+                }}
                 className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
               >
                 <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
@@ -129,7 +131,9 @@ export function Navbar() {
             <li className="mb-2">
               {user ? (
                 <button
-                  onClick={() => (window.location.href = "/user-profile")}
+                  onClick={() => {
+                    if (user.uid) window.location.href = `/user-profile/${user.uid}`;
+                  }}
                   className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >
                   <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
diff --git a/frontend/src/pages/EditProfile.tsx b/frontend/src/pages/EditProfile.tsx
new file mode 100644
index 0000000..55d8a1e
--- /dev/null
+++ b/frontend/src/pages/EditProfile.tsx
@@ -0,0 +1,159 @@
+import { useState, useRef, useContext, useEffect, FormEvent } from "react";
+import { FirebaseContext } from "src/utils/FirebaseProvider";
+import { useNavigate } from "react-router-dom";
+import { get, patch } from "src/api/requests";
+import { Helmet } from "react-helmet-async";
+
+interface UserProfile {
+  uid: string;
+  displayName?: string;
+  profilePic?: string;
+  biography?: string;
+}
+
+export function EditProfile() {
+  const [profile, setProfile] = useState<UserProfile | null>(null);
+
+  const profileDisplayName = useRef<HTMLInputElement>(null);
+  const profileBiography = useRef<HTMLTextAreaElement>(null);
+  const profilePicture = useRef<HTMLInputElement>(null);
+  const [currentProfilePic, setCurrentProfilePic] = useState<string | null>(null);
+
+  const [error, setError] = useState<boolean>(false);
+
+  const { user } = useContext(FirebaseContext);
+  // const { id } = useParams();
+  const uid = user?.uid;
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    const fetchUser = async () => {
+      if (!uid) return;
+      try {
+        const res = await get(`/api/users/${uid}`);
+        const profileData = await res.json();
+        setProfile(profileData);
+        setCurrentProfilePic(profileData.profilePic);
+      } catch {
+        setError(true);
+      }
+    };
+    fetchUser();
+  }, [uid]);
+
+  const handleEdit = async (e: FormEvent) => {
+    e.preventDefault();
+    try {
+      if (profileDisplayName.current && profileBiography.current && user) {
+        let profilePic;
+        if (profilePicture.current && profilePicture.current.files) {
+          profilePic = profilePicture.current.files[0];
+        }
+
+        const body = new FormData();
+        body.append("displayName", profileDisplayName.current.value);
+        body.append("biography", profileBiography.current.value);
+        if (profilePic) body.append("profilePic", profilePic);
+
+        const res = await patch(`/api/users/${uid}`, body);
+
+        if (!res.ok) {
+          throw new Error("Patch failed");
+        }
+
+        setError(false);
+        navigate(`/user-profile/${uid}`);
+      } else throw Error();
+    } catch (err) {
+      setError(true);
+    }
+  };
+
+  const handleImageChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.files && e.target.files[0]) {
+      const file = e.target.files[0];
+      setCurrentProfilePic(URL.createObjectURL(file));
+    }
+  };
+
+  return (
+    <>
+      <Helmet>
+        <title>Low-Price Center Marketplace</title>
+      </Helmet>
+      <div className="w-full mt-12 mb-6">
+        <p className="text-3xl text-center font-jetbrains font-medium">Edit Profile</p>
+      </div>
+      <form className="max-w-sm mx-auto p-4" onSubmit={handleEdit}>
+        {/* Profile Display Name */}
+        <div className="mb-5">
+          <label htmlFor="displayName" className="block mb-2 font-medium font-inter text-black">
+            Display Name
+          </label>
+          <input
+            id="displayName"
+            type="text"
+            defaultValue={profile?.displayName}
+            ref={profileDisplayName}
+            className="border border-gray-300 text-black text-sm rounded-md w-full p-2.5 y-600"
+            placeholder="Display Name"
+            required
+          />
+        </div>
+        {/* Biography */}
+        <div className="mb-5">
+          <label htmlFor="biography" className="block mb-2 font-medium font-inter text-black">
+            Biography
+          </label>
+          <textarea
+            id="biography"
+            rows={10}
+            defaultValue={profile?.biography}
+            ref={profileBiography}
+            className="border border-gray-300 text-black text-sm rounded-md w-full p-2.5 y-600"
+            placeholder="Add your biography..."
+          />
+        </div>
+        {/* Profile Picture */}
+        <div className="mb-5">
+          <label htmlFor="profilePic" className="block mb-2 font-medium font-inter text-black">
+            Profile Picture
+          </label>
+          <input
+            id="profilePic"
+            type="file"
+            accept="image/png, image/jpeg"
+            onChange={handleImageChange}
+            ref={profilePicture}
+            className="border border-gray-300 text-black text-sm rounded-md w-full p-2.5 y-600"
+          />
+          {currentProfilePic && (
+            <img className="w-full object-contain mt-2" src={currentProfilePic} alt="Profile" />
+          )}
+        </div>
+        <div className="flex justify-between gap-3">
+          <button
+            onClick={() => navigate(`/user-profile/${uid}`)}
+            className="bg-[#00629B] text-white font-semibold font-inter py-2 px-4 shadow-lg"
+          >
+            Cancel
+          </button>
+          <div className="flex gap-2">
+            <button
+              type="submit"
+              className="bg-[#00629B] text-white font-semibold font-inter py-2 px-4 shadow-lg"
+            >
+              Done
+            </button>
+          </div>
+        </div>
+        {/* error message */}
+        {error && (
+          <p className="m-2 mt-4 text-sm text-red-800 text-center">
+            Error editing profile. Try again.
+          </p>
+        )}
+      </form>
+    </>
+  );
+}
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index a9dae9b..118f2a2 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -1,5 +1,7 @@
+import { faPenToSquare } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useEffect, useState, useContext } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
 import { Helmet } from "react-helmet-async";
 import Product from "src/components/Product";
 import { FirebaseContext } from "src/utils/FirebaseProvider";
@@ -12,6 +14,7 @@ interface Product {
 }
 
 interface UserProfile {
+  firebaseUid: string;
   displayName?: string;
   email: string;
   productList: Product[];
@@ -24,16 +27,24 @@ export function ProfilePage() {
   const [profile, setProfile] = useState<UserProfile | null>(null);
   const [error, setError] = useState<string>("");
   const { user } = useContext(FirebaseContext);
+  const { id } = useParams();
+  const [hasPermissions, setHasPermissions] = useState<boolean>(false);
+
   useEffect(() => {
-    const userUid = user?.uid;
     const fetchUser = async () => {
-      await get(`/api/users/${userUid}`)
+      await get(`/api/users/${id}`)
         .then(async (res) => setProfile(await res.json()))
-        .catch(() => setError("user not found"));
+        .catch(() => setError("User not found"));
     };
-    fetchUser();
-  }, [user]);
-  console.log("profile.productList:", profile?.productList);
+    if (id) fetchUser();
+  }, [id]);
+
+  useEffect(() => {
+    if (user?.uid && profile?.firebaseUid) {
+      setHasPermissions(user.uid === profile.firebaseUid);
+    }
+  }, [user, profile]);
+
   return (
     <>
       <Helmet>
@@ -54,6 +65,14 @@ export function ProfilePage() {
                 >
                   &larr; Return to Marketplace
                 </button>
+                {hasPermissions && (
+                  <button
+                    className="text-lg mb-4 font-inter hover:underline"
+                    onClick={() => navigate(`/edit-profile`)}
+                  >
+                    Edit Profile <FontAwesomeIcon icon={faPenToSquare} />
+                  </button>
+                )}
               </div>
               <div className="flex justify-between mb-2 px-3 gap-10">
                 <div className="flex-1">
@@ -71,8 +90,8 @@ export function ProfilePage() {
                 <div>
                   <img
                     src={profile?.profilePic ? profile?.profilePic : "/profile-pic-default.png"}
-                    alt="Product Image"
-                    className="w-full h-full object-cover"
+                    alt="Profile Image"
+                    className="w-48 h-48 object-cover rounded-full shadow-md"
                   />
                 </div>
               </div>

From 09467e715e489beb0a0d66f8ebed9fc0992e0432 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Fri, 9 May 2025 13:37:45 -0700
Subject: [PATCH 05/11] changed link to /profile

---
 frontend/src/App.tsx               | 2 +-
 frontend/src/components/Navbar.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index dfd3452..576e113 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -56,7 +56,7 @@ const router = createBrowserRouter([
     element: <PageNotFound />,
   },
   {
-    path: "/user-profile/:id",
+    path: "/profile/:id",
     element: (
       <PrivateRoute>
         <ProfilePage />
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 01277a3..1addfd5 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -69,7 +69,7 @@ export function Navbar() {
             {user ? (
               <button
                 onClick={() => {
-                  if (user.uid) window.location.href = `/user-profile/${user.uid}`;
+                  if (user.uid) window.location.href = `/profile/${user.uid}`;
                 }}
                 className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
               >
@@ -132,7 +132,7 @@ export function Navbar() {
               {user ? (
                 <button
                   onClick={() => {
-                    if (user.uid) window.location.href = `/user-profile/${user.uid}`;
+                    if (user.uid) window.location.href = `/profile/${user.uid}`;
                   }}
                   className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >

From c296c285a3ef26f6c68b3d2ef106c9d163283fd1 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Wed, 14 May 2025 11:39:38 -0700
Subject: [PATCH 06/11] fixed mobile view, changed back button and sign in/out
 icon

---
 frontend/src/components/Navbar.tsx | 32 +++++++++++++++++++++++++-----
 frontend/src/pages/ProfilePage.tsx | 32 ++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 1addfd5..a739f49 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -1,4 +1,10 @@
-import { faBars, faCartShopping, faUser, faXmark } from "@fortawesome/free-solid-svg-icons";
+import {
+  faBars,
+  faCartShopping,
+  faUser,
+  faXmark,
+  faDoorOpen,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useContext, useEffect, useRef, useState } from "react";
 import { FirebaseContext } from "src/utils/FirebaseProvider";
@@ -84,7 +90,11 @@ export function Navbar() {
                 onClick={signOutFromFirebase}
                 className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
               >
-                <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                <FontAwesomeIcon
+                  className="text-lg pr-2"
+                  icon={faDoorOpen}
+                  aria-label="User Icon"
+                />
                 Sign Out
               </button>
             ) : (
@@ -92,7 +102,11 @@ export function Navbar() {
                 onClick={openGoogleAuthentication}
                 className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
               >
-                <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                <FontAwesomeIcon
+                  className="text-lg pr-2"
+                  icon={faDoorOpen}
+                  aria-label="User Icon"
+                />
                 Sign In
               </button>
             )}
@@ -147,7 +161,11 @@ export function Navbar() {
                   onClick={signOutFromFirebase}
                   className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >
-                  <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                  <FontAwesomeIcon
+                    className="text-lg pr-2"
+                    icon={faDoorOpen}
+                    aria-label="User Icon"
+                  />
                   Sign Out
                 </button>
               ) : (
@@ -155,7 +173,11 @@ export function Navbar() {
                   onClick={openGoogleAuthentication}
                   className="font-inter w-full text-center px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
                 >
-                  <FontAwesomeIcon className="text-lg pr-2" icon={faUser} aria-label="User Icon" />
+                  <FontAwesomeIcon
+                    className="text-lg pr-2"
+                    icon={faDoorOpen}
+                    aria-label="User Icon"
+                  />
                   Sign In
                 </button>
               )}
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index 118f2a2..32a5196 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -60,10 +60,10 @@ export function ProfilePage() {
             <>
               <div className="flex justify-between mb-2 px-3">
                 <button
-                  className="text-lg mb-4 font-inter hover:underline"
-                  onClick={() => navigate("/products")}
+                  className="text-lg text-left mb-4 font-inter hover:underline"
+                  onClick={() => navigate(-1)}
                 >
-                  &larr; Return to Marketplace
+                  &larr; Back
                 </button>
                 {hasPermissions && (
                   <button
@@ -74,11 +74,21 @@ export function ProfilePage() {
                   </button>
                 )}
               </div>
-              <div className="flex justify-between mb-2 px-3 gap-10">
+              <div className="flex flex-col md:flex-row justify-between mb-2 px-3 gap-10">
                 <div className="flex-1">
-                  <p className="text-2xl sm:text-3xl font-jetbrains font-bold mb-6">
-                    {profile?.displayName || profile?.email}
-                  </p>
+                  {/* Name */}
+                  <div className="flex flex-row justify-between mb-6">
+                    <p className="flex items-center text-2xl sm:text-3xl font-jetbrains font-bold">
+                      {profile?.displayName || profile?.email}
+                    </p>
+                    <div className="md:hidden items-end">
+                      <img
+                        src={profile?.profilePic ? profile?.profilePic : "/profile-pic-default.png"}
+                        alt="Profile Image"
+                        className="w-20 h-20 md:w-48 md:h-48 object-cover rounded-full shadow-md"
+                      />
+                    </div>
+                  </div>
                   {/* Biography */}
                   <div className="bg-[#F5F0E6] p-5 mb-6">
                     <p className="font-inter text-black text-base md:text-xl font-normal break-words">
@@ -86,17 +96,17 @@ export function ProfilePage() {
                     </p>
                   </div>
                 </div>
-                {/* Profile Image */}
-                <div>
+                {/* Profile Image on Desktop View*/}
+                <div className="hidden md:flex">
                   <img
                     src={profile?.profilePic ? profile?.profilePic : "/profile-pic-default.png"}
                     alt="Profile Image"
-                    className="w-48 h-48 object-cover rounded-full shadow-md"
+                    className="w-24 h-24 md:w-48 md:h-48 object-cover rounded-full shadow-md"
                   />
                 </div>
               </div>
               <div className="flex justify-between mb-2 px-3">
-                <p className="text-lg sm:text-3xl font-jetbrains font-medium">Products</p>
+                <p className="text-2xl sm:text-3xl font-jetbrains font-medium">Products</p>
               </div>
               {profile?.productList.length === 0 && (
                 <p className="font-inter text-lg px-3 pt-3">No listed products yet.</p>

From de552201395966ead903d8b6824bcd041aab41a3 Mon Sep 17 00:00:00 2001
From: n1sh1thaS <nishi2919@gmail.com>
Date: Tue, 20 May 2025 12:03:49 -0700
Subject: [PATCH 07/11] add isSold attribute and create button

---
 backend/src/controllers/products.ts           |  1 +
 backend/src/models/product.ts                 |  4 +++
 .../src/pages/Individual-product-page.tsx     | 29 ++++++++++++++-----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/backend/src/controllers/products.ts b/backend/src/controllers/products.ts
index a100060..037c826 100644
--- a/backend/src/controllers/products.ts
+++ b/backend/src/controllers/products.ts
@@ -191,6 +191,7 @@ export const updateProductById = [
           description: req.body.description,
           images: finalImages,
           timeUpdated: new Date(),
+          isSold: req.body.isSold,
         },
         { new: true },
       );
diff --git a/backend/src/models/product.ts b/backend/src/models/product.ts
index ca7386a..1d4df9a 100644
--- a/backend/src/models/product.ts
+++ b/backend/src/models/product.ts
@@ -25,6 +25,10 @@ const productSchema = new Schema({
     required: true,
   },
   images: [{ type: String }],
+  isSold: {
+    type: Boolean,
+    default: false,
+  }
 });
 
 export type Product = HydratedDocument<InferSchemaType<typeof productSchema>>;
diff --git a/frontend/src/pages/Individual-product-page.tsx b/frontend/src/pages/Individual-product-page.tsx
index a1b0025..d823666 100644
--- a/frontend/src/pages/Individual-product-page.tsx
+++ b/frontend/src/pages/Individual-product-page.tsx
@@ -1,4 +1,4 @@
-import { faPenToSquare } from "@fortawesome/free-solid-svg-icons";
+import { faCheck, faPenToSquare } from "@fortawesome/free-solid-svg-icons";
 import { faHeart as faHeartSolid } from "@fortawesome/free-solid-svg-icons";
 import { faHeart as faHeartRegular } from "@fortawesome/free-regular-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -20,6 +20,7 @@ export function IndividualProductPage() {
     images: string[];
     userEmail: string;
     description: string;
+    isSold: boolean;
   }>();
   const [error, setError] = useState<string>();
   const [hasPermissions, setHasPermissions] = useState<boolean>(false);
@@ -62,6 +63,10 @@ export function IndividualProductPage() {
     findEditPermission();
   }, []);
 
+  const handleMarkSold = () => {
+    setProduct({ ...product, isSold: !product?.isSold } as typeof product);
+  };
+
   const toggleSave = async () => {
     if (!user?.uid) {
       navigate("/login");
@@ -98,12 +103,22 @@ export function IndividualProductPage() {
           </button>
 
           {hasPermissions && (
-            <button
-              className="text-lg mb-4 font-inter hover:underline"
-              onClick={() => navigate(`/edit-product/${id}`)}
-            >
-              Edit Product <FontAwesomeIcon icon={faPenToSquare} />
-            </button>
+            <div className="flex flex-col items-end">
+              <button
+                className="text-lg mb-1 font-inter hover:underline"
+                onClick={() => navigate(`/edit-product/${id}`)}
+              >
+                Edit Product <FontAwesomeIcon icon={faPenToSquare} />
+              </button>
+              <button
+                onClick={handleMarkSold}
+                className={`text-lg mb-4 font-inter hover:underline ${
+                  product?.isSold && "text-red-800 font-semibold"
+                }`}
+              >
+                {product?.isSold ? "Sold" : "Mark as Sold"} <FontAwesomeIcon icon={faCheck} />
+              </button>
+            </div>
           )}
         </div>
         {/* Error message if product not found */}

From 3ed19ec40a80ce1e871776337494e7d7d1d6ab75 Mon Sep 17 00:00:00 2001
From: n1sh1thaS <nishi2919@gmail.com>
Date: Wed, 21 May 2025 11:33:52 -0700
Subject: [PATCH 08/11] implement mark product as sold functionality

---
 .../src/pages/Individual-product-page.tsx     | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Individual-product-page.tsx b/frontend/src/pages/Individual-product-page.tsx
index d823666..5397cee 100644
--- a/frontend/src/pages/Individual-product-page.tsx
+++ b/frontend/src/pages/Individual-product-page.tsx
@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useContext, useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
-import { get, post } from "src/api/requests";
+import { get, patch, post } from "src/api/requests";
 import { FirebaseContext } from "src/utils/FirebaseProvider";
 import EmblaCarousel from "src/components/EmblaCarousel";
 import { EmblaOptionsType } from "embla-carousel";
@@ -64,7 +64,31 @@ export function IndividualProductPage() {
   }, []);
 
   const handleMarkSold = () => {
-    setProduct({ ...product, isSold: !product?.isSold } as typeof product);
+    const updateProduct = async () => {
+      try {
+        if (product) {
+          const body = new FormData();
+          body.append("name", product?.name);
+          body.append("price", String(product?.price));
+          body.append("description", product?.description);
+          body.append("userEmail", product?.userEmail);
+          body.append("isSold", String(!product?.isSold));
+
+          // append existing image URLs
+          product.images.forEach((url) => body.append("existingImages", url));
+
+          const res = await patch(`/api/products/${id}`, body);
+
+          if (res.ok) {
+            setError("");
+            setProduct({ ...product, isSold: !product?.isSold } as typeof product);
+          } else throw Error();
+        } else throw Error();
+      } catch (err) {
+        setError("Unable to mark product as sold");
+      }
+    };
+    updateProduct();
   };
 
   const toggleSave = async () => {

From 23594e69d26ce3d5b444cddeb14520dfd033e04b Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Wed, 21 May 2025 17:36:04 -0700
Subject: [PATCH 09/11] changed navigation from empty page

---
 frontend/src/components/BackButton.tsx | 21 ++++++++++++++
 frontend/src/components/Navbar.tsx     | 16 +++++++----
 frontend/src/components/Product.tsx    |  4 ++-
 frontend/src/pages/ProfilePage.tsx     | 14 ++++-----
 package-lock.json                      | 39 ++++++++++++++++++++++++++
 package.json                           |  1 +
 6 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/components/BackButton.tsx

diff --git a/frontend/src/components/BackButton.tsx b/frontend/src/components/BackButton.tsx
new file mode 100644
index 0000000..6b2fa6b
--- /dev/null
+++ b/frontend/src/components/BackButton.tsx
@@ -0,0 +1,21 @@
+import { useNavigate } from "react-router-dom";
+
+function BackButton() {
+  const navigate = useNavigate();
+
+  const handleBack = () => {
+    if (window.history.length > 1) {
+      navigate(-1);
+    } else {
+      navigate("/products");
+    }
+  };
+
+  return (
+    <button className="text-lg text-left mb-4 font-inter hover:underline" onClick={handleBack}>
+      &larr; Back
+    </button>
+  );
+}
+
+export default BackButton;
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index b26c792..dee197c 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -78,11 +78,7 @@ export function Navbar() {
               onClick={() => (window.location.href = "/saved-products")}
               className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
             >
-              <FontAwesomeIcon
-                className="text-lg pr-2"
-                icon={faHeart}
-                aria-label="Heart Icon"
-              />
+              <FontAwesomeIcon className="text-lg pr-2" icon={faHeart} aria-label="Heart Icon" />
               Saved
             </button>
           </li>
@@ -157,6 +153,16 @@ export function Navbar() {
                 Products
               </button>
             </li>
+            <li className="mb-2">
+              <button
+                hidden={user === null}
+                onClick={() => (window.location.href = "/saved-products")}
+                className="font-inter w-full text-left px-4 py-2 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors"
+              >
+                <FontAwesomeIcon className="text-lg pr-2" icon={faHeart} aria-label="Heart Icon" />
+                Saved
+              </button>
+            </li>
             <li className="mb-2">
               {user ? (
                 <button
diff --git a/frontend/src/components/Product.tsx b/frontend/src/components/Product.tsx
index 4a5b4b5..344193f 100644
--- a/frontend/src/components/Product.tsx
+++ b/frontend/src/components/Product.tsx
@@ -25,7 +25,9 @@ function Product({
   const [isSaved, setIsSaved] = useState(initialIsSaved);
   const [isHovered, setIsHovered] = useState(false);
   const images =
-    productImages.length > 0 ? productImages : ["/productImages/product-placeholder.webp"];
+    Array.isArray(productImages) && productImages.length > 0
+      ? productImages
+      : ["/productImages/product-placeholder.webp"];
 
   const toggleSave = async (e: React.MouseEvent) => {
     e.preventDefault();
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index 32a5196..32c023b 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState, useContext } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { Helmet } from "react-helmet-async";
 import Product from "src/components/Product";
+import BackButton from "src/components/BackButton";
 import { FirebaseContext } from "src/utils/FirebaseProvider";
 import { get } from "src/api/requests";
 interface Product {
@@ -59,12 +60,7 @@ export function ProfilePage() {
           {!error && (
             <>
               <div className="flex justify-between mb-2 px-3">
-                <button
-                  className="text-lg text-left mb-4 font-inter hover:underline"
-                  onClick={() => navigate(-1)}
-                >
-                  &larr; Back
-                </button>
+                <BackButton />
                 {hasPermissions && (
                   <button
                     className="text-lg mb-4 font-inter hover:underline"
@@ -120,8 +116,10 @@ export function ProfilePage() {
                         productId={product._id}
                         productName={product.name}
                         productPrice={product.price}
-                        productImage={
-                          product.image ? product.image : "/productImages/product-placeholder.webp"
+                        productImages={
+                          product.image
+                            ? [product.image]
+                            : ["/productImages/product-placeholder.webp"]
                         }
                       />
                     </div>
diff --git a/package-lock.json b/package-lock.json
index 36320be..5f97eb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
+        "embla-carousel-react": "^8.6.0",
         "firebase-admin": "^13.0.2"
       },
       "devDependencies": {
@@ -697,6 +698,34 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "node_modules/embla-carousel": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
+      "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
+      "license": "MIT"
+    },
+    "node_modules/embla-carousel-react": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/embla-carousel-react/-/embla-carousel-react-8.6.0.tgz",
+      "integrity": "sha512-0/PjqU7geVmo6F734pmPqpyHqiM99olvyecY7zdweCw+6tKEXnrE90pBiBbMMU8s5tICemzpQ3hi5EpxzGW+JA==",
+      "license": "MIT",
+      "dependencies": {
+        "embla-carousel": "8.6.0",
+        "embla-carousel-reactive-utils": "8.6.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.1 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      }
+    },
+    "node_modules/embla-carousel-reactive-utils": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.6.0.tgz",
+      "integrity": "sha512-fMVUDUEx0/uIEDM0Mz3dHznDhfX+znCCDCeIophYb1QGVM7YThSWX+wz11zlYwWFOr74b4QLGg0hrGPJeG2s4A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "embla-carousel": "8.6.0"
+      }
+    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -1405,6 +1434,16 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/react": {
+      "version": "19.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
+      "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
diff --git a/package.json b/package.json
index f73905f..76d8c41 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "embla-carousel-react": "^8.6.0",
     "firebase-admin": "^13.0.2"
   },
   "devDependencies": {

From ce520182c6bac1563031871c66d56bdc1218915f Mon Sep 17 00:00:00 2001
From: n1sh1thaS <nishi2919@gmail.com>
Date: Thu, 22 May 2025 11:36:03 -0700
Subject: [PATCH 10/11] change button hover text

---
 frontend/src/pages/Individual-product-page.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/Individual-product-page.tsx b/frontend/src/pages/Individual-product-page.tsx
index 5397cee..bead325 100644
--- a/frontend/src/pages/Individual-product-page.tsx
+++ b/frontend/src/pages/Individual-product-page.tsx
@@ -32,6 +32,7 @@ export function IndividualProductPage() {
 
   const [currentIndex, setCurrentIndex] = useState(0);
   const [isSaved, setIsSaved] = useState(false);
+  const [hoverMarkSold, setHoverMarkSold] = useState(false);
 
   const location = useLocation() as {
     state?: { from?: "saved" | "marketplace" };
@@ -136,11 +137,14 @@ export function IndividualProductPage() {
               </button>
               <button
                 onClick={handleMarkSold}
+                onMouseEnter={() => setHoverMarkSold(true)}
+                onMouseLeave={() => setHoverMarkSold(false)}
                 className={`text-lg mb-4 font-inter hover:underline ${
                   product?.isSold && "text-red-800 font-semibold"
                 }`}
               >
-                {product?.isSold ? "Sold" : "Mark as Sold"} <FontAwesomeIcon icon={faCheck} />
+                {product?.isSold ? (hoverMarkSold ? "Unmark as Sold" : "Sold") : "Mark as Sold"}{" "}
+                <FontAwesomeIcon icon={faCheck} />
               </button>
             </div>
           )}

From 76c21eae62dc0ecb54f94db3268270e865666a20 Mon Sep 17 00:00:00 2001
From: Kyla <kyla123ma@gmail.com>
Date: Fri, 23 May 2025 11:14:40 -0700
Subject: [PATCH 11/11] added saved products to profile page

---
 .../src/pages/Individual-product-page.tsx     |  6 ++-
 frontend/src/pages/ProfilePage.tsx            | 41 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/frontend/src/pages/Individual-product-page.tsx b/frontend/src/pages/Individual-product-page.tsx
index bead325..3c3e23f 100644
--- a/frontend/src/pages/Individual-product-page.tsx
+++ b/frontend/src/pages/Individual-product-page.tsx
@@ -56,13 +56,15 @@ export function IndividualProductPage() {
       if (uid)
         await get(`/api/users/${uid}`).then(async (res) => {
           const ownedByUser = await res.json().then((data) => {
-            return data.productList.includes(id);
+            return data.productList
+              .map((product: { _id: string }) => String(product._id))
+              .includes(String(id));
           });
           setHasPermissions(ownedByUser);
         });
     };
     findEditPermission();
-  }, []);
+  }, [user, id]);
 
   const handleMarkSold = () => {
     const updateProduct = async () => {
diff --git a/frontend/src/pages/ProfilePage.tsx b/frontend/src/pages/ProfilePage.tsx
index 32c023b..6150d07 100644
--- a/frontend/src/pages/ProfilePage.tsx
+++ b/frontend/src/pages/ProfilePage.tsx
@@ -12,6 +12,7 @@ interface Product {
   name: string;
   price: number;
   image: string;
+  isSold: boolean;
 }
 
 interface UserProfile {
@@ -92,7 +93,7 @@ export function ProfilePage() {
                     </p>
                   </div>
                 </div>
-                {/* Profile Image on Desktop View*/}
+                {/* Profile Image on Desktop View */}
                 <div className="hidden md:flex">
                   <img
                     src={profile?.profilePic ? profile?.profilePic : "/profile-pic-default.png"}
@@ -101,16 +102,43 @@ export function ProfilePage() {
                   />
                 </div>
               </div>
+              {/* Products Section */}
               <div className="flex justify-between mb-2 px-3">
                 <p className="text-2xl sm:text-3xl font-jetbrains font-medium">Products</p>
               </div>
-              {profile?.productList.length === 0 && (
-                <p className="font-inter text-lg px-3 pt-3">No listed products yet.</p>
+              {profile?.productList.filter((product) => !product.isSold).length === 0 && (
+                <p className="font-inter text-lg px-3 pt-3">No listed products.</p>
               )}
+              <div className="grid sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 xxl:grid-cols-4">
+                {profile?.productList
+                  .filter((product) => !product.isSold)
+                  .map((product) => (
+                    <div key={product._id} className="px-3 py-3">
+                      <Product
+                        productId={product._id}
+                        productName={product.name}
+                        productPrice={product.price}
+                        productImages={
+                          product.image
+                            ? [product.image]
+                            : ["/productImages/product-placeholder.webp"]
+                        }
+                      />
+                    </div>
+                  ))}
+              </div>
 
+              {/* Sold Products Section */}
+              <div className="flex justify-between mt-10 mb-2 px-3">
+                <p className="text-2xl sm:text-3xl font-jetbrains font-medium">Sold Products</p>
+              </div>
+              {profile?.productList.filter((product) => product.isSold).length === 0 && (
+                <p className="font-inter text-lg px-3 pt-3">No sold products yet.</p>
+              )}
               <div className="grid sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 xxl:grid-cols-4">
-                {profile?.productList.map(
-                  (product: { _id: string; name: string; price: number; image: string }) => (
+                {profile?.productList
+                  .filter((product) => product.isSold)
+                  .map((product) => (
                     <div key={product._id} className="px-3 py-3">
                       <Product
                         productId={product._id}
@@ -123,8 +151,7 @@ export function ProfilePage() {
                         }
                       />
                     </div>
-                  ),
-                )}
+                  ))}
               </div>
             </>
           )}