Skip to content

Commit 1cd5594

Browse files
authored
Merge pull request #24 from codeit-maso/feature/Yun
이미지 파일 svg로 변경 및 Card 컴포넌트 props 속성 수정
2 parents 268c6a4 + eb39fb9 commit 1cd5594

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

src/assets/images/plus.png

-2.08 KB
Binary file not shown.

src/assets/images/plus.svg

Lines changed: 5 additions & 0 deletions
Loading

src/components/common/Card/Card.jsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import deleteIcon from '../../../assets/images/delete.svg';
2-
import plus from '../../../assets/images/plus.png';
2+
import plus from '../../../assets/images/plus.svg';
33
import Badge from '../Badge/Badge';
44
import styles from './Card.module.scss';
55

6-
export default function Card({ image, name, relation, content, date, empty }) {
6+
export default function Card({
7+
image,
8+
sender,
9+
relationship,
10+
content,
11+
createdAt,
12+
empty,
13+
}) {
714
return (
815
<article className={`${styles.Card} ${empty ? styles['empty-card'] : ''}`}>
916
{empty ? (
@@ -19,11 +26,11 @@ export default function Card({ image, name, relation, content, date, empty }) {
1926
<div className={styles['user-info']}>
2027
<div className={styles['profile-name']}>
2128
<p>
22-
From. <span>{name}</span>
29+
From. <span>{sender}</span>
2330
</p>
2431
</div>
2532
<div className={styles['relation-badge']}>
26-
<Badge relation={relation} />
33+
<Badge relation={relationship} />
2734
</div>
2835
</div>
2936
<div className={styles['delete-button']}>
@@ -37,7 +44,7 @@ export default function Card({ image, name, relation, content, date, empty }) {
3744
<p>{content}</p>
3845
</div>
3946
</div>
40-
<footer className={styles['Card-Footer']}>{date}</footer>
47+
<footer className={styles['Card-Footer']}>{createdAt}</footer>
4148
</>
4249
)}
4350
</article>

src/components/common/Card/Card.module.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
gap: 14px;
2828
justify-content: space-between;
2929
padding-bottom: 16px;
30-
border-bottom: 1px solid $grayscale-200;
30+
border-bottom: 1px solid $gray-200;
3131

3232
.profile-img {
3333
position: relative;
3434
width: 56px;
3535
height: 56px;
36-
border: 1px solid $grayscale-200;
36+
border: 1px solid $gray-200;
3737
border-radius: 100px;
3838
overflow: hidden;
3939

@@ -66,7 +66,7 @@
6666
justify-content: center;
6767
align-items: center;
6868
padding: 8px;
69-
border: 1px solid $grayscale-300;
69+
border: 1px solid $gray-300;
7070
border-radius: 6px;
7171
background-color: $white;
7272
}
@@ -84,12 +84,12 @@
8484
line-clamp: 3;
8585
word-break: break-word;
8686
@include font-18-regular;
87-
color: $grayscale-600;
87+
color: $gray-600;
8888
}
8989
}
9090

9191
.Card-Footer {
9292
@include font-12-regular;
93-
color: $grayscale-400;
93+
color: $gray-400;
9494
}
9595
}

0 commit comments

Comments
 (0)