Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-nary
j-nary committed Sep 23, 2024
2 parents f6e51e1 + 24bf61a commit 9ebc543
Show file tree
Hide file tree
Showing 26 changed files with 1,724 additions and 265 deletions.
Binary file modified .yarn/install-state.gz
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"@headlessui/react": "^1.7.3",
"@hookform/resolvers": "^2.9.10",
"@nanostores/react": "^0.7.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-popover": "^1.1.1",
"@sentry/nextjs": "^7.51.0",
"@sopt-makers/colors": "^3.0.1",
"@sopt-makers/fonts": "^2.0.1",
Expand Down
227 changes: 184 additions & 43 deletions pages/post/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import { paths } from '@/__generated__/schema2';
import { ampli } from '@/ampli';
import { useQueryGetMeeting } from '@api/API_LEGACY/meeting/hooks';
import { useQueryMyProfile } from '@api/API_LEGACY/user/hooks';
import { apiV2 } from '@api/index';
import { api, apiV2 } from '@api/index';
import { PostCommentWithMentionRequest } from '@api/mention';
import { useMutationPostCommentWithMention } from '@api/mention/hooks';
import { useInfinitePosts, useMutationPostLike, useMutationUpdateLike, useQueryGetPost } from '@api/post/hooks';
import LikeButton from '@components/button/LikeButton';
import ContentBlocker from '@components/blocker/ContentBlocker';
import FeedActionButton from '@components/feed/FeedActionButton/FeedActionButton';
import FeedCommentContainer from '@components/feed/FeedCommentContainer/FeedCommentContainer';
import FeedCommentInput from '@components/feed/FeedCommentInput/FeedCommentInput';
Expand All @@ -30,6 +31,10 @@ import Link from 'next/link';
import { useRouter } from 'next/router';
import React, { useContext, useEffect, useRef } from 'react';
import { styled } from 'stitches.config';
import ReWriteIcon from '@assets/svg/comment-write.svg';
import TrashIcon from '@assets/svg/trash.svg';
import AlertIcon from '@assets/svg/alert-triangle.svg';
import { AxiosError } from 'axios';

export default function PostPage() {
const commentRef = useRef<HTMLTextAreaElement | null>(null);
Expand Down Expand Up @@ -93,25 +98,30 @@ export default function PostPage() {
});

