Merge pull request #79 from DEPthes/dev

Dev
DEPthes · Aug 28, 2023 · 88b17d9 · 88b17d9
2 parents c5ac78a + a069ac4
commit 88b17d9
Show file tree

Hide file tree

Showing 15 changed files with 190 additions and 192 deletions.
diff --git a/apis/patchResetPassword.ts b/apis/patchResetPassword.ts
@@ -25,7 +25,6 @@ export async function patchResetPassword({
     renewPassword,
   });
   if (!response.data.check) {
-    console.log('오류');
     throw new IeumError(400);
   }
   return response;

diff --git a/components/appQueryClientProvider.tsx b/components/appQueryClientProvider.tsx
@@ -1,7 +1,5 @@
-import useApiError from '@/hooks/custom/useApiError';
-import { AxiosError } from 'axios';
 import React, { useState } from 'react';
-import { QueryCache, QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from 'react-query';
 
 export default function AppQueryClientProvider({ children }: { children: React.ReactNode }) {
   // next.js는 페이지 전환마다 _app.tsx가 렌더링되므로 queryClient가 재선언되지 않게 useState로 관리

diff --git a/components/authEmail.tsx b/components/authEmail.tsx
@@ -34,8 +34,9 @@ export default function AuthEmail({ title, screenType, moveNextPage, setEmail }:
     'normal',
   );
 
+  const { handleApiError } = useApiError();
+
   const checkEmailDuplicatedMutation = useMutation(getEmailDuplicated);
-  const { handleError: handleDefaultError } = useApiError();
 
   // 인증번호 받아오기
   const newSendAuthNumberMutation = useMutation(postSendAuthNumber);
@@ -94,7 +95,6 @@ export default function AuthEmail({ title, screenType, moveNextPage, setEmail }:
         clearInterval(timer);
         setAuthNumberIsValid('timeOver');
         setTimerStarted(false);
-        console.log('타이머가 종료되었습니다.');
       }
 
       return () => {
@@ -141,11 +141,6 @@ export default function AuthEmail({ title, screenType, moveNextPage, setEmail }:
     }
   };
 
-  //에러처리 => 인증번호가 일치하지 않을 경우
-  const { handleError } = useApiError({
-    400: () => setAuthNumberIsValid('notIsValid'),
-  });
-
   //인증번호 확인
   const checkAuthNumberHandler = async () => {
     newCheckAuthNumberMutation.mutate(
@@ -154,7 +149,11 @@ export default function AuthEmail({ title, screenType, moveNextPage, setEmail }:
         onSuccess: (response) => {
           checkAuthNumberSuccessHandler(response.data.check);
         },
-        onError: (err) => handleError(err as AxiosError),
+
+        //에러처리 => 인증번호가 일치하지 않을 경우
+        onError: handleApiError({
+          400: () => setAuthNumberIsValid('notIsValid'),
+        }),
       },
     );
   };

diff --git a/components/pages/join/join-Email.tsx b/components/pages/join/join-Email.tsx
@@ -67,7 +67,6 @@ const JoinEmail: React.FC<JoinEmailProps> = ({ joinChangeHandler }) => {
         clearInterval(timer);
         setAuthNumberIsValid('timeOver');
         setTimerStarted(false);
-        console.log('타이머가 종료되었습니다.');
       }
 
       return () => {
@@ -112,9 +111,7 @@ const JoinEmail: React.FC<JoinEmailProps> = ({ joinChangeHandler }) => {
   };
 
   //에러처리 => 인증번호가 일치하지 않을 경우
-  const { handleError } = useApiError({
-    400: () => setAuthNumberIsValid('notIsValid'),
-  });
+  const { handleApiError } = useApiError();
 
   //인증번호 확인
   const checkAuthNumberHandler = async () => {
@@ -126,7 +123,9 @@ const JoinEmail: React.FC<JoinEmailProps> = ({ joinChangeHandler }) => {
           onSuccess: (response) => {
             checkAuthNumberSuccessHandler(response.data.check);
           },
-          onError: (err) => handleError(err as AxiosError),
+          onError: handleApiError({
+            400: () => setAuthNumberIsValid('notIsValid'),
+          }),
         },
       );
     }

diff --git a/components/pages/join/join-Password.tsx b/components/pages/join/join-Password.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
 import CheckSquare from '@/components/check-square';
 
@@ -137,15 +137,7 @@ const JoinPassword: React.FC<JoinPasswordType> = ({ email, getNicknames }) => {
   };
 
   //에러 처리
-  const { handleError } = useApiError({
-    // 닉네임 GPT오류
-    500: () => {
-      setCheckNickname('error');
-      setIsDuplicatedCheckAble(true);
-    },
-    // 회원가입 체크
-    400: () => console.log('sign-up error'),
-  });
+  const { handleApiError } = useApiError();
 
   //GPT닉네임 바꾸는 함수
   async function changeNicknameHandler() {
@@ -173,7 +165,15 @@ const JoinPassword: React.FC<JoinPasswordType> = ({ email, getNicknames }) => {
     } catch (error) {
       // 서버에서 500 오류가 발생한 경우
       setIsFetch(false);
-      handleError(error as AxiosError);
+      handleApiError({
+        // 닉네임 GPT오류
+        500: () => {
+          setCheckNickname('error');
+          setIsDuplicatedCheckAble(true);
+        },
+        // 회원가입 체크
+        400: () => console.log('sign-up error'),
+      });
     }
   }
 
@@ -210,7 +210,15 @@ const JoinPassword: React.FC<JoinPasswordType> = ({ email, getNicknames }) => {
         onSuccess: (response) => {
           successHandler(response.data.check, response.data.information.accessToken);
         },
-        onError: (err) => handleError(err as AxiosError),
+        onError: handleApiError({
+          // 닉네임 GPT오류
+          500: () => {
+            setCheckNickname('error');
+            setIsDuplicatedCheckAble(true);
+          },
+          // 회원가입 체크
+          400: () => console.log('sign-up error'),
+        }),
       },
     );
   };
