fix(navigation): align quick menu with sidebar and mobile version

HospitalRun · Sep 1, 2020 · 0187c34 · 0187c34
1 parent 6ca4b59
commit 0187c34
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/shared/components/navbar/Navbar.tsx b/src/shared/components/navbar/Navbar.tsx
@@ -48,10 +48,10 @@ const Navbar = () => {
   const addPages = [
     pageMap.newPatient,
     pageMap.newAppointment,
-    pageMap.newLab,
     pageMap.newMedication,
-    pageMap.newIncident,
+    pageMap.newLab,
     pageMap.newImaging,
+    pageMap.newIncident,
   ]
 
   return (

diff --git a/src/shared/components/navbar/pageMap.tsx b/src/shared/components/navbar/pageMap.tsx
@@ -35,6 +35,18 @@ const pageMap: {
     path: '/appointments',
     icon: 'appointment',
   },
+  newMedication: {
+    permission: Permissions.RequestMedication,
+    label: 'medications.requests.new',
+    path: '/medications/new',
+    icon: 'add',
+  },
+  viewMedications: {
+    permission: Permissions.ViewMedications,
+    label: 'medications.requests.label',
+    path: '/medications',
+    icon: 'medication',
+  },
   newLab: {
     permission: Permissions.RequestLab,
     label: 'labs.requests.new',
@@ -47,17 +59,17 @@ const pageMap: {
     path: '/labs',
     icon: 'lab',
   },
-  newMedication: {
-    permission: Permissions.RequestMedication,
-    label: 'medications.requests.new',
-    path: '/medications/new',
+  newImaging: {
+    permission: Permissions.RequestImaging,
+    label: 'imagings.requests.new',
+    path: '/imaging/new',
     icon: 'add',
   },
-  viewMedications: {
-    permission: Permissions.ViewMedications,
-    label: 'medications.requests.label',
-    path: '/medications',
-    icon: 'medication',
+  viewImagings: {
+    permission: Permissions.ReadPatients,
+    label: 'imagings.requests.label',
+    path: '/imaging',
+    icon: 'image',
   },
   newIncident: {
     permission: Permissions.ReportIncident,
@@ -83,18 +95,6 @@ const pageMap: {
     path: '/visits',
     icon: 'visit',
   },
-  newImaging: {
-    permission: Permissions.RequestImaging,
-    label: 'imagings.requests.new',
-    path: '/imaging/new',
-    icon: 'add',
-  },
-  viewImagings: {
-    permission: Permissions.ReadPatients,
-    label: 'imagings.requests.label',
-    path: '/imaging',
-    icon: 'image',
-  },
   settings: {
     permission: null,
     label: 'settings.label',