Skip to content

Commit c8a2fb6

Browse files
authored
Merge pull request #141 from codeit-sprint-part3-6team/#136_1차-테스트-이슈-수정
#136 1차 테스트 이슈 수정
2 parents bbd1098 + ad4bc12 commit c8a2fb6

File tree

12 files changed

+59
-39
lines changed

12 files changed

+59
-39
lines changed

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/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/modal/auth/AuthModal.module.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
.message {
1111
font-size: 20px;
12-
font-weight: 500;
13-
color: var(--black-medium);
1412
margin-bottom: 32px;
1513
}
1614

@@ -20,7 +18,6 @@
2018
}
2119

2220
.message {
23-
font-size: 16px;
2421
margin-bottom: 32px;
2522
}
2623
}

src/components/common/modal/delete-cards/DeleteCardsModal.module.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
}
2121

2222
.message {
23-
font-size: 16px;
2423
margin-bottom: 32px;
2524
}
2625
}

src/components/common/navbar/Navbar.module.css

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,61 @@
88
border-bottom: 1px solid var(--gray-medium);
99
background-color: var(--white);
1010
padding: 0 80px 0 40px;
11-
margin-left: 280px;
11+
margin-left: 300px;
1212
}
1313

1414
.title {
15+
position: relative;
16+
17+
padding-right: 28px;
18+
margin-right: 40px;
19+
flex-shrink: 1;
20+
1521
font-size: 20px;
1622
font-weight: 700;
1723
color: var(--black-medium);
24+
25+
overflow: hidden;
26+
text-overflow: ellipsis;
27+
white-space: nowrap;
1828
}
1929

2030
.title.createdByMe::after {
2131
content: '';
2232

33+
position: absolute;
34+
top: 0;
35+
right: 0;
36+
2337
display: inline-block;
2438

2539
width: 20px;
2640
height: 17px;
2741

2842
background-image: url('/ic/ic_crown.svg');
2943
background-size: 100%;
30-
margin-left: 8px;
3144
}
3245

3346
.right-nav {
3447
display: flex;
48+
flex-shrink: 0;
3549
}
3650

3751
.left-section {
3852
position: relative;
3953

4054
display: flex;
4155
align-items: center;
56+
flex-shrink: 0;
4257

4358
margin-right: 72px;
4459
}
4560

4661
.left-section::before {
4762
content: '';
4863

64+
flex-shrink: 0;
65+
4966
position: absolute;
5067
top: 0;
5168
right: -36px;
@@ -56,6 +73,10 @@
5673
background-color: var(--gray-medium);
5774
}
5875

76+
.left-section button {
77+
flex-shrink: 0;
78+
}
79+
5980
.dropdown div > ul {
6081
top: 50px;
6182
right: -10px;

src/components/common/navbar/Navbar.tsx

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,6 @@ function Navbar() {
6464
}
6565
}, [isModalOpen, alertMessage]);
6666

67-
const renderTitle = () => {
68-
if (!isMyPage) return <h3 className={styles.title}>계정관리</h3>;
69-
if (!isMyDashboard) return <h3 className={styles.title}>내 대시보드</h3>;
70-
71-
return (
72-
<h3
73-
className={`${styles.title} ${dashboardData?.createdByMe && `${styles.createdByMe}`}`}
74-
>
75-
{dashboardData?.title}
76-
</h3>
77-
);
78-
};
79-
8067
const handleDropdownClick = (value: string) => {
8168
if (value === 'logout') {
8269
localStorage.removeItem('accessToken');
@@ -112,14 +99,31 @@ function Navbar() {
11299
}
113100
};
114101

102+
if (isMyDashboard && isMyPage && !dashboardData) {
103+
return;
104+
}
105+
106+
const renderTitle = () => {
107+
if (!isMyPage) return <h3 className={styles.title}>계정관리</h3>;
108+
if (!isMyDashboard) return <h3 className={styles.title}>내 대시보드</h3>;
109+
110+
return (
111+
<h3
112+
className={`${styles.title} ${dashboardData?.createdByMe && `${styles.createdByMe}`}`}
113+
>
114+
{dashboardData?.title}
115+
</h3>
116+
);
117+
};
118+
115119
return (
116120
<div className={styles.navbar}>
117121
{renderTitle()}
118122

119123
<div className={styles['right-nav']}>
120124
{isMyDashboard && isMyPage && (
121125
<div className={styles['left-section']}>
122-
{isEdit && (
126+
{isEdit && dashboardData.createdByMe && (
123127
<NavButton
124128
btnType="management"
125129
buttonName="관리"

src/components/common/userprofile/UserProfile.module.css

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44
}
55

66
.user-img {
7-
border-radius: 100%;
7+
position: relative;
8+
9+
flex-shrink: 0;
10+
811
width: 38px;
912
height: 38px;
1013
overflow: hidden;
11-
position: relative;
14+
15+
border-radius: 100%;
1216
}
1317

1418
.user-img > div {
@@ -20,18 +24,15 @@
2024
.user-img svg {
2125
width: 100%;
2226
height: 100%;
27+
2328
object-fit: cover;
2429
}
2530

2631
.user-nickname {
27-
font-size: 16px;
28-
font-weight: 400;
29-
color: #333236;
32+
flex-shrink: 0;
3033
margin-left: 12px;
31-
}
3234

33-
.header .user-nickname {
34-
font-weight: 500;
35+
font-weight: 400;
3536
}
3637

3738
.dashboard-detail .user-img {
@@ -60,8 +61,9 @@
6061
}
6162

6263
.user-nickname {
63-
font-size: 14px;
6464
margin-left: 8px;
65+
66+
font-size: 14px;
6567
}
6668

6769
.header .user-nickname {

src/components/product/auth/SigninForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function SigninForm() {
4848

4949
setValues((prevValues) => ({
5050
...prevValues,
51-
[name]: value,
51+
[name]: value.replace(/\s/g, ''),
5252
}));
5353
};
5454

src/components/product/auth/SignupForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function SignupForm() {
5050

5151
setValues((prevValues) => ({
5252
...prevValues,
53-
[name]: type === 'checkbox' ? checked : value,
53+
[name]: type === 'checkbox' ? checked : value.replace(/\s/g, ''),
5454
}));
5555
};
5656

0 commit comments

Comments
 (0)