From 4a7ee260c55b39f5f4c4284720c409b58bf305e8 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Sun, 22 Sep 2024 02:55:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=B2=84=ED=8A=BC=20=EB=A7=88?= =?UTF-8?q?=EC=A7=84=EA=B0=92=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=A7=A4=EC=B9=AD=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/find/FindEmail.tsx | 4 ++-- src/components/find/FindPassword.tsx | 8 ++++---- src/components/signup/Step1.tsx | 4 ++-- src/components/signup/Step3.tsx | 16 ++++++++++++++-- src/components/signup/Step4.tsx | 2 +- .../signup/modal/PhoneVerification.tsx | 4 ++-- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/components/find/FindEmail.tsx b/src/components/find/FindEmail.tsx index e9c558d..ef6f1cd 100644 --- a/src/components/find/FindEmail.tsx +++ b/src/components/find/FindEmail.tsx @@ -241,12 +241,12 @@ const FindEmail = () => { {isComplete ? (
다음으로
) : ( -
+
다음으로
)} diff --git a/src/components/find/FindPassword.tsx b/src/components/find/FindPassword.tsx index 949fb88..3a9662a 100644 --- a/src/components/find/FindPassword.tsx +++ b/src/components/find/FindPassword.tsx @@ -229,12 +229,12 @@ const FindPassword = () => { {isComplete ? (
다음으로
) : ( -
+
다음으로
)} @@ -310,11 +310,11 @@ const FindPassword = () => { className="w-full mx-auto" > {passwordMatch ? ( -
+
비밀번호 재설정
) : ( -
+
비밀번호 재설정
)} diff --git a/src/components/signup/Step1.tsx b/src/components/signup/Step1.tsx index cbfc9c9..003201b 100644 --- a/src/components/signup/Step1.tsx +++ b/src/components/signup/Step1.tsx @@ -128,9 +128,9 @@ const Step1: React.FC = ({ onNext, onUpdate }) => { diff --git a/src/components/signup/Step4.tsx b/src/components/signup/Step4.tsx index a0f9702..401a928 100644 --- a/src/components/signup/Step4.tsx +++ b/src/components/signup/Step4.tsx @@ -208,7 +208,7 @@ const Step4: React.FC = ({ onNext, onUpdate }) => { diff --git a/src/components/signup/modal/PhoneVerification.tsx b/src/components/signup/modal/PhoneVerification.tsx index b7794b9..5370321 100644 --- a/src/components/signup/modal/PhoneVerification.tsx +++ b/src/components/signup/modal/PhoneVerification.tsx @@ -252,12 +252,12 @@ const PhoneVerification: React.FC = ({ onNext, onPhoneNu {isComplete ? (
다음으로
) : ( -
+
다음으로
)} From 5af6bbc59c27af65dacd7a436947b607febf71c0 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Sun, 22 Sep 2024 03:30:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=B0=98=EC=9D=91?= =?UTF-8?q?=ED=98=95=20=EC=9E=91=EC=97=85=20=EB=B0=8F=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EB=93=A4=20flex-shrink-0=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mypage/edit/changepassword/page.tsx | 4 ++-- src/app/mypage/edit/changephone/page.tsx | 22 +++++++++++-------- src/components/mypage/CertifyPassword.tsx | 8 ++++--- src/components/mypage/NewPassword.tsx | 10 ++++++--- src/components/signup/Step4.tsx | 2 +- .../signup/modal/PhoneVerification.tsx | 10 ++++----- 6 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/app/mypage/edit/changepassword/page.tsx b/src/app/mypage/edit/changepassword/page.tsx index ca41492..a4b16e2 100644 --- a/src/app/mypage/edit/changepassword/page.tsx +++ b/src/app/mypage/edit/changepassword/page.tsx @@ -10,7 +10,7 @@ const ChangePasswordPage = () => { const [step, setStep] = useState(0); return (
-
+
{step === 2 ? null : (
router.back()} className="py-[14px]"> {
)}
-
+
{step === 0 ? : null} {step === 1 ? : null} {step === 2 ? : null} diff --git a/src/app/mypage/edit/changephone/page.tsx b/src/app/mypage/edit/changephone/page.tsx index ac1d90c..6ad6666 100644 --- a/src/app/mypage/edit/changephone/page.tsx +++ b/src/app/mypage/edit/changephone/page.tsx @@ -132,12 +132,14 @@ const ChangePhonePage = () => { return (
-
+
router.back()} className="py-[14px]">
-
+
+
+
휴대폰 번호를 인증해주세요
@@ -157,7 +159,7 @@ const ChangePhonePage = () => { isRequest ? (
재전송 @@ -165,12 +167,12 @@ const ChangePhonePage = () => { ) : (
+ className="ml-[6px] cursor-pointer px-4 py-[14px] bg-black rounded-[12px] text-white text-title2 flex-shrink-0"> 인증 요청
) ) : ( -
+
인증 요청
)} @@ -196,13 +198,13 @@ const ChangePhonePage = () => { {isRequest && validNumberOk ? (
인증 완료
) : ( -
+
인증 완료
)} @@ -227,17 +229,19 @@ const ChangePhonePage = () => {
)}
+
{isComplete ? (
+ className="cursor-pointer flex items-center justify-center px-5 py-[14px] w-full rounded-[12px] bg-gradient2 text-heading4 text-white mt-0 sm:mt-[40px]"> 변경 완료
) : ( -
+
변경 완료
)} +
); diff --git a/src/components/mypage/CertifyPassword.tsx b/src/components/mypage/CertifyPassword.tsx index ef5c1bb..66e148e 100644 --- a/src/components/mypage/CertifyPassword.tsx +++ b/src/components/mypage/CertifyPassword.tsx @@ -47,7 +47,8 @@ const CertifyPassword = ({ setStep }: CertifyPasswordType) => { }; return ( -
+
+
현재 사용하고 계신
@@ -64,10 +65,11 @@ const CertifyPassword = ({ setStep }: CertifyPasswordType) => { className="px-4 py-[14px] bg-bg text-body2 rounded-[12px] w-full outline-none" />
+
{isValid ? ( ) : ( - )} diff --git a/src/components/mypage/NewPassword.tsx b/src/components/mypage/NewPassword.tsx index 67ef2f2..67ebfe4 100644 --- a/src/components/mypage/NewPassword.tsx +++ b/src/components/mypage/NewPassword.tsx @@ -56,7 +56,8 @@ const NewPassword = ({ setStep }: NewPasswordType) => { }; return ( -
+
+
비밀번호를
@@ -95,15 +96,18 @@ const NewPassword = ({ setStep }: NewPasswordType) => { ${isSame && 'outline-success'} `} /> +
{isSame ? (
비밀번호가 일치합니다.
) : null} +
+
{/* Todo : 완료 버튼 누르면, 비밀번호 변경 요청 Api 실행, 성공 시 onSuccess setStep(2) 후 로그아웃, 실패할시 그냥 메인페이지로 이동 */} {isSame ? (
{ 변경 완료
) : ( -
+
변경 완료
)} diff --git a/src/components/signup/Step4.tsx b/src/components/signup/Step4.tsx index 401a928..991114a 100644 --- a/src/components/signup/Step4.tsx +++ b/src/components/signup/Step4.tsx @@ -135,7 +135,7 @@ const Step4: React.FC = ({ onNext, onUpdate }) => { />
중복확인
diff --git a/src/components/signup/modal/PhoneVerification.tsx b/src/components/signup/modal/PhoneVerification.tsx index 5370321..be0e787 100644 --- a/src/components/signup/modal/PhoneVerification.tsx +++ b/src/components/signup/modal/PhoneVerification.tsx @@ -172,7 +172,7 @@ const PhoneVerification: React.FC = ({ onNext, onPhoneNu isRequest ? (
@@ -181,13 +181,13 @@ const PhoneVerification: React.FC = ({ onNext, onPhoneNu ) : (
인증 요청
) ) : ( -
+
인증 요청
)} @@ -214,14 +214,14 @@ const PhoneVerification: React.FC = ({ onNext, onPhoneNu {isRequest && validNumberOk ? (
인증 완료
) : ( -
+
인증 완료
)}