diff --git a/app/(route)/mypage/_components/SettingList.tsx b/app/(route)/mypage/_components/SettingList.tsx
index 3c71f11d..90eacbf9 100644
--- a/app/(route)/mypage/_components/SettingList.tsx
+++ b/app/(route)/mypage/_components/SettingList.tsx
@@ -17,9 +17,14 @@ const EditUserInfo = {
const ButtonStyle = "w-full cursor-pointer border-b border-gray-50 px-24 py-20 pc:px-20 pc:py-16 hover:pc:bg-main-pink-50";
-const SettingList = ({ isOpener }: { isOpener: boolean }) => {
+interface Props {
+ closeBottomSheet?: () => void;
+ isOpener: boolean;
+ openModal: (modal: string) => void;
+}
+
+const SettingList = ({ isOpener, closeBottomSheet, openModal }: Props) => {
const router = useRouter();
- const { modal, openModal, closeModal } = useModal();
const handleLogout = async () => {
const res = await instance.delete("/auth");
@@ -32,6 +37,11 @@ const SettingList = ({ isOpener }: { isOpener: boolean }) => {
}
};
+ const handleWithdraw = () => {
+ openModal("withdraw");
+ closeBottomSheet?.();
+ };
+
return (
<>
event.stopPropagation()}>
@@ -46,12 +56,11 @@ const SettingList = ({ isOpener }: { isOpener: boolean }) => {
-
{EditUserInfo.logOut}
- - openModal("withdraw")} className={`rounded-b-lg ${ButtonStyle}`}>
+
-
{EditUserInfo.withdrawal}
- {modal === "withdraw" && }
>
);
};
diff --git a/app/(route)/mypage/_components/UserProfile.tsx b/app/(route)/mypage/_components/UserProfile.tsx
index 3897410e..4c5e3507 100644
--- a/app/(route)/mypage/_components/UserProfile.tsx
+++ b/app/(route)/mypage/_components/UserProfile.tsx
@@ -2,14 +2,17 @@
import dynamic from "next/dynamic";
import Image from "next/image";
+import WithdrawModal from "@/components/modal/WithdrawModal";
import { useAuth } from "@/hooks/useAuth";
import useBottomSheet from "@/hooks/useBottomSheet";
+import { useModal } from "@/hooks/useModal";
import SettingList from "./SettingList";
const MyPageBottomSheet = dynamic(() => import("@/components/bottom-sheet/MyPageBottomSheet"), { ssr: false });
const UserProfile = () => {
const { bottomSheet, openBottomSheet, closeBottomSheet, refs } = useBottomSheet();
+ const { modal, openModal, closeModal } = useModal();
const { session } = useAuth();
return (
@@ -31,12 +34,13 @@ const UserProfile = () => {
- {bottomSheet === "mypage" && }
+ {bottomSheet === "mypage" && }
+ {modal === "withdraw" && }
);
};
diff --git a/app/(route)/signup/page.tsx b/app/(route)/signup/page.tsx
index aeebd4d7..7931e1d4 100644
--- a/app/(route)/signup/page.tsx
+++ b/app/(route)/signup/page.tsx
@@ -43,7 +43,6 @@ const SignUp = () => {
formOptions={{ mode: "onBlur", defaultValues: { ...DEFAULT_VALUES, email: emailFromSignin ?? "" } }}>
-
diff --git a/app/_api/api.ts b/app/_api/api.ts
index 6bfdaafb..1c1f0fd2 100644
--- a/app/_api/api.ts
+++ b/app/_api/api.ts
@@ -1,3 +1,4 @@
+import { usePathname } from "next/navigation";
import { getSession } from "@/store/session/cookies";
import { Req_Delete_Type } from "@/types/deleteBodyType";
import { Req_Post_Type } from "@/types/postBodyType";
@@ -145,8 +146,10 @@ export class Api {
const refetchResult = await this.refetch(newEndPoint, config);
return refetchResult;
}
- const result = await res.json();
- this.makeError(result);
+ if (endPoint !== "/auth") {
+ const result = await res.json();
+ this.makeError(result);
+ }
return res;
}
}
diff --git a/app/_components/bottom-sheet/MyPageBottomSheet.tsx b/app/_components/bottom-sheet/MyPageBottomSheet.tsx
index c6cb35b6..947b5831 100644
--- a/app/_components/bottom-sheet/MyPageBottomSheet.tsx
+++ b/app/_components/bottom-sheet/MyPageBottomSheet.tsx
@@ -8,13 +8,14 @@ interface Props {
content: (node: HTMLElement | null) => void;
};
isOpener: boolean;
+ openModal: (modal: string) => void;
}
-const MyPageBottomSheet = ({ closeBottomSheet, refs, isOpener }: Props) => {
+const MyPageBottomSheet = ({ closeBottomSheet, refs, isOpener, openModal }: Props) => {
return (
<>
-
+
>
);