Merge pull request #2 from 4bujak-4bujak/feature/sign2

Feature/sign2

package.json

@@ -10,13 +10,20 @@
   },
   "dependencies": {
     "axios": "^1.6.8",
+    "framer-motion": "^11.1.9",
     "next": "14.2.3",
     "react": "^18",
     "react-cookie": "^7.1.4",
     "react-dom": "^18",
-    "react-toastify": "^10.0.5"
+    "react-hook-form": "^7.51.4",
+    "react-icons": "^5.2.1",
+    "react-markdown": "^9.0.1",
+    "react-query": "^3.39.3",
+    "react-toastify": "^10.0.5",
+    "remark-gfm": "^4.0.0"
   },
   "devDependencies": {
+    "@tailwindcss/typography": "^0.5.13",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",

src/api/auth/auth.post.api.ts

@@ -1,4 +1,5 @@
 // import { ICommon } from '../types/common';
+import { basicResponse } from '@/models/response';
 import { postRequest } from '../request';
 import {
   ISignIn,
@@ -10,6 +11,7 @@ import {
   IPhoneAuth
 } from '../types/auth';
 
+
 /* 회원가입 */
 
 export const signup = async ({
@@ -49,22 +51,22 @@ export const signin = async ({ memberEmail, memberPassword }: ISignIn) => {
 /* 이메일 인증 요청 */
 
 export const emailauthrequest = async ({ emailAddress }: IEmail) => {
-  const response = await postRequest<null, IEmail>('auth/email', {
+  const response = await postRequest<null, IEmail>(`auth/email`, {
     emailAddress
   });
 
-  return response;
+  return response as basicResponse | null;
 };
 
 /* 이메일 코드 검증 */
 
 export const emailauthverify = async ({ emailAddress, code }: IEmailAuth) => {
-  const response = await postRequest<null, IEmailAuth>('auth/email/verify', {
+  const response = await postRequest<null, IEmailAuth>(`auth/email/verify`, {
     emailAddress,
     code
   });
 
-  return response;
+  return response as basicResponse | null;
 };
 
 /* 휴대전화 번호 인증 요청*/
@@ -74,7 +76,7 @@ export const phoneauthrequest = async ({ phoneNumber }: IPhoneNumber) => {
     phoneNumber
   });
 
-  return response;
+  return response as basicResponse | null;
 };
 
 /* 휴대전화 번호 코드 검증*/
@@ -85,7 +87,7 @@ export const phoneauthverify = async ({ phoneNumber, code }: IPhoneAuth) => {
     code
   });
 
-  return response;
+  return response as basicResponse | null;
 };
 
 /* 로그아웃*/

src/api/types/auth.ts

@@ -49,6 +49,11 @@ export interface IEmailAuth extends IEmail {
   code: number;
 }
 
+export interface IEmailAuth2 {
+  emailAddress: string;
+  code: number;
+}
+
 export interface ITokenRefresh {
   // 아직 타입 안들어옴
 }

src/components/findpassword/ChangePasswordDone.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import MainContainer from '../shared/MainContainer';
+import { useRouter } from 'next/router';
+
+const ChangePasswordDone = () => {
+  const router = useRouter();
+  return (
+    <MainContainer>
+      <div className="mt-[210px] flex flex-col items-center justify-center">
+        <div className="relative">
+          <div className="w-[95.84px] h-[95.84px] bg-violet-100 rounded-full">
+            <img src="/sign/doneCircle.png" alt="" className="w-full" />
+          </div>
+          <div
+            className="w-[82px] h-[100px] z-10 absolute"
+            style={{ left: 18, top: -25 }}>
+            <img src="/sign/doneCheck.png" alt="" className=" w-full" />
+          </div>
+        </div>
+        <div className="mt-[32px]">
+          <div className="text-center text-black text-[22px] font-semibold font-pretendard leading-[30.80px]">
+            비밀번호 재설정이 <br />
+            완료되었습니다.
+          </div>
+        </div>
+      </div>
+      <div className="flex justify-center items-center mb-2">
+        <button
+          className=" border text-space-purple border-space-purple mt-[100px] w-[361px] h-12 px-3.5 rounded-lg  justify-center items-center inline-flex text-[15px] font-medium font-pretendard leading-snug "
+          type="submit"
+          onClick={() => router.replace('/signin')}>
+          로그인하러 가기
+        </button>
+      </div>
+    </MainContainer>
+  );
+};
+
+export default ChangePasswordDone;