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

fix(web-domains): 유저 정보 입력 에러 메시지 추가 #213

Merged
merged 2 commits into from
Sep 13, 2024
Merged

fix(web-domains): 유저 정보 입력 에러 메시지 추가 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29701e8
refactor: 인풋 에러 validation 추가
LeeJeongHooo Sep 13, 2024
bb63ea7
fix: 생년월일 validation 변경
LeeJeongHooo Sep 13, 2024
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
13 changes: 8 additions & 5 deletions packages/web-domains/src/user/features/get-user-info/components/Form/BasicInfoForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ export const BasicInfoForm = () => {
register,
handleSubmit,
control,
formState: { isValid },
formState: { isValid, errors },
} = useForm<BasicInfo>({
defaultValues: {
userName: searchParams.get('userName') || '',
birth: searchParams.get('birth') || '',
gender: searchParams.get('gender') || '',
},
mode: 'onTouched',
});

const goToNextPage = (data: BasicInfo) => {
Expand All @@ -46,7 +47,8 @@ export const BasicInfoForm = () => {
label="이름이 무엇인가요?"
answerNumber={1}
placeholder="이름을 입력해주세요"
errorMessage="2자 이상, 5자 이하로 입력해주세요"
hintMessage="2자 이상, 5자 이하로 입력해주세요"
error={errors.userName}
maxLength={5}
{...register('userName', {
required: true,
Expand All @@ -56,16 +58,17 @@ export const BasicInfoForm = () => {
})}
/>
<TextInput
label="나이가 어떻게 되나요?"
label="생년월일을 입력해주세요"
answerNumber={2}
error={errors.birth}
placeholder="생년월일 8자리를 입력해주세요"
maxLength={8}
{...register('birth', {
required: true,
maxLength: 8,
pattern: {
value: /^\d{8}$/,
message: '생년월일은 숫자 8자리여야 합니다',
value: /^(19[0-9][0-9]|20\d{2})(0[0-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])$/,
message: '생년월일 8자리를 입력해주세요',
},
})}
/>
Expand Down
9 changes: 6 additions & 3 deletions packages/web-domains/src/user/features/get-user-info/components/Form/ExtraInfoForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ export const ExtraInfoForm = () => {
const {
register,
handleSubmit,
formState: { isValid },
formState: { isValid, errors },
} = useForm<ExtraInfo>({
defaultValues: {
job: searchParams.get('job') || '',
location: searchParams.get('location') || '',
},
mode: 'onTouched',
});

const goToNextPage = (data: ExtraInfo) => {
Expand All @@ -42,7 +43,8 @@ export const ExtraInfoForm = () => {
answerNumber={4}
placeholder="예) 돈 많은 백수"
maxLength={15}
errorMessage="1자 이상, 15자 이하로 입력해주세요"
error={errors.job}
hintMessage="1자 이상, 15자 이하로 입력해주세요"
{...register('job', {
required: true,
minLength: 1,
Expand All @@ -54,8 +56,9 @@ export const ExtraInfoForm = () => {
answerNumber={5}
label="어디에 거주하고 계신가요?"
maxLength={15}
error={errors.location}
placeholder="예) 사랑시 고백구 행복동"
errorMessage="1자 이상, 15자 이하로 입력해주세요"
hintMessage="1자 이상, 15자 이하로 입력해주세요"
{...register('location', {
required: true,
minLength: 1,
Expand Down
19 changes: 13 additions & 6 deletions packages/web-domains/src/user/features/get-user-info/components/TextInput/TextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { Txt } from '@sambad/sds/components';
import { size, colors } from '@sambad/sds/theme';
import { ChangeEvent, forwardRef, InputHTMLAttributes } from 'react';
import { FieldError } from 'react-hook-form';

import { inputCss, textInputcss } from './styles';

export interface TextInputProps extends InputHTMLAttributes<HTMLInputElement> {
label: string;
errorMessage?: string;
hintMessage?: string;
answerNumber: string | number;
error?: FieldError;
}

export const TextInput = forwardRef<HTMLInputElement, TextInputProps>((props, ref) => {
const { maxLength, label, errorMessage, answerNumber, onChange, ...restProps } = props;
const { maxLength, label, hintMessage, answerNumber, onChange, error, ...restProps } = props;

const formattedAnswerNumber = answerNumber.toString().padStart(2, '0');

Expand All @@ -33,10 +35,15 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>((props, re
{label}
</Txt>
</label>
<input ref={ref} css={inputCss} onChange={handleChange} {...restProps} />
{errorMessage && (
<Txt as="p" typography="body4" color={colors.grey600}>
{errorMessage}
<input ref={ref} css={inputCss(!!error)} onChange={handleChange} {...restProps} />
{hintMessage && (
<Txt as="p" typography="body4" color={error ? colors.primary500 : colors.grey600}>
{hintMessage}
</Txt>
)}
{!hintMessage && error && (
<Txt as="p" typography="body4" color={colors.primary500}>
{error?.message}
</Txt>
)}
</div>
Expand Down
21 changes: 11 additions & 10 deletions packages/web-domains/src/user/features/get-user-info/components/TextInput/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { css } from '@emotion/react';
import { colors, borderRadiusVariants, size } from '@sambad/sds/theme';

export const inputCss = css({
display: 'block',
width: '100%',
backgroundColor: colors.grey200,
border: `1px solid ${colors.grey400}`,
padding: '12px 16px',
borderRadius: borderRadiusVariants.medium,
':focus': { borderColor: colors.grey600 },
outline: 'none',
});
export const inputCss = (error?: boolean) =>
css({
display: 'block',
width: '100%',
backgroundColor: colors.grey200,
border: `1px solid ${error ? colors.primary500 : colors.grey400}`,
padding: '12px 16px',
borderRadius: borderRadiusVariants.medium,
':focus': { borderColor: colors.grey600 },
outline: 'none',
});

export const textInputcss = css({
display: 'flex',
Expand Down
Loading