Skip to content

Commit c437d69

Browse files
authored
Merge pull request #106 from imaginer-dev/105-joinpage-UI수정-prettier-수정
fix: joinPage UI & Prettier 수정
2 parents 9befd65 + 933d13f commit c437d69

File tree

6 files changed

+38
-31
lines changed

6 files changed

+38
-31
lines changed

src/components/Join/JoinButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useJoinState } from "../../stores/joinStore";
1+
import { useJoinState } from '../../stores/joinStore';
22

33
const JoinButton = () => {
44
const { name, phone, email, password, pwCheck, useTermsCheck, privacyTermsCheck } = useJoinState();

src/components/Join/JoinForm.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { FC, ReactNode } from 'react';
22

33
interface Props {
4-
children: ReactNode;
5-
}
6-
7-
const JoinForm: FC<Props> = ({ children }) => {
8-
return <form className={'flex w-full flex-col mt-9'}>{children}</form>;
9-
};
10-
11-
export default JoinForm;
4+
children: ReactNode;
5+
}
6+
7+
const JoinForm: FC<Props> = ({ children }) => {
8+
return <form className={'mt-9 flex w-full flex-col'}>{children}</form>;
9+
};
10+
11+
export default JoinForm;

src/components/Join/TermsCheckInput.tsx

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,32 @@ import { useJoinState } from '../../stores/joinStore.ts';
33
const TermsCheckInput = () => {
44
const { useTermsCheck, privacyTermsCheck, useTermsCheckHandler, privacyTermsCheckHandler } = useJoinState();
55

6-
return (
7-
<label className="form-control w-full mt-5 mb-9">
6+
return (
7+
<label className="form-control mb-9 mt-5 w-full">
88
<div className="flex flex-col">
9-
<label className='font-bold'>약관 동의</label>
9+
<label className="font-bold">약관 동의</label>
1010
</div>
11-
<div className="flex justify-between items-center mt-2">
11+
<div className="mt-2 flex items-center justify-between">
1212
<label htmlFor="termsOne">이용약관 동의 (필수)</label>
13-
<input type="radio" className='radio radio-primary' checked={useTermsCheck} onClick={useTermsCheckHandler} />
13+
<input type="radio" className="radio-primary radio" checked={useTermsCheck} onClick={useTermsCheckHandler} />
1414
</div>
15-
{!useTermsCheck ? <span className="text-red-500">이용약관에 동의해 주세요.</span> : <span className='h-6'></span> }
16-
<div className="flex justify-between items-center mt-2">
15+
{!useTermsCheck ? <span className="text-red-500">이용약관에 동의해 주세요.</span> : <span className="h-6"></span>}
16+
<div className="mt-2 flex items-center justify-between">
1717
<label htmlFor="termsTwo">개인정보 수집, 이용 동의 (필수)</label>
18-
<input type="radio" className='radio radio-primary' checked={privacyTermsCheck} onClick={privacyTermsCheckHandler} />
19-
20-
</div>
21-
{!privacyTermsCheck ? <span className="text-red-500">개인정보 수집, 이용에 동의해 주세요.</span> : <span className='h-6'></span> }
18+
<input
19+
type="radio"
20+
className="radio-primary radio"
21+
checked={privacyTermsCheck}
22+
onClick={privacyTermsCheckHandler}
23+
/>
24+
</div>
25+
{!privacyTermsCheck ? (
26+
<span className="text-red-500">개인정보 수집, 이용에 동의해 주세요.</span>
27+
) : (
28+
<span className="h-6"></span>
29+
)}
2230
</label>
23-
);
31+
);
2432
};
2533

2634
export default TermsCheckInput;

src/components/common/HistoryBackButton.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@ const HistoryBackButton: React.FC = () => {
99

1010
return (
1111
<div className="relative">
12-
<svg onClick={handleBack}
12+
<svg
13+
onClick={handleBack}
1314
className={'shrink-0'}
1415
width="256"
1516
height="512"
1617
viewBox="0 0 256 512"
1718
fill="none"
18-
preserveAspectRatio='xMinYMin meet'
19+
preserveAspectRatio="xMinYMin meet"
1920
xmlns="http://www.w3.org/2000/svg"
20-
>
21-
<path d="M9.4 278.6c-12.5-12.5-12.5-32.8 0-45.3l128-128c9.2-9.2 22.9-11.9 34.9-6.9s19.8 16.6 19.8 29.6l0 256c0 12.9-7.8 24.6-19.8 29.6s-25.7 2.2-34.9-6.9l-128-128z"/>
22-
</svg>
21+
>
22+
<path d="M9.4 278.6c-12.5-12.5-12.5-32.8 0-45.3l128-128c9.2-9.2 22.9-11.9 34.9-6.9s19.8 16.6 19.8 29.6l0 256c0 12.9-7.8 24.6-19.8 29.6s-25.7 2.2-34.9-6.9l-128-128z" />
23+
</svg>
2324
</div>
2425
);
2526
};
2627

27-
export default HistoryBackButton;
28+
export default HistoryBackButton;

src/layouts/JoinPageLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ interface Props {
66

77
const JoinPageLayout: FC<Props> = ({ children }) => {
88
return (
9-
<main className={'flex flex-col h-full w-full max-w-md items-center m-auto overflow-auto p-8 justify-center'}>
10-
{children}
9+
<main className={'m-auto flex h-full w-full max-w-md flex-col items-center justify-center overflow-auto p-8'}>
10+
{children}
1111
</main>
1212
);
1313
};

src/pages/JoinPage.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import PwCheckInput from '../components/Join/PwCheckInput.tsx';
99
import TermsCheckInput from '../components/Join/TermsCheckInput.tsx';
1010
import JoinFormActions from '../components/Join/JoinFormActions.tsx';
1111
import JoinButton from '../components/Join/JoinButton.tsx';
12-
import HistoryBackButton from '../components/common/HistoryBackButton.tsx';
1312

1413
const JoinPage = () => {
1514
return (
1615
<JoinPageLayout>
17-
<HistoryBackButton/>
1816
<VerticalLogo />
1917
<JoinForm>
2018
<NameInput />

0 commit comments

Comments
 (0)