From 19b485ed8d091b739f171b83ee4e54ece71a5fe5 Mon Sep 17 00:00:00 2001 From: Jeongjin Oh Date: Tue, 26 Mar 2024 20:44:23 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20photo=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20props=20=ED=83=80=EC=9E=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Navigation/SideBar/LoginSideBarContent.tsx | 6 +++++- .../Navigation/SideBar/LogoutSideBarContent.tsx | 2 +- src/common/components/Photo/Photo.stories.tsx | 6 +++--- src/common/components/Photo/Photo.tsx | 14 +++++++------- src/common/components/RandomImge/RandomImage.tsx | 2 +- .../components/TagCategory/CategoryContent.tsx | 7 ++++++- .../components/TagCategory/FavoriteCategory.tsx | 2 +- .../tags/components/MemesByTagsContainer.tsx | 11 ++++++++--- .../memes/components/MemeDetail/MemeDetail.tsx | 1 + .../components/MemeShareModal/MemeShareModal.tsx | 2 +- src/features/upload/components/UploadMeme.tsx | 2 +- src/features/upload/components/UploadMemeData.tsx | 6 +++--- src/pages/mypage/index.tsx | 6 +++++- src/pages/setting/index.tsx | 2 +- 14 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/common/components/Navigation/SideBar/LoginSideBarContent.tsx b/src/common/components/Navigation/SideBar/LoginSideBarContent.tsx index a4a5a2eb..7c9a5a31 100644 --- a/src/common/components/Navigation/SideBar/LoginSideBarContent.tsx +++ b/src/common/components/Navigation/SideBar/LoginSideBarContent.tsx @@ -17,7 +17,11 @@ export const LoginSideBarContent = (props: LoginSideBarContentProps) => { <>
- + {user?.name} diff --git a/src/common/components/Navigation/SideBar/LogoutSideBarContent.tsx b/src/common/components/Navigation/SideBar/LogoutSideBarContent.tsx index ca246dce..9f465a1f 100644 --- a/src/common/components/Navigation/SideBar/LogoutSideBarContent.tsx +++ b/src/common/components/Navigation/SideBar/LogoutSideBarContent.tsx @@ -15,7 +15,7 @@ export const LogoutSideBarContent = (props: LogoutSideBarContentProps) => { <>
); diff --git a/src/common/components/RandomImge/RandomImage.tsx b/src/common/components/RandomImge/RandomImage.tsx index acef46bc..00c0a217 100644 --- a/src/common/components/RandomImge/RandomImage.tsx +++ b/src/common/components/RandomImge/RandomImage.tsx @@ -2,7 +2,7 @@ import type { ComponentProps } from "react"; import { Photo } from "../Photo"; -interface Props extends ComponentProps { +interface Props extends Omit, "alt" | "src" | "sizes"> { images?: { name: string; src: string }[]; } const randomImages = [ diff --git a/src/features/common/components/TagCategory/CategoryContent.tsx b/src/features/common/components/TagCategory/CategoryContent.tsx index 6a9cb8ca..7bffad64 100644 --- a/src/features/common/components/TagCategory/CategoryContent.tsx +++ b/src/features/common/components/TagCategory/CategoryContent.tsx @@ -64,7 +64,12 @@ export const CategoryContent = () => { gtmTrigger[category.name] } flex w-full items-center justify-between gap-8 rounded-full px-4 py-12 text-16-semibold-140 [&>span>#chevronDown]:data-[state=open]:rotate-180`} > - + {category.mainTags.length ? ( {
- + {FAVORITE_ID} { } return ( <> - + fetchNextPage({ cancelRefetch: false })} @@ -29,9 +33,10 @@ export const MemesByTagsContainer = ({ tag }: Props) => { interface ThumbnailProps { image: string; + tag: string; totalCount: number; } -const Thumbnail = React.memo(function Thumbnail({ image, totalCount }: ThumbnailProps) { +const Thumbnail = React.memo(function Thumbnail({ image, tag, totalCount }: ThumbnailProps) { const router = useRouter(); const clipboard = useClipboard(); const toast = useToast(); @@ -40,7 +45,7 @@ const Thumbnail = React.memo(function Thumbnail({ image, totalCount }: Thumbnail return (
- +
{totalCount}개 밈