Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Various UI tweaks and changes (#12364)

Browse Source
This commit is contained in:
Josh Hawkins 2024-07-09 14:36:55 -05:00 committed by GitHub
parent aacb8c84e0
commit d2f88491b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/components/navigation/Sidebar.tsx
View File

@ -5,9 +5,12 @@ import { useLocation } from "react-router-dom";
import GeneralSettings from "../menu/GeneralSettings"; import GeneralSettings from "../menu/GeneralSettings";
import AccountSettings from "../menu/AccountSettings"; import AccountSettings from "../menu/AccountSettings";
import useNavigation from "@/hooks/use-navigation"; import useNavigation from "@/hooks/use-navigation";
import { baseUrl } from "@/api/baseUrl";
import { useMemo } from "react";
function Sidebar() { function Sidebar() {
const location = useLocation(); const location = useLocation();
const basePath = useMemo(() => new URL(baseUrl).pathname, []);
const navbarLinks = useNavigation(); const navbarLinks = useNavigation();
@ -18,7 +21,8 @@ function Sidebar() {
<Logo className="mb-6 h-8 w-8" /> <Logo className="mb-6 h-8 w-8" />
{navbarLinks.map((item) => { {navbarLinks.map((item) => {
const showCameraGroups = const showCameraGroups =
item.id == 1 && item.url == location.pathname; item.id == 1 &&
(location.pathname === "/" || location.pathname === basePath);
return ( return (
<div key={item.id}> <div key={item.id}>

2
web/src/components/player/HlsVideoPlayer.tsx
View File

@ -161,7 +161,7 @@ export default function HlsVideoPlayer({
}, [videoRef, controlsOpen]); }, [videoRef, controlsOpen]);
return ( return (
<TransformWrapper minScale={1.0}> <TransformWrapper minScale={1.0} wheel={{ smoothStep: 0.005 }}>
<VideoControls <VideoControls
className={cn( className={cn(
"absolute left-1/2 z-50 -translate-x-1/2", "absolute left-1/2 z-50 -translate-x-1/2",

2
web/src/pages/SubmitPlus.tsx
View File

@ -456,7 +456,7 @@ function PlusFilterGroup({
<div className="hidden text-primary md:block"> <div className="hidden text-primary md:block">
{selectedScoreRange == undefined {selectedScoreRange == undefined
? "Score Range" ? "Score Range"
: `${selectedScoreRange[0] * 100}% - ${selectedScoreRange[1] * 100}%`} : `${Math.round(selectedScoreRange[0] * 100)}% - ${Math.round(selectedScoreRange[1] * 100)}%`}
</div> </div>
</Button> </Button>
</Trigger> </Trigger>

2
web/src/views/live/LiveBirdseyeView.tsx
View File

@ -111,7 +111,7 @@ export default function LiveBirdseyeView({
} }
return ( return (
<TransformWrapper minScale={1.0}> <TransformWrapper minScale={1.0} wheel={{ smoothStep: 0.005 }}>
<div <div
ref={mainRef} ref={mainRef}
className={ className={

2
web/src/views/live/LiveCameraView.tsx
View File

@ -295,7 +295,7 @@ export default function LiveCameraView({
}, []); }, []);
return ( return (
<TransformWrapper minScale={1.0}> <TransformWrapper minScale={1.0} wheel={{ smoothStep: 0.005 }}>
<div <div
ref={mainRef} ref={mainRef}
className={ className={