From e9f63348c3ddb166d24d0b91af665bd1ed8c44e2 Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 05:04:14 -0500 Subject: [PATCH 1/6] Remade the branch to grab the local testing, incorporated my prior changes from 338 into this branch. --- apps/frontend/app/dashboard/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index f30ff855..11751986 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -27,7 +27,10 @@ import { signOut, useSession } from "next-auth/react"; import toast, { Toaster } from 'react-hot-toast'; import { useRouter, useSearchParams } from 'next/navigation'; -const navigation = [{ name: 'Admin', href: '#', current: false }]; +const navigation = [ + { name: 'Help', href: '#', current: false }, + { name: 'USERS', href: '#', current: false } +]; const userNavigation = [ { name: 'Your Profile', href: '#' }, { name: 'Sign out', href: '#' }, From 75383152e3c69b0bdcfdcfb79fae59b111839841 Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 05:09:46 -0500 Subject: [PATCH 2/6] Should now open the docs when Help button is clicked --- apps/frontend/app/dashboard/page.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index 11751986..118e24fe 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -27,9 +27,11 @@ import { signOut, useSession } from "next-auth/react"; import toast, { Toaster } from 'react-hot-toast'; import { useRouter, useSearchParams } from 'next/navigation'; +const GLADOS_DOCS_LINK = 'https://automatingsciencepipeline.github.io/Monorepo/tutorial/usage/' + const navigation = [ - { name: 'Help', href: '#', current: false }, - { name: 'USERS', href: '#', current: false } + { name: 'Help', href: GLADOS_DOCS_LINK, current: false }, + { name: 'Admin', href: '#', current: false } ]; const userNavigation = [ { name: 'Your Profile', href: '#' }, From 678b65a3ae15b8cd9e3ad969dffced6c8d89dc63 Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 05:13:56 -0500 Subject: [PATCH 3/6] Added functionality so that clicking the Help button would open the docs in a new tab --- apps/frontend/app/dashboard/page.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index 118e24fe..d52bad4e 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -85,6 +85,7 @@ const Navbar = (props) => { @@ -157,6 +158,7 @@ const Navbar = (props) => { key={item.name} as='a' href={item.href} + target={item.name === 'Help' ? '_blank' : '_self'} // Experiment to see if I need both to be changed className={classNames( item.current ? 'text-white bg-blue-800' : From c34491cc669e36b433bac908dbe546590296bdf8 Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 05:44:58 -0500 Subject: [PATCH 4/6] made a change to try and see changes with my local testing --- apps/frontend/app/dashboard/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index d52bad4e..ebf33a50 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -31,7 +31,7 @@ const GLADOS_DOCS_LINK = 'https://automatingsciencepipeline.github.io/Monorepo/t const navigation = [ { name: 'Help', href: GLADOS_DOCS_LINK, current: false }, - { name: 'Admin', href: '#', current: false } + { name: 'USERS', href: '#', current: false } ]; const userNavigation = [ { name: 'Your Profile', href: '#' }, From 2f7b0421e4a46f72e132ccf9d648e2723b79b5f5 Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 10:16:08 -0500 Subject: [PATCH 5/6] Had Keycloak on; turned it off so now I can locally test. Got rid of Admin button --- apps/frontend/app/dashboard/page.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index ebf33a50..39d8c5c7 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -30,8 +30,7 @@ import { useRouter, useSearchParams } from 'next/navigation'; const GLADOS_DOCS_LINK = 'https://automatingsciencepipeline.github.io/Monorepo/tutorial/usage/' const navigation = [ - { name: 'Help', href: GLADOS_DOCS_LINK, current: false }, - { name: 'USERS', href: '#', current: false } + { name: 'Help', href: GLADOS_DOCS_LINK, current: false } ]; const userNavigation = [ { name: 'Your Profile', href: '#' }, From 71b5b5de334fad9d548b9fc5603bc0c6e540adce Mon Sep 17 00:00:00 2001 From: rhit-johnsoz2 Date: Mon, 16 Dec 2024 10:32:38 -0500 Subject: [PATCH 6/6] Ready to merge with main --- apps/frontend/app/dashboard/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/app/dashboard/page.tsx b/apps/frontend/app/dashboard/page.tsx index 39d8c5c7..cfaf8fdc 100644 --- a/apps/frontend/app/dashboard/page.tsx +++ b/apps/frontend/app/dashboard/page.tsx @@ -157,7 +157,7 @@ const Navbar = (props) => { key={item.name} as='a' href={item.href} - target={item.name === 'Help' ? '_blank' : '_self'} // Experiment to see if I need both to be changed + target={item.name === 'Help' ? '_blank' : '_self'} className={classNames( item.current ? 'text-white bg-blue-800' :