diff --git a/src/app/(after-login)/epigrams/_components/RecentComment.tsx b/src/app/(after-login)/epigrams/_components/RecentComment.tsx index a142984..27a0bb0 100644 --- a/src/app/(after-login)/epigrams/_components/RecentComment.tsx +++ b/src/app/(after-login)/epigrams/_components/RecentComment.tsx @@ -127,6 +127,8 @@ export default function RecentComment() { ) : ( isOwnComment && handleEdit(comment)} handleDelete={() => isOwnComment && handleDeleteConfirm(comment.id)} diff --git a/src/app/(after-login)/mypage/_components/CommentList.tsx b/src/app/(after-login)/mypage/_components/CommentList.tsx index 4ca48d9..7085ce2 100644 --- a/src/app/(after-login)/mypage/_components/CommentList.tsx +++ b/src/app/(after-login)/mypage/_components/CommentList.tsx @@ -21,6 +21,7 @@ import Spinner from '@/components/Spinner'; import type { FieldErrors } from 'react-hook-form'; interface CommentListProps { + linkToEpigram?: boolean; comments: CommentType[]; isFetching: boolean; hasNextPage: boolean; @@ -29,6 +30,7 @@ interface CommentListProps { } export default function CommentList({ + linkToEpigram = false, comments, isFetching, hasNextPage, @@ -134,6 +136,8 @@ export default function CommentList({ ) : ( handleEdit(comment)} handleDelete={() => handleDeleteConfirm(comment.id)} isOwnComment={comment.writer.id === session?.user.id} diff --git a/src/app/(after-login)/mypage/_components/MyWritings.tsx b/src/app/(after-login)/mypage/_components/MyWritings.tsx index ce0d6e9..3f2cbf9 100644 --- a/src/app/(after-login)/mypage/_components/MyWritings.tsx +++ b/src/app/(after-login)/mypage/_components/MyWritings.tsx @@ -35,6 +35,8 @@ export default function MyWritings() { const comments = commentData?.pages.flatMap((page) => page.list) ?? []; const CommentListCount = commentData?.pages?.[0]?.totalCount ?? 0; + console.log('comments', comments); + console.log('epigrams', epigrams); return ( @@ -66,6 +68,7 @@ export default function MyWritings() { { - if (isDetailPage) return; - window.location.href = `/epigrams/${epigramId}`; - }; const classes = { commentWrapper: cn( 'border-line-200 flex items-start border-t px-6 py-4 text-left md:py-6 lg:py-9', - !isDetailPage && 'cursor-pointer', className, ), commentBox: 'ml-4 flex-1', @@ -56,52 +52,64 @@ export default function Comment({ 'text-black-700 mt-2 text-[14px] leading-[1.7] break-keep md:mt-3 md:text-[16px] md:leading-relaxed lg:mt-4 lg:text-[20px]', }; - return ( + const CommentBody = () => ( <> -
-
{ - e.stopPropagation(); - setIsProfileModalOpen(true); - }} - className='cursor-pointer' - > - -
-
-
-
{writer.nickname}
-
{formatTime(updatedAt)}
- {isOwnComment && ( -
    -
  • - -
  • -
  • - -
  • -
- )} -
-
{content}
+
{ + e.stopPropagation(); + setIsProfileModalOpen(true); + }} + className='cursor-pointer' + > + +
+
+
+
{writer.nickname}
+
{formatTime(updatedAt)}
+ {isOwnComment && ( +
    +
  • + +
  • +
  • + +
  • +
+ )}
+
{content}
+ + ); + + return ( + <> + {linkToEpigram && baseUrl ? ( + + + + ) : ( +
+ +
+ )}