From 429f990b410372857d43c6c6968c0d9882d492fe Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 10 Mar 2025 10:45:25 -0600 Subject: [PATCH] gave whitelabels a label field --- src/navigation/Router.tsx | 23 +++++++++++++++-------- src/services/whiteLabel.ts | 10 +++++++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/navigation/Router.tsx b/src/navigation/Router.tsx index 83b1d3c..87f25fd 100644 --- a/src/navigation/Router.tsx +++ b/src/navigation/Router.tsx @@ -1,22 +1,28 @@ import { lazy, Suspense } from "react"; import LoadingScreen from "../app/LoadingScreen"; import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom"; -import { Typography } from "@mui/material"; import { useAuth0 } from "@auth0/auth0-react"; -import Teams from "pages/Teams"; -import Users from "pages/Users"; -import TeamPage from "pages/Team"; +// import Teams from "pages/Teams"; +// import Users from "pages/Users"; +// import TeamPage from "pages/Team"; import Header from "app/Header"; import Logout from "pages/Logout"; import Devices from "pages/Devices"; -import DevicePage from "pages/Device"; -import GroupsPage from "pages/Groups"; -import GroupPage from "pages/Group"; +// import DevicePage from "pages/Device"; +// import GroupsPage from "pages/Groups"; +// import GroupPage from "pages/Group"; import { ErrorBoundary } from "react-error-boundary"; import DeviceComponent from "pages/DeviceComponent"; import Bins from "pages/Bins"; +import { getWhitelabel } from "services/whiteLabel"; const DeviceHistory = lazy(() => import("pages/DeviceHistory")); +const DevicePage = lazy(() => import("pages/Device")); +const GroupsPage = lazy(() => import("pages/Groups")); +const GroupPage = lazy(() => import("pages/Group")); +const Teams = lazy(() => import("pages/Teams")); +const Users = lazy(() => import("pages/Users")); +const TeamPage = lazy(() => import("pages/Team")); interface Props { toggleTheme: () => void; @@ -31,6 +37,7 @@ export default function Router(props: Props) { const { toggleTheme } = props; const { isAuthenticated, loginWithRedirect, isLoading } = useAuth0(); + const whiteLabel = getWhitelabel(); const RelativeRoutes = () => { return ( @@ -187,7 +194,7 @@ export default function Router(props: Props) { } /> {/* } /> */} {/* } /> */} - } /> + } /> {/* Page routes */} {/* Hello!} /> */} diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts index fdb5997..9101cfe 100644 --- a/src/services/whiteLabel.ts +++ b/src/services/whiteLabel.ts @@ -47,6 +47,7 @@ interface WhiteLabel { tutorialPlaylistID?: string; thumbnail?: string; tutorialFiles?: { name: string; url: string }[]; + homePage?: string; } // const DEFAULT_WHITELABEL: WhiteLabel = { @@ -84,7 +85,8 @@ const STAGING_WHITELABEL: WhiteLabel = { hotjarID: import.meta.env.REACT_APP_HOTJAR_ID_BXT, docs: "Platform", protips: protips, - tutorialPlaylistID: "" + tutorialPlaylistID: "", + homePage: "/devices" }; const BXT_WHITE_LABEL: WhiteLabel = { @@ -103,7 +105,8 @@ const BXT_WHITE_LABEL: WhiteLabel = { blacklist: [], hotjarID: import.meta.env.REACT_APP_HOTJAR_ID_BXT, docs: "Platform", - protips: protips + protips: protips, + homePage: "/devices" }; export function isBXT(): boolean { @@ -138,7 +141,8 @@ const ADAPTIVE_AGRICULTURE_WHITE_LABEL: WhiteLabel = { url: "https://adaptiveagriculture.ca/wp-content/uploads/2023/08/Bindapt-Adapter-Plate-Set-Up-Guide.pdf" } - ] + ], + homePage: "/bins" }; export function IsAdaptiveAgriculture(): boolean {