@@ -227,7 +235,15 @@ const JoinPassword: React.FC<JoinPasswordType> = ({ email, getNicknames }) => {
         onSuccess: (response) => {
           loginHandler(response.data.check, email, password);
         },
-        onError: (err) => handleError(err as AxiosError),
+        onError: handleApiError({
+          // 닉네임 GPT오류
+          500: () => {
+            setCheckNickname('error');
+            setIsDuplicatedCheckAble(true);
+          },
+          // 회원가입 체크
+          400: () => console.log('sign-up error'),
+        }),
       },
     );
   };

diff --git a/components/pages/password/password-Email.tsx b/components/pages/password/password-Email.tsx
@@ -77,7 +77,6 @@ const PasswordEmail: React.FC<PasswordEmailProps> = ({ moveNextPage, setEmail })
         clearInterval(timer);
         setAuthNumberIsValid('timeOver');
         setTimerStarted(false);
-        console.log('타이머가 종료되었습니다.');
       }
 
       return () => {
@@ -111,9 +110,7 @@ const PasswordEmail: React.FC<PasswordEmailProps> = ({ moveNextPage, setEmail })
   };
 
   //에러처리 => 인증번호가 일치하지 않을 경우
-  const { handleError } = useApiError({
-    400: () => setAuthNumberIsValid('notIsValid'),
-  });
+  const { handleApiError } = useApiError();
 
   //인증번호 확인
   const checkAuthNumberHandler = async () => {
@@ -123,7 +120,9 @@ const PasswordEmail: React.FC<PasswordEmailProps> = ({ moveNextPage, setEmail })
         onSuccess: (response) => {
           checkAuthNumberSuccessHandler(response.data.check);
         },
-        onError: (err) => handleError(err as AxiosError),
+        onError: handleApiError({
+          400: () => setAuthNumberIsValid('notIsValid'),
+        }),
       },
     );
   };

diff --git a/components/pages/password/password-Password.tsx b/components/pages/password/password-Password.tsx
@@ -1,11 +1,9 @@
 import React, { useState } from 'react';
 import EyeOpenIcon from '../../../public/icons/eye-opened.svg';
 import EyeHiddenIcon from '../../../public/icons/eye-hidden.svg';
