From 62166cb061f772447a7591d46a52d11160674e28 Mon Sep 17 00:00:00 2001
From: HyunWoo Choi <116826162+chhw130@users.noreply.github.com>
Date: Sat, 16 Dec 2023 20:21:47 +0900
Subject: [PATCH] =?UTF-8?q?fix(logic)=20:=20=EC=86=8C=EC=85=9C=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=3D>=20=EC=B2=B4=ED=97=98=ED=98=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/Funnel/LoginFunnel.tsx      | 15 ++----
 component/Funnel/MainFunnel.tsx       | 73 +++++++++++++++------------
 component/template/MyPageTemplate.tsx | 10 +---
 component/template/SignupTemplate.tsx |  8 +--
 src/app/detail/page.tsx               |  1 +
 src/app/main/page.tsx                 |  7 +--
 src/app/signup/page.tsx               | 10 ++--
 7 files changed, 54 insertions(+), 70 deletions(-)

diff --git a/component/Funnel/LoginFunnel.tsx b/component/Funnel/LoginFunnel.tsx
index 00f3fed..11068ee 100644
--- a/component/Funnel/LoginFunnel.tsx
+++ b/component/Funnel/LoginFunnel.tsx
@@ -8,14 +8,9 @@ import VerticalLogoIcon from "../icon/VerticalLogoIcon";
 const LoginFunnel = () => {
   const router = useRouter();
 
-  const Rest_api_key = "536cb646ce60d71102dc92d2b7845c8d"; //REST API KEY
-  const redirect_uri = "http://localhost:3000/signup"; //Redirect URI
-  // oauth 요청 URL
-  const kakaoURL = `https://kauth.kakao.com/oauth/authorize?client_id=${Rest_api_key}&redirect_uri=${redirect_uri}&response_type=code`;
-
-  const signUpKakaoHandler = () => {
-    window.location.href = kakaoURL;
-  };
+  // const signUpKakaoHandler = () => {
+  //   window.location.href = kakaoURL;
+  // };
 
   return (
     <VStack w={"100%"} h={"100%"} justifyContent={"center"}>
@@ -32,9 +27,9 @@ const LoginFunnel = () => {
         flexDir={"column"}
         gap={"20px"}
       >
-        <Box onClick={() => signUpKakaoHandler()} cursor={"pointer"}>
+        {/* <Box onClick={() => signUpKakaoHandler()} cursor={"pointer"}>
           <KaKaoButtonIcon />
-        </Box>
+        </Box> */}
 
         <Text
           as={"u"}
diff --git a/component/Funnel/MainFunnel.tsx b/component/Funnel/MainFunnel.tsx
index 00dd691..82bfd2d 100644
--- a/component/Funnel/MainFunnel.tsx
+++ b/component/Funnel/MainFunnel.tsx
@@ -22,7 +22,13 @@ const MainFunnel = ({ setFunnel }: MainFunnelPropsType) => {
 
   return (
     <>
-      <VStack spacing={"16px"} as="section" marginTop={"71px"}>
+      <VStack
+        w={"#100%"}
+        h={"100%"}
+        spacing={"16px"}
+        as="section"
+        marginTop={"71px"}
+      >
         <Heading
           as={"h1"}
           color={"#FFFFFF"}
@@ -44,40 +50,41 @@ const MainFunnel = ({ setFunnel }: MainFunnelPropsType) => {
           </Text>
           을 추천 받자!
         </Heading>
-      </VStack>
-
-      <Card bgColor={"#FFFFFF20"} marginTop={"71px"}>
-        <CardBody textAlign={"center"} color={"#D2D2D2"}>
-          나.. 오늘 얼마나 먹었더라?
-          <br />안 찌려면 얼마만큼 운동해야하지?
-        </CardBody>
-      </Card>
-      <Image
-        src={MainPageDiet}
-        alt="식선생"
-        placeholder="blur"
-        style={{ width: "100%", height: "auto" }}
-        quality={100}
-      />
 
-      <ButtonGroup
-        width={"100%"}
-        pos={"absolute"}
-        bottom={"100px"}
-        padding={"0 22px"}
-        justifyContent={"center"}
-      >
-        <MainButton
-          w={"100%"}
-          h={"52px"}
-          bgColor={"#40E98E"}
-          onClick={() => {
-            setFunnel("login");
-          }}
+        <VStack spacing={"1px"} marginTop={"10%"}>
+          <Card bgColor={"#FFFFFF20"}>
+            <CardBody textAlign={"center"} color={"#D2D2D2"}>
+              나.. 오늘 얼마나 먹었더라?
+              <br />안 찌려면 얼마만큼 운동해야하지?
+            </CardBody>
+          </Card>
+          <Image
+            src={MainPageDiet}
+            alt="식선생"
+            placeholder="blur"
+            style={{ width: "100%", height: "auto" }}
+            quality={100}
+          />
+        </VStack>
+        <ButtonGroup
+          width={"100%"}
+          pos={"absolute"}
+          bottom={"100px"}
+          padding={"0 22px"}
+          justifyContent={"center"}
         >
-          <Text color={"#2B2C2C"}>다음으로</Text>
-        </MainButton>
-      </ButtonGroup>
+          <MainButton
+            w={"100%"}
+            h={"52px"}
+            bgColor={"#40E98E"}
+            onClick={() => {
+              setFunnel("login");
+            }}
+          >
+            <Text color={"#2B2C2C"}>다음으로</Text>
+          </MainButton>
+        </ButtonGroup>
+      </VStack>
     </>
   );
 };
diff --git a/component/template/MyPageTemplate.tsx b/component/template/MyPageTemplate.tsx
index 9884697..fd8cc8a 100644
--- a/component/template/MyPageTemplate.tsx
+++ b/component/template/MyPageTemplate.tsx
@@ -12,15 +12,6 @@ const MyPageTemplate = () => {
   const router = useRouter();
   const [userData, setUserData] = useState<UserInfoType>();
 
-  useEffect(() => {
-    let userInfo = localStorage.getItem("userInfo");
-    if (userInfo !== null) {
-      const userParsing: UserInfoType = JSON.parse(userInfo);
-      console.log(userParsing);
-      setUserData(userParsing);
-    }
-  }, [setUserData]);
-
   return (
     <>
       <Flex
@@ -29,6 +20,7 @@ const MyPageTemplate = () => {
         h={"100vh"}
         pos={"relative"}
         maxW={"390px"}
+        minH={"844px"}
         padding={"60px 22px 0px 22px"}
         margin={"0 auto"}
         alignItems={"center"}
diff --git a/component/template/SignupTemplate.tsx b/component/template/SignupTemplate.tsx
index 91a18b4..f110eaa 100644
--- a/component/template/SignupTemplate.tsx
+++ b/component/template/SignupTemplate.tsx
@@ -17,7 +17,7 @@ export interface UserInfoType {
   targetweight: number;
 }
 
-const SignupTemplate = ({ jwtToken }: { jwtToken: JwtToken }) => {
+const SignupTemplate = ({ jwtToken }: { jwtToken?: JwtToken }) => {
   const [progress, setProgress] = useState<number>(33.3);
   const [userInfo, setUserInfo] = useState<UserInfoType>({
     name: "",
@@ -29,12 +29,6 @@ const SignupTemplate = ({ jwtToken }: { jwtToken: JwtToken }) => {
   });
   const { funnel, setFunnel } = useFunnel("userAgreement");
 
-  useEffect(() => {
-    if (jwtToken) {
-      localStorage.setItem("jwt", jwtToken.jwt);
-    }
-  }, [jwtToken]);
-
   return (
     <>
       <Progress
diff --git a/src/app/detail/page.tsx b/src/app/detail/page.tsx
index 1ab8895..f5960df 100644
--- a/src/app/detail/page.tsx
+++ b/src/app/detail/page.tsx
@@ -17,6 +17,7 @@ const Page = () => {
         h={"100vh"}
         pos={"relative"}
         maxW={"390px"}
+        minH={"844px"}
         padding={"60px 22px 0px 22px"}
         margin={"0 auto"}
         alignItems={"center"}
diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx
index 525e7a4..f292d65 100644
--- a/src/app/main/page.tsx
+++ b/src/app/main/page.tsx
@@ -30,12 +30,6 @@ const Page = () => {
     reset,
   } = useForm<DietMsgType>();
 
-  useEffect(() => {
-    const jwt = localStorage.getItem("jwt");
-    const userInfo = localStorage.getItem("userInfo");
-    if (!jwt && !userInfo) return redirect("/");
-  }, []);
-
   const onSubmit: SubmitHandler<DietMsgType> = async (data) => {
     reset();
     await postUserDietMutation(data.msg);
@@ -53,6 +47,7 @@ const Page = () => {
         margin={"0 auto"}
         bgColor={"#2B2C2C"}
         alignItems={"center"}
+        minH={"844px"}
       >
         <TheHeader>
           <TextLogoIcon />
diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx
index 3c4b433..8f5efa5 100644
--- a/src/app/signup/page.tsx
+++ b/src/app/signup/page.tsx
@@ -13,14 +13,14 @@ const Page = async ({
 }: {
   searchParams: { code: string; error: string };
 }) => {
-  const kakaoCode = searchParams.code;
+  // const kakaoCode = searchParams.code;
 
-  const errorCode = searchParams.error;
-  if (errorCode) return redirect("/");
+  // const errorCode = searchParams.error;
+  // if (errorCode) return redirect("/");
 
-  const jwtToken: JwtToken = await postKakaoCode(kakaoCode);
+  // const jwtToken: JwtToken = await postKakaoCode(kakaoCode);
 
-  return <SignupTemplate jwtToken={jwtToken} />;
+  return <SignupTemplate />;
 };
 
 export default Page;