From bf4ca06144b88fca2c8fad9b6e262f7b4c1f3a40 Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Wed, 31 Jul 2024 22:29:49 +0900 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20BackButton=20aria-label=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Button/BackButton/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/Button/BackButton/index.tsx b/src/components/common/Button/BackButton/index.tsx index 47b7f4d4..6eb7e627 100644 --- a/src/components/common/Button/BackButton/index.tsx +++ b/src/components/common/Button/BackButton/index.tsx @@ -26,7 +26,7 @@ export default function BackButton({ href, hasPrevPath = true }: BackButton) { } return ( - ); From 924e4e529b218812f48d601df42613c38b335039 Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Wed, 31 Jul 2024 23:05:55 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20div=20=ED=81=AC=EA=B8=B0=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=ED=95=B4=20CLS=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/cart/TotalPay.module.scss | 2 +- src/pages/my/order/Order.module.scss | 5 +---- src/pages/my/order/[purchaseId].tsx | 20 +++++++++----------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/components/cart/TotalPay.module.scss b/src/components/cart/TotalPay.module.scss index 405a8fd4..f49a8232 100644 --- a/src/components/cart/TotalPay.module.scss +++ b/src/components/cart/TotalPay.module.scss @@ -36,4 +36,4 @@ display: flex; justify-content: space-between; @include font-headline2; -} \ No newline at end of file +} diff --git a/src/pages/my/order/Order.module.scss b/src/pages/my/order/Order.module.scss index 7db603b5..dfe0ceff 100644 --- a/src/pages/my/order/Order.module.scss +++ b/src/pages/my/order/Order.module.scss @@ -67,10 +67,6 @@ gap: 1.2rem; } - .orderPriceArea { - width: 100%; - } - .orderDetailLayout { display: flex; padding: 2rem 1.6rem; @@ -102,6 +98,7 @@ .orderDetailBottom { width: 100%; + height: auto; } .orderDetailHeader { diff --git a/src/pages/my/order/[purchaseId].tsx b/src/pages/my/order/[purchaseId].tsx index 7ab0bfe3..49ec0795 100644 --- a/src/pages/my/order/[purchaseId].tsx +++ b/src/pages/my/order/[purchaseId].tsx @@ -105,16 +105,15 @@ export default function OrderDetail() {
-
- -
- {/*
+ +
+ {/*

결제 수단

@@ -122,7 +121,6 @@ export default function OrderDetail() {
토스페이
*/} -
); } From 67237f98734da2cb8f9106cfb24f1ca58570f713 Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Wed, 31 Jul 2024 23:07:36 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/my/order/[purchaseId].tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/pages/my/order/[purchaseId].tsx b/src/pages/my/order/[purchaseId].tsx index 49ec0795..95dc7572 100644 --- a/src/pages/my/order/[purchaseId].tsx +++ b/src/pages/my/order/[purchaseId].tsx @@ -113,14 +113,6 @@ export default function OrderDetail() { inOrder />
- {/*
-
-
-

결제 수단

-
-
- 토스페이 -
*/}
); } From 33a4bac36dd80309612e27759a4bb62de46dffc2 Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:01:15 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20orderListArea=20=EC=84=B8?= =?UTF-8?q?=EB=A1=9C=20=EC=A7=80=EC=A0=95,=20orderLayout=20position=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/my/order/Order.module.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/my/order/Order.module.scss b/src/pages/my/order/Order.module.scss index dfe0ceff..84337945 100644 --- a/src/pages/my/order/Order.module.scss +++ b/src/pages/my/order/Order.module.scss @@ -1,6 +1,7 @@ @layer overrides { .orderLayout { display: flex; + position: relative; width: 100%; padding: 2rem 1.6rem; flex-direction: column; @@ -98,7 +99,7 @@ .orderDetailBottom { width: 100%; - height: auto; + height: 22.2rem; } .orderDetailHeader { @@ -162,6 +163,7 @@ .orderListArea { width: 100%; + height: auto; display: flex; flex-direction: column; padding-top: 1.2rem; From 8027f8566bd769d1601bad40d7a72ad752985f0d Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:35:48 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20BackButton=20aria-label=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Button/BackButton/index.tsx | 2 +- src/components/common/Card/index.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/common/Button/BackButton/index.tsx b/src/components/common/Button/BackButton/index.tsx index 6eb7e627..9310e3f3 100644 --- a/src/components/common/Button/BackButton/index.tsx +++ b/src/components/common/Button/BackButton/index.tsx @@ -27,7 +27,7 @@ export default function BackButton({ href, hasPrevPath = true }: BackButton) { return ( ); } diff --git a/src/components/common/Card/index.tsx b/src/components/common/Card/index.tsx index 6640cba3..f44b001c 100644 --- a/src/components/common/Card/index.tsx +++ b/src/components/common/Card/index.tsx @@ -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' From 089d990265bef34c8f5ea365dc8d1aff1593f335 Mon Sep 17 00:00:00 2001 From: Seoin <144193370+Seoin02@users.noreply.github.com> Date: Thu, 1 Aug 2024 01:08:36 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=EC=A3=BC=EB=AC=B8=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=9A=94=EC=86=8C=20=EC=84=B8=EB=A1=9C=20=EA=B3=A0=EC=A0=95?= =?UTF-8?q?=EA=B0=92=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/my/order/Order.module.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/my/order/Order.module.scss b/src/pages/my/order/Order.module.scss index 84337945..2e1bc442 100644 --- a/src/pages/my/order/Order.module.scss +++ b/src/pages/my/order/Order.module.scss @@ -86,6 +86,7 @@ @include font-headline3; width: 100%; + height: 2rem; text-align: left; } @@ -98,8 +99,11 @@ } .orderDetailBottom { + display: flex; + flex-direction: column; width: 100%; height: 22.2rem; + overflow: hidden; } .orderDetailHeader { @@ -118,6 +122,7 @@ .deliveryArea { display: flex; + height: 14.6rem; padding-top: 1.2rem; flex-direction: column; align-items: center; @@ -147,6 +152,7 @@ .deliveryMessageArea { display: flex; + height: 7rem; padding: 1.2rem var(--selectpayment, 0); flex-direction: column; justify-content: center; @@ -163,13 +169,16 @@ .orderListArea { width: 100%; - height: auto; + 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;