From f4c04faa0c1091cf9adcf359900b8a32cd1c177d Mon Sep 17 00:00:00 2001 From: imi21123 Date: Mon, 4 Dec 2023 00:39:29 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Feat:=20=EC=9E=A5=EB=B0=94=EA=B5=AC?= =?UTF-8?q?=EB=8B=88=20=EC=BF=BC=EB=A6=AC=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0,=20=EC=98=81=EC=97=85=20=EC=A2=85=EB=A3=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A4=80=EB=B9=84=EC=A4=91=20=EB=B2=84=ED=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/CartPage/CartPage.css | 24 +++++++++++++ src/pages/CartPage/CartPage.jsx | 35 +++++++++++-------- src/pages/OrderProcessPage/OrderProcess.css | 4 +-- .../OrderProcessPage/OrderProcessPage.jsx | 4 +-- src/pages/StoreDetailPage/StoreDetailPage.css | 1 - src/pages/StoreDetailPage/StoreDetailPage.jsx | 7 +++- 6 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/pages/CartPage/CartPage.css b/src/pages/CartPage/CartPage.css index c38cf41..fbb15b7 100644 --- a/src/pages/CartPage/CartPage.css +++ b/src/pages/CartPage/CartPage.css @@ -3,6 +3,7 @@ width: 100%; height: 94vh; flex-direction: column; + padding-bottom: 2rem; } .cart-page__cafe-info { @@ -11,6 +12,7 @@ padding-right: 1.56rem; padding-top: 1.38rem; padding-bottom: 0.44rem; + text-decoration: none; } .cart-page__cafe-info__img { @@ -150,6 +152,7 @@ border-radius: 0.625rem; background: #d82356; text-decoration: none; + margin-top: 1.5rem; margin-left: auto; margin-right: auto; justify-content: center; @@ -204,6 +207,27 @@ margin-right: 1.06rem; } +.cart-page__store-close { + display: flex; + width: 23.4375rem; + height: 3.6875rem; + flex-shrink: 0; + border-radius: 0.625rem; + background: #838383; + color: #fff; + text-align: center; + font-family: "Bold"; + font-size: 1.125rem; + line-height: 130%; /* 1.4625rem */ + letter-spacing: -0.01125rem; + margin-top: 1.5rem; + margin-left: auto; + margin-right: auto; + justify-content: center; + align-items: center; + position: relative; +} + .cart-page__cart-empty { display: flex; align-items: center; diff --git a/src/pages/CartPage/CartPage.jsx b/src/pages/CartPage/CartPage.jsx index cb31e18..2f32517 100644 --- a/src/pages/CartPage/CartPage.jsx +++ b/src/pages/CartPage/CartPage.jsx @@ -140,7 +140,10 @@ const CartPage = () => { {paymentData && paymentData?.carts.length > 0 ? (
-
+ { {paymentData?.name} -
+
{paymentData?.carts.map((item) => ( @@ -223,24 +226,28 @@ const CartPage = () => { + 더 담으러 가기
- - {totalQuantity} - 주문하기 - - {totalPrice?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + - "원"} - - + {paymentData?.isOpened ? ( + + {totalQuantity} + 주문하기 + + {totalPrice?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + + "원"} + + + ) : ( +
지금은 준비중입니다.
+ )}
) : (
diff --git a/src/pages/OrderProcessPage/OrderProcess.css b/src/pages/OrderProcessPage/OrderProcess.css index 2fc67b4..760fe16 100644 --- a/src/pages/OrderProcessPage/OrderProcess.css +++ b/src/pages/OrderProcessPage/OrderProcess.css @@ -3,7 +3,7 @@ width: 100%; height: 94vh; flex-direction: column; - /* height: 100%; */ + padding-bottom: 2rem; } .order-process-page__menu__img { @@ -327,7 +327,7 @@ margin-right: auto; } -.order-process-page__is-close { +.order-process-page__store-close { display: flex; width: 23.4375rem; height: 3.6875rem; diff --git a/src/pages/OrderProcessPage/OrderProcessPage.jsx b/src/pages/OrderProcessPage/OrderProcessPage.jsx index 51c6b76..18a9280 100644 --- a/src/pages/OrderProcessPage/OrderProcessPage.jsx +++ b/src/pages/OrderProcessPage/OrderProcessPage.jsx @@ -462,8 +462,8 @@ const OrderProcessPage = () => { 장바구니 담기
) : ( -
- 지금은 영업 전입니다. +
+ 지금은 준비중입니다.
)} diff --git a/src/pages/StoreDetailPage/StoreDetailPage.css b/src/pages/StoreDetailPage/StoreDetailPage.css index c9551c4..a288c8f 100644 --- a/src/pages/StoreDetailPage/StoreDetailPage.css +++ b/src/pages/StoreDetailPage/StoreDetailPage.css @@ -6,7 +6,6 @@ .store-detail-page__scroll { overflow-y: auto; - overflow-x: hidden; } .store-detail-page__banner { diff --git a/src/pages/StoreDetailPage/StoreDetailPage.jsx b/src/pages/StoreDetailPage/StoreDetailPage.jsx index a4918b4..0a3fd66 100644 --- a/src/pages/StoreDetailPage/StoreDetailPage.jsx +++ b/src/pages/StoreDetailPage/StoreDetailPage.jsx @@ -144,7 +144,12 @@ const StoreDetailPage = () => { {"영업 시간"} - {caffeeInfo?.openTime} + {caffeeInfo?.openTime.split("\n").map((line, index) => ( + + {line} +
+ + ))}
From b384687944a10f2c28061765be352122efc7ac2f Mon Sep 17 00:00:00 2001 From: imi21123 Date: Mon, 4 Dec 2023 01:14:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Feat:=20=EC=98=A4=EB=A5=B4=EB=8B=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackagingStatusPage/PackagingStatusPage.css | 13 ++++++++++++- .../PackagingStatusPage/PackagingStatusPage.jsx | 13 ++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/pages/PackagingStatusPage/PackagingStatusPage.css b/src/pages/PackagingStatusPage/PackagingStatusPage.css index 9fc84a2..e199d48 100644 --- a/src/pages/PackagingStatusPage/PackagingStatusPage.css +++ b/src/pages/PackagingStatusPage/PackagingStatusPage.css @@ -31,7 +31,7 @@ margin-bottom: 2rem; } -.packaging-status-page__promotion { +.packaging-status-page__event-img { display: flex; margin-left: auto; margin-right: auto; @@ -73,3 +73,14 @@ margin-top: auto; margin-bottom: auto; } + +.packaging-status-page__event { + color: var(--kakao-logo, #d82356); + font-family: "Semibold"; + font-size: 0.9375rem; + line-height: 130%; + letter-spacing: -0.00938rem; + margin-top: auto; + margin-bottom: auto; + margin-left: 0.2rem; +} diff --git a/src/pages/PackagingStatusPage/PackagingStatusPage.jsx b/src/pages/PackagingStatusPage/PackagingStatusPage.jsx index 5423a79..2d84f0b 100644 --- a/src/pages/PackagingStatusPage/PackagingStatusPage.jsx +++ b/src/pages/PackagingStatusPage/PackagingStatusPage.jsx @@ -12,7 +12,7 @@ const PackagingStatusPage = () => { const storeId = params.get("storeId"); const apiRoot = process.env.REACT_APP_API_ROOT; - const [promotion, setPromotion] = useState(null); + const [event, setEvent] = useState(null); useEffect(() => { // API 엔드포인트 const apiUrl = `${apiRoot}/api/v1/store/${storeId}/event`; @@ -23,7 +23,7 @@ const PackagingStatusPage = () => { .then((response) => { // API 응답을 상태에 저장 console.log(response.data); - setPromotion(response.data.eventImgUrl); + setEvent(response.data); }) .catch((error) => { console.error("Error fetching store data:", error); @@ -40,8 +40,8 @@ const PackagingStatusPage = () => { promotion @@ -55,7 +55,7 @@ const PackagingStatusPage = () => { src={takeIn} alt="takeOut" /> - 먹고갈게요 + 먹고갈게요 @@ -70,6 +70,9 @@ const PackagingStatusPage = () => { alt="takeOut" /> 가져갈게요 + + ({event?.takeOutEvent}) + From 56b252052fd551482f8f5c44e292f8939a0b239e Mon Sep 17 00:00:00 2001 From: imi21123 Date: Mon, 4 Dec 2023 01:41:48 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Feat:=20=EA=B0=80=EA=B2=8C=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=95=98=EB=8B=A8=20=ED=8C=A8=EB=94=A9=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=82=AC=EC=A7=84=20=EC=97=86=EB=8A=94?= =?UTF-8?q?=20=EB=A9=94=EB=89=B4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/no_image_menu.svg | 44 ++++++++++++++----- src/pages/OrderProcessPage/OrderProcess.css | 1 - .../OrderProcessPage/OrderProcessPage.jsx | 11 +++-- .../PackagingStatusPage.jsx | 2 +- src/pages/StoreDetailPage/StoreDetailPage.css | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/assets/images/no_image_menu.svg b/src/assets/images/no_image_menu.svg index 79c7c3e..27fb973 100644 --- a/src/assets/images/no_image_menu.svg +++ b/src/assets/images/no_image_menu.svg @@ -1,23 +1,45 @@ - - - - + + + + + + + + - - + + - - + + + + + + + + + + + + + - + + + + - + - + + + + + diff --git a/src/pages/OrderProcessPage/OrderProcess.css b/src/pages/OrderProcessPage/OrderProcess.css index 760fe16..3280e74 100644 --- a/src/pages/OrderProcessPage/OrderProcess.css +++ b/src/pages/OrderProcessPage/OrderProcess.css @@ -16,7 +16,6 @@ align-items: center; flex-shrink: 0; border-radius: 0.5rem; - background: #fff; box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.15); margin-left: auto; margin-right: auto; diff --git a/src/pages/OrderProcessPage/OrderProcessPage.jsx b/src/pages/OrderProcessPage/OrderProcessPage.jsx index 18a9280..ebe87c7 100644 --- a/src/pages/OrderProcessPage/OrderProcessPage.jsx +++ b/src/pages/OrderProcessPage/OrderProcessPage.jsx @@ -246,12 +246,11 @@ const OrderProcessPage = () => { }} /> -
- menuImg -
+ menuImg
{foodOptionInfo?.name} diff --git a/src/pages/PackagingStatusPage/PackagingStatusPage.jsx b/src/pages/PackagingStatusPage/PackagingStatusPage.jsx index 2d84f0b..94ddac0 100644 --- a/src/pages/PackagingStatusPage/PackagingStatusPage.jsx +++ b/src/pages/PackagingStatusPage/PackagingStatusPage.jsx @@ -71,7 +71,7 @@ const PackagingStatusPage = () => { /> 가져갈게요 - ({event?.takeOutEvent}) + {event?.takeOutEvent}
diff --git a/src/pages/StoreDetailPage/StoreDetailPage.css b/src/pages/StoreDetailPage/StoreDetailPage.css index a288c8f..49165fd 100644 --- a/src/pages/StoreDetailPage/StoreDetailPage.css +++ b/src/pages/StoreDetailPage/StoreDetailPage.css @@ -2,6 +2,7 @@ display: flex; width: 100%; flex-direction: column; + padding-bottom: 5rem; } .store-detail-page__scroll {