Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] 회원가입 페이지 구현 완료 #105

Merged
merged 5 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@mantine/styles": "^6.0.22",
"@tabler/icons-react": "^3.11.0",
"@types/js-cookie": "^3.0.6",
"axios": "^1.7.3",
"axios": "^1.7.7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기서 main과 complict 일어날 수도 있을 것 같아서 기능에 지장이 없다면 버전은 유지해주시면 좋겠습니다!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

파일삭제하겟습니다

"classnames": "^2.5.1",
"embla-carousel-react": "^7.1.0",
"js-cookie": "^3.0.5",
Expand Down
11 changes: 7 additions & 4 deletions src/components/common/CheckBox/CheckBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@ import styles from "./CheckBox.module.css";

interface CheckBoxProps {
label: string;
checked?: boolean;
onChange?: (checked: boolean) => void;
}

export const CheckBox: React.FC<CheckBoxProps> = ({ label }) => {
const [checked, setChecked] = useState(false);
export const CheckBox: React.FC<CheckBoxProps> = ({ label, checked = false, onChange }) => {
const [isChecked, setChecked] = useState(checked);

const handleClick = () => {
setChecked(!checked);
setChecked(!isChecked);
onChange?.(!isChecked);
};

return (
<div className={styles.checkboxContainer} onClick={handleClick}>
<MantineCheckbox
checked={checked}
checked={isChecked}
onChange={handleClick}
size="sm"
radius={"sm"}
Expand Down
22 changes: 16 additions & 6 deletions src/components/common/RegisterForm/registerForm.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
flex-direction: column;
justify-content: center;
align-items: center;
padding: 20px;
padding: 50px;
gap: 30px;
position: relative;
background: var(--color-surfaceContainerLowest);
Expand All @@ -15,18 +15,28 @@
word-wrap: break-word;
}

.form {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 10px;
padding: 20px;
/* Add gap between form elements */
}

.registerBox label {
margin-bottom: 10px;
}

.text {
width: 300px;
width: 400px;
height: 12%;
}

.logo {
margin-bottom: 0px;
width: 150px;
width: 180px;
height: auto;
}

Expand Down Expand Up @@ -57,7 +67,7 @@
}

.logo {
width: 110px;
width: 160px;
}

.text {
Expand All @@ -73,7 +83,7 @@
}

.logo {
width: 90px;
width: 110px;
}

.text {
Expand All @@ -89,7 +99,7 @@
}

.logo {
width: 75px;
width: 90px;
}

.text {
Expand Down
Loading
Loading