From 2c5c91a23f2a2c7115176ad58ec75afb62bd1949 Mon Sep 17 00:00:00 2001
From: chaaanuwu <gkchanuwa@gmail.com>
Date: Sun, 12 Apr 2026 03:10:54 +0530
Subject: [PATCH 1/3] feat: Add follow/unfollow functionality in Profile;
 implement followUser API integration

---
 client/src/api/userFollows.api.js |  6 ++++++
 client/src/pages/Profile.jsx      | 34 +++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 client/src/api/userFollows.api.js

diff --git a/client/src/api/userFollows.api.js b/client/src/api/userFollows.api.js
new file mode 100644
index 0000000..a5881f2
--- /dev/null
+++ b/client/src/api/userFollows.api.js
@@ -0,0 +1,6 @@
+import axiosInstance from "./axiosInstance";
+
+export const followUser = async (followingId) => {
+    const res = await axiosInstance.post('/me/follow', { followingId });
+    return res;
+}
\ No newline at end of file
diff --git a/client/src/pages/Profile.jsx b/client/src/pages/Profile.jsx
index 4053dac..626a62f 100644
--- a/client/src/pages/Profile.jsx
+++ b/client/src/pages/Profile.jsx
@@ -12,9 +12,11 @@ import Modal from "../components/ui/Modal";
 import SearchBar from "../components/ui/SearchBar";
 import { getHistoryBanner } from "../api/history.api";
 import Dropdown from "../components/ui/Dropdown";
