Merge pull request #100 from Team-INSERT/fix/chore

Fix/chore
Team-INSERT · Nov 2, 2023 · e5f41ac · e5f41ac
2 parents 9882058 + e9b6fa5
commit e5f41ac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/hooks/useMeisterHTML.ts b/src/hooks/useMeisterHTML.ts
@@ -123,19 +123,19 @@ export const useMeisterHTML = () => {
       .replaceAll("`", "")
       .replaceAll(
         "(상점 : ",
-        `\n<span style="font-size: 24px !important; font-weight: 600 !important;">상점 `,
+        `\n<span style="font-size: 20px !important; font-weight: 600 !important;">상점 `,
       )
       .replaceAll(
         "(벌점 : ",
-        `\n<span style="font-size: 24px !important; font-weight: 600 !important;">벌점 `,
+        `\n<span style="font-size: 20px !important; font-weight: 600 !important;">벌점 `,
       )
       .replaceAll("점)", "점</span>")
       .replaceAll("부여일 : ", "20")
       .replace(/상\d{2}-/gi, "")
       .replace(/기숙사\d{2}-/gi, "")
       .replace(/학교\d{2}-/gi, "")
-      .replace(/\(([^)]*선생님[^)]*)\)/g, "$1")
-      .replace(/·/gi, "asdfasfsf");
+      .replace(/\(([^)]*선생님[^)]*)\)/gi, "$1")
+      .replace(/\([^)]*\)/gi, "");
   };
 
   return { getBasicJobSkills, scoreParser, pointParser };

diff --git a/src/templates/home/layouts/HomeCalender.tsx b/src/templates/home/layouts/HomeCalender.tsx
@@ -1,5 +1,6 @@
 import { color, flex, font } from "@/styles";
 import { CalenderIcon } from "@/assets/icons";
+import getPlanType from "@/helpers/getPlanType.helper";
 import React from "react";
 import styled from "styled-components";
 import HomeHead from "./HomeHead";
@@ -19,7 +20,7 @@ const HomeCalender = ({ calenders }: IHomeCalenderProps) => {
       <CalenderBody>
         {calenders.map((calender) => (
           <CalenderContent>
-            - {calender.title} ({calender.type})
+            - {calender.title} <span>{getPlanType(calender.type)}</span>
           </CalenderContent>
         ))}
       </CalenderBody>
@@ -43,10 +44,15 @@ const CalenderBody = styled.div`
 `;
 
 const CalenderContent = styled.p`
-  ${font.p3};
+  ${font.p2};
   padding-left: 6px;
   white-space: pre;
   line-height: 160%;
+
+  span {
+    ${font.p4};
+    color: ${color.gray};
+  }
 `;
 
 export default HomeCalender;
diff --git a/src/templates/meister/index.tsx b/src/templates/meister/index.tsx
@@ -369,7 +369,7 @@ const PointHTMLContent = styled.div`
   }
 
   li > div > div {
-    font-size: 20px !important;
+    font-size: 16px !important;
     font-weight: 500 !important;
     text-align: center !important;
     white-space: pre-wrap !important;
@@ -378,7 +378,7 @@ const PointHTMLContent = styled.div`
   }
 
   li > div > div:first-child > div {
-    font-size: 20px !important;
+    font-size: 18px !important;
     font-weight: 500 !important;
     color: black !important;
   }