diff --git a/src/components/RegisterPage/EmailSection.tsx b/src/components/RegisterPage/EmailSection.tsx index 44da2216..2b341754 100644 --- a/src/components/RegisterPage/EmailSection.tsx +++ b/src/components/RegisterPage/EmailSection.tsx @@ -27,93 +27,89 @@ export const EmailSection = ({ console.log(isVerifyLoading); }, [isVerifyLoading]); return ( -
-
+
+
+
+ {email && isEmailSend && isEmailVerified && ( +
+ ✔ 인증이 완료되었습니다. +
+ )} + +
+ +
+ + {isEmailSend && (
- {email && isEmailSend && isEmailVerified && ( -
- ✔ 인증이 완료되었습니다. -
- )} - +
-
- -
- {isEmailSend && ( -
-
- -
- -
- )} -
+ )}
); }; diff --git a/src/pages/User/Login/LoginPage.tsx b/src/pages/User/Login/LoginPage.tsx index 3742f78e..fbfd55fe 100644 --- a/src/pages/User/Login/LoginPage.tsx +++ b/src/pages/User/Login/LoginPage.tsx @@ -4,6 +4,7 @@ import { EmailInput } from '@/components/Common/Input/EmailInput'; import { PasswordInput } from '@/components/Common/Input/PasswordInput'; import { useToastStore } from '@/hooks/useToastStore'; import { useLogin } from './../../../hooks/useLogin'; +import { Link } from 'react-router-dom'; // const KAKAO_CLIENT_ID = import.meta.env.VITE_JAVASCRIPT_KEY as string; // const REDIRECT_URI = 'http://localhost:5173/login/kakao'; @@ -31,10 +32,6 @@ export const LoginPage = () => { mutate({ email, password }); }; - const handleNavigateRegister = () => { - navigate('/register'); - }; - return (

@@ -60,12 +57,12 @@ export const LoginPage = () => {
계정이 없으신가요? - {' '}회원가입 - +

diff --git a/src/pages/User/Register/RegisterPage.tsx b/src/pages/User/Register/RegisterPage.tsx index b07fedaf..ad16da63 100644 --- a/src/pages/User/Register/RegisterPage.tsx +++ b/src/pages/User/Register/RegisterPage.tsx @@ -23,51 +23,51 @@ export const RegisterPage = () => { }; return ( -
-

회원가입

-
-
- updateField('email', value)} - onAuthNumChange={(value) => - updateField('authNum', value) - } - onRequestVerify={handleRequestEmailVerifyCode} - onRequestAuthNumVerify={handleVerifyEmail} - isVerifyLoading={validationState.isVerifyLoading} - isEmailSend={validationState.isEmailSend} - isEmailVerified={validationState.isEmailVerified} - > - - updateField('password', value) - } - onConfirmPasswordChange={(value) => - updateField('confirmPassword', value) - } - > - - updateField('nickname', value) - } - onRequestNicknameVerify={handleCheckNickname} - isNicknameChecked={validationState.isNicknameChecked} - isNicknameValid={validationState.isNicknameValid} - > - - -
이미 회원이신가요?
+
+

+ Bottler +

+ + updateField('email', value)} + onAuthNumChange={(value) => updateField('authNum', value)} + onRequestVerify={handleRequestEmailVerifyCode} + onRequestAuthNumVerify={handleVerifyEmail} + isVerifyLoading={validationState.isVerifyLoading} + isEmailSend={validationState.isEmailSend} + isEmailVerified={validationState.isEmailVerified} + > + updateField('password', value)} + onConfirmPasswordChange={(value) => + updateField('confirmPassword', value) + } + > + updateField('nickname', value)} + onRequestNicknameVerify={handleCheckNickname} + isNicknameChecked={validationState.isNicknameChecked} + isNicknameValid={validationState.isNicknameValid} + > + +
+ +
+ 이미 회원이신가요? + + {' '} + 로그인 - +
);