Merge branch 'develop' into 'feature/development_assistant'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx
This commit is contained in:
Amirhossein Mahmoodi
2023-08-12 16:13:43 +03:30
parent 2ef9ae0e30
commit 7af22bab33
9 changed files with 597 additions and 3 deletions

View File

@@ -78,6 +78,17 @@ export const REJECT_PROVINCE_MANAGER =
BASE_URL + "/dashboard/province_manager/reject";
//province manager
// 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";

View File

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