solf merge conflict

apps/edr-freight-web/backoffice/src/App.tsx

@@ -1,67 +1,46 @@
 import { Navigate, Outlet, Route, Routes, useLocation, useNavigate } from "react-router-dom";
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { FreightDashboardLayout, type SidebarSection } from "@/components/layout";
-import { Boxes, LayoutDashboard, Network, Paperclip, Settings, SlidersHorizontal } from "lucide-react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import {
+  Boxes,
+  FileText,
+  LayoutDashboard,
+  Network,
+  Paperclip,
+  Settings,
+  SlidersHorizontal,
+} from "lucide-react";
+
+import { FreightDashboardLayout, type SidebarItem, type SidebarSection } from "@/components/layout";
+import LoadingScreen from "./components/LoadingScreen";
 import { useAuth } from "./auth/useAuth";
 import LoginPage from "./pages/auth/LoginPage";
+import BookingRequestDetailPage from "./pages/bookings/BookingRequestDetailPage";
+import BookingRequestsPage from "./pages/bookings/BookingRequestsPage";
+import DemoUser1Page from "./pages/dashboard/demo/DemoUser1Page";
+import DemoUser2Page from "./pages/dashboard/demo/DemoUser2Page";
 import OverviewPage from "./pages/dashboard/OverviewPage";
 import EmployeesPage from "./pages/dashboard/user-management/EmployeesPage";
 import PermissionsPage from "./pages/dashboard/user-management/PermissionsPage";
 import RolesPage from "./pages/dashboard/user-management/RolesPage";
 import UserManagementPage from "./pages/dashboard/user-management/UserManagementPage";
-import LoadingScreen from "./components/LoadingScreen";
-import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
+import UsersPage from "./pages/dashboard/user-management/UsersPage";
 import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage";
-import DemoUser1Page from "./pages/dashboard/demo/DemoUser1Page";
-import DemoUser2Page from "./pages/dashboard/demo/DemoUser2Page";
+import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
 import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
 import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
 import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
 
-// Create a QueryClient instance
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       retry: 1,
       refetchOnWindowFocus: false,
-      staleTime: 5 * 60 * 1000, // 5 minutes
+      staleTime: 5 * 60 * 1000,
     },
   },
 });
 
