Merge branch 'develop' into 'feature/development_assistant'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx

public/locales/fa/app.json

@@ -82,6 +82,7 @@
     "passenger_office_page": "اداره مسافر",
     "machinary_office_page": "ماشین آلات",
     "development_assistant": "معاون توسعه",
+    "development_assistant": "معاون توسعه",
     "inspector_expert_page": "بازدید کارشناس",
     "commercial_chief_page": "رئیس اداره بازرگانی",
     "edit_profile": "ویرایش پروفایل"
@@ -180,6 +181,17 @@
     "vehicle_type": "نوع ماشین",
     "state_name": "وضعیت درخواست"
   },
+  "DevelopmentAssistant": {
+    "name": "نام",
+    "id": "کد یکتا",
+    "national_id": "کد ملی",
+    "phone_number": "موبایل",
+    "created_at": "تاریخ درخواست",
+    "updated_at": "تاریخ بروزرسانی",
+    "navgan_id": "کد ناوگان",
+    "vehicle_type": "نوع ماشین",
+    "state_name": "وضعیت درخواست"
+  },
   "ProvinceHeadExpert": {
     "name": "نام",
     "id": "کد یکتا",

src/core/data/apiRoutes.js

@@ -89,6 +89,17 @@ export const REJECT_DEVELOPMENT_ASSISTANT =
     BASE_URL + "/dashboard/development_assistant/reject";
 //development assistant
 
+// development  assistant
+export const GET_DEVELOPMENT_ASSISTANT =
+    BASE_URL + "/dashboard/development_assistant/show";
+
+export const CONFIRM_DEVELOPMENT_ASSISTANT =
+    BASE_URL + "/dashboard/development_assistant/confirm";
+
+export const REJECT_DEVELOPMENT_ASSISTANT =
+    BASE_URL + "/dashboard/development_assistant/reject";
+//development assistant
+
 // inspector expert
 export const GET_INSPECTOR_EXPERT =
     BASE_URL + "/dashboard/inspector_expert/show";

src/core/data/sidebarMenu.jsx

@@ -73,6 +73,14 @@ const sidebarMenu = [
             selected: false,
             role: "development_assistant",
         },
+        {
+            key: "sidebar.development-assistant",
+            type: "page",
+            route: "/dashboard/development-assistant",
+            icon: <DesktopWindowsIcon/>,
+            selected: false,
+            role: "development_assistant",
+        },
         {
             key: "sidebar.inspector-expert",
             type: "page",