From a876c19149e0ea1cd53d354d08cb2103437e19e4 Mon Sep 17 00:00:00 2001 From: chaem03 Date: Sat, 5 Oct 2024 10:54:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]#27=20-=20=EB=94=94=EC=9E=90=EC=9D=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=97=90=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/BoothDetail/styled.js | 31 ++++++++++++--------- src/pages/booth/BoothPage.jsx | 1 + 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/components/common/BoothDetail/styled.js b/src/components/common/BoothDetail/styled.js index c4f30f9..8e365cd 100644 --- a/src/components/common/BoothDetail/styled.js +++ b/src/components/common/BoothDetail/styled.js @@ -9,21 +9,29 @@ const slideUp = keyframes` } `; export const DetailWrapper = styled.div` - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; position: fixed; bottom: 0; - width: 370px; - height: 55%; - gap: 20px; + width: 100%; + max-width: 540px; + height: 400px; + overflow-y: auto; + ::-webkit-scrollbar { + display: none; /* Chrome , Safari , Opera */ + } + /* Firefox */ + scrollbar-width: none; + + /* Internet Explorer 10+, Edge */ + -ms-overflow-style: none; + background-color: #fff; + padding: 1.5rem 1.75rem; border-radius: 20px 20px 0px 0px; box-shadow: 0px 2px 40px 0px rgba(0, 0, 0, 0.7); - z-index: 10; + z-index: 30; - animation: ${slideUp} 0.5s ease-out forwards; + animation: ${({ $isVisible }) => ($isVisible ? slideInUp : slideOutDown)} + 0.75s ease-out; @media (max-width: 375px) { height: 80%; @@ -32,11 +40,8 @@ export const DetailWrapper = styled.div` export const DetailContent = styled.div` display: flex; flex-direction: column; - width: 90%; + gap: 15px; - @media (max-width: 375px) { - margin-top: 1rem; - } `; export const NameContainer = styled.div` diff --git a/src/pages/booth/BoothPage.jsx b/src/pages/booth/BoothPage.jsx index df44054..98d1d08 100644 --- a/src/pages/booth/BoothPage.jsx +++ b/src/pages/booth/BoothPage.jsx @@ -549,6 +549,7 @@ export const BoothPage = () => { setSelectBooth(null)} + $isVisible={selectBooth} /> /* setSelectBooth(null)} /> From cd23c0cf846dccacd3c9969141e002ae3f5a8e0a Mon Sep 17 00:00:00 2001 From: chaem03 Date: Sat, 5 Oct 2024 12:14:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]#27=20-=ED=95=84=ED=84=B0=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=EB=B6=80=20=EC=84=A4=EC=A0=95=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hook/useBooth.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/hook/useBooth.js b/src/hook/useBooth.js index 50c1918..d177d44 100644 --- a/src/hook/useBooth.js +++ b/src/hook/useBooth.js @@ -12,10 +12,6 @@ export const useBoothData = ({ const fetchBoothData = async () => { try { - if (!day) { - console.warn("day 값이 없습니다. 기본값을 사용합니다."); - return; // day 값이 없을 경우 요청을 보내지 않음 - } const res = await getBoothList( day, category,