From f65df0370c07fa84a588ce54f6f47817c3583e53 Mon Sep 17 00:00:00 2001
From: alien-code-hunter <128029440+alien-code-hunter@users.noreply.github.com>
Date: Tue, 16 Apr 2024 09:53:45 +0000
Subject: [PATCH 1/4] docs:adding my name to the readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ab8a87d..d4f681f 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ This is the repo that you will use during the Web Academy exercises. Please fork
 
 Before participating, make sure you have gone through [the pre-requisites](https://dhis2.github.io/academy-web-app-dev/docs/before-academy/) for the academy.
 
-For more information about the academy and the topics taught, check the website: https://dhis2.github.io/academy-web-app-dev/
\ No newline at end of file
+For more information about the academy and the topics taught, check the website: https://dhis2.github.io/academy-web-app-dev/

From cfc3186f9ba72ed53abddf7195577d980ae3a222 Mon Sep 17 00:00:00 2001
From: alien-code-hunter <128029440+alien-code-hunter@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:00:27 +0000
Subject: [PATCH 2/4] docs:adding my name to the readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4f681f..e6c1073 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# DHIS2 Web App Development Academy
+# DHIS2 Web App Development Academy - MEDULETU KAMATI 
 
 This is the repo that you will use during the Web Academy exercises. Please fork it, clone it and run it following the instructions on the workshop site: https://dhis2.github.io/academy-web-app-dev/docs/resources/set_up_fork.
 

From 334dd2cf160d8ae00590582b6fed2fff2d63c962 Mon Sep 17 00:00:00 2001
From: alien-code-hunter <meduletu.Kamati@gmail.com>
Date: Tue, 16 Apr 2024 10:18:53 +0000
Subject: [PATCH 3/4] docs: adding my name to the readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e6c1073..93e6eeb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# DHIS2 Web App Development Academy - MEDULETU KAMATI 
+# DHIS2 Web App Development Academy - MEDULETU KAMATI Nam
 
 This is the repo that you will use during the Web Academy exercises. Please fork it, clone it and run it following the instructions on the workshop site: https://dhis2.github.io/academy-web-app-dev/docs/resources/set_up_fork.
 

From b4b6726e2696924a4ac790392c7e9b8731a98c93 Mon Sep 17 00:00:00 2001
From: alien-code-hunter <meduletu.Kamati@gmail.com>
Date: Tue, 16 Apr 2024 12:36:59 +0000
Subject: [PATCH 4/4] bug: fixing the menu

---
 src/navigation/Navigation.js | 9 +++++----
 src/navigation/index.js      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/navigation/Navigation.js b/src/navigation/Navigation.js
index 38b5781..707ae2f 100644
--- a/src/navigation/Navigation.js
+++ b/src/navigation/Navigation.js
@@ -1,3 +1,4 @@
+import { Menu, MenuItem } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React from 'react'
 // @TODO: Import the `Menu` and `MenuItem` components
@@ -10,14 +11,14 @@ const NavigationItem = ({ path, label }) => {
     // "null" when not active, "object" when active
     const routeMatch = useMatch(path)
     // path is matched if routeMatch is not null
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line no-unuseds-vars
     const isActive = Boolean(routeMatch)
 
     // eslint-disable-next-line no-unused-vars
     const onClick = () => navigate(path)
 
     // @TODO: Use the `MenuItem` component instead of the `div`
-    return <div>{label}</div>
+    return <MenuItem label={label} active={isActive} onClick={onClick}/>
 }
 
 NavigationItem.propTypes = {
@@ -27,7 +28,7 @@ NavigationItem.propTypes = {
 
 export const Navigation = () => (
     // @TODO: Use the `Menu` components instead of the `div`
-    <div>
+    <Menu>
         <NavigationItem
             // Menu item for the home page
             label="Home"
@@ -45,5 +46,5 @@ export const Navigation = () => (
             label="Form"
             path="/form"
         />
-    </div>
+    </Menu>
 )
diff --git a/src/navigation/index.js b/src/navigation/index.js
index 52c2529..76e9477 100644
--- a/src/navigation/index.js
+++ b/src/navigation/index.js
@@ -1 +1 @@
-export * from './Navigation.js'
+export {Navigation} from './Navigation.js'
\ No newline at end of file