Merge pull request #421 from CodebilityDev/miguel/fix-feeds-restriction

miguel/fix feeds restriction

Author: yyyort

apps/codebility/app/home/feeds/_components/Feed.tsx

@@ -7,11 +7,11 @@ import { useFeedsStore } from "@/store/feeds-store"; // Adjust path as needed
 import Post from "./Post";
 
 interface FeedProp {
-  isMentor: boolean;
+  isAdmin: boolean;
   onCreatePost?: () => void;
 }
 
-export default function Feed({ isMentor }: FeedProp) {
+export default function Feed({ isAdmin }: FeedProp) {
   const posts = useFeedsStore((state) => state.posts);
   const fetchPosts = useFeedsStore((state) => state.fetchPosts);
 
@@ -47,7 +47,7 @@ export default function Feed({ isMentor }: FeedProp) {
           <Post
             key={post.id}
             post={post}
-            isMentor={isMentor}
+            isAdmin={isAdmin}
             onDelete={handleDeletePost}
           />
         ))}

apps/codebility/app/home/feeds/_components/Post.tsx

@@ -1,9 +1,10 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import Image from "next/image";
 import Link from "next/link";
 import FeedPostModal from "@/components/modals/FeedPostModal";
 import { Box } from "@/components/shared/dashboard";
 import { defaultAvatar } from "@/public/assets/images";
+import { useUserStore } from "@/store/codev-store";
 import { format } from "date-fns";
 import { ArrowBigUp } from "lucide-react";
 import toast from "react-hot-toast";
@@ -14,12 +15,29 @@ import PostUpvote from "./PostUpvote";
 
 interface PostProps {
   post: PostType;
-  isMentor?: boolean;
+  isAdmin?: boolean;
   onDelete?: (deletedPostId: string | number) => void;
 }
 
-export default function Post({ post, isMentor, onDelete }: PostProps) {
+export default function Post({ post, isAdmin, onDelete }: PostProps) {
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isAuthor, setIsAuthor] = useState(false);
+  const { user } = useUserStore();
+
+  useEffect(() => {
+    const checkIfAuthor = async () => {
+      if (!user) return;
+      if (user.id === post.author_id?.id) {
+        setIsAuthor(true);
+      } else {
+        setIsAuthor(false);
+      }
+    };
+
+    if (user) {
+      checkIfAuthor();
+    }
+  }, [user]);
 
   const handleDelete = async (e: React.MouseEvent) => {
     e.stopPropagation();
@@ -37,12 +55,6 @@ export default function Post({ post, isMentor, onDelete }: PostProps) {
     }
   };
 
-  const handleUpvote = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    e.preventDefault();
-    // You can add upvote logic here
-  };
-
   const openModal = () => setIsModalOpen(true);
   const closeModal = () => setIsModalOpen(false);
   return (
@@ -52,7 +64,7 @@ export default function Post({ post, isMentor, onDelete }: PostProps) {
         onClick={openModal}
       >
         {/* Delete Button in top-right */}
-        {isMentor && (
+        {(isAdmin || isAuthor) && (
           <button
             className="invisible absolute right-2 top-2 rounded bg-red-500 px-2 py-1 text-white hover:bg-red-600 group-hover:visible"
             onClick={handleDelete}

apps/codebility/app/home/feeds/_components/PostView.tsx

@@ -33,20 +33,36 @@ export default function PostView({ postId }: PostViewProps) {
   const [post, setPost] = useState<PostType | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const [isMentor, setIsMentor] = useState(true);
+  const [isAdmin, setIsAdmin] = useState(true);
+  const [isAuthor, setIsAuthor] = useState(false);
   const { user } = useUserStore();
 
   useEffect(() => {
     const fetchRole = async () => {
       if (!user) return;
       const role = await getUserRole(user.role_id ?? null);
-      setIsMentor(role === "Mentor" || role === "Admin");
+      setIsAdmin(role === "Admin");
+    };
+
+    const checkIfAuthor = async () => {
+      console.log(
+        "CHECKING USER ID AND AUTHOR ID: ",
+        user?.id,
+        post?.author_id?.id,
+      );
+      if (!user) return;
+      if (user.id === post?.author_id?.id) {
+        setIsAuthor(true);
+      } else {
+        setIsAuthor(false);
+      }
     };
 
     if (user) {
       fetchRole();
+      checkIfAuthor();
     }
-  }, [user]);
+  }, [user, post]);
 
   const fetchPost = async () => {
     if (!supabase) return;
@@ -56,6 +72,7 @@ export default function PostView({ postId }: PostViewProps) {
         .select(
           `*,
           author_id(
+            id,
             first_name,
             last_name,
             image_url
@@ -125,7 +142,7 @@ export default function PostView({ postId }: PostViewProps) {
         </ReactMarkdown>
       </div>
 
-      {isMentor && (
+      {(isAdmin || isAuthor) && (
         <Button className="mb-4 mt-4 w-auto" onClick={openModal}>
           Edit Post
         </Button>

apps/codebility/app/home/feeds/_services/query.ts

@@ -11,6 +11,7 @@ export const getPosts = async () => {
     .select(`
       *,
       author_id(
+        id,
         first_name,
         last_name,
         image_url
@@ -32,6 +33,7 @@ export type PostType = {
   title: string;
   content: string;
   author_id?: {
+    id: string;
     first_name: string;
     last_name: string;
     image_url?: string;

apps/codebility/app/home/feeds/page.tsx

@@ -9,15 +9,15 @@ import Feed from "./_components/Feed";
 import { getUserRole } from "./_services/action";
 
 export default function FeedsPage() {
-  const [isMentor, setIsMentor] = useState(true);
+  const [isAdmin, setIsAdmin] = useState(true);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const { user } = useUserStore();
 
   useEffect(() => {
     const fetchRole = async () => {
       if (!user) return;
       const role = await getUserRole(user.role_id ?? null);
-      setIsMentor(role === "Mentor" || role === "Admin");
+      setIsAdmin(role === "Admin");
     };
 
     if (user) {
@@ -37,12 +37,10 @@ export default function FeedsPage() {
             Codebility community.
           </p>
         </div>
-        {isMentor && (
-          <Button className="mb-4 mt-4 w-auto" onClick={openModal}>
-            Create Post
-          </Button>
-        )}
-        <Feed isMentor={isMentor} />
+        <Button className="mb-4 mt-4 w-auto" onClick={openModal}>
+          Create Post
+        </Button>
+        <Feed isAdmin={isAdmin} />
       </div>
 
       <CreatePostModal isOpen={isModalOpen} onClose={closeModal} />