From 65721dbe55bedda6652643bc1f7b87c3c775ae69 Mon Sep 17 00:00:00 2001 From: dajee Date: Sun, 15 Feb 2026 21:31:56 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EB=A9=94=EB=89=B4=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EC=83=89=20=EB=B0=8F=20=EB=A7=81=ED=81=AC?= =?UTF-8?q?=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/detail/HostTopBar.jsx | 2 +- src/components/menu/MenuTrigger.jsx | 4 ++-- src/pages/enrollEvent/EnrollStepOne.jsx | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/components/detail/HostTopBar.jsx b/src/components/detail/HostTopBar.jsx index f18a0d8..a449f3a 100644 --- a/src/components/detail/HostTopBar.jsx +++ b/src/components/detail/HostTopBar.jsx @@ -14,7 +14,7 @@ function HostTopBar({ title, onClick }) {

{title}

- + ); } diff --git a/src/components/menu/MenuTrigger.jsx b/src/components/menu/MenuTrigger.jsx index 38c5f41..f7c9240 100644 --- a/src/components/menu/MenuTrigger.jsx +++ b/src/components/menu/MenuTrigger.jsx @@ -1,7 +1,7 @@ import styled from "styled-components"; -import { useMenu } from "./MenuProvider.jsx"; import MenuSvg from "../../assets/icons/Menu.svg?react"; // 기본(흰색) import HamburgerSvg from "../../assets/icons/HamburgerMenu.svg?react"; // 검정색 +import { useMenu } from "./MenuProvider.jsx"; export default function MenuTrigger({ size = 24, @@ -21,7 +21,7 @@ export default function MenuTrigger({ aria-expanded={open} onClick={toggleMenu} > - + ); } diff --git a/src/pages/enrollEvent/EnrollStepOne.jsx b/src/pages/enrollEvent/EnrollStepOne.jsx index 0fa5be4..995b51a 100644 --- a/src/pages/enrollEvent/EnrollStepOne.jsx +++ b/src/pages/enrollEvent/EnrollStepOne.jsx @@ -27,13 +27,14 @@ function EnrollStepOne({ data, setData, setIsNextActive }) { }; //전시 수정 (추가) + useEffect(() => { - if (data.link) { - setNoTicket(false); - } else if (data.link === "") { - setNoTicket(true); - } - }, []); + // 가격 + setIsFree(data.price === "무료"); + + // 링크 + setNoTicket(!data.link || data.link === ""); + }, [data.price, data.link]); //입력값 검사 useEffect(() => { const safeStr = (val) => String(val || "").trim(); @@ -256,19 +257,23 @@ function EnrollStepOne({ data, setData, setIsNextActive }) { {/* 예매 링크 */}
+ { setNoTicket(checked); + update("link", checked ? "" : data.link); }} /> + 예매 필요 없음 (자유 입장) + {!noTicket && ( update("link", v)} textAlign="right" /> From dc1afe82e895e88b94af76ee299c8db6d3b652f2 Mon Sep 17 00:00:00 2001 From: dajee Date: Sun, 15 Feb 2026 21:41:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=8A=A4=ED=81=AC=EB=9E=A9=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-dist/sw.js | 2 +- src/pages/Home.jsx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 1db24c1..1810485 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -82,7 +82,7 @@ define(['./workbox-5a5d9309'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", - "revision": "0.63lc3vlpj1o" + "revision": "0.8rmn3jieedo" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 5625265..6f43055 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -69,7 +69,6 @@ export default function Home() { const [login, setLogin] = useState(!!sessionStorage.getItem("accessToken")); const [showLoginModal, setShowLoginModal] = useState(false); - const handleScrapClick = async (id, scraped) => { if (!login) { setShowLoginModal(true); @@ -77,13 +76,11 @@ export default function Home() { } try { - // fetchData(여기서는 axiosInstance)를 전달 const success = await toggleScrap(fetchData, id, scraped); - if (success) { window.location.reload(); } else { - console.error("스크랩 실패"); + alert("스크랩 처리에 실패했습니다."); } } catch (err) { console.error("에러 발생:", err); @@ -170,9 +167,12 @@ export default function Home() { onGoing={item.open} scraped={item.scrap} onClick={() => navigate(`/detail/${item.exhibitionId}`)} - onScrapClick={() => - handleScrapClick(item.exhibitionId, item.scrap) - } + onScrapClick={(e) => { + if (e && e.stopPropagation) { + e.stopPropagation(); + } + handleScrapClick(item.exhibitionId, item.scrap); + }} /> ))} From 5c9fabfe5726efcf45bea5841851247733ed3f58 Mon Sep 17 00:00:00 2001 From: dajee Date: Sun, 15 Feb 2026 21:54:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=8A=A4=ED=81=AC=EB=9E=A9=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B5=9C=EC=A2=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/Menu.svg | 2 +- src/components/detail/HostTopBar.jsx | 2 +- src/components/menu/MenuTrigger.jsx | 2 +- src/pages/Detail.jsx | 10 +++++++++- src/pages/Home.jsx | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/assets/icons/Menu.svg b/src/assets/icons/Menu.svg index fa38f6f..55c975c 100644 --- a/src/assets/icons/Menu.svg +++ b/src/assets/icons/Menu.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/detail/HostTopBar.jsx b/src/components/detail/HostTopBar.jsx index a449f3a..f18a0d8 100644 --- a/src/components/detail/HostTopBar.jsx +++ b/src/components/detail/HostTopBar.jsx @@ -14,7 +14,7 @@ function HostTopBar({ title, onClick }) {

{title}

- + ); } diff --git a/src/components/menu/MenuTrigger.jsx b/src/components/menu/MenuTrigger.jsx index f7c9240..d9e2324 100644 --- a/src/components/menu/MenuTrigger.jsx +++ b/src/components/menu/MenuTrigger.jsx @@ -21,7 +21,7 @@ export default function MenuTrigger({ aria-expanded={open} onClick={toggleMenu} > - + ); } diff --git a/src/pages/Detail.jsx b/src/pages/Detail.jsx index 9626f0e..81a1cea 100644 --- a/src/pages/Detail.jsx +++ b/src/pages/Detail.jsx @@ -439,7 +439,7 @@ export default function Detail() { {exhibition.dateException && (
- +

{exhibition.dateException}

)} @@ -890,3 +890,11 @@ const AutoHeightTextarea = styled.textarea` color: ${({ theme }) => theme.colors.gray6}; } `; + +const StyledMenuIcon = styled(MenuIcon)` + width: 18px; + height: 18px; + path { + stroke: #57b190; + } +`; diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 6f43055..ddfd1ea 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -69,6 +69,7 @@ export default function Home() { const [login, setLogin] = useState(!!sessionStorage.getItem("accessToken")); const [showLoginModal, setShowLoginModal] = useState(false); + const handleScrapClick = async (id, scraped) => { if (!login) { setShowLoginModal(true);