From a47d807ff94b32527d9e2d15b8409853607b1137 Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 26 Dec 2024 21:26:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20ArtworkInfoType=EC=9D=98=20view=20?= =?UTF-8?q?=EB=A5=BC=20viewCount=20=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/artwork.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/artwork.ts b/src/types/artwork.ts index 30fe858..bba8ae4 100644 --- a/src/types/artwork.ts +++ b/src/types/artwork.ts @@ -4,7 +4,7 @@ interface ArtworkInfoType { postImage: string; userId: number; nickname: string; - view: number; + viewCount: number; likeCount: number; commentCount: number; isLiked: boolean; From 89de07843a6cc0fbf0f40807c0a50dad66881854 Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 26 Dec 2024 22:55:21 +0900 Subject: [PATCH 2/3] =?UTF-8?q?style:=20FollowButton=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Button/FollowButton.tsx | 6 +++--- src/components/Input/EmailInput.tsx | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Button/FollowButton.tsx b/src/components/Button/FollowButton.tsx index 45e2cdc..204eb52 100644 --- a/src/components/Button/FollowButton.tsx +++ b/src/components/Button/FollowButton.tsx @@ -30,13 +30,13 @@ const FollowButton = ({ onClick={toggleFollow} aria-label={ariaLabel} className={` - flex items-center justify-center rounded-full + button-s flex items-center justify-center rounded-full w-[95px] h-[37px] gap-[3px] ${backgroundColor} ${textColor} ${textSize} ${ isFollowing - ? 'border border-gray-900 text-gray-900 bg-white' - : 'bg-gray-900 text-white' + ? 'border border-gray-300 text-gray-300 bg-transparent' + : 'bg-gray-800 text-white' } hover:bg-opacity-80 active:bg-opacity-60 active:scale-95 transition-all duration-300 ease-in-out diff --git a/src/components/Input/EmailInput.tsx b/src/components/Input/EmailInput.tsx index d075ed8..cdc1466 100644 --- a/src/components/Input/EmailInput.tsx +++ b/src/components/Input/EmailInput.tsx @@ -7,6 +7,7 @@ import { useEffect, useState } from 'react'; import { useFormContext } from 'react-hook-form'; import useGetValidateEmail from '@/apis/auth/validateEmail'; + import Icon from '../Icon/Icon'; const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i; From 25cc4e03e3101d833d5a273ed76644a995b67bee Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 26 Dec 2024 22:55:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20Footer=20UI=20=EA=B9=A8=EC=A7=90=20?= =?UTF-8?q?=ED=98=84=EC=83=81=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Layout/AppShell.tsx | 2 +- src/styles/globals.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Layout/AppShell.tsx b/src/components/Layout/AppShell.tsx index b7cb3e0..6457a95 100644 --- a/src/components/Layout/AppShell.tsx +++ b/src/components/Layout/AppShell.tsx @@ -19,7 +19,7 @@ const AppShell = ({ children }: { children: ReactNode }) => { dark: 'custom-dark', }} > -
+
{children}