From 88d72fcabd173ce1451eb97ad69a4fc51354e969 Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 16 Jan 2025 18:28:25 +0900 Subject: [PATCH 01/23] =?UTF-8?q?feat:=20=EC=9E=91=ED=92=88=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/artwork/upload/page.tsx | 5 +++++ src/constants/routes.ts | 1 + 2 files changed, 6 insertions(+) create mode 100644 src/app/artwork/upload/page.tsx diff --git a/src/app/artwork/upload/page.tsx b/src/app/artwork/upload/page.tsx new file mode 100644 index 0000000..bb95d1d --- /dev/null +++ b/src/app/artwork/upload/page.tsx @@ -0,0 +1,5 @@ +const ArtworkUpload = () => { + return
ArtworkUpload
; +}; + +export default ArtworkUpload; diff --git a/src/constants/routes.ts b/src/constants/routes.ts index 5007b5b..b8ddb09 100644 --- a/src/constants/routes.ts +++ b/src/constants/routes.ts @@ -3,6 +3,7 @@ const ROUTE = { signIn: '/auth/sign-in', signUp: '/auth/sign-up', artworkList: '/artwork/list', + artworkUpload: '/artwork/upload', }; export default ROUTE; From af560123eec10bceffd7fbfa86c5ab165ca99a05 Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 16 Jan 2025 18:40:30 +0900 Subject: [PATCH 02/23] =?UTF-8?q?move:=20=EC=9E=91=ED=92=88=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20onC?= =?UTF-8?q?lick=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Navbar/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index e3de8e6..74640ff 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -101,11 +101,9 @@ const Navbar = () => { -

- 작품 업로드 -

+

작품 업로드

) : ( From 78d5471bb431ff52d1f53f7230fb6d4e853ac79f Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 16 Jan 2025 21:24:15 +0900 Subject: [PATCH 03/23] =?UTF-8?q?style:OvalButton=EC=9D=B4=20padding=20?= =?UTF-8?q?=EB=8C=80=EC=8B=A0=20line-height=EA=B0=80=20=EB=86=92=EC=9D=B4?= =?UTF-8?q?=EB=A5=BC=20=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=A4=91=EC=95=99=EC=97=90=20?= =?UTF-8?q?=EB=B0=B0=EC=B9=98=ED=95=98=EB=8F=84=EB=A1=9D=20CSS=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 --- src/components/Button/OvalButton.tsx | 6 ++++-- src/components/Navbar/index.tsx | 1 + src/types/buttons/OvalButtonProps.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Button/OvalButton.tsx b/src/components/Button/OvalButton.tsx index 58aea34..2cf9f5d 100644 --- a/src/components/Button/OvalButton.tsx +++ b/src/components/Button/OvalButton.tsx @@ -3,6 +3,7 @@ import { OvalButtonProps } from '@/types'; const OvalButton = ({ variant = 'primary', buttonSize, + className, children, onClick, @@ -27,8 +28,8 @@ const OvalButton = ({ }; const buttonSizeClasses = { - m: 'h-[69px] px-[46px] py-[17px]', - s: 'h-[50px] px-[34px] py-[20px]', + m: 'leading-[69px]', + s: 'leading-[50px]', }; return ( @@ -42,6 +43,7 @@ const OvalButton = ({ ${hoverBgColorClasses[variant]} ${textColorClasses[variant]} ${buttonSizeClasses[buttonSize]} + ${className} `} > {buttonSize === 'm' ? ( diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index 74640ff..f55e47b 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -102,6 +102,7 @@ const Navbar = () => { variant='primary' buttonSize='s' onClick={moveToArtworkUpload} + className='w-[124px]' >

작품 업로드

diff --git a/src/types/buttons/OvalButtonProps.ts b/src/types/buttons/OvalButtonProps.ts index db5789f..e155510 100644 --- a/src/types/buttons/OvalButtonProps.ts +++ b/src/types/buttons/OvalButtonProps.ts @@ -6,4 +6,5 @@ export interface OvalButtonProps 'disabled' | 'loading' | 'icon' | 'iconPosition' | 'type' > { buttonSize: 's' | 'm'; + className?: string; } From 9e1be90fe7aa83bcdfc8e67a5e9ec2941ef7b63e Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Thu, 16 Jan 2025 23:42:52 +0900 Subject: [PATCH 04/23] =?UTF-8?q?refactor:=20custom-label=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/globals.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/styles/globals.css b/src/styles/globals.css index 464618a..24244b6 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -51,8 +51,7 @@ } .body2, - .placeholder, - .custom-label { + .placeholder { font-size: 1rem; /* 16px */ } @@ -72,7 +71,6 @@ font-weight: 600; /* SemiBold */ } - .custom-label, .subtitle2, .placeholder, .button-l, From 8d6e1c932c594e64ef18504291a4d5c677303747 Mon Sep 17 00:00:00 2001 From: Dahyeon Jin Date: Fri, 17 Jan 2025 01:52:07 +0900 Subject: [PATCH 05/23] =?UTF-8?q?style:=20FilterDropdown=EC=9D=98=20width?= =?UTF-8?q?=EB=A5=BC=20className=EC=9C=BC=EB=A1=9C=20=EB=B0=9B=EC=95=84?= =?UTF-8?q?=EC=84=9C=20=EC=B2=98=EB=A6=AC=EB=90=A0=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ArtworkPage/ArtworkFilter.tsx | 1 + src/components/FilterDropdown/index.tsx | 34 ++++++++++++++++---- src/components/Navbar/index.tsx | 1 - 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/components/ArtworkPage/ArtworkFilter.tsx b/src/components/ArtworkPage/ArtworkFilter.tsx index fd383b4..ca9e67e 100644 --- a/src/components/ArtworkPage/ArtworkFilter.tsx +++ b/src/components/ArtworkPage/ArtworkFilter.tsx @@ -77,6 +77,7 @@ const ArtworkFilter = ({ options={FILTER_OPTIONS} selected={selectedFilter} onChange={handleFilterChange} + className='w-[149px]' /> diff --git a/src/components/FilterDropdown/index.tsx b/src/components/FilterDropdown/index.tsx index b555b95..9d88a8a 100644 --- a/src/components/FilterDropdown/index.tsx +++ b/src/components/FilterDropdown/index.tsx @@ -10,12 +10,19 @@ interface FilterDropdownProps { options: string[]; selected: string; onChange: (value: string) => void; + + label?: string; + placeholder?: string; + className?: string; } const FilterDropdown = ({ options, selected, onChange, + label, + placeholder, + className, }: FilterDropdownProps) => { const [isDropdownOpen, setIsDropdownOpen] = useState(false); @@ -29,16 +36,29 @@ const FilterDropdown = ({ }; return ( -
+
+ {label && ( + + )} + - )} + {type === 'textarea' ? ( + <> + +