Merge pull request #56 from chhw130/main

fix(OG) : OGImg 변경
potenday-project · Dec 16, 2023 · 775e734 · 775e734
2 parents 1e1a04f + 35c6207
commit 775e734
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 25 deletions.
diff --git a/component/Funnel/LoginFunnel.tsx b/component/Funnel/LoginFunnel.tsx
@@ -4,6 +4,7 @@ import Image from "next/image";
 import { useRouter } from "next/navigation";
 import KaKaoButtonIcon from "../icon/KaKaoButtonIcon";
 import VerticalLogoIcon from "../icon/VerticalLogoIcon";
+import MainButton from "../button/MainButton";
 
 const LoginFunnel = () => {
   const router = useRouter();
@@ -17,31 +18,26 @@ const LoginFunnel = () => {
       <Box marginBottom={"150px"}>
         <VerticalLogoIcon />
       </Box>
+
+      {/* <Box onClick={() => signUpKakaoHandler()} cursor={"pointer"}>
+          <KaKaoButtonIcon />
+        </Box> */}
+
       <ButtonGroup
         width={"100%"}
         pos={"absolute"}
-        bottom={"27px"}
+        bottom={"5vh"}
         padding={"0 22px"}
         justifyContent={"center"}
-        alignItems={"center"}
-        flexDir={"column"}
-        gap={"20px"}
       >
-        {/* <Box onClick={() => signUpKakaoHandler()} cursor={"pointer"}>
-          <KaKaoButtonIcon />
-        </Box> */}
-
-        <Text
-          as={"u"}
-          fontSize={"17px"}
-          h={"35px"}
-          color={"#9D9D9D"}
-          margin={"0.5rem"}
+        <MainButton
+          w={"100%"}
+          h={"52px"}
+          bgColor={"#40E98E"}
           onClick={() => router.push("/signup")}
-          cursor={"pointer"}
         >
-          체험하기
-        </Text>
+          <Text color={"#2B2C2C"}>체험하기</Text>
+        </MainButton>
       </ButtonGroup>
     </VStack>
   );

diff --git a/component/Funnel/MainFunnel.tsx b/component/Funnel/MainFunnel.tsx
@@ -69,7 +69,7 @@ const MainFunnel = ({ setFunnel }: MainFunnelPropsType) => {
         <ButtonGroup
           width={"100%"}
           pos={"absolute"}
-          bottom={"3vh"}
+          bottom={"5vh"}
           padding={"0 22px"}
           justifyContent={"center"}
         >

diff --git a/component/template/MyPageTemplate.tsx b/component/template/MyPageTemplate.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { Box, Flex, HStack, Text, VStack } from "@chakra-ui/react";
 import { useRouter } from "next/navigation";
 import Image from "next/image";
@@ -7,11 +8,14 @@ import TheHeader from "../header/TheHeader";
 import CloseIcon from "../icon/CloseIcon";
 import TodayReportCard from "../card/TodayReportCard";
 import { UserInfoType } from "./SignupTemplate";
+import { useUser } from "../../utils/hooks/useUser";
 
 const MyPageTemplate = () => {
   const router = useRouter();
   const [userData, setUserData] = useState<UserInfoType>();
 
+  const {} = useUser();
+
   return (
     <>
       <Flex

diff --git a/src/app/favicon.ico → public/logo.ico b/src/app/favicon.ico → public/logo.ico
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -8,9 +8,7 @@ export const metadata: Metadata = {
   ),
   title: "식선생",
   description: "당신의 식단 관리 서비스",
-  icons: {
-    icon: "/icon.png",
-  },
+
   openGraph: {
     title: "식선생",
     description: "당신의 식단 관리 서비스",
@@ -40,6 +38,9 @@ export default function RootLayout({
 }) {
   return (
     <html lang="ko" style={{ height: "100%" }} suppressHydrationWarning>
+      <head>
+        <link rel="icon" href="%PUBLIC_URL%/logo.ico" />
+      </head>
       <body suppressHydrationWarning={true}>
         <QueryLayout>
           <ChakraLayout>{children}</ChakraLayout>

diff --git a/src/app/opengraph-image.jpg b/src/app/opengraph-image.jpg
diff --git a/src/app/opengraph-image.png b/src/app/opengraph-image.png
diff --git a/utils/api/AxiosSetting.ts b/utils/api/AxiosSetting.ts
@@ -21,10 +21,14 @@ export interface DietResponse {
 }
 
 export const getUserInfo = async () => {
-  const jwtToken = localStorage.getItem(`jwt`);
-  const res = await instacne.get("/users", {
-    headers: { Authorization: `Bearer ${jwtToken}` },
-  });
+  const userId = localStorage.getItem(`userId`);
+  const res = await instacne.get(`/users/${userId}`);
+  return res;
+};
+
+export const getUserBmr = async () => {
+  const userId = localStorage.getItem(`userId`);
+  const res = await instacne.get(`/users/${userId}/bmr`);
   return res;
 };