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

Jump to bottom

[서인] 주문내역 상세 페이지 / 성능 개선 #319

Merged
merged 6 commits into from
Aug 2, 2024
Merged

[서인] 주문내역 상세 페이지 / 성능 개선 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf4ca06
refactor: BackButton aria-label 속성 추가
Seoin02 Jul 31, 2024
924e4e5
refactor: div 크기 지정해 CLS 개선
Seoin02 Jul 31, 2024
67237f9
refactor: 불필요한 코드 제거
Seoin02 Jul 31, 2024
33a4bac
refactor: orderListArea 세로 지정, orderLayout position 지정
Seoin02 Jul 31, 2024
8027f85
refactor: BackButton aria-label 중복 삭제
Seoin02 Jul 31, 2024
089d990
refactor: 주문내역 상세 페이지 요소 세로 고정값 지정
Seoin02 Jul 31, 2024
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
2 changes: 1 addition & 1 deletion src/components/cart/TotalPay.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
display: flex;
justify-content: space-between;
@include font-headline2;
}
}
4 changes: 2 additions & 2 deletions src/components/common/Button/BackButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export default function BackButton({ href, hasPrevPath = true }: BackButton) {
}

return (
<button className={styles.backButton} onClick={handleClick}>
<LeftArrow width={24} height={24} alt="뒤로 가기 버튼" />
<button className={styles.backButton} onClick={handleClick} aria-label="뒤로 가기 버튼">
<LeftArrow width={24} height={24} />
</button>
);
}
Expand Down
1 change: 1 addition & 0 deletions src/components/common/Card/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export default function Card({
fill
blurDataURL={'@/assets/svgs/rectangle.svg'}
placeholder="blur"
quality={75}
sizes={
size === 'extraLarge'
? '(max-width: 156px) 100vw, 150px'
Expand Down
16 changes: 12 additions & 4 deletions src/pages/my/order/Order.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@layer overrides {
.orderLayout {
display: flex;
position: relative;
width: 100%;
padding: 2rem 1.6rem;
flex-direction: column;
Expand Down Expand Up @@ -67,10 +68,6 @@
gap: 1.2rem;
}

.orderPriceArea {
width: 100%;
}

.orderDetailLayout {
display: flex;
padding: 2rem 1.6rem;
Expand All @@ -89,6 +86,7 @@
@include font-headline3;

width: 100%;
height: 2rem;
text-align: left;
}

Expand All @@ -101,7 +99,11 @@
}

.orderDetailBottom {
display: flex;
flex-direction: column;
width: 100%;
height: 22.2rem;
overflow: hidden;
}

.orderDetailHeader {
Expand All @@ -120,6 +122,7 @@

.deliveryArea {
display: flex;
height: 14.6rem;
padding-top: 1.2rem;
flex-direction: column;
align-items: center;
Expand Down Expand Up @@ -149,6 +152,7 @@

.deliveryMessageArea {
display: flex;
height: 7rem;
padding: 1.2rem var(--selectpayment, 0);
flex-direction: column;
justify-content: center;
Expand All @@ -165,12 +169,16 @@

.orderListArea {
width: 100%;
min-height: 17.7rem;
max-height: 31rem;
overflow-y: auto;
display: flex;
flex-direction: column;
padding-top: 1.2rem;
padding-bottom: 1.2rem;
gap: 1.2rem;
}

.rectangle {
width: 100%;
height: 0.8rem;
Expand Down
24 changes: 7 additions & 17 deletions src/pages/my/order/[purchaseId].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,23 +105,13 @@ export default function OrderDetail() {
</div>
<div className={styles.orderDetailBottom}>
<div className={styles.rectangle} />
<div className={styles.orderPriceArea}>
<TotalPay
title="결제 금액"
totalPrice={totalPrice}
totalOriginalPrice={totalOriginalPrice}
productCount={orderCount}
inOrder
/>
</div>
{/* <div className={styles.paymentMethod}>
<div className={styles.rectangle} />
<div className={styles.paymentMethodTitle}>
<h3>결제 수단</h3>
<hr className={styles.updownBorder} />
</div>
<span>토스페이</span>
</div> */}
<TotalPay
title="결제 금액"
totalPrice={totalPrice}
totalOriginalPrice={totalOriginalPrice}
productCount={orderCount}
inOrder
/>
</div>
</div>
);
Expand Down