From 43b8b1b37dbbfc8d2d30c01014fcc4392c16aee6 Mon Sep 17 00:00:00 2001 From: Joshua Miller <37462274+CodingPupper3033@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:06:27 -0500 Subject: [PATCH 1/3] Updated the Header tabValue to rely on the location pathname instead of the parameter abValue which does not exist. --- src/frontend/src/components/nav/Header.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index 0d4fa9fd097d..2faefac557a8 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -3,7 +3,7 @@ import { useDisclosure } from '@mantine/hooks'; import { IconBell, IconSearch } from '@tabler/icons-react'; import { useQuery } from '@tanstack/react-query'; import { useState } from 'react'; -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useLocation } from 'react-router-dom'; import { api } from '../../App'; import { navTabs as mainNavTabs } from '../../defaults/links'; @@ -100,12 +100,13 @@ export function Header() { function NavTabs() { const { classes } = InvenTreeStyle(); - const { tabValue } = useParams(); + const defaultTabValue = "home"; + const tabValue = useLocation().pathname.split('/')[1] || defaultTabValue; const navigate = useNavigate(); return ( Date: Mon, 12 Feb 2024 09:23:20 -0500 Subject: [PATCH 2/3] Fixing my quotation marks? --- src/frontend/src/components/nav/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index 2faefac557a8..6ec39f2ec991 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -100,7 +100,7 @@ export function Header() { function NavTabs() { const { classes } = InvenTreeStyle(); - const defaultTabValue = "home"; + const defaultTabValue = 'home'; const tabValue = useLocation().pathname.split('/')[1] || defaultTabValue; const navigate = useNavigate(); From fa1cb1b71524191f38547893526f92ddc8ef895c Mon Sep 17 00:00:00 2001 From: Joshua Miller <37462274+CodingPupper3033@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:29:11 -0500 Subject: [PATCH 3/3] Alphabeticalizing my imports!!!! --- src/frontend/src/components/nav/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index 6ec39f2ec991..43d28729a259 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -3,7 +3,7 @@ import { useDisclosure } from '@mantine/hooks'; import { IconBell, IconSearch } from '@tabler/icons-react'; import { useQuery } from '@tanstack/react-query'; import { useState } from 'react'; -import { useNavigate, useLocation } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router-dom'; import { api } from '../../App'; import { navTabs as mainNavTabs } from '../../defaults/links';