-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
16 changed files
with
275 additions
and
141 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { ButtonPrimary } from '@components/common/button/Button'; | ||
| import { Button } from '@components/common'; | ||
|
|
||
| export default function ReviewButton() { | ||
| return <ButtonPrimary onClick={() => {}}>완료</ButtonPrimary>; | ||
| return <Button onClick={() => {}}>완료</Button>; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { useNavigate, useNavigation } from 'react-router-dom'; | ||
| import { LeftIcon } from '../icons/Icons'; | ||
|
|
||
| const Back = () => { | ||
| const navigate = useNavigate(); | ||
|
|
||
| return ( | ||
| <div className="flex h-10 items-center" onClick={() => navigate(-1)}> | ||
| <LeftIcon /> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Back; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,33 @@ | ||
| import { ReactNode } from 'react'; | ||
|
|
||
| interface ButtonProps { | ||
| onClick: () => void; | ||
| isActive?: boolean; | ||
| type?: 'submit' | 'button' | 'reset' | undefined; | ||
| onClick?: VoidFunction; | ||
| children: ReactNode; | ||
| className?: string; | ||
| outline?: boolean; | ||
| } | ||
|
|
||
| export const ButtonWhite: React.FC<ButtonProps> = ({ onClick, children }) => { | ||
| const Button = ({ | ||
| isActive = true, | ||
| type = 'submit', | ||
| onClick, | ||
| children, | ||
| outline = false, | ||
| }: ButtonProps) => { | ||
| return ( | ||
| <button | ||
| type={type} | ||
| onClick={onClick} | ||
| className="btn-base rounded-lg border border-solid border-gray3 text-sm"> | ||
| disabled={!isActive} | ||
| className={`btn-base headline1 ${ | ||
| outline | ||
| ? 'text-main1 border-main1 border-[1.5px] border-solid bg-white' | ||
| : 'bg-main1 text-white' | ||
| } h-14 p-2 disabled:cursor-not-allowed disabled:bg-gray3`}> | ||
| {children} | ||
| </button> | ||
| ); | ||
| }; | ||
|
|
||
| export const ButtonPrimary: React.FC<ButtonProps> = ({ onClick, children }) => { | ||
| return ( | ||
| <button | ||
| onClick={onClick} | ||
| className="btn-base bg-main1 text-lg font-bold text-white disabled:cursor-not-allowed disabled:bg-gray3"> | ||
| {children} | ||
| </button> | ||
| ); | ||
| }; | ||
| export default Button; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import Back from './back/Back'; | ||
| import Button from './button/Button'; | ||
| import { Nav } from './nav'; | ||
| import { Header } from './header'; | ||
|
|
||
| export { Back, Button, Nav, Header }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,5 @@ | ||
| import Preference from '@components/Preference'; | ||
|
|
||
| const Main = () => { | ||
| return ( | ||
| <> | ||
| <Preference /> | ||
| </> | ||
| ); | ||
| return <></>; | ||
| }; | ||
|
|
||
| export default Main; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import { Button } from '@components/common'; | ||
| import Back from '@components/common/back/Back'; | ||
| import { KakaoIcon, LogoIcon } from '@components/common/icons/Icons'; | ||
| import { UserInputBox } from '@components/user'; | ||
|
|
||
| const Signin = () => { | ||
| return ( | ||
| <div className="flex h-[95vh] flex-col"> | ||
| <Back /> | ||
| <div className="mb-auto"> | ||
| <div className="mb-16 mt-14 flex flex-col items-center"> | ||
| <div className="mb-2"> | ||
| <LogoIcon /> | ||
| </div> | ||
| <h1 className="body6 text-gray6"> | ||
| 위플랜플랜즈에 오신 것을 환영합니다. | ||
| </h1> | ||
| </div> | ||
| <form className="mb-auto"> | ||
| <UserInputBox label={'이메일'} placeholder={'이메일을 입력하세요'} /> | ||
| <UserInputBox | ||
| label={'비밀번호'} | ||
| placeholder={'비밀번호를 입력하세요'} | ||
| /> | ||
| <Button>로그인</Button> | ||
| </form> | ||
| </div> | ||
|
|
||
| <div className="mt-auto "> | ||
| <div className="body6 mb-5 flex h-4 items-center gap-4 text-gray4"> | ||
| <hr className="flex-auto" /> | ||
| 또는 | ||
| <hr className="flex-auto" /> | ||
| </div> | ||
| <button className="body3 mb-2 flex h-14 w-full items-center justify-center gap-2 rounded-lg bg-[#fee304] p-2 text-['#3B1E1E']"> | ||
| <KakaoIcon /> | ||
| 카카오로 로그인 | ||
| </button> | ||
|
|
||
| <Button outline type="button"> | ||
| 회원가입 | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Signin; |
Oops, something went wrong.