Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GGFE-145] 상점 구매페이지 #913

Merged
merged 8 commits into from
Aug 4, 2023
Merged

[GGFE-145] 상점 구매페이지 #913

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
333996a
[Feat] [GGFE-145] 구매 가능 아이템 리스트 컴포넌트
hyobb109 Aug 2, 2023
ca85dee
[Feat] [GGFE-145] 상점페이지에 구매 컴포넌트 추가
hyobb109 Aug 2, 2023
0865bd6
[Style] [GGFE-145] 아이템 카드 배경 및 버튼 색상 수정
hyobb109 Aug 2, 2023
aec5685
[Style] [GGFE-145] 미리보기 이미지 꽉 차도록 수정
hyobb109 Aug 3, 2023
3910f8a
[Style] [GGFE-145] 아이템 이름, 가격 배치 수정
hyobb109 Aug 3, 2023
043e144
[Feat] [GGFE-145] 구매, 선물하기 모달 임시 생성
hyobb109 Aug 3, 2023
5ed3666
[Feat] [GGFE-145] 아이템 리스트 조회 mock api 적용
hyobb109 Aug 3, 2023
b08ea55
[Style] [GGFE-145] 세일 여부 구분하여 스타일 적용
hyobb109 Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions components/shop/ItemCard.tsx
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

조건문으로 세일 여부 확인하여 스타일 다르게 적용되도록 수정했습니다~

Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,24 @@ export default function ItemCard({ item }: { item: Item }) {
<div className={styles.img}>
<Image src={item.imageUrl} alt={item.itemName} fill />
</div>
<div className={styles.badge}>{item.discount}%</div>
{item.discount && <div className={styles.badge}>{item.discount}%</div>}
</div>
<div className={styles.details}>
<div className={styles.itemPriceTag}>
<div className={styles.title}>
<h4>{item.itemName}</h4>
</div>
<div className={styles.priceTags}>
<h5 className={styles.originalPrice}>${item.price}</h5>
<h5 className={styles.discountedPrice}>${item.salePrice}</h5>
<h5
className={
item.discount ? styles.onDiscount : styles.originalPrice
}
>
${item.price}
</h5>
{item.discount !== 0 && (
<h5 className={styles.discountedPrice}>${item.salePrice}</h5>
)}
</div>
</div>
<div className={styles.content}>
Expand Down
4 changes: 2 additions & 2 deletions pages/api/pingpong/items/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export default function handler(
content: '확성기 설명',
imageUrl: '/image/fallBackSrc.jpeg',
price: 2000,
discount: 20,
salePrice: 1600,
discount: 0,
salePrice: 2000,
},
{
itemId: 3,
Expand Down
6 changes: 6 additions & 0 deletions styles/store/ItemCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
}
.priceTags {
.originalPrice {
font-size: 1rem;
padding: 0;
margin: 0;
}

.onDiscount {
text-decoration: line-through 2px solid #666666;
padding: 0;
margin: 0;
Expand Down