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:
@@ -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";
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user