Merge branch 'dev' into 'features/stat'

# Conflicts:
#   package-lock.json
#   src/router.js
#   vite.config.js

src/router.js

@@ -3,8 +3,20 @@ import Layout from "./layout.jsx";
 import HomePage from "./pages/Home/HomePage";
 import LoginPage from "./pages/Login/LoginPage";
 import StatPage from "./pages/Stat/StatPage";
+import RegisterPage from "./pages/Register/RegisterPage.jsx";
+import VolunteersPage from "./pages/Volunteers/VolunteersPage";
+import ProfilePage from "./pages/Profile/ProfilePage";
+import EventsPage from "./pages/Events/EventsPage.jsx";
 
 const router = createBrowserRouter([
+    {
+      path: "/login",
+      Component: LoginPage,
+    },
+    {
+        path: "/register",
+        Component: RegisterPage,
+    },
     {
         path: "/",
         Component: Layout,
@@ -20,6 +32,18 @@ const router = createBrowserRouter([
             {
                 path: "/stat",
                 Component:StatPage,
+            },
+            {
+                path:"/profile",
+                Component:ProfilePage,
+            },
+            {
+                path: "/events",
+                Component: EventsPage,
+            },
+            {
+                path: "/volunteers",
+                Component: VolunteersPage,
             }
         ]
     }