Skip to content

Commit

Permalink
Rmove dependency on date-fns
Browse files Browse the repository at this point in the history
  • Loading branch information
maxslarsson committed Feb 2, 2025
1 parent f499df8 commit 6f65cf7
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
11 changes: 0 additions & 11 deletions ground-server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ground-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.0.4",
"date-fns": "^4.1.0",
"lucide-react": "^0.468.0",
"next": "15.1.4",
"next-auth": "^5.0.0-beta.25",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"use client";

import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
import { format } from "date-fns"; // Import date-fns
import { useData } from "@/contexts/data-context";
import {
ChartConfig,
Expand All @@ -10,7 +9,7 @@ import {
ChartTooltipContent,
} from "@/components/ui/chart";

function GetConfig(label: string) {
function getConfig(label: string) {
const chartConfig = {
config: {
label: label,
Expand All @@ -20,6 +19,14 @@ function GetConfig(label: string) {
return chartConfig;
}

function tickFormatter(tick: number) {
const date = new Date(tick);
const hours = date.getHours().toString().padStart(2, '0');
const minutes = date.getMinutes().toString().padStart(2, '0');
const formattedTime = `${hours}:${minutes}`;
return formattedTime;
}

interface LiveValueWithHistoricalGraphProps {
label: string;
dbField: string;
Expand All @@ -44,7 +51,7 @@ export function LiveValueWithHistoricalGraph({
<h3 className="text-center mb-2 font-semibold">
{duration}-Minute {label} History
</h3>
<ChartContainer config={GetConfig(label)} className="w-full h-full">
<ChartContainer config={getConfig(label)} className="w-full h-full">
<LineChart
accessibilityLayer
data={fieldData.map((d) => ({
Expand All @@ -57,7 +64,7 @@ export function LiveValueWithHistoricalGraph({
<XAxis
interval="preserveStartEnd"
dataKey="timestamp"
tickFormatter={(tick) => format(new Date(tick), "HH:mm")}
tickFormatter={tickFormatter}
tickLine={false}
axisLine={false}
tickMargin={8}
Expand Down
15 changes: 11 additions & 4 deletions ground-server/src/components/widgets/graph-widget.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
import { format } from "date-fns"; // Import date-fns

import {
ChartConfig,
Expand All @@ -15,7 +14,7 @@ import {
} from "@/lib/definitions";
import { useData } from "@/contexts/data-context";

function GetConfig(channel: TelemetryChannel) {
function getConfig(channel: TelemetryChannel) {
const chartConfig = {
config: {
label: channel.label,
Expand All @@ -25,6 +24,14 @@ function GetConfig(channel: TelemetryChannel) {
return chartConfig;
}

function tickFormatter(tick: number) {
const date = new Date(tick);
const hours = date.getHours().toString().padStart(2, '0');
const minutes = date.getMinutes().toString().padStart(2, '0');
const formattedTime = `${hours}:${minutes}`;
return formattedTime;
}

function GenericHistoricalChart(
duration: number,
data: DataPoint[],
Expand All @@ -37,7 +44,7 @@ function GenericHistoricalChart(
<h3 className="text-center mb-2 font-semibold">
{duration}-Minute {channel.label} History
</h3>
<ChartContainer config={GetConfig(channel)} className="w-full h-full">
<ChartContainer config={getConfig(channel)} className="w-full h-full">
<LineChart
accessibilityLayer
data={data.map((d) => ({
Expand All @@ -50,7 +57,7 @@ function GenericHistoricalChart(
<XAxis
interval="preserveStartEnd"
dataKey="timestamp"
tickFormatter={(tick) => format(new Date(tick), "HH:mm")}
tickFormatter={tickFormatter}
tickLine={false}
axisLine={false}
tickMargin={8}
Expand Down

0 comments on commit 6f65cf7

Please sign in to comment.