Skip to content

Commit 3149fc8

Browse files
authored
Merge pull request #80 from codeit-sprint-part3-6team/#75_페이지_나의대시보드
#75 나의 대시보드 페이지 반응형 디자인
2 parents 7029335 + 054bc38 commit 3149fc8

File tree

4 files changed

+135
-27
lines changed

4 files changed

+135
-27
lines changed

src/components/common/sidebar/.gitkeep

Whitespace-only changes.

src/components/product/mydashboard/DashboardList.module.css

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
.dashboard-container {
2+
max-width: 1022px;
3+
margin-left: 340px;
4+
}
5+
16
.dashboard-list {
27
max-width: 1022px;
38
padding-top: 40px;
4-
margin-left: 340px;
59
display: grid;
610
grid-template-columns: repeat(3, 1fr);
711
gap: 13px;
@@ -22,11 +26,11 @@
2226
}
2327

2428
.pagination {
25-
margin-left: 340px;
2629
margin-top: 12px;
2730
display: flex;
2831
align-items: center;
2932
gap: 16px;
33+
justify-content: flex-end;
3034
}
3135

3236
.pagination-text {
@@ -36,24 +40,28 @@
3640
}
3741

3842
@media screen and (max-width: 1199px) {
43+
.dashboard-container {
44+
margin-left: 200px;
45+
}
3946
.dashboard-list {
4047
max-width: 504px;
41-
margin-left: 200px;
4248
grid-template-columns: repeat(2, 1fr);
4349
}
4450

4551
.pagination {
46-
margin-left: 200px;
52+
max-width: 504px;
4753
}
4854
}
4955

5056
@media screen and (max-width: 743px) {
51-
.dashboard-list {
57+
.dashboard-container {
5258
margin-left: 90px;
59+
}
60+
.dashboard-list {
5361
grid-template-columns: repeat(1, 1fr);
5462
}
5563

5664
.pagination {
57-
margin-left: 90px;
65+
max-width: 260px;
5866
}
5967
}

src/components/product/mydashboard/InvitationList.module.css

Lines changed: 113 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,45 +38,56 @@
3838
margin-top: 24px;
3939
margin-left: 340px;
4040
background-color: var(--white);
41-
width: 1022px;
41+
max-width: 1022px;
4242
}
4343

4444
.table {
45-
width: 1022px;
46-
padding: 0 76px;
45+
width: 100%;
46+
border-collapse: collapse;
47+
padding-left: 60px;
4748
}
4849

49-
.table-head {
50-
width: 798px;
51-
display: flex;
52-
justify-content: space-between;
50+
.table-head th,
51+
.table-body td {
52+
text-align: left;
53+
padding: 20px 76px;
54+
border-bottom: 1px solid var(--gray-bright);
5355
}
5456

55-
.table-title {
57+
.table-head th:nth-child(3),
58+
.table-body td:nth-child(3) {
59+
text-align: center;
60+
justify-content: center;
61+
}
62+
63+
.table-head th {
5664
font-size: 16px;
5765
font-weight: 400;
5866
color: var(--gray-dark);
59-
text-align: left;
60-
padding-bottom: 20px;
6167
}
6268

63-
.table-body {
64-
width: 860px;
65-
display: flex;
66-
gap: 235px;
67-
}
68-
69-
.table-content {
69+
.table-body td {
7070
font-size: 16px;
7171
font-weight: 400;
7272
color: var(--black-medium);
73-
margin-bottom: 30px;
73+
}
74+
75+
.table-content-title {
76+
display: none;
77+
}
78+
79+
.invitation-btn {
80+
display: flex;
81+
gap: 10px;
82+
}
83+
84+
.table-body tr:last-child td {
85+
border-bottom: none; /* 마지막 줄은 선 제거 */
7486
}
7587

7688
.invitation-btn {
7789
display: flex;
7890
gap: 10px;
79-
margin-left: 40px;
8091
font-weight: 500;
8192
}
8293

@@ -85,11 +96,94 @@
8596
max-width: 504px;
8697
margin-left: 200px;
8798
}
99+
100+
.table {
101+
max-width: 450px;
102+
margin-left: 28px;
103+
}
104+
105+
.table-head th,
106+
.table-body td {
107+
padding: 20px 0;
108+
}
109+
110+
.head {
111+
padding: 18px 28px;
112+
margin-top: 48px;
113+
}
88114
}
89115

90116
@media screen and (max-width: 743px) {
91117
.invitation-container {
92118
max-width: 260px;
93119
margin-left: 90px;
94120
}
121+
122+
.head {
123+
padding: 24px 16px;
124+
margin-top: 24px;
125+
}
126+
127+
.table-content-title {
128+
display: flex;
129+
gap: 24px;
130+
font-size: 14px;
131+
font-weight: 400;
132+
color: var(--gray-dark);
133+
width: 38px;
134+
}
135+
136+
.table-content {
137+
display: flex;
138+
gap: 24px;
139+
}
140+
141+
.table-body td {
142+
border: none;
143+
margin-bottom: 3px;
144+
}
145+
}
146+
147+
@media screen and (max-width: 743px) {
148+
.table {
149+
display: block; /* 테이블 레이아웃을 블록으로 변경 */
150+
width: 100%;
151+
border: none;
152+
margin: 0;
153+
padding: 0;
154+
}
155+
156+
.table-head {
157+
display: none; /* 헤더는 모바일에서 숨김 */
158+
}
159+
160+
.table-body {
161+
display: flex;
162+
flex-direction: column; /* 세로 카드 구조 */
163+
width: 100%;
164+
margin-bottom: 8px;
165+
padding: 10px 16px;
166+
background-color: var(--white);
167+
border-bottom: 1px solid var(--gray-bright);
168+
}
169+
170+
.table-body tr {
171+
display: flex;
172+
flex-direction: column;
173+
gap: 8px;
174+
padding: 12px;
175+
}
176+
177+
.table-body td {
178+
display: flex;
179+
padding: 4px 0;
180+
font-size: 14px;
181+
color: var(--black-medium);
182+
}
183+
184+
/* 수락/거절 버튼 */
185+
.invitation-btn {
186+
justify-content: flex-start;
187+
margin-top: 10px;
188+
}
95189
}

src/components/product/mydashboard/InvitationList.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,16 @@ export default function InvitationList() {
141141
{invitations.map((invite) => (
142142
<tr key={invite.id} className={styles['table-body']}>
143143
<td className={styles['table-content']}>
144-
{invite.dashboard.title}
144+
<span className={styles['table-content-title']}>이름</span>
145+
<span className={styles['table-content-dashboard']}>
146+
{invite.dashboard.title}
147+
</span>
145148
</td>
146149
<td className={styles['table-content']}>
147-
{invite.inviter.nickname}
150+
<span className={styles['table-content-title']}>초대자</span>
151+
<span className={styles['table-content-dashbaord']}>
152+
{invite.inviter.nickname}
153+
</span>
148154
</td>
149155
<td className={styles['invitation-btn']}>
150156
{invite.inviteAccepted ? (

0 commit comments

Comments
 (0)