diff --git a/FE/src/components/Login/index.tsx b/FE/src/components/Login/index.tsx index 880d737..836b896 100644 --- a/FE/src/components/Login/index.tsx +++ b/FE/src/components/Login/index.tsx @@ -5,17 +5,17 @@ import { FormEvent, useEffect, useState } from 'react'; import { login } from 'service/auth'; import useAuthStore from 'store/useAuthStore.ts'; import Overay from '../ModalOveray.tsx'; +import Toast from 'components/Toast.tsx'; export default function Login() { const { isOpen, toggleModal } = useLoginModalStore(); const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const { setIsLogin } = useAuthStore(); - const [errorCode, setErrorCode] = useState(200); useEffect(() => { - setEmail(''); - setPassword(''); + setEmail('jindding'); + setPassword('1234'); }, [isOpen]); if (!isOpen) return; @@ -23,9 +23,12 @@ export default function Login() { const handleSubmit = async (e: FormEvent) => { e.preventDefault(); const res = await login(email, password); + if ('message' in res) { + let message = ''; + if (res.statusCode === 401) message = '존재하지 않는 사용자입니다.'; + else if (res.statusCode === 400) message = '잘못된 입력형식입니다.'; - if ('error' in res) { - setErrorCode(res.statusCode); + Toast({ message, type: 'error' }); return; } @@ -40,8 +43,12 @@ export default function Login() { import.meta.env.VITE_TEST_PW, ); - if ('error' in res) { - setErrorCode(res.statusCode); + if ('message' in res) { + let message = ''; + if (res.statusCode === 401) message = '존재하지 않는 사용자입니다.'; + else if (res.statusCode === 400) message = '잘못된 입력형식입니다.'; + + Toast({ message, type: 'error' }); return; } @@ -58,17 +65,9 @@ export default function Login() { <> toggleModal()} />
-

JuGa

-

- { - { - '401': '존재하지 않는 사용자입니다.', - '400': '잘못된 입력형식입니다.', - }[errorCode] - } -

-
-
+

JuGa

+ +
- diff --git a/FE/src/store/useAuthStore.ts b/FE/src/store/useAuthStore.ts index 0e9a949..0ecf1d4 100644 --- a/FE/src/store/useAuthStore.ts +++ b/FE/src/store/useAuthStore.ts @@ -1,25 +1,15 @@ import { create } from 'zustand'; type AuthStore = { - accessToken: string | null; isLogin: boolean; - setAccessToken: (token: string) => void; setIsLogin: (isLogin: boolean) => void; - resetToken: () => void; }; const useAuthStore = create((set) => ({ - accessToken: null, isLogin: false, setIsLogin: (isLogin: boolean) => { set({ isLogin }); }, - setAccessToken: (token: string) => { - set({ accessToken: token, isLogin: token !== null }); - }, - resetToken: () => { - set({ accessToken: null, isLogin: false }); - }, })); export default useAuthStore; diff --git a/FE/src/types.ts b/FE/src/types.ts index 88b257f..a5dc698 100644 --- a/FE/src/types.ts +++ b/FE/src/types.ts @@ -3,9 +3,10 @@ export type LoginSuccessResponse = { }; export type LoginFailResponse = { - error: string; - message: string[]; + message: string; statusCode: number; + timestamp: string; + path: string; }; export type TiemCategory = 'D' | 'W' | 'M' | 'Y';