+import { followUser } from "../api/userFollows.api";
 
 export default function Profile() {
     const [profileData, setProfileData] = useState(null);
+    const [following, setFollowing] = useState(false);
     const [loading, setLoading] = useState(true);
     const [isModalOpen, setIsModalOpen] = useState(false);
     const [isDropdownOpen, setIsDropdownOpen] = useState(false);
@@ -27,8 +29,9 @@ export default function Profile() {
     useEffect(() => {
         const fetchProfile = async () => {
             try {
-                const data = await getProfile(userId);
-                setProfileData(data);
+                const res = await getProfile(userId);
+                setProfileData(res);
+                console.log(res);
             } catch (err) {
                 console.error("Failed to fetch profile", err);
             } finally {
@@ -38,6 +41,17 @@ export default function Profile() {
         fetchProfile();
     }, [userId]);
 
+    const handleFollow = async () => {
+        try {
+            const res = await followUser(profileData.user._id);
+            if (res.status === 200) {
+                setFollowing(true);
+            }
+        } catch (error) {
+            console.error("Failed to follow user", error);
+        }
+    }
+
     const handleChangeCover = async () => {
         setIsModalOpen(true);
         try {
@@ -143,9 +157,17 @@ export default function Profile() {
                             className="flex items-center gap-3"
                         >
                             {!isMyProfile ? (
-                                <button className="px-10 py-4 bg-stone-900 text-white rounded-2xl font-bold text-sm hover:bg-stone-800 transition-all shadow-lg active:scale-95">
-                                    Follow
-                                </button>
+                                !following ? (
+                                    <button
+                                        onClick={handleFollow}
+                                        className="px-10 py-4 bg-stone-900 text-white rounded-2xl font-bold text-sm hover:bg-stone-800 transition-all shadow-lg active:scale-95">
+                                        Follow
+                                    </button>
+                                ) : (
+                                    <button className="px-10 py-4 bg-white border border-stone-200 text-stone-600 rounded-2xl font-bold text-sm hover:bg-stone-50 transition-all shadow-sm active:scale-95">
+                                        Unfollow
+                                    </button>
+                                )
                             ) : (
                                 <button className="px-10 py-4 bg-white border border-stone-200 text-stone-600 rounded-2xl font-bold text-sm hover:bg-stone-50 transition-all shadow-sm active:scale-95">
                                     Edit Profile
@@ -160,7 +182,7 @@ export default function Profile() {
                                 >
                                     <span className="material-symbols-outlined text-2xl">more_horiz</span>
                                 </button>
-                                
+
                                 <Dropdown open={isDropdownOpen} setOpen={setIsDropdownOpen}>
                                     <div className="p-2 min-w-40">
                                         <button className="w-full text-left p-2 text-sm font-bold text-stone-600 hover:bg-stone-50 rounded-lg transition-colors uppercase tracking-wider">

From f9130cdef5f329635ee6d391d49ce2804b9159fe Mon Sep 17 00:00:00 2001
From: chaaanuwu <gkchanuwa@gmail.com>
Date: Tue, 21 Apr 2026 16:36:04 +0530
Subject: [PATCH 2/3] feat: Implement comment functionality; add API for
 fetching and posting comments, integrate with Profile and ReviewCard
 components

---
 client/src/api/commments.api.js         |  18 ++++
 client/src/components/Tabs.jsx          |   4 +-
 client/src/components/ui/ReviewCard.jsx |   6 +-
 client/src/pages/Profile.jsx            | 120 +++++++++++++++++++++---
 4 files changed, 131 insertions(+), 17 deletions(-)
 create mode 100644 client/src/api/commments.api.js

diff --git a/client/src/api/commments.api.js b/client/src/api/commments.api.js
new file mode 100644
index 0000000..377dddb
--- /dev/null
+++ b/client/src/api/commments.api.js
@@ -0,0 +1,18 @@
+import axiosInstance from "./axiosInstance"
+
+export const getAllComments = async (reviewId) => {
+    const res = await axiosInstance.get(`/${reviewId}/comments`);
+    return res.data;
+};
+
+export const postComment = async (reviewId, comment) => {
+    const res = axiosInstance.post(`/${reviewId}/comments`, {
+        comment: comment
+    });
+    return res;
+};
+
+export const deleteComment = async (commentId) => {
+    const res = axiosInstance.delete(`/comments/${commentId}`);
+    return res;
+}
\ No newline at end of file
diff --git a/client/src/components/Tabs.jsx b/client/src/components/Tabs.jsx
index 69fc474..cd916fb 100644
--- a/client/src/components/Tabs.jsx
+++ b/client/src/components/Tabs.jsx
@@ -3,11 +3,10 @@ import { motion, AnimatePresence } from "framer-motion";
 import ReviewCard from "./ui/ReviewCard";
 import defaultPfp from "../assets/default-pfp.jpg";
 import { getMyReviews, getUserReviews } from "../api/reviews.api";
-import MovieCard from "./ui/MovieCard";
 import HistoryTab from "./HistoryTab";
 import Loader from "./ui/Loader";
 
-export default function Tabs({ profileData, isMyProfile }) {
+export default function Tabs({ profileData, isMyProfile, onReplyClick }) {
     const [activeTab, setActiveTab] = useState("reviews");
     const [tabContent, setTabContent] = useState(null);
     const [loading, setLoading] = useState(false);
@@ -111,6 +110,7 @@ export default function Tabs({ profileData, isMyProfile }) {
                                                 reviewText={r?.review}
                                                 reviewLikes={r?.likedBy}
                                                 rating={r?.rating}
+                                                onReplyClick={() => onReplyClick(r)}
                                             />
                                         ))
                                     ) : (
diff --git a/client/src/components/ui/ReviewCard.jsx b/client/src/components/ui/ReviewCard.jsx
index fd1056b..081de85 100644
--- a/client/src/components/ui/ReviewCard.jsx
+++ b/client/src/components/ui/ReviewCard.jsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-import axios from "axios";
 import useUserStore from "../../store/userStore";
 import { toggleLikeReview } from "../../api/reviews.api";
 
@@ -19,6 +18,7 @@ export default function ReviewCard({
     releaseYear,
     imdbRating,
     genres,
+    onReplyClick
 }) {
     const [isLiked, setIsLiked] = useState(
         Array.isArray(reviewLikes)
@@ -179,7 +179,9 @@ export default function ReviewCard({
                         {formattedLikes}
                     </button>
 
-                    <button className="flex items-center gap-1.5 px-3.5 py-1.5 rounded-lg border border-gray-200 bg-white text-[13px] font-semibold text-gray-600 cursor-pointer">
+                    <button
+                    onClick={onReplyClick}
+                    className="flex items-center gap-1.5 px-3.5 py-1.5 rounded-lg border border-gray-200 bg-white text-[13px] font-semibold text-gray-600 cursor-pointer">
                         <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
                             <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z" />
                         </svg>
diff --git a/client/src/pages/Profile.jsx b/client/src/pages/Profile.jsx
index 626a62f..af15a8d 100644
--- a/client/src/pages/Profile.jsx
+++ b/client/src/pages/Profile.jsx
@@ -1,5 +1,5 @@
 import { useParams } from "react-router-dom";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
 import { motion, AnimatePresence } from "framer-motion";
 
 import bbBg from "../assets/bb-bg.jpg";
@@ -13,17 +13,22 @@ import SearchBar from "../components/ui/SearchBar";
 import { getHistoryBanner } from "../api/history.api";
 import Dropdown from "../components/ui/Dropdown";
 import { followUser } from "../api/userFollows.api";
+import { getAllComments, postComment } from "../api/commments.api";
 
 export default function Profile() {
     const [profileData, setProfileData] = useState(null);
     const [following, setFollowing] = useState(false);
     const [loading, setLoading] = useState(true);
-    const [isModalOpen, setIsModalOpen] = useState(false);
+    const [isChangeCoverModalOpen, setIsChangeCoverModalOpen] = useState(false);
+    const [isReplyModalOpen, setIsReplyModalOpen] = useState(false);
+    const [selectedReview, setSelectedReview] = useState(null);
     const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+    const [comments, setComments] = useState([]);
     const [banners, setBanners] = useState([]);
     const [selectedBackdrop, setSelectedBackdrop] = useState(null);
     const user = useUserStore((state) => state.user);
     const { userId } = useParams();
+    const commentInputRef = useRef(null);
 
     // Fetch profile data
     useEffect(() => {
@@ -52,8 +57,31 @@ export default function Profile() {
         }
     }
 
+    const handleOpenReplyModal = async (review) => {
+        setSelectedReview(review);
+        setIsReplyModalOpen(true);
+        try {
+            const res = await getAllComments(review._id);
+            setComments(res.comments);
+        } catch (error) {
+            console.error("Failed to fetch comments", error);
+        }
+    }
+
+    const handlePostComment = async (review, comment) => {
+        console.log(commentInputRef.current.value);
+        try {
+            const res = await postComment(selectedReview._id, commentInputRef.current.value);
+            if (res.data.success) {
+                console.log("Comment posted successfully");
+            }
+        } catch (error) {
+            console.error("Failed to post comment", error);
+        }
+    }
+
     const handleChangeCover = async () => {
-        setIsModalOpen(true);
+        setIsChangeCoverModalOpen(true);
         try {
             const bannerData = await getHistoryBanner();
             const movies = bannerData.data.map(item => item.movieId);
@@ -74,7 +102,7 @@ export default function Profile() {
                     cover: selectedBackdrop
                 }
             }));
-            setIsModalOpen(false);
+            setIsChangeCoverModalOpen(false);
             setSelectedBackdrop(null);
         } catch (err) {
             console.error("Failed to set profile cover", err);
@@ -174,7 +202,7 @@ export default function Profile() {
                                 </button>
                             )}
 
-                            {/* DROPDOWN CONTAINER */}
+                            {/* Dropdown */}
                             <div className="relative">
                                 <button
                                     onClick={() => setIsDropdownOpen(!isDropdownOpen)}
@@ -226,13 +254,84 @@ export default function Profile() {
                     className="pb-24"
                 >
                     <div className="bg-white rounded-[2.5rem] border border-stone-200 shadow-sm overflow-hidden min-h-125">
-                        <Tabs profileData={profileData} isMyProfile={isMyProfile} />
+                        <Tabs
+                            profileData={profileData}
+                            isMyProfile={isMyProfile}
+                            onReplyClick={handleOpenReplyModal}
+                        />
                     </div>
                 </motion.section>
             </div>
 
+            {/* Comments Modal */}
+            <Modal open={isReplyModalOpen} setOpen={setIsReplyModalOpen}>
+                <div className="flex flex-col h-[80vh] max-h-175">
+
+                    <div className="p-6 border-b border-stone-100 bg-stone-50/50">
+                        <h3 className="text-[10px] font-black uppercase tracking-[0.3em] text-amber-600 mb-1">
+                            Discussion
+                        </h3>
+                        <h2 className="text-2xl font-black tracking-tight text-stone-900 leading-none">
+                            Responses
+                        </h2>
+                    </div>
+
+                    <div className="flex-1 overflow-y-auto p-6 space-y-6 scrollbar-hide">
+                        {comments?.length > 0 ? (
+                            comments.map((c) => (
+                                <div key={c._id} className="flex gap-4 group">
+                                    <img
+                                        src={c.userId?.pfp || defaultPfp}
+                                        className="w-8 h-8 rounded-full object-cover shrink-0 shadow-sm"
+                                    />
+                                    <div className="flex-1">
+                                        <div className="bg-stone-100 rounded-2xl rounded-tl-none px-4 py-3">
+                                            <p className="text-xs font-black text-stone-900">{profileData.user.firstName} {profileData.user.lastName}</p>
+                                            <p className="text-sm text-stone-600 mt-1 leading-relaxed">{c.comment}</p>
+                                        </div>
+                                        <div className="flex gap-4 mt-2 ml-2">
+                                            <button className="text-[9px] font-black uppercase tracking-widest text-stone-400 hover:text-amber-600 transition-colors">Like</button>
+                                            <button className="text-[9px] font-black uppercase tracking-widest text-stone-400 hover:text-amber-600 transition-colors">Reply</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            ))
+                        ) : (
+                            <div className="py-10 text-center">
+                                <p className="text-stone-400 font-serif italic text-sm">No thoughts shared yet. Be the first to break the silence.</p>
+                            </div>
+                        )}
+                    </div>
+
+                    <div className="p-4 bg-white border-t border-stone-100 shadow-[0_-10px_20px_rgba(0,0,0,0.02)]">
+                        <div className="relative flex items-center gap-3 bg-stone-100 rounded-2xl p-2 focus-within:bg-white focus-within:ring-2 focus-within:ring-amber-500/20 transition-all">
+                            <img
+                                src={user?.user?.pfp || defaultPfp}
+                                className="w-8 h-8 rounded-full object-cover ml-1 shadow-sm"
+                            />
+                            <textarea
+                                ref={commentInputRef}
+                                placeholder="Add to the conversation..."
+                                className="flex-1 bg-transparent border-none outline-none focus:ring-0 text-sm py-2 resize-none max-h-32 text-stone-800 placeholder-stone-400 font-medium"
+                                rows={1}
+                                onInput={(e) => {
+                                    e.target.style.height = 'auto';
+                                    e.target.style.height = e.target.scrollHeight + 'px';
+                                }}
+                            />
+                            <button
+                                onClick={handlePostComment}
+                                className="px-4 py-2 bg-stone-900 text-white rounded-xl text-[10px] font-black uppercase tracking-widest hover:bg-amber-600 active:scale-95 transition-all shadow-lg"
+                            >
+                                Post
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </Modal>
+
             {/* Modal for Cover Selection */}
-            <Modal open={isModalOpen} setOpen={setIsModalOpen}>
+            <Modal open={isChangeCoverModalOpen} setOpen={setIsChangeCoverModalOpen}>
                 <div className="flex flex-col h-[90vh] max-h-225">
                     {/* Header */}
                     <div className="p-6 md:p-10 border-b border-stone-100 bg-white/80 backdrop-blur-md sticky top-0 z-10">
@@ -284,11 +383,6 @@ export default function Profile() {
                                                         Click to Apply
                                                     </p>
                                                 </div>
-                                                <div className="size-10 rounded-full bg-white/10 backdrop-blur-md border border-white/20 flex items-center justify-center text-white opacity-0 group-hover:opacity-100 transition-opacity">
-                                                    <svg className="size-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2.5} d="M5 13l4 4L19 7" />
-                                                    </svg>
-                                                </div>
                                             </div>
                                         </div>
                                     </motion.div>
@@ -308,7 +402,7 @@ export default function Profile() {
                     {selectedBackdrop && (
                         <div className="p-6 border-t border-stone-100 bg-white/80 backdrop-blur-md sticky bottom-0 flex justify-end gap-4">
                             <button
-                                onClick={() => setIsModalOpen(false)}
+                                onClick={() => setIsChangeCoverModalOpen(false)}
                                 className="px-6 py-3 bg-stone-200 rounded-xl font-bold hover:bg-stone-300 transition-all"
                             >
                                 Cancel

From 6e59a567191b180d11b17732db5e67c4852a026d Mon Sep 17 00:00:00 2001
From: chaaanuwu <gkchanuwa@gmail.com>
Date: Wed, 22 Apr 2026 14:41:32 +0530
Subject: [PATCH 3/3] feat: Enhance comment functionality; add update and
 delete APIs, integrate with Profile component

---
 client/src/api/commments.api.js | 13 ++++++---
 client/src/pages/Profile.jsx    | 48 ++++++++++++++++++++++++++++++---
 server/routes/comment.route.js  | 15 ++++++++++-
 3 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/client/src/api/commments.api.js b/client/src/api/commments.api.js
index 377dddb..1c2276f 100644
--- a/client/src/api/commments.api.js
+++ b/client/src/api/commments.api.js
@@ -12,7 +12,14 @@ export const postComment = async (reviewId, comment) => {
     return res;
 };
 
-export const deleteComment = async (commentId) => {
-    const res = axiosInstance.delete(`/comments/${commentId}`);
+export const updateComment = async (reviewId, commentId, updatedComment) => {
+    const res = axiosInstance.patch(`/${reviewId}/comments/${commentId}`, {
+        comment: updatedComment
+    });
+    return res;
+};
+
+export const deleteComment = async (reviewId, commentId) => {
+    const res = axiosInstance.delete(`/${reviewId}/comments/${commentId}`);
     return res;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/client/src/pages/Profile.jsx b/client/src/pages/Profile.jsx
index af15a8d..7491f85 100644
--- a/client/src/pages/Profile.jsx
+++ b/client/src/pages/Profile.jsx
@@ -1,6 +1,6 @@
 import { useParams } from "react-router-dom";
 import { useState, useEffect, useRef } from "react";
-import { motion, AnimatePresence } from "framer-motion";
+import { motion } from "framer-motion";
 
 import bbBg from "../assets/bb-bg.jpg";
 import defaultPfp from "../assets/default-pfp.jpg";
@@ -13,7 +13,7 @@ import SearchBar from "../components/ui/SearchBar";
 import { getHistoryBanner } from "../api/history.api";
 import Dropdown from "../components/ui/Dropdown";
 import { followUser } from "../api/userFollows.api";
-import { getAllComments, postComment } from "../api/commments.api";
+import { getAllComments, postComment, updateComment } from "../api/commments.api";
 
 export default function Profile() {
     const [profileData, setProfileData] = useState(null);
@@ -24,6 +24,7 @@ export default function Profile() {
     const [selectedReview, setSelectedReview] = useState(null);
     const [isDropdownOpen, setIsDropdownOpen] = useState(false);
     const [comments, setComments] = useState([]);
+    const [selectedComment, setSelectedComment] = useState(null);
     const [banners, setBanners] = useState([]);
     const [selectedBackdrop, setSelectedBackdrop] = useState(null);
     const user = useUserStore((state) => state.user);
@@ -68,7 +69,7 @@ export default function Profile() {
         }
     }
 
-    const handlePostComment = async (review, comment) => {
+    const handlePostComment = async () => {
         console.log(commentInputRef.current.value);
         try {
             const res = await postComment(selectedReview._id, commentInputRef.current.value);
@@ -80,6 +81,18 @@ export default function Profile() {
         }
     }
 
+    const handleUpdateComment = async () => {
+        try {
+            const res = await updateComment(selectedReview._id, selectedComment, "Updated comment content");
+            setSelectedComment(null);
+            if (res.data.success) {
+                console.log("Comment updated successfully");
+            }
+        } catch (error) {
+            console.error("Failed to update comment", error);
+        }
+    }
+
     const handleChangeCover = async () => {
         setIsChangeCoverModalOpen(true);
         try {
@@ -286,7 +299,34 @@ export default function Profile() {
                                     />
                                     <div className="flex-1">
                                         <div className="bg-stone-100 rounded-2xl rounded-tl-none px-4 py-3">
-                                            <p className="text-xs font-black text-stone-900">{profileData.user.firstName} {profileData.user.lastName}</p>
+                                            <div className="flex items-center gap-2">
+                                                <p className="text-xs font-black text-stone-900">{profileData?.user.firstName} {profileData?.user.lastName}</p>
+                                                <span className="text-[9px] text-stone-400 ml-2">{new Date(c.createdAt).toLocaleString()}</span>
+
+                                                {isMyProfile &&
+                                                    <div className="relative">
+                                                        <button
+                                                            onClick={() => setSelectedComment(selectedComment === c._id ? null : c._id)}
+                                                            className="w-5 h-5 flex items-center justify-center text-stone-400 hover:text-stone-900 transition-all active:scale-95"
+                                                        >
+                                                            <span className="material-symbols-outlined text-2xl">more_horiz</span>
+                                                        </button>
+
+                                                        <Dropdown open={selectedComment === c._id} setOpen={setSelectedComment}>
+                                                            <div className="p-2 min-w-40">
+                                                                <button
+                                                                onClick={() => handleUpdateComment}
+                                                                className="w-full text-left p-2 text-sm font-bold text-stone-600 hover:bg-stone-50 rounded-lg transition-colors uppercase tracking-wider">
+                                                                    Edit Comment
+                                                                </button>
+                                                                <button className="w-full text-left p-2 text-sm font-bold text-red-500 hover:bg-red-50 rounded-lg transition-colors uppercase tracking-wider">
+                                                                    Delete Comment
+                                                                </button>
+                                                            </div>
+                                                        </Dropdown>
+                                                    </div>
+                                                }
+                                            </div>
                                             <p className="text-sm text-stone-600 mt-1 leading-relaxed">{c.comment}</p>
                                         </div>
                                         <div className="flex gap-4 mt-2 ml-2">
diff --git a/server/routes/comment.route.js b/server/routes/comment.route.js
index aeb18e6..777f93f 100644
--- a/server/routes/comment.route.js
+++ b/server/routes/comment.route.js
@@ -2,7 +2,16 @@ import { Router } from 'express';
 
 import authorize from '../middlewares/auth.middleware.js';
 
-import { addReplyComment, addReviewComment, getAllComments, updateReplyComment, deleteReplyComment, getComment } from '../controllers/comment.controller.js';
+import {
+    addReplyComment,
+    addReviewComment,
+    getAllComments,
+    updateReplyComment,
+    deleteReplyComment,
+    getComment,
+    deleteReviewComment,
+    updateReviewComment
+} from '../controllers/comment.controller.js';
 
 const commentRouter = Router();
 
@@ -12,6 +21,10 @@ commentRouter.get('/:reviewId/comments/:commentId', authorize, getComment);
 
 commentRouter.post('/:reviewId/comments', authorize, addReviewComment);
 
+commentRouter.patch('/:reviewId/comments/:commentId', authorize, updateReviewComment);
+
+commentRouter.delete('/:reviewId/comments/:commentId', authorize, deleteReviewComment);
+
 commentRouter.post('/:reviewId/comments/:commentId/reply', authorize, addReplyComment);
 
 commentRouter.patch('/:reviewId/comments/:commentId/reply/:replyCommentId', authorize, updateReplyComment);