-import Layout from '../../layouts/layout';
 import useAlert from '../../../recoil/alert/useAlert';
 import { patchResetPassword } from '@/apis/patchResetPassword';
 import { useMutation } from 'react-query';
-import { AxiosError } from 'axios';
 import useApiError from '@/hooks/custom/useApiError';
 import { useRouter } from 'next/router';
 import { passwordRegex } from '@/libs/passwordRegex';
@@ -29,7 +27,7 @@ const PasswordPassword: React.FC<PasswordPasswordProps> = ({ email }) => {
   });
   const { showAlert } = useAlert();
   const newChangePasswordMutation = useMutation(patchResetPassword);
-  const { handleError: handleDefaultError } = useApiError();
+  const { handleApiError } = useApiError();
 
   //새 비밀번호 입력 비밀번호 보이기&숨기기
   const togglePasswordHandler = () => {
@@ -97,7 +95,7 @@ const PasswordPassword: React.FC<PasswordPasswordProps> = ({ email }) => {
               { title: '아니요', style: 'tertiary', handler: () => router.push('/') },
             ],
           }),
-        onError: handleDefaultError,
+        onError: handleApiError(),
       },
     );
   };

diff --git a/components/pages/response/response-Select.tsx b/components/pages/response/response-Select.tsx
@@ -51,37 +51,7 @@ const ResponseSelect: React.FC<SendProps> = ({ componentChangeHandler, title, co
     setEnvelopType(num);
   };
 
-  const { handleError: handlerSendError } = useApiError({
-    500: () =>
-      showAlert({
-        title: (
-          <div className='flex flex-col items-center'>
-            <span>편지 보내기에 실패했습니다.</span>
-            <span>편지를 다시 보낼까요?</span>
-          </div>
-        ),
-        actions: [
-          { title: '네', style: 'primary', handler: newSendHandler },
-          { title: '아니요', style: 'tertiary', handler: null },
-        ],
-      }),
-  });
-
-  const { handleError: handlerSendGptError } = useApiError({
-    500: () =>
-      showAlert({
-        title: (
-          <div className='flex flex-col items-center'>
-            <span>편지 보내기에 실패했습니다.</span>
-            <span>편지를 다시 보낼까요?</span>
-          </div>
-        ),
-        actions: [
-          { title: '네', style: 'primary', handler: newSendGptHandler },
-          { title: '아니요', style: 'tertiary', handler: null },
-        ],
-      }),
-  });
+  const { handleApiError } = useApiError();
 
   //편지답장 특정인에게 발송하기
   const newSendMutation = useMutation(postSend);
@@ -92,7 +62,21 @@ const ResponseSelect: React.FC<SendProps> = ({ componentChangeHandler, title, co
         onSuccess: () => {
           componentChangeHandler('Complete');
         },
-        onError: (err) => handlerSendError(err as AxiosError),
+        onError: handleApiError({
+          500: () =>
+            showAlert({
+              title: (
+                <div className='flex flex-col items-center'>
+                  <span>편지 보내기에 실패했습니다.</span>
+                  <span>편지를 다시 보낼까요?</span>
+                </div>
+              ),
+              actions: [
+                { title: '네', style: 'primary', handler: newSendHandler },
+                { title: '아니요', style: 'tertiary', handler: null },
+              ],
+            }),
+        }),
       },
     );
   };
@@ -106,7 +90,21 @@ const ResponseSelect: React.FC<SendProps> = ({ componentChangeHandler, title, co
         onSuccess: () => {
           componentChangeHandler('Complete');
         },
-        onError: (err) => handlerSendGptError(err as AxiosError),
+        onError: handleApiError({
+          500: () =>
+            showAlert({
+              title: (
+                <div className='flex flex-col items-center'>
+                  <span>편지 보내기에 실패했습니다.</span>
+                  <span>편지를 다시 보낼까요?</span>
+                </div>
+              ),
+              actions: [
+                { title: '네', style: 'primary', handler: newSendGptHandler },
+                { title: '아니요', style: 'tertiary', handler: null },
+              ],
+            }),
+        }),
       },
     );
   };