diff --git a/packages/frontend/src/components/stock/layouts/StockRow.tsx b/packages/frontend/src/components/stock/layouts/StockRow.tsx index b39962e5e..443e2949c 100644 --- a/packages/frontend/src/components/stock/layouts/StockRow.tsx +++ b/packages/frontend/src/components/stock/layouts/StockRow.tsx @@ -190,7 +190,7 @@ export const StockRow = (props: StockRowProps): JSX.Element => { setOptionsMenuOpen(false)} component={NavLink} - to={`/stock/${props.stock.ticker}`} + to={`${stocksEndpointPath}/${props.stock.ticker}`} target="_blank" > diff --git a/packages/frontend/src/content/modules/Stock/StockHeader.tsx b/packages/frontend/src/content/modules/Stock/StockHeader.tsx index 97ffc06f1..ac80d1ccd 100644 --- a/packages/frontend/src/content/modules/Stock/StockHeader.tsx +++ b/packages/frontend/src/content/modules/Stock/StockHeader.tsx @@ -181,7 +181,7 @@ export const StockHeader = (props: StockHeaderProps): JSX.Element => { setEditDialogOpen(false)} /> setDeleteDialogOpen(false)}> - setDeleteDialogOpen(false)} navigateTo="/stock" /> + setDeleteDialogOpen(false)} navigateTo={stocksEndpointPath} /> ); diff --git a/packages/frontend/src/content/modules/Watchlist/WatchlistHeader.tsx b/packages/frontend/src/content/modules/Watchlist/WatchlistHeader.tsx index 954345f2d..2c5f9e03f 100644 --- a/packages/frontend/src/content/modules/Watchlist/WatchlistHeader.tsx +++ b/packages/frontend/src/content/modules/Watchlist/WatchlistHeader.tsx @@ -112,7 +112,7 @@ export const WatchlistHeader = (props: WatchlistHeaderProps): JSX.Element => { setDeleteDialogOpen(false)} - navigateTo="/watchlist" + navigateTo={watchlistsEndpointPath} /> diff --git a/packages/frontend/src/content/modules/WatchlistSummary/WatchlistCard.tsx b/packages/frontend/src/content/modules/WatchlistSummary/WatchlistCard.tsx index 1bef83f86..e3d9346f8 100644 --- a/packages/frontend/src/content/modules/WatchlistSummary/WatchlistCard.tsx +++ b/packages/frontend/src/content/modules/WatchlistSummary/WatchlistCard.tsx @@ -41,7 +41,12 @@ const WatchlistCard = (props: WatchlistCardProps): JSX.Element => { return ( - + diff --git a/packages/frontend/src/layouts/SidebarLayout/Header/Buttons/SearchButton.tsx b/packages/frontend/src/layouts/SidebarLayout/Header/Buttons/SearchButton.tsx index 1fec213b6..e9a9e53bc 100644 --- a/packages/frontend/src/layouts/SidebarLayout/Header/Buttons/SearchButton.tsx +++ b/packages/frontend/src/layouts/SidebarLayout/Header/Buttons/SearchButton.tsx @@ -83,7 +83,7 @@ export const HeaderSearchButton = (): JSX.Element => { if (e.key === "Enter") { if (stocks.length) { handleClose(); - navigate(`/stock/${stocks[0].ticker}`); + navigate(`${stocksEndpointPath}/${stocks[0].ticker}`); } } }; @@ -267,7 +267,7 @@ export const HeaderSearchButton = (): JSX.Element => { { sx={{ ".MuiTouchRipple-child": { backgroundColor: theme.colors.alpha.trueWhite[30] } }} component={NavLink} onClick={closeSidebar} - to="/stock" + to={stocksEndpointPath} startIcon={} > All Stocks @@ -179,7 +184,7 @@ export const SidebarContent = (): JSX.Element => { sx={{ ".MuiTouchRipple-child": { backgroundColor: theme.colors.alpha.trueWhite[30] } }} component={NavLink} onClick={closeSidebar} - to="/watchlist" + to={watchlistsEndpointPath} startIcon={} > Watchlists @@ -197,7 +202,7 @@ export const SidebarContent = (): JSX.Element => { sx={{ ".MuiTouchRipple-child": { backgroundColor: theme.colors.alpha.trueWhite[30] } }} component={NavLink} onClick={closeSidebar} - to="/usermanagement" + to={usersEndpointPath} startIcon={} > User Management diff --git a/packages/frontend/src/router.tsx b/packages/frontend/src/router.tsx index 233b5d9ce..47a6d04de 100644 --- a/packages/frontend/src/router.tsx +++ b/packages/frontend/src/router.tsx @@ -1,5 +1,11 @@ import { Box, CircularProgress } from "@mui/material"; -import { User, accountEndpointPath } from "@rating-tracker/commons"; +import { + User, + accountEndpointPath, + stocksEndpointPath, + usersEndpointPath, + watchlistsEndpointPath, +} from "@rating-tracker/commons"; import NProgress from "nprogress"; import { Suspense, lazy, useState, useEffect, createContext } from "react"; import type { RouteObject } from "react-router"; @@ -212,7 +218,7 @@ const AuthWrapper = (props: AuthWrapperProps): JSX.Element => { props.isLoginPage ? ( // If an authenticated user tries to access the login page, redirect them to their desired page // If no redirect was specified, redirect to the stock page - + ) : ( // If any other page was requested, show it ) @@ -276,23 +282,23 @@ const routes: RouteObject[] = [ ), children: [ { - path: "stock", + path: stocksEndpointPath, element: , }, { - path: "stock/:ticker", + path: stocksEndpointPath + "/:ticker", element: , }, { - path: "usermanagement", + path: usersEndpointPath, element: , }, { - path: "watchlist", + path: watchlistsEndpointPath, element: , }, { - path: "watchlist/:id", + path: watchlistsEndpointPath + "/:id", element: , }, ],