Merge pull request #56 from artslidd/develop

Put back the Events Page

apps/main/src/components/NavigationBar.tsx

@@ -189,7 +189,7 @@ export function UserMenuPopover({ isCollapsed }: { isCollapsed: boolean }) {
           />
         </RouterLink>
 
-        <RouterLink to="/planning?tab=events">
+        <RouterLink to="/events">
           <MenuDropdownItem
             icon={<CalendarCheckIcon className="w-5 h-5" aria-hidden="true" />}
             label={t("myEvents")}

apps/main/src/lib/routes.tsx

@@ -24,6 +24,7 @@ import { TabloDetailsPage } from "../pages/tablo-details";
 import { TasksPage } from "../pages/tasks";
 import { UpdatePasswordPage } from "../pages/update-password";
 import ChatProvider from "../providers/ChatProvider";
+import { EventsPage } from "src/pages/events";
 
 export const routes: RouteObject[] = [
   // Protected routes
@@ -92,7 +93,7 @@ export const routes: RouteObject[] = [
           },
           {
             path: "events",
-            element: <PlanningPage />,
+            element: <EventsPage />,
             children: [{ index: true }, { path: "create", element: <EventModal mode="create" /> }],
           },
           {