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

UI Fixes (#13703)

Browse Source 
* Respect ui configured timezone

* Non alert videos are always 16:9
This commit is contained in:
Nicolas Mowen 2024-09-12 13:28:15 -06:00 committed by GitHub
parent d84e3cacca
commit 87ab4e7c9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/card/AnimatedEventCard.tsx
View File

@ -91,13 +91,17 @@ export function AnimatedEventCard({
const [alertVideos] = usePersistence("alertVideos", true); const [alertVideos] = usePersistence("alertVideos", true);
const aspectRatio = useMemo(() => { const aspectRatio = useMemo(() => {
if (!config || !Object.keys(config.cameras).includes(event.camera)) { if (
!config ||
!alertVideos ||
!Object.keys(config.cameras).includes(event.camera)
) {
return 16 / 9; return 16 / 9;
} }
const detect = config.cameras[event.camera].detect; const detect = config.cameras[event.camera].detect;
return detect.width / detect.height; return detect.width / detect.height;
}, [config, event]); }, [alertVideos, config, event]);
return ( return (
<Tooltip> <Tooltip>

1
web/src/components/card/ReviewCard.tsx
View File

@ -50,6 +50,7 @@ export default function ReviewCard({
const formattedDate = useFormattedTimestamp( const formattedDate = useFormattedTimestamp(
event.start_time, event.start_time,
config?.ui.time_format == "24hour" ? "%H:%M" : "%I:%M %p", config?.ui.time_format == "24hour" ? "%H:%M" : "%I:%M %p",
config?.ui.timezone,
); );
const isSelected = useMemo( const isSelected = useMemo(
() => () =>

1
web/src/components/card/SearchThumbnail.tsx
View File

@ -42,6 +42,7 @@ export default function SearchThumbnail({
const formattedDate = useFormattedTimestamp( const formattedDate = useFormattedTimestamp(
searchResult.start_time, searchResult.start_time,
config?.ui.time_format == "24hour" ? "%b %-d, %H:%M" : "%b %-d, %I:%M %p", config?.ui.time_format == "24hour" ? "%b %-d, %H:%M" : "%b %-d, %I:%M %p",
config?.ui.timezone,
); );
return ( return (

1
web/src/components/overlay/detail/ReviewDetailDialog.tsx
View File

@ -73,6 +73,7 @@ export default function ReviewDetailDialog({
config?.ui.time_format == "24hour" config?.ui.time_format == "24hour"
? "%b %-d %Y, %H:%M" ? "%b %-d %Y, %H:%M"
: "%b %-d %Y, %I:%M %p", : "%b %-d %Y, %I:%M %p",
config?.ui.timezone,
); );
// content // content

1
web/src/components/overlay/detail/SearchDetailDialog.tsx
View File

@ -227,6 +227,7 @@ function ObjectDetailsTab({
config?.ui.time_format == "24hour" config?.ui.time_format == "24hour"
? "%b %-d %Y, %H:%M" ? "%b %-d %Y, %H:%M"
: "%b %-d %Y, %I:%M %p", : "%b %-d %Y, %I:%M %p",
config?.ui.timezone,
); );
const score = useMemo(() => { const score = useMemo(() => {

1
web/src/components/player/PreviewThumbnailPlayer.tsx
View File

@ -168,6 +168,7 @@ export default function PreviewThumbnailPlayer({
const formattedDate = useFormattedTimestamp( const formattedDate = useFormattedTimestamp(
review.start_time, review.start_time,
config?.ui.time_format == "24hour" ? "%b %-d, %H:%M" : "%b %-d, %I:%M %p", config?.ui.time_format == "24hour" ? "%b %-d, %H:%M" : "%b %-d, %I:%M %p",
config?.ui?.timezone,
); );
return ( return (

9
web/src/hooks/use-date-utils.ts
View File

@ -2,12 +2,17 @@ import { FrigateConfig } from "@/types/frigateConfig";
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil"; import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
import { useMemo } from "react"; import { useMemo } from "react";
export function useFormattedTimestamp(timestamp: number, format: string) { export function useFormattedTimestamp(
timestamp: number,
format: string,
timezone?: string,
) {
const formattedTimestamp = useMemo(() => { const formattedTimestamp = useMemo(() => {
return formatUnixTimestampToDateTime(timestamp, { return formatUnixTimestampToDateTime(timestamp, {
timezone,
strftime_fmt: format, strftime_fmt: format,
}); });
}, [format, timestamp]); }, [format, timestamp, timezone]);
return formattedTimestamp; return formattedTimestamp;
} }