Merge branch 'develop' of https://github.com/LikeLion-KNU/dongBTI int…

…o refactor/dropdown
LikeLion-KNU · Sep 11, 2024 · abc2d77 · abc2d77
2 parents d39e121 + 3065c5a
commit abc2d77
Show file tree

Hide file tree

Showing 9 changed files with 1,230 additions and 492 deletions.
diff --git a/index.html b/index.html
@@ -7,17 +7,7 @@
         <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width" />
         <title>동BTI</title>
     </head>
-    <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-LLMBJD2PDC"></script>
-    <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag() {
-            dataLayer.push(arguments);
-        }
-        gtag("js", new Date());
 
-        gtag("config", "G-LLMBJD2PDC");
-    </script>
     <body>
         <div id="root"></div>
         <script type="module" src="/src/main.tsx"></script>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,10 +45,11 @@
         "jest-environment-jsdom": "^29.7.0",
         "regenerator-runtime": "^0.14.1",
         "rollup-plugin-visualizer": "^5.12.0",
-        "serve": "^14.2.3",
+        "serve": "^6.5.8",
         "start-server-and-test": "^2.0.5",
         "ts-node": "^10.9.2",
         "typescript": "^5.0.2",
-        "vite": "^4.4.0"
+        "vite": "^4.4.0",
+        "vite-plugin-radar": "^0.9.6"
     }
 }
diff --git a/src/constants/clubs.ts b/src/constants/clubs.ts
@@ -153,7 +153,7 @@ const clubs: Club[] = [
     },
     {
         name: "미담장학회",
-        summary: "소개글 없음",
+        summary: "다양한 교육봉사활동을 설계하고 실제로 진행하는 동아리입니다.",
         description: null,
         department: "social",
     },
@@ -165,8 +165,8 @@ const clubs: Club[] = [
     },
     {
         name: "수리영역",
-        summary: "소개글 없음",
-        description: null,
+        summary: "수리수리 마수리!",
+        description: "교내외 보수가 필요한 시설을 수리하는 동아리",
         department: "social",
     },
     {
@@ -177,7 +177,7 @@ const clubs: Club[] = [
     },
     {
         name: "한울회",
-        summary: "소개글 없음",
+        summary: "아람단 단원들과 함께하는 대학 연합 봉사 동아리",
         description: null,
         department: "social",
     },
@@ -207,8 +207,8 @@ const clubs: Club[] = [
     },
     {
         name: "IVF",
-        summary: "소개글 없음",
-        description: null,
+        summary: "캠퍼스 속의 하나님의 나라",
+        description: "IVF",
         department: "religious",
     },
     {
@@ -285,8 +285,8 @@ const clubs: Club[] = [
     },
     {
         name: "산악부",
-        summary: "소개글 없음",
-        description: null,
+        summary: "건강도 낭만도 재미도 챙기는",
+        description: "경북대 유일무이 산악부",
         department: "physical",
     },
     {
@@ -369,8 +369,8 @@ const clubs: Club[] = [
     },
     {
         name: "Now&Here",
-        summary: "소개글 없음",
-        description: null,
+        summary: "우리가 있는 지금 이 곳 경북대에서 미래를 만들자",
+        description: "경북대 진로설계 동아리",
         department: "academic",
     },
     {
@@ -393,8 +393,8 @@ const clubs: Club[] = [
     },
     {
         name: "솔라이브",
-        summary: "소개글 없음",
-        description: null,
+        summary: "창업가들의 동아리",
+        description: "솔라이브입니다.",
         department: "academic",
     },
     {
@@ -411,13 +411,13 @@ const clubs: Club[] = [
     },
     {
         name: "에이스",
-        summary: "소개글 없음",
-        description: null,
+        summary: "경제 시사 발표 및 토의 동아리",
+        description: "ACE(About Current Economy)입니다.",
         department: "academic",
     },
     {
         name: "H.P",
-        summary: "소개글 없음",
+        summary: "펌프, 환영합니다, 리듬 오락",
         description: null,
         department: "academic",
     },

diff --git a/src/constants/results.ts b/src/constants/results.ts
@@ -56,7 +56,7 @@ export const results = [
         department: "피지컬",
     },
     {
-        resultType: "10cm",
+        resultType: "tencm",
         clubs: ["청음반", "우리노래반"],
         typeName: "어쿠스틱 감성을 즐기는 10cm형",
         iconName: "art",

diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
@@ -95,14 +95,14 @@ export default function HomePage() {
                     <Input
                         variants="primary"
                         width="242px"
-                        height="40px"
+                        height="45px"
                         placeholder="이름을 입력하세용"
                         onChange={(e) => userInfo.setName(e.currentTarget.value)}
                     />
                     <DropDown
                         color="primary"
                         width="242px"
-                        height="30px"
+                        height="45px"
                         selectedDepartment={selectedDepartment}
                         setSelectedDepartment={setSelectedDepartment}
                     />

diff --git a/src/services/StageRoot.ts b/src/services/StageRoot.ts
@@ -23,7 +23,7 @@ export const StageRoot = new TreeNode.Builder({
                                 new TreeNode.Builder({
                                     question: null,
                                     choice: "어쿠스틱 감성 있지~",
-                                    resultType: "10cm",
+                                    resultType: "tencm",
                                 }).build(),
                             )
                             .setRight(

diff --git a/src/styles/global.ts b/src/styles/global.ts
@@ -7,6 +7,8 @@ export const GlobalStyle = css`
         border: 0;
         box-sizing: border-box;
 
+        font-family: "NanumSquareNeo", sans-serif;
+
         // 스크롤바 숨김 처리
         -ms-overflow-style: none; /* 인터넷 익스플로러 */
         scrollbar-width: none; /* 파이어폭스 */

diff --git a/vite.config.ts b/vite.config.ts
@@ -1,6 +1,7 @@
 import path from "path";
 import { visualizer } from "rollup-plugin-visualizer";
 import { defineConfig } from "vite";
+import { VitePluginRadar } from "vite-plugin-radar";
 
 import react from "@vitejs/plugin-react";
 
@@ -17,6 +18,11 @@ export default defineConfig({
             filename: "./docs/bundle.html",
             open: true,
         }),
+        VitePluginRadar({
+            analytics: {
+                id: "G-LLMBJD2PDC",
+            },
+        }),
     ],
     resolve: {
         alias: {