From b46c109ddc0db5373c54964891dd20bca499d316 Mon Sep 17 00:00:00 2001 From: cmlim0070 <87525734+cmlim0070@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:32:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?env=20:=20=EA=B0=9C=EB=B0=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=EC=9B=8C=EC=BB=A4=20=EC=BA=90=EC=8B=B1=20=EB=AC=B4=ED=9A=A8?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/sw.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/sw.js b/public/sw.js index ce241bc..dfb7557 100644 --- a/public/sw.js +++ b/public/sw.js @@ -2,7 +2,13 @@ const cacheName = '::myServiceWorker'; const version = 'v0.0.1'; const cacheList = []; +const isDev = + self.location.hostname === 'localhost' || + self.location.hostname === '127.0.0.1'; + self.addEventListener('fetch', (e) => { + if (isDev) return e.respondWith(fetch(e.request)); + e.respondWith( caches.match(e.request).then((r) => { if (r) { From 9f9875e3947ef3e57e2cf19a9e571189f546217b Mon Sep 17 00:00:00 2001 From: cmlim0070 <87525734+cmlim0070@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:32:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?design=20:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/User/Login/LoginPage.tsx | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/pages/User/Login/LoginPage.tsx b/src/pages/User/Login/LoginPage.tsx index 78d7884..3742f78 100644 --- a/src/pages/User/Login/LoginPage.tsx +++ b/src/pages/User/Login/LoginPage.tsx @@ -36,33 +36,37 @@ export const LoginPage = () => { }; return ( -
+
+

+ Bottler +

-

로그인

-
+
- +
+ 계정이 없으신가요? + + {' '}회원가입 + +
From 51666e9993a2f4677f02d55c3fdb54288045eca6 Mon Sep 17 00:00:00 2001 From: cmlim0070 <87525734+cmlim0070@users.noreply.github.com> Date: Sat, 4 Jan 2025 00:26:34 +0900 Subject: [PATCH 3/3] =?UTF-8?q?design=20:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8&?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=86=8C=ED=8F=AD=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RegisterPage/EmailSection.tsx | 154 +++++++++---------- src/pages/User/Login/LoginPage.tsx | 11 +- src/pages/User/Register/RegisterPage.tsx | 88 +++++------ 3 files changed, 123 insertions(+), 130 deletions(-) diff --git a/src/components/RegisterPage/EmailSection.tsx b/src/components/RegisterPage/EmailSection.tsx index 44da221..2b34175 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 3742f78..fbfd55f 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 b07feda..ad16da6 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} + > + +
+ +
+ 이미 회원이신가요? + + {' '} + 로그인 - +
);