mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-01 19:17:41 +03:00
WebUI tweaks (#22980)
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
* Use escape key to go back to main camera dashboard * Add icon showing when review item is needing review
This commit is contained in:
parent
8fc1e97df5
commit
8eace9c3e7
@ -17,6 +17,9 @@ import { useUserPersistence } from "@/hooks/use-user-persistence";
|
|||||||
import { Skeleton } from "../ui/skeleton";
|
import { Skeleton } from "../ui/skeleton";
|
||||||
import { Button } from "../ui/button";
|
import { Button } from "../ui/button";
|
||||||
import { FaCircleCheck } from "react-icons/fa6";
|
import { FaCircleCheck } from "react-icons/fa6";
|
||||||
|
import { FaExclamationTriangle } from "react-icons/fa";
|
||||||
|
import { MdOutlinePersonSearch } from "react-icons/md";
|
||||||
|
import { ThreatLevel } from "@/types/review";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { getTranslatedLabel } from "@/utils/i18n";
|
import { getTranslatedLabel } from "@/utils/i18n";
|
||||||
@ -127,6 +130,11 @@ export function AnimatedEventCard({
|
|||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const threatLevel = useMemo<ThreatLevel>(
|
||||||
|
() => (event.data.metadata?.potential_threat_level ?? 0) as ThreatLevel,
|
||||||
|
[event],
|
||||||
|
);
|
||||||
|
|
||||||
const aspectRatio = useMemo(() => {
|
const aspectRatio = useMemo(() => {
|
||||||
if (
|
if (
|
||||||
!config ||
|
!config ||
|
||||||
@ -152,7 +160,15 @@ export function AnimatedEventCard({
|
|||||||
<Tooltip>
|
<Tooltip>
|
||||||
<TooltipTrigger asChild>
|
<TooltipTrigger asChild>
|
||||||
<Button
|
<Button
|
||||||
className="pointer-events-none absolute left-2 top-1 z-40 bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100"
|
className={cn(
|
||||||
|
"absolute left-2 top-1 z-40 transition-opacity",
|
||||||
|
threatLevel === ThreatLevel.SECURITY_CONCERN &&
|
||||||
|
"pointer-events-auto bg-severity_alert opacity-100 hover:bg-severity_alert",
|
||||||
|
threatLevel === ThreatLevel.NEEDS_REVIEW &&
|
||||||
|
"pointer-events-auto bg-severity_detection opacity-100 hover:bg-severity_detection",
|
||||||
|
threatLevel === ThreatLevel.NORMAL &&
|
||||||
|
"pointer-events-none bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 opacity-0 group-hover:pointer-events-auto group-hover:opacity-100",
|
||||||
|
)}
|
||||||
size="xs"
|
size="xs"
|
||||||
aria-label={t("markAsReviewed")}
|
aria-label={t("markAsReviewed")}
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
@ -160,7 +176,13 @@ export function AnimatedEventCard({
|
|||||||
updateEvents();
|
updateEvents();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FaCircleCheck className="size-3 text-white" />
|
{threatLevel === ThreatLevel.SECURITY_CONCERN ? (
|
||||||
|
<FaExclamationTriangle className="size-3 text-white" />
|
||||||
|
) : threatLevel === ThreatLevel.NEEDS_REVIEW ? (
|
||||||
|
<MdOutlinePersonSearch className="size-3 text-white" />
|
||||||
|
) : (
|
||||||
|
<FaCircleCheck className="size-3 text-white" />
|
||||||
|
)}
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>{t("markAsReviewed")}</TooltipContent>
|
<TooltipContent>{t("markAsReviewed")}</TooltipContent>
|
||||||
|
|||||||
@ -389,7 +389,7 @@ export default function LiveCameraView({
|
|||||||
return "mse";
|
return "mse";
|
||||||
}, [lowBandwidth, mic, webRTC, isRestreamed]);
|
}, [lowBandwidth, mic, webRTC, isRestreamed]);
|
||||||
|
|
||||||
useKeyboardListener(["m"], (key, modifiers) => {
|
useKeyboardListener(["m", "Escape"], (key, modifiers) => {
|
||||||
if (!modifiers.down) {
|
if (!modifiers.down) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -407,6 +407,12 @@ export default function LiveCameraView({
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "Escape":
|
||||||
|
if (!fullscreen) {
|
||||||
|
navigate(-1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user