Merge pull request #1408 from mozzy11/develop

add back the home menu link
I-TECH-UW · Jan 16, 2025 · ed358fc · ed358fc
2 parents e44814c + d3644e2
commit ed358fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,4 @@ src/main/resources/adminPassword.txt
 /.apt_generated/
 */plugins/*.jar
 Patient/*
-volume/database/data/
+volume/*
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -221,6 +221,12 @@ export default function App() {
                   component={() => <Home />}
                   role=""
                 />
+                <SecureRoute
+                  path="/Dashboard"
+                  exact
+                  component={() => <Home />}
+                  role=""
+                />
                 <SecureRoute
                   path="/admin"
                   exact

diff --git a/frontend/src/components/layout/Header.js b/frontend/src/components/layout/Header.js
@@ -580,15 +580,12 @@ function OEHeader(props) {
                       >
                         <SideNavItems>
                           {menus["menu"].map((childMenuItem, index) => {
-                            // ignore the Home Menu in the new UI
-                            if (childMenuItem.menu.elementId != "menu_home") {
-                              return generateMenuItems(
-                                childMenuItem,
-                                index,
-                                0,
-                                "$.menu[" + index + "]",
-                              );
-                            }
+                            return generateMenuItems(
+                              childMenuItem,
+                              index,
+                              0,
+                              "$.menu[" + index + "]",
+                            );
                           })}
                         </SideNavItems>
                       </SideNav>