const { mutateAsync: mutateReportPost } = useMutation({
mutationFn: (postId: number) => POST('/post/v1/{postId}/report', { params: { path: { postId } } }),
mutationFn: (postId: number) =>
api.post<
paths['/post/v2/{postId}/report']['post']['responses']['201']['content']['application/json;charset=UTF-8']
>(`/post/v2/${postId}/report`, {}),
});
const handleConfirmReportPost =
({ postId, callback }: { postId: number; callback: () => void }) =>
async () => {
const { error } = await mutateReportPost(postId);
if (error) {
try {
await mutateReportPost(postId);
open({
icon: 'success',
content: '게시글을 신고했습니다',
});
callback();
} catch (error) {
const axiosError = error as AxiosError<{ errorCode: string }>;
open({
icon: 'error',
content: error.message,
content: axiosError?.response?.data?.errorCode as string,
});
callback();
return;
}
open({
icon: 'success',
content: '게시글을 신고했습니다',
});
callback();
};

const { data: meeting } = useQueryGetMeeting({ params: { id: post?.meeting.id ? String(post.meeting.id) : '' } });
Expand All @@ -123,6 +133,8 @@ export default function PostPage() {
!!comment
);

console.log({ comments });

const handleClickComment = () => {
const refCurrent = commentRef.current;
if (refCurrent) {
Expand Down Expand Up @@ -178,6 +190,7 @@ export default function PostPage() {
))
}
>
<ReWriteIcon />
수정
</FeedActionButton>,
<FeedActionButton
Expand All @@ -195,6 +208,7 @@ export default function PostPage() {
));
}}
>
<TrashIcon />
삭제
</FeedActionButton>,
]
Expand All @@ -214,6 +228,7 @@ export default function PostPage() {
));
}}
>
<AlertIcon />
신고
</FeedActionButton>,
]
Expand Down Expand Up @@ -272,23 +287,86 @@ export default function PostPage() {
{postsInMeeting?.map(post => {
if (!post) return;
return (
<Link key={post.id} href={`/post?id=${post.id}`}>
<FeedItem
/* TODO: FeedItem 인터페이스 안 맞는거 맞춰주기. 내부에서 query params 의존하는 부분 수정하기. */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
/* @ts-ignore */
post={post}
meetingId={meetingId}
// eslint-disable-next-line prettier/prettier
LikeButton={
<LikeButton
isLiked={post.isLiked}
likeCount={post.likeCount}
onClickLike={handleClickLike(post.id)(mutateLike)}
<>
{post.isBlockedPost ? (
<ContentBlocker />
) : (
<Link key={post.id} href={`/post?id=${post.id}`}>
<FeedItem
/* TODO: FeedItem 인터페이스 안 맞는거 맞춰주기. 내부에서 query params 의존하는 부분 수정하기. */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
/* @ts-ignore */
post={post}
meetingId={meetingId}
// eslint-disable-next-line prettier/prettier
LikeButton={
<LikeButton
isLiked={post.isLiked}
likeCount={post.likeCount}
onClickLike={handleClickLike(post.id)(mutateLike)}
/>
}
Actions={
isMine
? [
<FeedActionButton
onClick={() =>
overlay.open(({ isOpen, close }) => (
<FeedEditModal
isModalOpened={isOpen}
postId={String(post.id)}
handleModalClose={close}
/>
))
}
>
<ReWriteIcon />
수정
</FeedActionButton>,
<FeedActionButton
onClick={() => {
overlay.open(({ isOpen, close }) => (
// eslint-disable-next-line prettier/prettier
<ConfirmModal
isModalOpened={isOpen}
message="게시글을 삭제하시겠습니까?"
cancelButton="돌아가기"
confirmButton="삭제하기"
handleModalClose={close}
handleConfirm={mutateDeletePost}
/>
));
}}
>
<TrashIcon />
삭제
</FeedActionButton>,
]
: [
<FeedActionButton
onClick={() => {
overlay.open(({ isOpen, close }) => (
// eslint-disable-next-line prettier/prettier
<ConfirmModal
isModalOpened={isOpen}
message="게시글을 신고하시겠습니까?"
cancelButton="돌아가기"
confirmButton="신고하기"
handleModalClose={close}
handleConfirm={handleConfirmReportPost({ postId: post.id, callback: close })}
/>
));
}}
>
<AlertIcon />
신고
</FeedActionButton>,
]
}
/>
}
/>
</Link>
</Link>
)}
</>
);
})}
</FeedList>
Expand All @@ -300,24 +378,87 @@ export default function PostPage() {
{allMeetingPosts?.map(post => {
if (!post) return;
return (
<Link key={post.id} href={`/post?id=${post.id}`}>
<FeedItem
/* TODO: FeedItem 인터페이스 안 맞는거 맞춰주기. 내부에서 query params 의존하는 부분 수정하기. */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
/* @ts-ignore */
post={post}
meetingId={meetingId}
HeaderSection={<MeetingInfo meetingInfo={post.meeting} />}
// eslint-disable-next-line prettier/prettier
LikeButton={
<LikeButton
isLiked={post.isLiked}
likeCount={post.likeCount}
onClickLike={handleClickLike(post.id)(mutateLikeInAllPost)}
<>
{post.isBlockedPost ? (
<ContentBlocker />
) : (
<Link key={post.id} href={`/post?id=${post.id}`}>
<FeedItem
/* TODO: FeedItem 인터페이스 안 맞는거 맞춰주기. 내부에서 query params 의존하는 부분 수정하기. */
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
/* @ts-ignore */
post={post}
meetingId={meetingId}
HeaderSection={<MeetingInfo meetingInfo={post.meeting} />}
// eslint-disable-next-line prettier/prettier
LikeButton={
<LikeButton
isLiked={post.isLiked}
likeCount={post.likeCount}
onClickLike={handleClickLike(post.id)(mutateLikeInAllPost)}
/>
}
Actions={
isMine
? [
<FeedActionButton
onClick={() =>
overlay.open(({ isOpen, close }) => (
<FeedEditModal
isModalOpened={isOpen}
postId={String(post.id)}
handleModalClose={close}
/>
))
}
>
<ReWriteIcon />
수정
</FeedActionButton>,
<FeedActionButton
onClick={() => {
overlay.open(({ isOpen, close }) => (
// eslint-disable-next-line prettier/prettier
<ConfirmModal
isModalOpened={isOpen}
message="게시글을 삭제하시겠습니까?"
cancelButton="돌아가기"
confirmButton="삭제하기"
handleModalClose={close}
handleConfirm={mutateDeletePost}
/>
));
}}
>
<TrashIcon />
삭제
</FeedActionButton>,
]
: [
<FeedActionButton
onClick={() => {
overlay.open(({ isOpen, close }) => (
// eslint-disable-next-line prettier/prettier
<ConfirmModal
isModalOpened={isOpen}
message="게시글을 신고하시겠습니까?"
cancelButton="돌아가기"
confirmButton="신고하기"
handleModalClose={close}
handleConfirm={handleConfirmReportPost({ postId: post.id, callback: close })}
/>
));
}}
>
<AlertIcon />
신고
</FeedActionButton>,
]
}
/>
}
/>
</Link>
</Link>
)}
</>
);
})}
</FeedList>
Expand Down
3 changes: 3 additions & 0 deletions public/assets/svg/alert-triangle.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/assets/svg/clicked-dots-vertical.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/assets/svg/clicked-menu-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/assets/svg/comment-write.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9ebc543

Please sign in to comment.