Skip to content

Commit d65ecab

Browse files
authored
Merge branch 'feature' into #137_1차-테스트-이슈수정
2 parents b663cea + 25a664f commit d65ecab

File tree

72 files changed

+944
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+944
-294
lines changed

package-lock.json

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"react-dom": "^18.3.1",
2828
"react-redux": "^9.2.0",
2929
"react-router-dom": "^7.0.2",
30+
"react-toastify": "^11.0.2",
3031
"redux": "^5.0.1"
3132
},
3233
"devDependencies": {

public/images/img_landingimage1.svg

Lines changed: 5 additions & 26 deletions
Loading

public/images/img_textlogo.svg

Lines changed: 2 additions & 8 deletions
Loading

src/components/common/button/NavButton.module.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
background: none;
1010
padding: 0 16px;
1111

12-
font-size: 16px;
13-
font-weight: 500;
1412
color: var(--gray);
1513

1614
cursor: pointer;

src/components/common/checkbox/CheckBox.module.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
}
44

55
.text {
6-
font-size: 16px;
76
font-weight: 400;
8-
color: var(--black-medium);
97
cursor: pointer;
108
}
119

src/components/common/chip/Chip.module.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
}
1212

1313
.status {
14+
max-width: 100%;
15+
1416
font-size: 12px;
1517
line-height: 18px;
1618
}
@@ -48,6 +50,8 @@
4850
}
4951

5052
.dot {
53+
flex-shrink: 0;
54+
5155
display: inline-block;
5256
width: 6px;
5357
height: 6px;

src/components/common/dropdown/Dropdown.tsx

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import styles from '@/components/common/dropdown/Dropdown.module.css';
22
import useDropdown from '@/hooks/useDropdown';
3-
import { PropsWithChildren } from 'react';
3+
import { MouseEvent, PropsWithChildren, useEffect, useRef } from 'react';
44

55
type Menu = {
66
label: string;
@@ -18,14 +18,32 @@ function Dropdown({
1818
onMenuClick,
1919
}: PropsWithChildren<DropdownProps>) {
2020
const { isOpen, toggleDropdown, closeDropdown } = useDropdown();
21+
const ref = useRef<HTMLDivElement | null>();
2122

2223
const handleMenuClick = (value: string) => {
2324
onMenuClick(value);
2425
closeDropdown();
2526
};
2627

28+
useEffect(() => {
29+
const handleClickOutside = (e: Event) => {
30+
const target = e.target as HTMLDivElement;
31+
if (ref.current && !ref.current.contains(target)) closeDropdown();
32+
};
33+
34+
document.addEventListener('click', handleClickOutside);
35+
36+
return () => {
37+
document.removeEventListener('click', handleClickOutside);
38+
};
39+
}, [ref]);
40+
2741
return (
28-
<div className={styles.dropdown}>
42+
<div
43+
ref={ref}
44+
className={styles.dropdown}
45+
onClick={(e) => e.stopPropagation()}
46+
>
2947
<button
3048
type="button"
3149
className={styles['btn-dropdown']}

src/components/common/input/auth-input/AuthInput.module.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
}
44

55
.title {
6-
font-size: 16px;
76
font-weight: 400;
8-
color: var(--black-medium);
97
cursor: pointer;
108
}
119

@@ -22,7 +20,6 @@
2220
border-radius: 8px;
2321
width: 100%;
2422
height: 50px;
25-
font-size: 16px;
2623
font-weight: 400;
2724
}
2825

src/components/common/input/info-input/DeadlineInput.module.css

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,26 @@
77
font-size: 18px;
88
line-height: 26px;
99
color: var(--black-medium);
10-
margin-bottom: 8px;
1110

1211
@media screen and (max-width: 743px) {
1312
font-size: 16px;
1413
line-height: 24px;
1514
}
1615
}
16+
17+
.topic-box {
18+
display: flex;
19+
align-items: center;
20+
gap: 2px;
21+
margin-bottom: 8px;
22+
}
23+
24+
.require {
25+
font-weight: 500;
26+
font-size: 16px;
27+
color: var(--violet);
28+
29+
@media screen and (max-width: 743px) {
30+
font-size: 14px;
31+
}
32+
}

0 commit comments

Comments
 (0)