From 2547f2ea931d6a1e2f85981ddf94ca5955ac8d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=84=9C=EB=A6=AC=ED=8B=B0=EC=BD=94=EB=8D=94?= <85999976+jisung24@users.noreply.github.com> Date: Sat, 2 Dec 2023 19:00:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20select=20option=EA=B0=92=20?= =?UTF-8?q?=EB=B9=88=20=EA=B0=92=20=EC=97=86=EC=95=A0=EA=B3=A0=20default?= =?UTF-8?q?=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=84=A3=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/onboarding/OnbardingPage.tsx | 1 + src/pages/onboarding/constants.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/onboarding/OnbardingPage.tsx b/src/pages/onboarding/OnbardingPage.tsx index 03de5435..f149992a 100644 --- a/src/pages/onboarding/OnbardingPage.tsx +++ b/src/pages/onboarding/OnbardingPage.tsx @@ -140,6 +140,7 @@ const Onboarding = () => { ref={selectRef} onChange={handleSelectChange} value={selectValue} + placeholder={'아이 학년을 선택해주세요'} /> ) : ( Date: Sat, 2 Dec 2023 19:47:09 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=B2=84=ED=8A=BC=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EB=B0=94=EB=80=8C=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/button/Button.tsx | 4 ++-- src/components/common/inputbox/input/Input.tsx | 15 ++++++--------- src/pages/onboarding/OnbardingPage.tsx | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx index bc7e7d9a..7eaa1f03 100644 --- a/src/components/common/button/Button.tsx +++ b/src/components/common/button/Button.tsx @@ -41,8 +41,8 @@ const Button = ({ } ${BUTTON_TEXT_COLOR['blue500']} ${BUTTON_BORDER_COLOR['blue500']}` : buttonType === 'Plain-disabled' ? `${BUTTON_RADIUS['middle']} ${ - fullWidth ? 'w-full' : width ? 'w-[317px]' : BUTTON_WIDTH[width] - } ${height ? 'h-[43px]' : BUTTON_HEIGHT[height]} ${ + fullWidth ? 'w-full' : width ? 'w-[343px]' : BUTTON_WIDTH[width] + } ${height ? 'h-[56px]' : BUTTON_HEIGHT[height]} ${ BUTTON_BG_COLOR['white0'] } ${BUTTON_TEXT_COLOR['gray500']} ${BUTTON_BORDER_COLOR['gray500']}` : buttonType === 'Plain-red' diff --git a/src/components/common/inputbox/input/Input.tsx b/src/components/common/inputbox/input/Input.tsx index e70a018b..7fd74986 100644 --- a/src/components/common/inputbox/input/Input.tsx +++ b/src/components/common/inputbox/input/Input.tsx @@ -21,7 +21,6 @@ const Input = forwardRef( ) => { const [inputValue, setInputValue] = useState('') const [searchInputValue, setSearchInputValue] = useState('') - return inputType === 'Default' ? (
( className={`${ fullWidth ? 'w-full h-[52px]' : 'w-[323px] h-[52px]' } rounded-[10px] ${ - field === 'email' && - !validate('email', inputValue) && + (field === 'email' || + field === 'nickname' || + field === 'childname') && + !validate(field, inputValue) && inputValue !== '' ? 'border border-red-600' - : field === 'nickname' && - !validate('nickname', inputValue) && - inputValue !== '' - ? 'border border-red-600' : 'border border-blue-350' } px-[20px] font-nsk text-black-800 bg-white-200 body-18 placeholder:text-gray-600 outline-none`} value={inputValue} @@ -54,8 +51,8 @@ const Input = forwardRef( />

{field === 'email' && - !validate('email', inputValue) && - inputValue !== '' + inputValue !== '' && + !validate('email', inputValue) ? (errorMessage = '잘못된 이메일입니다') : field === 'nickname' && !validate('nickname', inputValue) && diff --git a/src/pages/onboarding/OnbardingPage.tsx b/src/pages/onboarding/OnbardingPage.tsx index f149992a..b9bda34d 100644 --- a/src/pages/onboarding/OnbardingPage.tsx +++ b/src/pages/onboarding/OnbardingPage.tsx @@ -181,7 +181,6 @@ const Onboarding = () => { : 'Round-blue-500' } onClick={() => { - // 아무것도 입력을 하지 않았을 때! if ( inputRef.current?.value === '' || selectRef.current?.value === '' From e1c34ca7e9eaa831a062aae1b1ed130f611314bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EC=84=9C=EB=A6=AC=ED=8B=B0=EC=BD=94=EB=8D=94?= <85999976+jisung24@users.noreply.github.com> Date: Sat, 2 Dec 2023 19:48:38 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EB=B2=84=ED=8A=BC=20div=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20absolute=EB=8C=80=EC=8B=A0=20spacing=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/onboarding/OnbardingPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/onboarding/OnbardingPage.tsx b/src/pages/onboarding/OnbardingPage.tsx index b9bda34d..3ab0dc23 100644 --- a/src/pages/onboarding/OnbardingPage.tsx +++ b/src/pages/onboarding/OnbardingPage.tsx @@ -161,7 +161,8 @@ const Onboarding = () => {

))} -