resolve conflicts

2024-12-23 13:09:03 +03:30
parent d650e55604 fe7e504917
commit 515adb398e
106 changed files with 4074 additions and 582 deletions
--- a/src/core/utils/pageMenu.js
+++ b/src/core/utils/pageMenu.js
@@ -108,7 +108,7 @@ export const pageMenu = [
                        id: "roadItemManagmentSupervisorCartable",
                        label: "کارتابل",
                        type: "page",
-                        route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/supervisor/cartable",
+                        route: "/dashboard/road-items/supervisor",
                        permissions: [
                            "show-road-item-supervise-cartable",
                            "show-road-item-supervise-cartable-province",
@@ -135,7 +135,7 @@ export const pageMenu = [
                        id: "roadItemManagmentOparationCartable",
                        label: "کارتابل",
                        type: "page",
-                        route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/operator/cartable",
+                        route: "/dashboard/road-items/operator",
                        permissions: ["create-road-item"],
                    },
                ],