Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

온보딩 selectbox 기본값 설정 #301

Merged
merged 3 commits into from
Dec 3, 2023
Merged

온보딩 selectbox 기본값 설정 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2547f2e
fix: 온보딩 페이지 select option값 빈 값 없애고 default 문자열 넣기
jisung24 Dec 2, 2023
79226b1
fix: 버튼 크기 바뀌는 문제 해결
jisung24 Dec 2, 2023
e1c34ca
fix: 버튼 div위치 absolute대신 spacing컴포넌트 적용
jisung24 Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/common/button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
15 changes: 6 additions & 9 deletions src/components/common/inputbox/input/Input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,19 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
) => {
const [inputValue, setInputValue] = useState('')
const [searchInputValue, setSearchInputValue] = useState('')

return inputType === 'Default' ? (
<div className={'my-[10px]'}>
<input
type={'text'}
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}
Expand All @@ -54,8 +51,8 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
/>
<p className={'font-nsk caption-13 text-red-600 px-3 mt-1'}>
{field === 'email' &&
!validate('email', inputValue) &&
inputValue !== ''
inputValue !== '' &&
!validate('email', inputValue)
? (errorMessage = '잘못된 이메일입니다')
: field === 'nickname' &&
!validate('nickname', inputValue) &&
Expand Down
5 changes: 3 additions & 2 deletions src/pages/onboarding/OnbardingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const Onboarding = () => {
ref={selectRef}
onChange={handleSelectChange}
value={selectValue}
placeholder={'아이 학년을 선택해주세요'}
/>
) : (
<Input
Expand All @@ -160,7 +161,8 @@ const Onboarding = () => {
</div>
))}
</div>
<ul className={'absolute bottom-[15px] w-full text-center'}>
<Spacing size={220} />
<ul className={'w-full text-center'}>
{PAGE_CONTENT[currentPage].buttonType.map(
(buttonLabel, i) =>
buttonLabel && (
Expand All @@ -180,7 +182,6 @@ const Onboarding = () => {
: 'Round-blue-500'
}
onClick={() => {
// 아무것도 입력을 하지 않았을 때!
if (
inputRef.current?.value === '' ||
selectRef.current?.value === ''
Expand Down
1 change: 0 additions & 1 deletion src/pages/onboarding/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ export const PAGE_CONTENT = [
]

export const CHILD_GRADE = [
'',
'초등학교 1학년',
'초등학교 2학년',
'초등학교 3학년',
Expand Down