Skip to content

Commit 80844ff

Browse files
authored
Merge pull request #30 from codeit-maso/feature/Yun
Card, Badge 컴포넌트 클래스 네임 BEM 방식으로 변경 및 파일 위치 변경
2 parents 634e676 + 969a9c8 commit 80844ff

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

src/components/common/Badge/Badge.jsx renamed to src/pages/Posts/components/Badge/Badge.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const relationship = {
99

1010
export default function Badge({ relation }) {
1111
return (
12-
<div className={`${styles.Badge} ${styles[relation]}`}>
12+
<div className={`${styles.badge} ${styles[relation]}`}>
1313
{relationship[relation]}
1414
</div>
1515
);

src/components/common/Badge/Badge.module.scss renamed to src/pages/Posts/components/Badge/Badge.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@use '../../../assets/styles/variables.scss' as *;
1+
@use '../../../../assets/styles/variables.scss' as *;
22

3-
.Badge {
3+
.badge {
44
display: inline-block;
55
padding: 0 8px;
66
border-radius: 4px;
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import deleteIcon from '../../../assets/images/delete.svg';
2-
import plus from '../../../assets/images/plus.svg';
1+
import deleteIcon from '../../../../assets/images/delete.svg';
2+
import plus from '../../../../assets/images/plus.svg';
33
import Badge from '../Badge/Badge';
44
import styles from './Card.module.scss';
55

@@ -9,42 +9,42 @@ export default function Card({
99
relationship,
1010
content,
1111
createdAt,
12-
empty,
12+
empty = false,
1313
}) {
1414
return (
15-
<article className={`${styles.Card} ${empty ? styles['empty-card'] : ''}`}>
15+
<article className={`${styles.card} ${empty ? styles['card--empty'] : ''}`}>
1616
{empty ? (
17-
<div className={styles.empty}>
17+
<div>
1818
<img src={plus} alt="추가하기" />
1919
</div>
2020
) : (
2121
<>
22-
<header className={styles['Card-Header']}>
23-
<div className={styles['profile-img']}>
22+
<header className={styles['card__header']}>
23+
<div className={styles['card__profile-img']}>
2424
<img src={image} alt="프로필 이미지" />
2525
</div>
26-
<div className={styles['user-info']}>
27-
<div className={styles['profile-name']}>
26+
<div className={styles['card__user-info']}>
27+
<div className={styles['card__profile-name']}>
2828
<p>
2929
From. <span>{sender}</span>
3030
</p>
3131
</div>
32-
<div className={styles['relation-badge']}>
32+
<div className={styles['card__relation-badge']}>
3333
<Badge relation={relationship} />
3434
</div>
3535
</div>
36-
<div className={styles['delete-button']}>
36+
<div className={styles['card__delete-button']}>
3737
<button>
3838
<img src={deleteIcon} alt="쓰레기통 아이콘" />
3939
</button>
4040
</div>
4141
</header>
42-
<div className={styles['Card-Body']}>
43-
<div className={styles.content}>
42+
<div className={styles['card__body']}>
43+
<div className={styles['card__content']}>
4444
<p>{content}</p>
4545
</div>
4646
</div>
47-
<footer className={styles['Card-Footer']}>{createdAt}</footer>
47+
<footer className={styles['card__footer']}>{createdAt}</footer>
4848
</>
4949
)}
5050
</article>

src/components/common/Card/Card.module.scss renamed to src/pages/Posts/components/Card/Card.module.scss

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@use '../../../assets/styles/variables.scss' as *;
1+
@use '../../../../assets/styles/variables.scss' as *;
22

3-
.Card {
3+
.card {
44
display: flex;
55
flex-direction: column;
66
width: 384px;
@@ -11,7 +11,7 @@
1111
background: $white;
1212
gap: 16px;
1313

14-
&.empty-card {
14+
&.card--empty {
1515
display: flex;
1616
justify-content: center;
1717
align-items: center;
@@ -22,14 +22,14 @@
2222
}
2323
}
2424

25-
.Card-Header {
25+
&__header {
2626
display: flex;
2727
gap: 14px;
2828
justify-content: space-between;
2929
padding-bottom: 16px;
3030
border-bottom: 1px solid $gray-200;
3131

32-
.profile-img {
32+
.card__profile-img {
3333
position: relative;
3434
width: 56px;
3535
height: 56px;
@@ -45,13 +45,13 @@
4545
}
4646
}
4747

48-
.user-info {
48+
.card__user-info {
4949
display: flex;
5050
flex: 1;
5151
flex-direction: column;
5252
gap: 6px;
5353

54-
.profile-name {
54+
.card__profile-name {
5555
@include font-20-regular;
5656

5757
span {
@@ -60,7 +60,7 @@
6060
}
6161
}
6262

63-
.delete-button {
63+
.card__delete-button {
6464
button {
6565
display: flex;
6666
justify-content: center;
@@ -73,10 +73,11 @@
7373
}
7474
}
7575

76-
.Card-Body {
76+
&__body {
77+
height: 280px;
7778
padding: 16px 0;
7879

79-
.content {
80+
.card__content {
8081
display: -webkit-box;
8182
-webkit-box-orient: vertical;
8283
overflow: hidden;
@@ -88,7 +89,7 @@
8889
}
8990
}
9091

91-
.Card-Footer {
92+
&__footer {
9293
@include font-12-regular;
9394
color: $gray-400;
9495
}

0 commit comments

Comments
 (0)