Merge pull request #153 from KUSITMS-29th-TEAM-B/fix/#148

Fix/#148 폰트 이슈
KUSITMS-29th-TEAM-B · May 22, 2024 · 4ce89dc · 4ce89dc
2 parents cfb09e0 + 5137637
commit 4ce89dc
Show file tree

Hide file tree

Showing 14 changed files with 287 additions and 299 deletions.
diff --git a/src/assets/fonts/Font.css b/src/assets/fonts/Font.css
@@ -24,3 +24,21 @@
     url("./woff2/Pretendard-Regular.woff2") format("woff2"),
     url("./woff/Pretendard-Regular.woff") format("woff");
 }
+
+@font-face {
+  font-family: "Pretendard-ExtraBold";
+  font-weight: 400;
+  font-display: swap;
+  src: local("Pretendard ExtraBold"),
+    url("./woff2/Pretendard-ExtraBold.woff2") format("woff2"),
+    url("./woff/Pretendard-ExtraBold.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Pretendard-Bold";
+  font-weight: 400;
+  font-display: swap;
+  src: local("Pretendard Bold"),
+    url("./woff2/Pretendard-Bold.woff2") format("woff2"),
+    url("./woff/Pretendard-Bold.woff") format("woff");
+}
diff --git a/src/assets/fonts/woff/Pretendard-Bold.woff b/src/assets/fonts/woff/Pretendard-Bold.woff
diff --git a/src/assets/fonts/woff/Pretendard-ExtraBold.woff b/src/assets/fonts/woff/Pretendard-ExtraBold.woff
diff --git a/src/assets/fonts/woff2/Pretendard-Bold.woff2 b/src/assets/fonts/woff2/Pretendard-Bold.woff2
diff --git a/src/assets/fonts/woff2/Pretendard-ExtraBold.woff2 b/src/assets/fonts/woff2/Pretendard-ExtraBold.woff2
diff --git a/src/components/Experience/KeywordTab.tsx b/src/components/Experience/KeywordTab.tsx
@@ -208,7 +208,10 @@ const KeywordTab = ({ openDeleteModal }: KeywordTabProp) => {
   React.useEffect(() => {
     if (selectedPrimeTag && selectedPrimeTag.id !== "더보기" && user?.token) {
       getPrimeTagYears(selectedPrimeTag.id, user?.token).then((res) =>
+      {
+        console.log('dddd', res);
         setPrimeTagYears(res.data.years)
+      }
       );
     }
   }, [selectedPrimeTag, user?.token]);

diff --git a/src/components/common/Checkbox.tsx b/src/components/common/Checkbox.tsx
@@ -41,7 +41,7 @@ const StyledLabel = styled.label`
 `;
 
 const StyledP = styled.p`
-  ${(props) => props.theme.fonts.cap2};
+  ${(props) => props.theme.fonts.cap1};
   color: ${(props) => props.theme.colors.neutral600};
   margin-left: 0.25rem;
 `;

diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
@@ -7,48 +7,6 @@ const Footer = () => {
     <StyledContainer>
       <TopConatiner>
         <img src={logo} alt="logo" className="logo" />
-        <div className="footer_btn">
-          <a
-            href="https://www.youtube.com/watch?v=S-yABpcMaQs"
-            target="_blank"
-            rel="noreferrer"
-            className="link"
-          >
-            공지사항
-          </a>
-          <a
-            href="https://www.youtube.com/watch?v=S-yABpcMaQs"
-            target="_blank"
-            rel="noreferrer"
-            className="link"
-          >
-            이용약관
-          </a>
-          <a
-            href="https://www.youtube.com/watch?v=S-yABpcMaQs"
-            target="_blank"
-            rel="noreferrer"
-            className="link"
-          >
-            개인정보처리방침
-          </a>
-          <a
-            href="https://www.youtube.com/watch?v=S-yABpcMaQs"
-            target="_blank"
-            rel="noreferrer"
-            className="link"
-          >
-            메일 문의
-          </a>
-          <a
-            href="https://www.youtube.com/watch?v=S-yABpcMaQs"
-            target="_blank"
-            rel="noreferrer"
-            className="link"
-          >
-            인스타그램
-          </a>
-        </div>
       </TopConatiner>
       <BottomConatiner>
         <div>
@@ -96,42 +54,42 @@ const StyledContainer = styled.div`
 `;
 
 const TopConatiner = styled.div`
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 2rem;
+  .logo {
+    width: 8rem;
+  }
+  .footer_btn {
     display: flex;
-    justify-content: space-between;
-    margin-bottom: 2rem;
-    .logo{
-        width: 8rem;
-    }
-    .footer_btn{
-        display: flex;
-        flex-direction: row;
-        gap: 2rem;
-        color: var(--neutral-600, #63698D);
-        border: none;
-        text-decoration: none;
-    }
-    .link{
-        color: var(--neutral-600, #63698D);
-        text-decoration: none;
-    }
+    flex-direction: row;
+    gap: 2rem;
+    color: var(--neutral-600, #63698d);
+    border: none;
+    text-decoration: none;
+  }
+  .link {
+    color: var(--neutral-600, #63698d);
+    text-decoration: none;
+  }
 `;
 
 const BottomConatiner = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: start;
+  gap: 4rem;
+  ${(props) => props.theme.fonts.body4};
+  color: ${(props) => props.theme.colors.neutral500};
+  .service_info {
     display: flex;
     flex-direction: row;
-    justify-content: start;
-    gap: 4rem;
-    ${(props) => props.theme.fonts.body4};
-    color: ${(props) => props.theme.colors.neutral500};
-    .service_info{
-        display: flex;
-        flex-direction: row;
-        width: 19rem;
-    }
-    .sub-title{
-        flex:1;
-    }
-    .sub-content{
-        flex:4;
-    }
+    width: 19rem;
+  }
+  .sub-title {
+    flex: 1;
+  }
+  .sub-content {
+    flex: 4;
+  }
 `;
diff --git a/src/components/common/RadioGroup.tsx b/src/components/common/RadioGroup.tsx
@@ -52,7 +52,7 @@ const RadioGroup = ({ name, value, options, onChange }: RadioGroupProp) => {
           label={item.name}
           sx={{
             ".MuiFormControlLabel-label": {
-              fontSize: "12px",
+              fontSize: "14px",
               color: theme.colors.neutral600,
             },
           }}

diff --git a/src/components/common/Tag.tsx b/src/components/common/Tag.tsx
@@ -27,5 +27,5 @@ const TagContainer = styled.div`
   border-radius: 0.6875rem;
   background: ${(props) => props.theme.colors.main50};
   color: var(--main-500, #7d82ff);
-  ${(props) => props.theme.fonts.cap2};
+  ${(props) => props.theme.fonts.cap1};
 `;
diff --git a/src/pages/ExperienceEditPage.tsx b/src/pages/ExperienceEditPage.tsx
@@ -699,6 +699,7 @@ const ExperienceEditPage = () => {
                   theme.fonts.title4 + `color: ${theme.colors.neutral700}`
                 }
                 style={{
+                  fontSize: "16px",
                   borderRadius: "12px",
                   border: `1px solid ${theme.colors.neutral400}`,
                   background: `${theme.colors.neutral0}`,
@@ -985,9 +986,10 @@ const customInputCss = {
   padding: "9px 22px",
   background: "none",
   borderRadius: "5px",
+  maxWidth: "200px",
   border: `1px solid var(--neutral-400, #D9DBE6)`,
-  maxWidth: "131px",
   color: `var(--main-500, #7D82FF)`,
+  fontSize: "16px",
 };
 
 const TagPopperBox = styled.div`

diff --git a/src/pages/ExperienceWritePage.tsx b/src/pages/ExperienceWritePage.tsx
@@ -7,7 +7,7 @@ import {
   AccordionSummary,
   Popper,
 } from "@mui/material";
-import { ArrowDown, ArrowLeft, Plus2, Search } from "../assets";
+import { ArrowDown, ArrowLeft, Plus, Plus2, Search } from "../assets";
 import Textarea from "../components/common/Textarea";
 import { questions } from "../assets/data/questions";
 import { useNavigate } from "react-router-dom";
@@ -449,10 +449,12 @@ const ExperienceWritePage = () => {
                   >
                     <TagPopperBox>
                       <TagSearchBox>
+                        <Plus2 />
                         <input
                           value={newTag}
                           onChange={(e) => setNewTag(e.target.value)}
                           onKeyUp={handleTagSearch}
+                          placeholder="경험을 분류할 태그를 직접 생성할 수 있어요."
                         />
                         <Search />
                       </TagSearchBox>
@@ -677,6 +679,7 @@ const ExperienceWritePage = () => {
                   theme.fonts.title4 + `color: ${theme.colors.neutral700}`
                 }
                 style={{
+                  fontSize: "16px",
                   borderRadius: "12px",
                   border: `1px solid ${theme.colors.neutral400}`,
                   background: `${theme.colors.neutral0}`,
@@ -845,6 +848,7 @@ const BasicFormContainer = styled.div`
     display: flex;
     flex-direction: row;
     align-items: center;
+    flex-wrap: wrap;
   }
 `;
 
@@ -964,9 +968,10 @@ const customInputCss = {
   padding: "9px 22px",
   background: "none",
   borderRadius: "5px",
+  maxWidth: "200px",
   border: `1px solid var(--neutral-400, #D9DBE6)`,
-  maxWidth: "131px",
   color: `var(--main-500, #7D82FF)`,
+  fontSize: "16px",
 };
 
 const TagPopperBox = styled.div`