From 46ba74e060d07eb5e1fb03c7b9e3799a91127412 Mon Sep 17 00:00:00 2001
From: jisu Seo <jseo9732@gmail.com>
Date: Sat, 6 Jan 2024 15:02:25 +0900
Subject: [PATCH] =?UTF-8?q?Feat:=20=EA=B8=B0=EB=B3=B8=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@types/auth.types.ts                      |  4 +-
 src/components/user/ErrorMessage.tsx          |  9 ++
 src/components/user/index.ts                  |  3 +-
 .../user/useInputBox/UserInputBox.tsx         | 41 +++++----
 src/pages/login/login.page.tsx                | 85 ++++++++++++++-----
 5 files changed, 96 insertions(+), 46 deletions(-)
 create mode 100644 src/components/user/ErrorMessage.tsx

diff --git a/src/@types/auth.types.ts b/src/@types/auth.types.ts
index 589b7210..c95769ab 100644
--- a/src/@types/auth.types.ts
+++ b/src/@types/auth.types.ts
@@ -1,4 +1,4 @@
-interface AuthRequest {
+export interface AuthRequest {
   email: string;
   password: string;
   name: string;
@@ -9,7 +9,7 @@ interface AuthRequest {
   survey: string;
 }
 
-interface LoginRequest {
+export interface LoginFormVlaue {
   email: string;
   password: string;
 }
diff --git a/src/components/user/ErrorMessage.tsx b/src/components/user/ErrorMessage.tsx
new file mode 100644
index 00000000..89f8e587
--- /dev/null
+++ b/src/components/user/ErrorMessage.tsx
@@ -0,0 +1,9 @@
+interface Props {
+  children: string;
+}
+
+const ErrorMessage = ({ children }: Props) => {
+  return <p className="body6 text-red">{children}</p>;
+};
+
+export default ErrorMessage;
diff --git a/src/components/user/index.ts b/src/components/user/index.ts
index 4d720963..844de37c 100644
--- a/src/components/user/index.ts
+++ b/src/components/user/index.ts
@@ -1,5 +1,6 @@
 import UserInputBox from './useInputBox/UserInputBox';
 import UserEmailInputBox from './useInputBox/UserEmailInputBox';
 import UserPwInputBox from './useInputBox/UserPwInputBox';
+import ErrorMessage from './ErrorMessage';
 
-export { UserInputBox, UserEmailInputBox, UserPwInputBox };
\ No newline at end of file
+export { UserInputBox, UserEmailInputBox, UserPwInputBox, ErrorMessage };
diff --git a/src/components/user/useInputBox/UserInputBox.tsx b/src/components/user/useInputBox/UserInputBox.tsx
index edea2f2c..a969e1b8 100644
--- a/src/components/user/useInputBox/UserInputBox.tsx
+++ b/src/components/user/useInputBox/UserInputBox.tsx
@@ -1,52 +1,49 @@
-import { useState } from 'react';
 import { CloseIcon } from '@components/common/icons/Icons';
+import { UseFormRegisterReturn, UseFormSetValue } from 'react-hook-form';
+import { LoginFormVlaue } from '@/@types/auth.types';
 
 interface Props {
   label: string;
-  type?: string;
-  name: string;
+  id: 'email' | 'password';
+  type?: 'text' | 'email' | 'password';
   placeholder: string;
-  // children: React.ReactNode;
-  validifyCheckList?: string[];
-  // onInputBlur: VoidFunction;
+  register: UseFormRegisterReturn;
+  inputValue: string;
+  setValue: UseFormSetValue<LoginFormVlaue>;
   marginB?: string;
+  // validifyCheckList?: string[];
+  // onInputBlur: VoidFunction;
+  // children: React.ReactNode;
 }
 
 const UserInputBox = ({
   label,
-  type = 'password',
-  name,
+  id,
+  type = 'text',
   placeholder,
-  // validifyCheckList,
+  register,
+  inputValue,
+  setValue,
   marginB = 'mb-6',
 }: Props) => {
-  const [inputValue, setInputValue] = useState('');
-
-  const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setInputValue(e.target.value);
-  };
-
   return (
     <div className={`${marginB} flex flex-col gap-2`}>
       <div className="flex flex-col gap-2">
-        <label htmlFor={label} className="body3 text-main2">
+        <label htmlFor={id} className="body3 text-main2">
           {label}
         </label>
         <div className="flex h-10 items-center border-b-[1.25px] border-solid border-gray3 focus-within:border-main1">
           <input
-            id={label}
+            id={id}
             className="w-full text-sm font-normal outline-none placeholder:text-gray3"
             type={type}
-            name={name}
             placeholder={placeholder}
-            required
-            value={inputValue}
-            onChange={onInputChange}
+            {...register}
           />
           {inputValue && (
             <div
               onClick={() => {
-                setInputValue('');
+                setValue(id, '');
               }}>
               <CloseIcon size={20} color="white" fill="#888888" />
             </div>
diff --git a/src/pages/login/login.page.tsx b/src/pages/login/login.page.tsx
index 56a15506..6a7c45bb 100644
--- a/src/pages/login/login.page.tsx
+++ b/src/pages/login/login.page.tsx
@@ -1,32 +1,52 @@
 import { postEmailLogin } from '@api/auth';
+import authCient from '@api/authClient';
 import SubmitBtn from '@components/common/button/SubmitBtn';
 import Back from '@components/common/back/Back';
 import { KakaoIcon, LogoIcon } from '@components/common/icons/Icons';
-import { UserInputBox } from '@components/user';
+import { ErrorMessage, UserInputBox } from '@components/user';
 import { useNavigate } from 'react-router-dom';
+import { SubmitHandler, useForm } from 'react-hook-form';
+import { LoginFormVlaue } from '@/@types/auth.types';
+import { useState } from 'react';
+import { AxiosError } from 'axios';
 
 const Login = () => {
   const navigate = useNavigate();
+  const {
+    register,
+    handleSubmit,
+    watch,
+    setValue,
+    formState: { errors },
+  } = useForm<LoginFormVlaue>({
+    reValidateMode: 'onSubmit',
+    // 다른 옵션들...
+  });
 
-  const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-    const formData = new FormData(e.currentTarget);
-    const emailValue = formData.get('email');
-    const pwValue = formData.get('pw');
+  const [isLoginFailed, setIsLoginFailed] = useState<boolean>(false);
 
-    const res = await postEmailLogin({
-      email: emailValue as string,
-      password: pwValue as string,
-    });
-
-    if (res.data.status === 200) {
-      window.localStorage.setItem(
-        'accessToken',
-        res.data.data.tokenInfo.accessToken,
-      );
-      navigate('/');
+  const onLoginSubmit: SubmitHandler<LoginFormVlaue> = async (data) => {
+    const { email, password } = data;
+    try {
+      const res = await postEmailLogin({
+        email,
+        password,
+      });
+      if (res.data.status === 200) {
+        authCient.defaults.headers.common['Authorization'] =
+          res.data.data.tokenInfo.accessToken;
+        navigate('/');
+      }
+    } catch (err) {
+      if (err instanceof AxiosError) {
+        console.error('로그인 중 에러 발생', err);
+        if (err.response?.data.errorMessage) {
+          setIsLoginFailed(true);
+        }
+      }
     }
   };
+
   return (
     <div className="flex h-[95vh] flex-col">
       <Back />
@@ -39,18 +59,42 @@ const Login = () => {
             위플랜플랜즈에 오신 것을 환영합니다.
           </h1>
         </div>
-        <form className="mb-auto" onSubmit={handleSubmit}>
+        <form className="mb-auto" onSubmit={handleSubmit(onLoginSubmit)}>
           <UserInputBox
             label={'이메일'}
+            id="email"
             type="email"
-            name="email"
             placeholder={'이메일을 입력하세요'}
+            register={register('email', { required: '아이디를 입력해주세요.' })}
+            inputValue={watch('email')}
+            setValue={setValue}
           />
           <UserInputBox
             label={'비밀번호'}
-            name="pw"
+            id="password"
+            type="password"
             placeholder={'비밀번호를 입력하세요'}
+            register={register('password', {
+              required: '비밀번호를 입력해주세요.',
+            })}
+            inputValue={watch('password')}
+            setValue={setValue}
           />
+          {errors.email?.type === 'required' && (
+            <ErrorMessage>{`${errors.email?.message}`}</ErrorMessage>
+          )}
+          {!errors.email && errors.password?.type === 'required' && (
+            <ErrorMessage>비밀번호를 입력해 주세요!</ErrorMessage>
+          )}
+          {!errors.email && !errors.password && isLoginFailed && (
+            <>
+              <ErrorMessage>
+                아이디(로그인 전용 아이디) 또는 비밀번호를 잘못 입력했습니다.
+              </ErrorMessage>
+              <ErrorMessage>입력하신 내용을 다시 확인해주세요.</ErrorMessage>
+            </>
+          )}
+
           <SubmitBtn>로그인</SubmitBtn>
         </form>
       </div>
@@ -65,7 +109,6 @@ const Login = () => {
           <KakaoIcon />
           카카오로 로그인
         </button>
-
         <SubmitBtn outline type="button">
           회원가입
         </SubmitBtn>