Merge branch 'dev' into 'features/profile'

# Conflicts:
#   package-lock.json
#   src/index.css
#   src/router.js

src/router.js

@@ -3,6 +3,8 @@ import Layout from "./layout.jsx";
 import HomePage from "./pages/Home/HomePage";
 import LoginPage from "./pages/Login/LoginPage";
 import ProfilePage from "./pages/Profile/ProfilePage";
+import EventsPage from "./pages/Events/EventsPage.jsx";
+
 
 const router = createBrowserRouter([
     {
@@ -20,6 +22,10 @@ const router = createBrowserRouter([
             {
                 path:"/profile",
                 Component:ProfilePage,
+            },
+            {
+                path: "/events",
+                Component: EventsPage,
             }
         ]
     }