Merge freight/develop into feature/trains-management

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

@@ -7,10 +7,14 @@ import {
   Paperclip,
   Settings,
   SlidersHorizontal,
+<<<<<<< HEAD
   Train,
   Truck,
   Container,
   Package,
+=======
+  TrainTrack,
+>>>>>>> 523d7e58422f1bde8024c2dd237092a7cf6aa190
 } from "lucide-react";
 
 import { FreightDashboardLayout, type SidebarItem, type SidebarSection } from "@/components/layout";
@@ -33,6 +37,7 @@ import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage
 import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
 import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
 import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
+import TrainsPage from "./pages/trains/TrainsPage";
 import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
 import TrainsPage from "./pages/trains/TrainsPage";
 import TrainDetailPage from "./pages/trains/TrainDetailPage";
@@ -55,6 +60,11 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         href: "/dashboard/booking-requests",
         icon: <FileText />,
       },
+      {
+        label: "Train scheduling",
+        href: "/dashboard/operations/train-scheduling",
+        icon: <TrainTrack />,
+      },
       ...demoItems,
     ],
   },
@@ -233,6 +243,7 @@ const App = () => {
             path="booking-requests/:id/contract"
             element={<BookingContractPage />}
           />
+          <Route path="operations/train-scheduling" element={<TrainsPage />} />
 
           <Route path="trains" element={<TrainsPage />} />
           <Route path="trains/:id" element={<TrainDetailPage />} />