Skip to content

Commit

Permalink
Merge pull request #15 from chhw130/dev
Browse files Browse the repository at this point in the history
fix(type) : type interface import error
  • Loading branch information
chhw130 authored Dec 14, 2023
2 parents df29f48 + a45eb5c commit b540573
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
25 changes: 17 additions & 8 deletions component/form/UserAgreementForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ import {
ModalBody,
ModalCloseButton,
ModalContent,
ModalFooter,
ModalHeader,
ModalOverlay,
Text,
VStack,
useDisclosure,
} from "@chakra-ui/react";
Expand Down Expand Up @@ -41,24 +43,31 @@ const UserAgreementForm = ({

return (
<>
<Modal isOpen={isOpen} onClose={onClose} size={"full"}>
<Modal
isOpen={isOpen}
onClose={onClose}
size={["full", "xl", "xl"]}
scrollBehavior={"inside"}
>
<ModalOverlay />
<ModalContent overflow={"scroll"} h={"100vh"}>
<ModalContent>
<ModalCloseButton />
<ModalHeader padding={"30px"} />
<ModalBody>
<ModalBody minW={"390px"}>
{modalState === "serviceAgreement" && (
<Box>
서비스 이용 약관
<br />
<>
<Text>서비스 이용 약관</Text>
<br />
{serviceAgreement}
</Box>
</>
)}
{modalState === "personalAgreement" && (
<Box>{personalAgreement}</Box>
<Box overflow={"scroll"}>
<Text as={"pre"}>{personalAgreement}</Text>
</Box>
)}
</ModalBody>
<ModalFooter />
</ModalContent>
</Modal>
<Box as="section" alignSelf={"flex-start"}>
Expand Down
2 changes: 1 addition & 1 deletion component/form/UserInfoForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import MainInput from "../input/MainInput";
import MainButton from "../button/MainButton";
import { SubmitHandler, useForm } from "react-hook-form";
import { UserInfoType } from "@/app/signup/page";
import { UserInfoType } from "../template/SignupTemplate";

function RadioCard(props: any) {
const { getInputProps, getRadioProps } = useRadio(props);
Expand Down
2 changes: 1 addition & 1 deletion component/form/UserPhysicForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from "@chakra-ui/react";
import { SubmitHandler, useForm } from "react-hook-form";
import { useRouter } from "next/navigation";
import { UserInfoType } from "@/app/signup/page";
import { UserInfoType } from "../template/SignupTemplate";

interface UserPhysicsFormPropsType {
userInfo: UserInfoType;
Expand Down
Loading

0 comments on commit b540573

Please sign in to comment.