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 03de5435..3ab0dc23 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={'아이 학년을 선택해주세요'} /> ) : ( {

))} -