Merge pull request #150 from Chaem03/feature/#27

[Fix]#27 - 라인나우 삭제
LikeLion-at-DGU · Oct 6, 2024 · 8935f89 · 8935f89
2 parents 1c72255 + 8b4a232
commit 8935f89
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/index.html b/index.html
@@ -3,7 +3,11 @@
   <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"
+    />
+
     <title>2024년 동국대학교 가을축제 부스사이트</title>
   </head>
 

diff --git a/src/components/common/BoothDetail/BoothDetail.jsx b/src/components/common/BoothDetail/BoothDetail.jsx
@@ -1,6 +1,5 @@
 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";
@@ -45,10 +44,6 @@ export const BoothDetail = ({ onClose, booth_id, boothInfo }) => {
     );
   };
 
-  // const MoveonTabling = (tabling_link) => {
-  //   window.open(`${tabling_link}`, "_blank");
-  // };
-
   return (
     <S.DetailWrapper>
       <S.DetailContent>
@@ -130,12 +125,6 @@ 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/components/common/BoothDetail/styled.js b/src/components/common/BoothDetail/styled.js
@@ -67,8 +67,8 @@ export const NameContainer = styled.div`
     color: #000;
     text-align: center;
     ${({ theme }) => theme.fonts.AppleSDGothicNeoB00};
-
     font-size: 15px;
+    max-width: 40%;
   }
 `;
 

diff --git a/src/pages/booth/BoothPage.jsx b/src/pages/booth/BoothPage.jsx
@@ -575,9 +575,6 @@ export const BoothPage = () => {
           </S.FilterWrapper>
 
           <S.BoothList $isOpen={isBoothListOpen}>
-            <S.NoticeTabling>
-              부스 클릭 시 테이블링 예약 링크로 이동 가능합니다.
-            </S.NoticeTabling>
             {filteredData && filteredData.length > 0 ? (
               filteredData.map((booth) => (
                 <S.BoothItem
@@ -595,7 +592,7 @@ export const BoothPage = () => {
                     <S.BoothWrap>
                       <S.BoothName>{booth.name}</S.BoothName>
                       {booth.is_reservable && (
-                        <S.reservabletag>예약 가능</S.reservabletag>
+                        <S.reservabletag>Line Now</S.reservabletag>
                       )}
                     </S.BoothWrap>
                     <S.BoothWho>{booth.host}</S.BoothWho>
@@ -630,7 +627,7 @@ export const BoothPage = () => {
                     <S.BoothWrap>
                       <S.BoothName>{booth.name}</S.BoothName>
                       {booth.is_reservable && (
-                        <S.reservabletag>예약 가능</S.reservabletag>
+                        <S.reservabletag>Line Now</S.reservabletag>
                       )}
                     </S.BoothWrap>
                     <S.BoothWho>{booth.host}</S.BoothWho>

diff --git a/src/pages/booth/Styled.js b/src/pages/booth/Styled.js
@@ -377,9 +377,7 @@ export const reservabletag = styled.div`
   border-radius: 4.09px;
   background: #e4ff83;
   color: #1851ff;
-
-  font-size: 7px;
-
+  font-size: 9px;
   font-weight: 700;
 `;
 export const HeartWrap = styled.div`