From 26a61f959a915e68ff78d21837cab3ff9d2783a8 Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Tue, 9 Jul 2024 14:29:41 -0500 Subject: [PATCH] Various UI tweaks and changes --- web/src/components/navigation/Sidebar.tsx | 6 +++++- web/src/components/player/HlsVideoPlayer.tsx | 2 +- web/src/pages/SubmitPlus.tsx | 2 +- web/src/views/live/LiveBirdseyeView.tsx | 2 +- web/src/views/live/LiveCameraView.tsx | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/src/components/navigation/Sidebar.tsx b/web/src/components/navigation/Sidebar.tsx index 35a02d7dca..27ea9805c5 100644 --- a/web/src/components/navigation/Sidebar.tsx +++ b/web/src/components/navigation/Sidebar.tsx @@ -5,9 +5,12 @@ import { useLocation } from "react-router-dom"; import GeneralSettings from "../menu/GeneralSettings"; import AccountSettings from "../menu/AccountSettings"; import useNavigation from "@/hooks/use-navigation"; +import { baseUrl } from "@/api/baseUrl"; +import { useMemo } from "react"; function Sidebar() { const location = useLocation(); + const basePath = useMemo(() => new URL(baseUrl).pathname, []); const navbarLinks = useNavigation(); @@ -18,7 +21,8 @@ function Sidebar() { {navbarLinks.map((item) => { const showCameraGroups = - item.id == 1 && item.url == location.pathname; + item.id == 1 && + (location.pathname === "/" || location.pathname === basePath); return (
diff --git a/web/src/components/player/HlsVideoPlayer.tsx b/web/src/components/player/HlsVideoPlayer.tsx index 5562303b2a..d66ed4b53b 100644 --- a/web/src/components/player/HlsVideoPlayer.tsx +++ b/web/src/components/player/HlsVideoPlayer.tsx @@ -161,7 +161,7 @@ export default function HlsVideoPlayer({ }, [videoRef, controlsOpen]); return ( - + {selectedScoreRange == undefined ? "Score Range" - : `${selectedScoreRange[0] * 100}% - ${selectedScoreRange[1] * 100}%`} + : `${Math.round(selectedScoreRange[0] * 100)}% - ${Math.round(selectedScoreRange[1] * 100)}%`}
diff --git a/web/src/views/live/LiveBirdseyeView.tsx b/web/src/views/live/LiveBirdseyeView.tsx index 8f7ebda771..01146f643b 100644 --- a/web/src/views/live/LiveBirdseyeView.tsx +++ b/web/src/views/live/LiveBirdseyeView.tsx @@ -111,7 +111,7 @@ export default function LiveBirdseyeView({ } return ( - +
+