Merge pull request TEAM-BEAT#151 from TEAM-BEAT/fix/TEAM-BEAT#150/Fon…

…tsFix [Fix/TEAM-BEAT#150] ios/safari에서 폰트 안 먹는 오류 수정
imddoy · Jul 15, 2024 · 590a61e · 590a61e
2 parents 9576b00 + 6dc34ec
commit 590a61e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 28 deletions.
diff --git a/index.html b/index.html
@@ -3,7 +3,6 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <link rel="stylesheet" href="./src/styles/fonts/fonts.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>비트</title>
   </head>

diff --git a/src/pages/lookup/Lookup.tsx b/src/pages/lookup/Lookup.tsx
@@ -1,13 +1,11 @@
 import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
-import * as S from "./Lookup.styled";
-import NonExistent from "./components/nonExistent/NonExistent";
 import LookupWrapper from "./components/LookupWrapper";
+import NonExistent from "./components/nonExistent/NonExistent";
+import * as S from "./Lookup.styled";
 
 import { dummyData } from "./dummyData";
 
-import { LookupProps } from "./types/lookupType";
-
 import ActionBottomSheet from "@components/commons/bottomSheet/actionsBottomSheet/ActionBottomSheet";
 import PhoneNumber from "@components/commons/bottomSheet/actionsBottomSheet/phoneNumber/PhoneNumber";
 import OuterLayout from "@components/commons/bottomSheet/OuterLayout";
@@ -56,20 +54,19 @@ const Lookup = () => {
           {lookUpList.map((item) => (
             <React.Fragment key={item.bookingId}>
               <LookupWrapper {...item} handleBtn={() => handleSheetOpen(item.bookingId)} />
-              {selectedBookingId === item.bookingId && (
-                <ActionBottomSheet
-                  onClickOutside={handleSheetClose}
-                  title="대표자에게 연락하여 취소를 요청해 주세요"
-                  subTitle="대표자 연락처"
-                  alignItems="center"
-                  padding="2rem 2rem 2.4rem 2rem"
-                >
-                  <PhoneNumber phone={item.bookerPhoneNumber} />
-                  <OuterLayout margin="1.6rem 0 0 0">
-                    <Button onClick={handleSheetClose}>확인했어요</Button>
-                  </OuterLayout>
-                </ActionBottomSheet>
-              )}
+              <ActionBottomSheet
+                isOpen={selectedBookingId === item.bookingId}
+                onClickOutside={handleSheetClose}
+                title="대표자에게 연락하여 취소를 요청해 주세요"
+                subTitle="대표자 연락처"
+                alignItems="center"
+                padding="2rem 2rem 2.4rem 2rem"
+              >
+                <PhoneNumber phone={item.bookerPhoneNumber} />
+                <OuterLayout margin="1.6rem 0 0 0">
+                  <Button onClick={handleSheetClose}>확인했어요</Button>
+                </OuterLayout>
+              </ActionBottomSheet>
             </React.Fragment>
           ))}
         </>

diff --git a/src/pages/nonMbLookup/components/InputWrapper.tsx b/src/pages/nonMbLookup/components/InputWrapper.tsx
@@ -27,7 +27,7 @@ const InputWrapper = ({ btnOn, btnOff, isReadyRequest, dataStatus }: InputProps)
     pwdStatus: false,
   });
 
-  const { name, birth, number, password, pwdStatus } = nonMemberInfo;
+  const { bookerName, birth, number, password, pwdStatus } = nonMemberInfo;
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const { name: fieldName, value } = e.target;
@@ -56,12 +56,12 @@ const InputWrapper = ({ btnOn, btnOff, isReadyRequest, dataStatus }: InputProps)
   };
 
   useEffect(() => {
-    if (name && birth.length === 6 && number.length === 13 && password.length === 4) {
+    if (bookerName && birth.length === 6 && number.length === 13 && password.length === 4) {
       btnOn();
     } else {
       btnOff();
     }
-  }, [name, birth, number, password]);
+  }, [bookerName, birth, number, password]);
 
   useEffect(() => {
     if (isReadyRequest) {
@@ -86,7 +86,13 @@ const InputWrapper = ({ btnOn, btnOff, isReadyRequest, dataStatus }: InputProps)
   return (
     <S.InputWrapperLayout>
       {/* maxLenght 있는 부분 InputField에서 글자수 보이게 / 안 보이게 조정 필요 */}
-      <TextField name="name" type="input" value={name} onChange={handleChange} placeholder="이름" />
+      <TextField
+        name="name"
+        type="input"
+        value={bookerName}
+        onChange={handleChange}
+        placeholder="이름"
+      />
       <TextField
         type="input"
         name="birth"

diff --git a/src/styles/fonts/PretendardVariable.woff2 b/src/styles/fonts/PretendardVariable.woff2
diff --git a/src/styles/fonts/fonts.css b/src/styles/fonts/fonts.css