Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/components/commons/SignInput/SignInput.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
.input-field {
@extend %input-base;
}
.disabled {
color: $gray30;
}

.helper-text {
@include text-style(1.2, 400, $gray30);
Expand Down
12 changes: 10 additions & 2 deletions src/components/commons/SignInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,23 @@ interface SignInputProps extends InputHTMLAttributes<HTMLInputElement> {
isError?: boolean;
isVerified?: boolean;
helperText?: string;
disabled?: boolean;
}

const SignInput = forwardRef<HTMLInputElement, SignInputProps>(
({ id, type = "text", isError = false, isVerified = false, helperText, ...props }, ref) => {
({ id, type = "text", isError = false, isVerified = false, helperText, disabled = false, ...props }, ref) => {
const helperTextLines = helperText?.split("\n") || [];

return (
<div className={cx("container")}>
<input className={cx("input-field", { error: isError })} ref={ref} id={id} type={type} {...props} />
<input
className={cx("input-field", { error: isError }, { disabled: disabled })}
ref={ref}
id={id}
type={type}
{...props}
disabled={disabled}
/>
<div className={cx("helper-text")}>
{helperTextLines.map((line, index) => (
<p key={index} className={cx({ error: isError, verified: isVerified })}>
Expand Down
9 changes: 8 additions & 1 deletion src/components/commons/SignInputController/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ interface SignInputControllerProps<T extends FieldValues> {
control: Control<T>;
condition: SignField;
setError?: UseFormSetError<T> | undefined;
disabled?: boolean;
}

const SignInputController = <T extends FieldValues>({ name, control, condition }: SignInputControllerProps<T>) => {
const SignInputController = <T extends FieldValues>({
name,
control,
condition,
disabled = false,
}: SignInputControllerProps<T>) => {
const { defaultMessage, type, ...inputProps } = condition;

return (
Expand All @@ -22,6 +28,7 @@ const SignInputController = <T extends FieldValues>({ name, control, condition }
id={name}
type={type}
isError={!!fieldState.error}
disabled={disabled}
helperText={fieldState.error?.message || defaultMessage}
{...inputProps}
{...field}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.container {
@include flexbox(center, start);
min-height: 100vh;
padding-bottom: 8.6rem;
}

.items {
@include column-flexbox();
gap: 4rem;
max-width: 40rem;
width: 100%;

@include responsive("M") {
padding-left: 2rem;
padding-right: 2rem;
}
}

.header {
@include text-style(3, 700);
}

.user-container {
@include column-flexbox();
width: 100%;
}

.form {
@include column-flexbox(center, start);
gap: 3rem;

&-input {
@include column-flexbox(center, start);
gap: 0.6rem;

&-except-email {
@include column-flexbox();
gap: 0.6rem;
width: 100%;
}
}
}

.auth-form {
@include column-flexbox(start, center);
min-height: 100vh;
padding-top: 15vh;
padding-bottom: 8.6rem;
gap: 1rem;

@include responsive("T") {
padding-top: 10vh;
}

.auth-form-txt {
font-size: 20px;
}

form {
@include column-flexbox(center, center);
width: 100%;
max-width: 35rem;
gap: 0.5rem;
}
}

.input-field {
@extend %input-base;
margin: 2rem 0;
}
.disabled {
color: $gray30;
}

.helper-text {
@include text-style(1.2, 400, $gray30);
@include column-flexbox(start, end);
min-height: 1.6rem;

.verified {
color: $primary40;
}

.error {
color: $red;
}
}
168 changes: 165 additions & 3 deletions src/components/domains/myPage/contents/UpdateUserInfo/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,170 @@
import Text from "@/components/commons/Text";

import classNames from "classnames/bind";
import styles from "./UpdateUserInfo.module.scss";
const cx = classNames.bind(styles);

const UpdateUserInfo = () => {
const [auth, setAuth] = useState(false);
const [password, setPassword] = useState("");

const handlePasswordSubmit = (e: React.FormEvent) => {
e.preventDefault();
if (password) {
setAuth(true);
}
};

return (
<>
<h1>UpdateUserInfo Component</h1>
</>
<div className={cx("container")}>
<div className={cx("items")}>
{auth ? (
<UserForm />
) : (
<div className={cx("auth-form")}>
<Text className={cx("auth-form-txt")} text="회원정보변경을 위해 사용자 인증이 필요합니다." />
<Text className={cx("auth-form-txt")} text="비밀번호를 입력해주세요." />
<form onSubmit={handlePasswordSubmit}>
<input
className={cx("input-field")}
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder="비밀번호를 입력해주세요"
/>
<Button type="submit" color="blue" variant="primary" size="large" isSquare={true}>
비밀번호 확인
</Button>
</form>
</div>
)}
</div>
</div>
);
};

export default UpdateUserInfo;

import Button from "@/components/commons/Button";
import SignInputController from "@/components/commons/SignInputController";
import { StatusType } from "@/constants/emailAndCodeStatus";
import { inputOrder, SIGNUP_DEFAULT_VALUES } from "@/constants/signDefaultValues";
import { SIGN_UP_CONDITION, SIGN_UP_EMAIL_CONDITION } from "@/constants/signInputCondition";
import { useEmailAndCodeValidation } from "@/hooks/useEmailAndCodeValidation";
import { useNicknameValidation } from "@/hooks/useNicknameValidation";
import { useSignUpMutation } from "@/hooks/useSignUpMutation";
import { SignUpFormInputs, signUpSchema } from "@/schemas/signUpSchema";
import { zodResolver } from "@hookform/resolvers/zod";
import { useCallback, useEffect, useRef, useState } from "react";
import { useForm, useFormState } from "react-hook-form";

const UserForm = () => {
const submitButtonRef = useRef<HTMLButtonElement>(null);
const [submitKey, setSubmitKey] = useState(0);

const { control, formState, setError, watch, clearErrors, setValue, trigger, getValues, setFocus } =
useForm<SignUpFormInputs>({
resolver: zodResolver(signUpSchema),
mode: "onChange",
defaultValues: SIGNUP_DEFAULT_VALUES,
});

const { emailStatus, codeStatus, validateEmailAndCode } = useEmailAndCodeValidation(
watch,
setValue,
setError,
clearErrors,
);

const nickname = watch("nickname");

const {
errors: { email: isEmailError, nickname: isNicknameError },
} = useFormState({ control, name: ["email", "nickname"] });

useNicknameValidation(nickname, Boolean(isNicknameError), setError);

const { signUp } = useSignUpMutation();

const customSubmit = useCallback(
async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
setSubmitKey((prev) => prev + 1);

if (isEmailError) {
await trigger(["password", "confirmPassword", "name", "nickname", "phoneNumber"]);
return;
} else {
const isZodValid = await trigger();

if (!isZodValid) {
alert("회원정보입력을 잘못하셨습니다");
return;
}
const { email, name, nickname, password, phoneNumber } = getValues();
alert("회원정보변경 완료");
console.log({ email, name, nickname, password, phoneNumber });
// signUp({ email, name, nickname, password, phoneNumber });
}
},
[isEmailError, trigger, validateEmailAndCode, getValues, signUp],
);

useEffect(() => {
const errors = formState.errors;

if (emailStatus.status !== StatusType.SUCCESS) {
setFocus("email");
return;
} else if (codeStatus.status !== StatusType.SUCCESS) {
setFocus("code");
return;
}
if (Object.keys(errors).length > 0) {
console.log(errors);
const firstErrorField = inputOrder.find((field) => errors[field]);

if (firstErrorField) {
setFocus(firstErrorField);
}
}
}, [formState.errors, submitKey, codeStatus.status, emailStatus.status, setFocus]);

const handleKeyDown = (e: React.KeyboardEvent<HTMLFormElement>) => {
if (e.key === "Enter") {
e.preventDefault();
submitButtonRef.current?.click();
}
};

return (
<form className={cx("form")} onSubmit={customSubmit} onKeyDown={handleKeyDown}>
<div className={cx("form-input")}>
<div className={cx("form-input-except-email")}>
<SignInputController
name="email"
control={control}
condition={SIGN_UP_EMAIL_CONDITION["email"]}
setError={setError}
disabled={true}
/>
{(Object.keys(SIGN_UP_CONDITION) as Array<keyof typeof SIGN_UP_CONDITION>).map((key) => (
<SignInputController
key={key}
name={key}
control={control}
condition={SIGN_UP_CONDITION[key]}
setError={setError}
/>
))}
</div>
</div>

<Button type="submit" color="blue" variant="primary" size="large" isSquare={true} ref={submitButtonRef}>
회원정보변경
</Button>
</form>
);
};

UserForm;
Loading