fix(layout) : mainpage layout

potenday-project · Dec 22, 2023 · daec59c · daec59c
1 parent ff023e7
commit daec59c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/component/Funnel/LoginFunnel.tsx b/component/Funnel/LoginFunnel.tsx
@@ -14,7 +14,7 @@ const LoginFunnel = () => {
   // };
 
   return (
-    <VStack w={"100%"} h={"100%"} justifyContent={"center"}>
+    <VStack w={"100%"} h={"100vh"} justifyContent={"center"}>
       <Box marginBottom={"150px"}>
         <VerticalLogoIcon />
       </Box>
@@ -26,7 +26,7 @@ const LoginFunnel = () => {
       <ButtonGroup
         width={"100%"}
         pos={"absolute"}
-        bottom={"5vh"}
+        bottom={"4vh"}
         padding={"0 22px"}
         justifyContent={"center"}
       >

diff --git a/component/Funnel/MainFunnel.tsx b/component/Funnel/MainFunnel.tsx
@@ -20,16 +20,14 @@ interface MainFunnelPropsType {
 }
 
 const MainFunnel = ({ setFunnel }: MainFunnelPropsType) => {
-  console.log(process.env.NEXT_PUBLIC_API_URL);
-
   return (
     <>
       <VStack
         w={"#100%"}
         h={"100%"}
         spacing={"16px"}
         as="section"
-        marginTop={"71px"}
+        justifyContent={"center"}
       >
         <Heading
           as={"h1"}
@@ -74,7 +72,7 @@ const MainFunnel = ({ setFunnel }: MainFunnelPropsType) => {
         <ButtonGroup
           width={"100%"}
           pos={"absolute"}
-          bottom={"5vh"}
+          bottom={"4vh"}
           padding={"0 22px"}
           justifyContent={"center"}
         >

diff --git a/component/form/UserPhysicForm.tsx b/component/form/UserPhysicForm.tsx
@@ -50,10 +50,6 @@ const UserPhysicForm = ({ userInfo }: UserPhysicsFormPropsType) => {
       targetWeight: parseInt(data.targetWeight),
     };
 
-    // await postUserInfoMutation(newUserInfo);
-    // console.log(userId);
-    // localStorage.setItem("userId", userId.user_id);
-
     localStorage.setItem("userInfo", JSON.stringify(newUserInfo));
     router.push("/main");
   };

diff --git a/component/header/TheMainHeader.tsx b/component/header/TheMainHeader.tsx
@@ -0,0 +1,10 @@
+"use client";
+
+import { Box } from "@chakra-ui/react";
+import { ReactNode } from "react";
+
+const TheMainHeader = () => {
+  return <Box as={"header"}>header</Box>;
+};
+
+export default TheMainHeader;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,6 +1,8 @@
 import type { Metadata } from "next";
 import { ChakraLayout } from "@/app/ChakraLayout";
 import QueryLayout from "./QueryLayout";
+import TheHeader from "../../component/header/TheHeader";
+import TheMainHeader from "../../component/header/TheMainHeader";
 
 export const metadata: Metadata = {
   metadataBase: new URL(
@@ -43,7 +45,10 @@ export default function RootLayout({
       </head>
       <body suppressHydrationWarning={true}>
         <QueryLayout>
-          <ChakraLayout>{children}</ChakraLayout>
+          <ChakraLayout>
+            {/* <TheMainHeader /> */}
+            {children}
+          </ChakraLayout>
         </QueryLayout>
       </body>
     </html>