mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-08 04:05:26 +03:00
Improve time formatting
This commit is contained in:
parent
7d5709a818
commit
d14bd1b29f
@ -2,6 +2,7 @@ import { FrigateConfig } from "@/types/frigateConfig";
|
|||||||
import { GraphDataPoint } from "@/types/graph";
|
import { GraphDataPoint } from "@/types/graph";
|
||||||
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
|
import { formatUnixTimestampToDateTime } from "@/utils/dateUtil";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
|
import ActivityIndicator from "../ui/activity-indicator";
|
||||||
|
|
||||||
type TimelineBarProps = {
|
type TimelineBarProps = {
|
||||||
startTime: number;
|
startTime: number;
|
||||||
@ -20,6 +21,10 @@ export default function TimelineBar({
|
|||||||
}: TimelineBarProps) {
|
}: TimelineBarProps) {
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
|
if (!config) {
|
||||||
|
return <ActivityIndicator />;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="my-1 p-1 w-full h-18 border rounded cursor-pointer hover:bg-secondary hover:bg-opacity-30"
|
className="my-1 p-1 w-full h-18 border rounded cursor-pointer hover:bg-secondary hover:bg-opacity-30"
|
||||||
@ -165,7 +170,8 @@ export default function TimelineBar({
|
|||||||
)}
|
)}
|
||||||
<div className="text-gray-500">
|
<div className="text-gray-500">
|
||||||
{formatUnixTimestampToDateTime(startTime, {
|
{formatUnixTimestampToDateTime(startTime, {
|
||||||
strftime_fmt: "%a %d %B",
|
strftime_fmt:
|
||||||
|
config.ui.time_format == "24hour" ? "%m/%d %H:%M" : "%m/%d %I:%M%P",
|
||||||
time_style: "medium",
|
time_style: "medium",
|
||||||
date_style: "medium",
|
date_style: "medium",
|
||||||
})}
|
})}
|
||||||
|
|||||||
@ -181,6 +181,14 @@ export default function DesktopTimelineView({
|
|||||||
min: new Date(timeline.range.start * 1000),
|
min: new Date(timeline.range.start * 1000),
|
||||||
max: new Date(timeline.range.end * 1000),
|
max: new Date(timeline.range.end * 1000),
|
||||||
zoomable: false,
|
zoomable: false,
|
||||||
|
format: {
|
||||||
|
majorLabels: {
|
||||||
|
minute:
|
||||||
|
config.ui.time_format == "24hour"
|
||||||
|
? "MM/DD HH:mm"
|
||||||
|
: "MM/DD hh:mma",
|
||||||
|
},
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
timechangeHandler={(data) => {
|
timechangeHandler={(data) => {
|
||||||
controllerRef.current?.scrubToTimestamp(
|
controllerRef.current?.scrubToTimestamp(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user