Merge pull request #108 from 42ence/main

[deploy] 반영
42wekey · Jun 26, 2023 · df0b741 · df0b741
2 parents a49875f + 724a31e
commit df0b741
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/myPage/Comments.tsx b/src/components/myPage/Comments.tsx
@@ -14,6 +14,7 @@ import { StarRating } from "../../hooks/StarRating";
 import Modal from "../modal/Modal";
 import { modal } from "../../utils/recoil/modal";
 import { ConvertTime } from "../../hooks/ConvertTime";
+import { useParams } from "react-router";
 
 export interface CommentProps {
   comment: Comment;
@@ -29,6 +30,8 @@ const Comments = ({ comment, isLikeComment }: CommentProps) => {
   const [userState, setProfileState] = useRecoilState(profileState);
   const [isLike, setIsLike] = useState<Boolean>();
   const [{ modalName }, setModal] = useRecoilState(modal);
+  const params = useParams() as { profile: string; intraId: string };
+  const intraId = params.intraId;
 
   const clickLikeButton = (commentId?: Number, intraId?: String) => {
     fetch(`${baseUrl}/like.${commentId}/${intraId}`, {
@@ -57,7 +60,7 @@ const Comments = ({ comment, isLikeComment }: CommentProps) => {
           )}
           {isLikeComment && <span className={styles_star.divide}>|</span>}
           <span className={styles.commentTime}>{getTime(comment.update_time)}</span>
-          {comment.intra_id === userState.intra_id || isLikeComment === false ? (
+          {comment.intra_id === userState.intra_id || (isLikeComment === false && intraId === userState.intra_id) ? (
             <button
               style={{"all":"unset"}}
               className={styles.commentEditBtn}

diff --git a/src/components/myPage/MyPage.tsx b/src/components/myPage/MyPage.tsx
@@ -71,7 +71,7 @@ export default function MyComment() {
         <span className={styles.userLevel}>레벨{profileUser.user_level}</span>
       </div>
       <div>
-        <span className={styles.userUpdate}>회원정보 업데이트</span>
+      {userState.intra_id === intraId ?(<span className={styles.userUpdate}>회원정보 업데이트</span>):(null)}
       </div>
     </div>
   );
@@ -155,9 +155,10 @@ export default function MyComment() {
           <CommentList comments={likeComments} isLikeComment={true} />
         )}
       </div>
-      <div className={styles.logout} onClick={onClick}>
-        로그아웃
-      </div>
+      {userState.intra_id === intraId ? (<div className={styles.logout} onClick={onClick}>
+          로그아웃
+      </div>):(null)
+      }
     </div>
   );
 }