-// const sidebarItems: SidebarItem[] = [
-//   {
-//     label: "Overview",
-//     href: "/dashboard/overview",
-//     icon: <LayoutDashboard />,
-//   },
-//   {
-//     label: "User management",
-//     href: "/dashboard/user-management",
-//     icon: <Network />,
-//     children: [
-//       {
-//         label: "Employees",
-//         href: "/dashboard/user-management/employees",
-//       },
-//       {
-//         label: "Permissions",
-//         href: "/dashboard/user-management/permissions",
-//       },
-//       {
-//         label: "Roles",
-//         href: "/dashboard/user-management/roles",
-//       },
-//     ],
-//   },
-//   {
-//     label: "Rule Engine",
-//     href: "/dashboard/rule-engine",
-//     icon: <Settings />,
-//   },
-// ];
-
-const sidebarSections: SidebarSection[] = [
+const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
   {
     title: "Main menu",
     mutedTitle: true,
@@ -71,6 +50,12 @@ const sidebarSections: SidebarSection[] = [
         href: "/dashboard/overview",
         icon: <LayoutDashboard />,
       },
+      {
+        label: "Booking requests",
+        href: "/dashboard/booking-requests",
+        icon: <FileText />,
+      },
+      ...demoItems,
     ],
   },
   {
@@ -81,6 +66,10 @@ const sidebarSections: SidebarSection[] = [
         href: "/dashboard/user-management",
         icon: <Network />,
         children: [
+          {
+            label: "Users",
+            href: "/dashboard/user-management/users",
+          },
           {
             label: "Employees",
             href: "/dashboard/user-management/employees",
@@ -117,11 +106,6 @@ const sidebarSections: SidebarSection[] = [
         icon: <Boxes />,
         children: getCategorySidebarChildren("configuration"),
       },
-    ],
-  },
-  {
-    title: "Rules & pricing",
-    items: [
       {
         label: "Rules",
         href: "/dashboard/rules",
@@ -130,6 +114,7 @@ const sidebarSections: SidebarSection[] = [
       },
     ],
   },
+ 
 ];
 
 const hasPermission = (
@@ -138,16 +123,41 @@ const hasPermission = (
 ) => {
   if (!user) return false;
   if (user.permissions?.some((p) => p.key === key)) return true;
+
   return (user.employee ?? []).some((emp) =>
     (emp.positions ?? []).some((pos) =>
       (pos.permissions ?? []).some((p) => p.key === key),
     ),
   );
 };
+
 const DashboardShell = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const { user, logout } = useAuth();
+
+  const demoItems: SidebarItem[] = [
+    ...(hasPermission(user, "can:demo:user1")
+      ? [
+          {
+            label: "User1",
+            href: "/dashboard/user1",
+            icon: <Settings />,
+          },
+        ]
+      : []),
+    ...(hasPermission(user, "can:demo:user2")
+      ? [
+          {
+            label: "User2",
+            href: "/dashboard/user2",
+            icon: <Settings />,
+          },
+        ]
+      : []),
+  ];
+
+  const sidebarSections = buildSidebarSections(demoItems);
   const displayName = user?.name?.en || user?.username || user?.email || "User";
 
   return (
@@ -188,38 +198,57 @@ const App = () => {
       <Routes>
         <Route path="/" element={<Navigate to="/dashboard/overview" replace />} />
         <Route path="/dashboard" element={<Navigate to="/dashboard/overview" replace />} />
+
         <Route path="/dashboard" element={<DashboardShell />}>
           <Route path="overview" element={<OverviewPage />} />
+
+          <Route path="booking-requests" element={<BookingRequestsPage />} />
+          <Route path="booking-requests/:id" element={<BookingRequestDetailPage />} />
+
           <Route path="user-management" element={<UserManagementPage />} />
+          <Route path="user-management/users" element={<UsersPage />} />
+          <Route path="user-management/employees" element={<EmployeesPage />} />
+          <Route path="user-management/permissions" element={<PermissionsPage />} />
+          <Route path="user-management/roles" element={<RolesPage />} />
+
+          <Route path="file-settings" element={<FileUploadSettingsPage />} />
+          <Route path="dropdown-settings" element={<DropdownSettingsPage />} />
+
           <Route
             path="configuration"
             element={<Navigate to="/dashboard/configuration/cargo-types" replace />}
           />
           <Route path="configuration/:resource" element={<RuleEngineResourcePage />} />
+
           <Route
             path="rules"
             element={<Navigate to="/dashboard/rules/priority-rules" replace />}
           />
           <Route path="rules/:resource" element={<RuleEngineResourcePage />} />
+
           <Route
             path="rule-engine"
             element={<Navigate to="/dashboard/configuration/cargo-types" replace />}
           />
           <Route path="rule-engine/:resource" element={<RuleEngineLegacyRedirect />} />
-          <Route path="user-management/employees" element={<EmployeesPage />} />
-          <Route path="user-management/permissions" element={<PermissionsPage />} />
-          <Route path="user-management/roles" element={<RolesPage />} />
+
           <Route path="user1" element={<DemoUser1Page />} />
           <Route path="user2" element={<DemoUser2Page />} />
-          <Route path="file-settings" element={<FileUploadSettingsPage />} />
-          <Route path="dropdown-settings" element={<DropdownSettingsPage />} />
-          <Route path="org-structure" element={<Navigate to="/dashboard/user-management" replace />} />
-          <Route path="org-structure/*" element={<Navigate to="/dashboard/user-management" replace />} />
+
+          <Route
+            path="org-structure"
+            element={<Navigate to="/dashboard/user-management" replace />}
+          />
+          <Route
+            path="org-structure/*"
+            element={<Navigate to="/dashboard/user-management" replace />}
+          />
         </Route>
+
         <Route path="*" element={<Navigate to="/dashboard/overview" replace />} />
       </Routes>
     </QueryClientProvider>
   );
 };
 
-export default App;
+export default App;