Merge pull request #171 from LikeLion-at-DGU/develop

[Fix] font 이름 수정 / lineNow 링크 연결 복구
LikeLion-at-DGU · Oct 7, 2024 · 5791635 · 5791635
2 parents f20d217 + dd4b32e
commit 5791635
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/images/logo.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"

diff --git a/public/fonts/NanumSquareRoundOTFB.otf → public/fonts/NanumSquareRoundOTFB.ttf b/public/fonts/NanumSquareRoundOTFB.otf → public/fonts/NanumSquareRoundOTFB.ttf
diff --git a/src/components/common/BoothDetail/BoothDetail.jsx b/src/components/common/BoothDetail/BoothDetail.jsx
@@ -1,5 +1,6 @@
 import * as S from "./styled";
 import { useState, useRef } from "react";
+import tablingImg from "../../../assets/images/tabling.svg";
 import CancelIcon from "../../../assets/images/X_Icon.svg";
 import { Detailtitle } from "../../../constant/StarDetail/data";
 import { useBoothDetailData } from "../../../hook/useBoothDetail";
@@ -42,6 +43,9 @@ export const BoothDetail = ({ onClose, booth_id, boothInfo }) => {
       prevIndex === totalImages - 1 ? 0 : prevIndex + 1
     );
   };
+  const MoveonTabling = (tabling_link) => {
+    window.open(`${tabling_link}`, "_blank");
+  };
 
   return (
     <S.DetailWrapper>
@@ -125,6 +129,12 @@ export const BoothDetail = ({ onClose, booth_id, boothInfo }) => {
           </S.Details>
         </S.DetailInfo>
       </S.DetailContent>
+      {boothInfo.is_reservable === true && (
+        <S.tabling
+          src={tablingImg}
+          onClick={() => MoveonTabling(boothDetailData.tabling_link)}
+        ></S.tabling>
+      )}
     </S.DetailWrapper>
   );
 };
diff --git a/src/pages/booth/BoothPage.jsx b/src/pages/booth/BoothPage.jsx
@@ -577,6 +577,9 @@ export const BoothPage = () => {
           </S.FilterWrapper>
 
           <S.BoothList $isOpen={isBoothListOpen}>
+            <S.NoticeTabling>
+              부스 클릭 시 테이블링 예약 링크로 이동 가능합니다.
+            </S.NoticeTabling>
             {filteredData && filteredData.length > 0 ? (
               filteredData.map((booth) => (
                 <S.BoothItem