diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx index fd8e97e..de5fd44 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx @@ -35,7 +35,7 @@ const SidebarListItems = ({ menuItem, dispatch }) => { {menuItem.badges && ( {menuItem.badges.map((badge, i) => ( - + ))} )} diff --git a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx index 5a4f1e5..0066097 100644 --- a/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx +++ b/src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx @@ -33,7 +33,7 @@ const SidebarSubitems = ({ subitem, dispatch }) => { {subitem.badges && ( {subitem.badges.map((badge, i) => ( - + ))} )} diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index 466b5e7..6b0d367 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -95,7 +95,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadItem.total"], + badges: [{ key: "roadItem.total" }], Subitems: [ { id: "roadItemManagmentSupervisor", @@ -103,7 +103,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadItem.supervise_cnt"], + badges: [{ key: "roadItem.supervise_cnt" }], Subitems: [ { id: "roadItemManagmentSupervisorCartable", @@ -123,7 +123,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadItem.operation_cnt"], + badges: [{ key: "roadItem.operation_cnt" }], Subitems: [ { id: "roadItemManagmentOparationCartable", @@ -290,7 +290,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["safetyAndPrivacy.step_one", "safetyAndPrivacy.step_two"], + badges: [{ key: "safetyAndPrivacy.step_one", color: 'warning' }, { key: "safetyAndPrivacy.step_two", color: 'error' }], Subitems: [ { id: "safetyAndPrivacyManagmentOparation", @@ -344,7 +344,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadObserved.total"], + badges: [{ key: "roadObserved.total" }], Subitems: [ { id: "roadObservationsManagmentSupervisor", @@ -352,7 +352,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadObserved.supervise_cnt", "roadObserved.complaint_cnt"], + badges: [{ key: "roadObserved.supervise_cnt" }, { key: "roadObserved.complaint_cnt" }], Subitems: [ { id: "roadObservationsManagmentSupervisorCartable", @@ -369,7 +369,7 @@ export const pageMenu = [ type: "menu", icon: , hasSubitems: true, - badges: ["roadObserved.operation_cnt", "roadObserved.complaint_cnt"], + badges: [{ key: "roadObserved.operation_cnt" }, { key: "roadObserved.complaint_cnt" }], Subitems: [ { id: "roadObservationsManagmentOparationCartable",