Skip to content

Commit

Permalink
Merge pull request #15 from chhw130/main
Browse files Browse the repository at this point in the history
feat(img) : next img
  • Loading branch information
chhw130 authored Dec 11, 2023
2 parents ce0b444 + 4a1fe6e commit 29b0c92
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 11 deletions.
2 changes: 0 additions & 2 deletions component/form/UserInfoForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ interface UserInfoFormPropsType {
}

const UserInfoForm = ({ setFunnel, setProgress }: UserInfoFormPropsType) => {
const params = useParams();

const options = ["남성", "여성"];

const { getRootProps, getRadioProps } = useRadioGroup({
Expand Down
8 changes: 6 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
images: {
domains: ["images.pexels.com"],
},
};

module.exports = nextConfig
module.exports = nextConfig;
1 change: 0 additions & 1 deletion src/app/ChakraLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import dynamic from "next/dynamic";
const ChakraProvider = dynamic(() =>
import("@chakra-ui/provider").then((mod) => mod.ChakraProvider)
);
import localFont from "next/font/local";

// const BMJUA = localFont({
// src: [
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<html lang="en" suppressHydrationWarning>
<html lang="ko" style={{ height: "100%" }} suppressHydrationWarning>
<body suppressHydrationWarning={true}>
<QueryLayout>
<ChakraLayout>{children}</ChakraLayout>
Expand Down
68 changes: 63 additions & 5 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,69 @@
"use client";
import { Box, ButtonGroup, Flex, Heading, Text } from "@chakra-ui/react";
import MainButton from "../../component/button/MainButton";
import { useRouter } from "next/navigation";
import Image from "next/image";

export default function Home() {
const router = useRouter();
return (
<main>
<MainButton w={"350px"} h={"52px"}>
시작하기
</MainButton>
</main>
<Flex
as={"main"}
flexDir={"column"}
w={"90%"}
height={"100vh"}
margin={"0 auto"}
justifyContent={"center"}
alignItems={"center"}
>
<Image
src={"https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg"}
alt="식선생"
width={100}
height={100}
/>
<Box as="section" paddingBottom={"100px"}>
<Heading
as={"h1"}
color={"#000000"}
fontSize={"24px"}
fontWeight={"semibold"}
textAlign={"center"}
lineHeight={10}
padding={"15px"}
>
살빼려면
<br />
오늘 얼마만큼 운동해야하지?
</Heading>
<Text
as={"h2"}
color={"#787878"}
fontSize={"17px"}
textAlign={"center"}
lineHeight={7}
>
오늘 먹은 음식을 식선생에게 외쳐보세요! <br />
필요 운동량과 안찌는 식단을 한번에 알려드려요
</Text>
</Box>

<ButtonGroup
width={"90%"}
pos={"fixed"}
bottom={"30px"}
margin={"0 auto"}
>
<MainButton
w={"100%"}
h={"52px"}
onClick={() => {
router.push("/signup");
}}
>
다음으로
</MainButton>
</ButtonGroup>
</Flex>
);
}

0 comments on commit 29b0c92

Please sign in to comment.