diff --git a/src/assets/fonts/subset-PyeongChangPeace-Bold.woff2 b/src/assets/fonts/subset-PyeongChangPeace-Bold.woff2
new file mode 100644
index 0000000..afe0917
Binary files /dev/null and b/src/assets/fonts/subset-PyeongChangPeace-Bold.woff2 differ
diff --git a/src/assets/fonts/subset-PyeongChangPeace-Light.woff2 b/src/assets/fonts/subset-PyeongChangPeace-Light.woff2
new file mode 100644
index 0000000..b606d8d
Binary files /dev/null and b/src/assets/fonts/subset-PyeongChangPeace-Light.woff2 differ
diff --git a/src/components/ImageModal/index.css.ts b/src/components/ImageModal/index.css.ts
index 1d392e5..176023d 100644
--- a/src/components/ImageModal/index.css.ts
+++ b/src/components/ImageModal/index.css.ts
@@ -1,13 +1,15 @@
import { style } from "@vanilla-extract/css";
export const container = style({
+ position: "relative",
width: "100%",
height: "100%",
});
export const zoomInBtn = style({
position: "absolute",
+ top: "5px",
+ left: "5px",
cursor: "pointer",
- margin: "5px",
padding: "3px",
borderRadius: "5px",
backgroundColor: "rgba(255, 255, 255, 0.3)",
@@ -17,3 +19,13 @@ export const image = style({
height: "100%",
objectFit: "cover",
});
+
+export const placeBtn = style({
+ position: "absolute",
+ top: "5px",
+ right: "5px",
+ cursor: "pointer",
+ padding: "3px",
+ borderRadius: "5px",
+ backgroundColor: "rgba(255, 255, 255, 0.3)",
+});
diff --git a/src/components/ImageModal/index.tsx b/src/components/ImageModal/index.tsx
index e48cffe..ddb3d53 100644
--- a/src/components/ImageModal/index.tsx
+++ b/src/components/ImageModal/index.tsx
@@ -1,6 +1,31 @@
import * as styles from "./index.css.ts";
-export default function ImageModal({ src, alt }: { src: string; alt: string }) {
+interface ImageModalProps {
+ src: string;
+ alt: string;
+ activePlace?: "60주년기념관" | "함인섭광장" | "대운동장";
+}
+
+export default function ImageModal({ src, alt, activePlace }: ImageModalProps) {
+ const placeLinks: { [key: string]: string } = {
+ "60주년기념관": "https://kko.to/hKoJW3SEaa",
+ 함인섭광장: "https://kko.to/KvvTprkn8T",
+ 대운동장: "https://kko.to/MkBZQvfuH0",
+ };
+
+ const handlePlaceButtonClick = () => {
+ if (activePlace) {
+ const link = placeLinks[activePlace];
+ if (link) {
+ window.location.href = link;
+ } else {
+ console.error(`Link for ${activePlace} is not defined.`);
+ }
+ } else {
+ console.error("activePlace is not provided.");
+ }
+ };
+
return (
zoom_in
+ {alt === "layout" && (
+
+ map
+
+ )}
);
diff --git a/src/pages/BoothNFoodDetail/Overview/index.tsx b/src/pages/BoothNFoodDetail/Overview/index.tsx
index dd4b188..e6785fa 100644
--- a/src/pages/BoothNFoodDetail/Overview/index.tsx
+++ b/src/pages/BoothNFoodDetail/Overview/index.tsx
@@ -1,4 +1,5 @@
import ImageModal from "../../../components/ImageModal/index.tsx";
+import { BoothPlaceType } from "../../../shared/types/asset_types.ts";
import * as styles from "./index.css.ts";
type OverviewProps = {
@@ -6,7 +7,7 @@ type OverviewProps = {
date: number[];
imgURL: string;
order: number;
- place: string;
+ place: BoothPlaceType;
};
export default function Overview({ title, date, imgURL, order, place }: OverviewProps) {
@@ -20,7 +21,13 @@ export default function Overview({ title, date, imgURL, order, place }: Overview
schedule
- {title.includes("주점") ? "18:00 ~ 01:00" : "11:00 ~ 17:00"}
+
+ {title === "주점"
+ ? place === "미래광장"
+ ? "18:00 ~ 00:00"
+ : "18:00 ~ 01:00"
+ : "11:00 ~ 17:00"}
+
date_range
diff --git a/src/pages/BoothNFoodList/index.tsx b/src/pages/BoothNFoodList/index.tsx
index 8d83478..651cb6b 100644
--- a/src/pages/BoothNFoodList/index.tsx
+++ b/src/pages/BoothNFoodList/index.tsx
@@ -29,15 +29,15 @@ export default function BoothNFoodList() {
{activePlace !== "미래광장" && (
)}
diff --git a/src/pages/Notice/index.tsx b/src/pages/Notice/index.tsx
index f888fb7..22f13e0 100644
--- a/src/pages/Notice/index.tsx
+++ b/src/pages/Notice/index.tsx
@@ -101,19 +101,25 @@ function Notice() {
) : (
currentNotices.map((noticeItem, index) => (
-
+
toggleNotice(noticeItem.id)} className={notice}>
{index + 1 + (currentPage - 1) * itemsPerPage}
{/* 공지사항의 renewal이 true일 경우 'New' 배지를 표시 */}
{noticeItem.renewal &&
중요}
-
toggleNotice(noticeItem.id)} className={noticeContentWrapper}>
+
{/* downbtn을 클릭하면 토글 */}
-