diff --git a/component/card/ChattingMsgCard.tsx b/component/card/ChattingMsgCard.tsx index 58293da..fcda1a8 100644 --- a/component/card/ChattingMsgCard.tsx +++ b/component/card/ChattingMsgCard.tsx @@ -8,7 +8,7 @@ const ChattingMsgCard = ({ children }: CardProps) => { bgColor={"#F5F5F9"} width={"max-content"} shadow={"none"} - margin={"10px 0px 10px 22px"} + margin={"0px 0px 0px 22px"} > { - + 반갑습니다 00님 자, 오늘은 어떤 음식을 드셨나요? @@ -47,7 +52,7 @@ const ChattingRoom = () => { - + diff --git a/component/card/DietChattingMsgCard.tsx b/component/card/DietChattingMsgCard.tsx index 6e3023b..8535030 100644 --- a/component/card/DietChattingMsgCard.tsx +++ b/component/card/DietChattingMsgCard.tsx @@ -18,7 +18,7 @@ const DietChattingMsgCart = ({}: CardProps) => { w={"312px"} bgColor={"#F5F5F9"} shadow={"none"} - margin={"10px 0px 10px 22px"} + margin={"0px 0px 0px 22px"} > diff --git a/component/card/UserChattingMsgCard.tsx b/component/card/UserChattingMsgCard.tsx index 3b9d02f..b0e0b6b 100644 --- a/component/card/UserChattingMsgCard.tsx +++ b/component/card/UserChattingMsgCard.tsx @@ -7,9 +7,10 @@ const UserChattingMsgCard = ({ children }: CardProps) => { bgColor={"#F5F5F9"} width={"max-content"} shadow={"none"} - margin={"10px 22px 20px 0px"} + margin={"0px 22px 0px 0px"} float={"right"} fontSize={"18px"} + alignSelf={"flex-end"} > { + return ( + <> + + {children} + + + ); +}; + +export default TheHeader; diff --git a/src/app/detail/page.tsx b/src/app/detail/page.tsx new file mode 100644 index 0000000..8471c6f --- /dev/null +++ b/src/app/detail/page.tsx @@ -0,0 +1,55 @@ +"use client"; +import { Flex, Text, VStack } from "@chakra-ui/react"; +import { useRouter } from "next/navigation"; +import TodayReportCard from "../../../component/card/TodayReportCard"; +import TheHeader from "../../../component/header/TheHeader"; + +const Page = () => { + const router = useRouter(); + return ( + <> + + + router.push("/main")} + cursor={"pointer"} + > + {"<"} + + + 오늘의 칼로리 레포트 + + + + + + 00님의 하루 칼로리 +
+ 아침 : 계란후라이 200 kcal + 점심 : 짜장면 1000 kcal + 저녁 : 마라탕 800 kcal +
+ + 00님께 드리는 팩폭 +
+ 기초대사량에서 300 Kcal 초과 + 권장 운동 + 걷기 운동 1시간 이상 +
+
+
+ + ); +}; + +export default Page; diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx index 7c80454..913c089 100644 --- a/src/app/main/page.tsx +++ b/src/app/main/page.tsx @@ -3,6 +3,7 @@ import { Flex, Text } from "@chakra-ui/react"; import ChattingRoom from "../../../component/card/ChattingRoom"; import DietStateCard from "../../../component/card/DietStateCard"; import { useRouter } from "next/navigation"; +import TheHeader from "../../../component/header/TheHeader"; const Page = () => { const router = useRouter(); @@ -19,20 +20,12 @@ const Page = () => { bgColor={"#D9D9D9"} alignItems={"center"} > - + 로고 router.push("/mypage")} cursor={"pointer"}> 마이페이지 - +
diff --git a/src/app/mypage/page.tsx b/src/app/mypage/page.tsx index fc49415..59589fe 100644 --- a/src/app/mypage/page.tsx +++ b/src/app/mypage/page.tsx @@ -2,6 +2,7 @@ import { Flex, Text, VStack } from "@chakra-ui/react"; import { useRouter } from "next/navigation"; import TodayReportCard from "../../../component/card/TodayReportCard"; +import TheHeader from "../../../component/header/TheHeader"; const Page = () => { const router = useRouter(); @@ -17,13 +18,7 @@ const Page = () => { margin={"0 auto"} alignItems={"center"} > - + router.push("/main")} @@ -32,25 +27,24 @@ const Page = () => { {"<"} - 오늘의 칼로리 레포트 + 마이페이지 - - - - - 00님의 하루 칼로리 -
- 아침 : 계란후라이 200 kcal - 점심 : 짜장면 1000 kcal - 저녁 : 마라탕 800 kcal -
+ + - 00님께 드리는 팩폭 + 내 정보
- 기초대사량에서 300 Kcal 초과 - 권장 운동 - 걷기 운동 1시간 이상 + 이름 + 성별 + 나이 + 체중 + 목표체중
+ 오늘의 식단 + + + 로그아웃 +