Merge branch 'develop' into feature/LikeLion-at-DGU#27

Chaem03 · Oct 3, 2024 · 6b3cffe · 6b3cffe
2 parents 0e2f764 + c65ed01
commit 6b3cffe
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -2,10 +2,22 @@
 <html lang="ko">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>2024년 가을 동국대학교 축제사이트</title>
+    <title>2024년 동국대학교 가을축제 부스사이트</title>
   </head>
+  <script
+    async
+    src="https://www.googletagmanager.com/gtag/js?id=G-0VZEZZB767"
+  ></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() {
+      dataLayer.push(arguments);
+    }
+    gtag("js", new Date());
+    gtag('config', import.meta.env.VITE_GA_MEASUREMENT_ID);
+  </script>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,6 +13,8 @@
     "axios": "^1.7.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-ga": "^3.3.1",
+    "react-ga4": "^2.1.0",
     "react-icons": "^5.3.0",
     "react-modal": "^3.16.1",
     "react-router-dom": "^6.26.2",

diff --git a/public/images/logo.svg b/public/images/logo.svg
diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src/router.jsx b/src/router.jsx
@@ -1,8 +1,6 @@
 import { createBrowserRouter } from "react-router-dom";
 import { DefaultLayout } from "@layout/DefaultLayout";
-import { MainPage } from "@pages/main/MainPage";
-import { PerformancePage } from "@pages/performance/PerformancePage";
-import { NoticePage } from "@pages/notice/NoticePage";
+
 import { BoothPage } from "@pages/booth/BoothPage";
 import { AboutPage } from "@pages/about/AboutPage";
 
@@ -11,17 +9,15 @@ export const router = createBrowserRouter([
     path: "/",
     element: <DefaultLayout />,
     children: [
-      { path: "", element: <MainPage /> },
-      // 공연 페이지
-      { path: "/performance", element: <PerformancePage /> },
-      // 공지 페이지
-      { path: "/notice", element: <NoticePage /> }, // named import 적용
+
+
       //부스페이지
       {
         path: "/:booth_id/:day/:category/:location/:is_night/:is_reservable",
         element: <BoothPage />,
       },
       //개발자페이지
+
       { path: "/about", element: <AboutPage /> },
     ],
   },