From 070fc36e1590e1bb6738b7c712484bfc2adb33bc Mon Sep 17 00:00:00 2001
From: Eduarda de Castro Guterres
<86486666+eduardacastro@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:41:41 -0300
Subject: [PATCH 1/5] feat: change colors in header (button and name) deleted
changed language
---
src/components/Nav/Nav.tsx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/Nav/Nav.tsx b/src/components/Nav/Nav.tsx
index 057f5a4..a495743 100644
--- a/src/components/Nav/Nav.tsx
+++ b/src/components/Nav/Nav.tsx
@@ -58,7 +58,7 @@ export const Nav = () => {
if (keycloak?.authenticated) {
return (
-
+
);
}
@@ -77,12 +77,13 @@ export const Nav = () => {
alignItems: 'center',
px: '2rem',
minHeight: '5rem',
+ backgroundColor: 'black',
}}
className="shadow"
>
-
+
-
+
Jamie
@@ -91,7 +92,6 @@ export const Nav = () => {
sx={{ display: 'flex', justifyContent: 'flex-end', flex: 1, alignItems: 'center' }}
className="space-x-4"
>
- {renderLanguageSwitcher()}
{renderLoginButton()}
From ec59f41dc87f25f50f1a06df5ae49e63a1fa0718 Mon Sep 17 00:00:00 2001
From: Eduarda de Castro Guterres
<86486666+eduardacastro@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:41:25 -0300
Subject: [PATCH 2/5] fix: hover button
---
src/components/Nav/Nav.tsx | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/components/Nav/Nav.tsx b/src/components/Nav/Nav.tsx
index a495743..7d08d0b 100644
--- a/src/components/Nav/Nav.tsx
+++ b/src/components/Nav/Nav.tsx
@@ -58,13 +58,24 @@ export const Nav = () => {
if (keycloak?.authenticated) {
return (
-
+
);
}
return (
-
+
);
};
@@ -83,7 +94,7 @@ export const Nav = () => {
>
-
+
Jamie
From 1258d7a58d79d9c53e72ff5fdd30e84a619b8ae4 Mon Sep 17 00:00:00 2001
From: Eduarda de Castro Guterres
<86486666+eduardacastro@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:57:45 -0300
Subject: [PATCH 3/5] fix: adjustments in navbar
---
src/components/Nav/Nav.tsx | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/components/Nav/Nav.tsx b/src/components/Nav/Nav.tsx
index 7d08d0b..19ea20b 100644
--- a/src/components/Nav/Nav.tsx
+++ b/src/components/Nav/Nav.tsx
@@ -54,15 +54,19 @@ export const Nav = () => {
keycloak?.login({ redirectUri: `${JAMIE_UI_BASE_URL}${location.pathname}` });
};
+/* The `renderLoginButton` function is responsible for rendering the login button based on the
+authentication status of the user. */
const renderLoginButton = () => {
if (keycloak?.authenticated) {
return (
@@ -71,15 +75,18 @@ export const Nav = () => {
return (
);
};
+/* Return a element that represents the navigation bar component. */
return (
{
display: 'flex',
alignItems: 'center',
px: '2rem',
- minHeight: '5rem',
+ minHeight: '3rem',
backgroundColor: 'black',
}}
className="shadow"
>
-
+
Jamie
From 07f2d062b3dda825d63922aabdedb3b04d8242d8 Mon Sep 17 00:00:00 2001
From: Eduarda de Castro Guterres
<86486666+eduardacastro@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:58:13 -0300
Subject: [PATCH 4/5] fix: comments
---
src/components/Nav/Nav.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Nav/Nav.tsx b/src/components/Nav/Nav.tsx
index 19ea20b..7c49c8e 100644
--- a/src/components/Nav/Nav.tsx
+++ b/src/components/Nav/Nav.tsx
@@ -64,7 +64,7 @@ authentication status of the user. */
backgroundColor: '#ffffff',
maxHeight: '2rem',
maxWidth: '6rem',
- transition: 'background-color 0.3s, color 0.3s', // Adiciona uma transição suave
+ transition: 'background-color 0.3s, color 0.3s', // add soft transition
'&:hover': {
backgroundColor: '#e4e4e4', // background color when mouse is over button
},
From 571be41db5b7fc3f1cc70f65e6fbbfdf5df18f62 Mon Sep 17 00:00:00 2001
From: Eduarda de Castro Guterres
<86486666+eduardacastro@users.noreply.github.com>
Date: Fri, 1 Sep 2023 15:46:46 -0300
Subject: [PATCH 5/5] fix: button
---
src/components/Nav/Nav.tsx | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/components/Nav/Nav.tsx b/src/components/Nav/Nav.tsx
index 7c49c8e..98a77f7 100644
--- a/src/components/Nav/Nav.tsx
+++ b/src/components/Nav/Nav.tsx
@@ -60,15 +60,7 @@ authentication status of the user. */
if (keycloak?.authenticated) {
return (
-
+
);
}