[week10][이진서] 과제 제출

src/apis/api.js

@@ -113,7 +113,15 @@ export const updateComment = async (id, data) => {
 };
 
 // 과제 !!
-export const deleteComment = async (id) => {};
+export const deleteComment = async (id) => {
+  const response = await instanceWithToken.delete(`/comment/${id}/`);
+  if (response.status === 204) {
+    console.log("DELETE SUCCESS");
+    window.location.reload();
+  } else {
+    console.log("[ERROR] error while deleting delete");
+  }
+};
 
 export const getUser = async () => {
   const response = await instanceWithToken.get("/account/info/");

src/components/Comment/CommentElement.jsx

@@ -1,59 +1,96 @@
 import { useState, useEffect } from "react";
+import { updateComment } from "../../apis/api";
+import { getUser } from "../../apis/api";
+import { getCookie } from "../../utils/cookie";
 
 const CommentElement = (props) => {
-    const { comment, handleCommentDelete, postId } = props;
-    const [content, setContent] = useState(comment.content);
-    const [isEdit, setIsEdit] = useState(false);
-
-    const [onChangeValue, setOnChangeValue] = useState(content); // 수정 취소 시 직전 content 값으로 변경을 위한 state
-
-    // comment created_at 전처리
-    const date = new Date(comment.created_at);
-    const year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    month = month < 10 ? `0${month}` : month;
-    let day = date.getDate();
-    day = day < 10 ? `0${day}` : day;
-
-    const handleEditComment = () => { // add api call for editing comment
-        setContent(onChangeValue);
-        setIsEdit(!isEdit);
-        console.log({
-            post: postId,
-            comment: comment.id,
-            content: content
-        });
-    };
-
-    useEffect(() => { // add api call to check if user is the author of the comment
-    }, []);
-
-    return (
-        <div className="w-full flex flex-row justify-between items-center mb-5">
-            <div className="w-3/4 flex flex-col gap-1">
-                {isEdit ? (
-                    <input className="input mb-2" value={onChangeValue} onChange={(e) => setOnChangeValue(e.target.value)} />
-                ) : (
-                    <p className="text-lg">{content}</p>
-                )}
-
-                <span className="text-base text-gray-300">{year}.{month}.{day}</span>
-            </div>
-
-            <div className="flex flex-row items-center gap-3">
-                {isEdit ? (
-                    <>
-                        <button onClick={() => { setIsEdit(!isEdit); setOnChangeValue(content); }}>취소</button>
-                        <button onClick={handleEditComment}>완료</button>
-                    </>
-                ) : (
-                    <>
-                        <button onClick={() => handleCommentDelete(comment.id)}>삭제</button>
-                        <button onClick={() => setIsEdit(!isEdit)}>수정</button>
-                    </>
-                )}
-            </div>
-        </div>
-    );
+  const { comment, handleCommentDelete, postId } = props;
+  const [content, setContent] = useState(comment.content);
+  const [isEdit, setIsEdit] = useState(false);
+  const [user, setUser] = useState();
+
+  const [onChangeValue, setOnChangeValue] = useState(content); // 수정 취소 시 직전 content 값으로 변경을 위한 state
+
+  // comment created_at 전처리
+  const date = new Date(comment.created_at);
+  const year = date.getFullYear();
+  let month = date.getMonth() + 1;
+  month = month < 10 ? `0${month}` : month;
+  let day = date.getDate();
+  day = day < 10 ? `0${day}` : day;
+
+  useEffect(() => {
+    // access_token이 있으면 유저 정보 가져옴
+    if (getCookie("access_token")) {
+      const getUserAPI = async () => {
+        const user = await getUser();
+        setUser(user);
+      };
+      getUserAPI();
+    }
+  }, []);
+
+  const handleEditComment = () => {
+    // add api call for editing comment
+    updateComment(comment.id, { content: onChangeValue });
+    setIsEdit(!isEdit);
+    console.log({
+      post: postId,
+      comment: comment.id,
+      content: content,
+    });
+  };
+
+  useEffect(() => {
+    // add api call to check if user is the author of the comment
+  }, []);
+
+  console.log(comment);
+  return (
+    <div className="w-full flex flex-row justify-between items-center mb-5">
+      <div className="w-3/4 flex flex-col gap-1">
+        {isEdit ? (
+          <input
+            className="input mb-2"
+            value={onChangeValue}
+            onChange={(e) => setOnChangeValue(e.target.value)}
+          />
+        ) : (
+          <p className="text-lg">{content}</p>
+        )}
+
+        <span className="text-base text-gray-300">
+          {year}.{month}.{day}
+        </span>
+      </div>
+
+      <div className="flex flex-row items-center gap-3">
+        {user?.id === comment?.author ? (
+          <>
+            {isEdit ? (
+              <>
+                <button
+                  onClick={() => {
+                    setIsEdit(!isEdit);
+                    setOnChangeValue(content);
+                  }}
+                >
+                  취소
+                </button>
+                <button onClick={handleEditComment}>완료</button>
+              </>
+            ) : (
+              <>
+                <button onClick={() => handleCommentDelete(comment.id)}>
+                  삭제
+                </button>
+                <button onClick={() => setIsEdit(!isEdit)}>수정</button>
+              </>
+            )}
+          </>
+        ) : null}
+      </div>
+    </div>
+  );
 };
 export default CommentElement;

src/components/Comment/index.jsx

@@ -1,53 +1,69 @@
-import { useState } from "react";
-import comments from "../../data/comments"; // dummy data
+import { useState, useEffect } from "react";
+import comments from "../../data/comments";
+import { getComments, createComment, deleteComment } from "../../apis/api";
 import CommentElement from "./CommentElement";
 
 const Comment = ({ postId }) => {
-    const [commentList, setCommentList] = useState(comments); // state for comments
-    const [newContent, setNewContent] = useState(""); // state for new comment
+  const [commentList, setCommentList] = useState([]); // state for comments
+  const [newContent, setNewContent] = useState(""); // state for new comment
 
-    const handleCommentSubmit = (e) => {
-        e.preventDefault();
-        setCommentList([ // TODO: add api call for creating comment
-            ...commentList,
-            {
-                id: commentList.length + 1,
-                content: newContent,
-                created_at: new Date().toISOString(),
-                post: postId,
-                author: {
-                    id: 1,
-                    username: "user1"
-                }
-            }
-        ]);
-        console.log({
-            post: postId,
-            content: newContent
-        });
-        setNewContent("");
+  useEffect(() => {
+    const getCommentsAPI = async () => {
+      const comments = await getComments(postId);
+      setCommentList(comments);
     };
+    console.log("get comment success");
+    getCommentsAPI();
+  }, []);
 
-    const handleCommentDelete = (commentId) => {
-        console.log("comment: ", commentId);
-        setCommentList(commentList.filter((comment) => comment.id !== commentId)); // TODO: add api call for deleting comment
-    };
+  const handleCommentSubmit = (e) => {
+    e.preventDefault();
+    createComment({
+      post: postId,
+      content: newContent,
+    }); //api.js에서 data에 해당하는부분은 {} 배열로 주어져야함.
+    console.log({
+      post: postId,
+      content: newContent,
+    });
+    setNewContent("");
+  };
+
+  const handleCommentDelete = (commentId) => {
+    deleteComment(commentId); // TODO: add api call for deleting comment
+  };
+  return (
+    <div className="w-full mt-5 self-start">
+      <h1 className="text-3xl font-bold my-5">Comments</h1>
+      {commentList.map((comment) => {
+        return (
+          <CommentElement
+            key={comment.id}
+            comment={comment}
+            handleCommentDelete={handleCommentDelete}
+            postId={postId}
+          />
+        );
+      })}
 
-    return (
-        <div className="w-full mt-5 self-start">
-            <h1 className="text-3xl font-bold my-5">Comments</h1>
-            {commentList.map((comment) => {
-                return (
-                    <CommentElement key={comment.id} comment={comment} handleCommentDelete={handleCommentDelete} postId={postId} />
-                );
-            })}
-
-            <form className="flex flex-row mt-10 gap-3" onSubmit={handleCommentSubmit}>
-                <input type="text" value={newContent} placeholder="댓글을 입력해주세요" className="input" style={{ width: "calc(100% - 100px)" }} onChange={(e) => setNewContent(e.target.value)} />
-                <button type="submit" className="button">작성</button>
-            </form>
-        </div>
-    );
+      <form
+        className="flex flex-row mt-10 gap-3"
+        onSubmit={handleCommentSubmit}
+      >
+        <input
+          type="text"
+          value={newContent}
+          placeholder="댓글을 입력해주세요"
+          className="input"
+          style={{ width: "calc(100% - 100px)" }}
+          onChange={(e) => setNewContent(e.target.value)}
+        />
+        <button type="submit" className="button">
+          작성
+        </button>
+      </form>
+    </div>
+  );
 };
 
 export default Comment;

src/routes/PostDetailPage.jsx

@@ -44,6 +44,7 @@ const PostDetailPage = () => {
     }
   };
 
+
   return (
     post && (
       <div className="flex flex-col items-center w-[60%] p-8">