Skip to content

Commit 0d4a193

Browse files
mpfeilfreds-dev
andauthored
migrate to rr7 (#482)
* migrate to rr7 * adjust `/explore` route to new routing * adjust all routes to new routing except `/resources` * fix `duplicate imports` eslint errors * update `package-lock.json` * fix TS errors * fix more TypeScript errors * fix Photo upload on react-router * delete set-theme route * fix `.mdx` typegen errors * fix session * remove navigate and use Link * ensure same sensor order * fix wrong loader import * migrate to rr7 (#487) * fix eslint warnings * remove markdown * fix ESLint --------- Co-authored-by: freds-dev <[email protected]> --------- Co-authored-by: freds-dev <[email protected]>
1 parent 7815eb7 commit 0d4a193

File tree

191 files changed

+6308
-9331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+6308
-9331
lines changed

.eslintrc.cjs

Lines changed: 0 additions & 44 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ measurements.csv
1919
/playwright-report/
2020
/blob-report/
2121
/playwright/.cache/
22+
23+
.react-router/

app/components/aggregation-filter.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import * as SelectPrimitive from "@radix-ui/react-select";
12
import { Filter } from "lucide-react";
2-
import { Separator } from "./ui/separator";
3+
import { useSearchParams, useSubmit } from "react-router";
34
import { Badge } from "./ui/badge";
4-
import { useSearchParams, useSubmit } from "@remix-run/react";
5-
import * as SelectPrimitive from "@radix-ui/react-select";
65

76
import { Select, SelectContent, SelectItem } from "./ui/select";
7+
import { Separator } from "./ui/separator";
88

99
type Aggregation = {
1010
value: string;
@@ -52,7 +52,7 @@ export function AggregationFilter() {
5252
value={selectedAggregation?.value}
5353
onValueChange={(value) => {
5454
searchParams.set("aggregation", value);
55-
submit(searchParams);
55+
void submit(searchParams);
5656
}}
5757
>
5858
<SelectPrimitive.Trigger

app/components/color-picker.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
"use client";
22

3+
import { X } from "lucide-react";
34
import { Button } from "@/components/ui/button";
45
import { Input } from "@/components/ui/input";
5-
import { X } from "lucide-react";
66

77
export function ColorPicker({
88
handleColorChange,
99
colorPickerState,
1010
setColorPickerState,
11-
className,
1211
}: {
1312
handleColorChange: (color: string, index: number) => void;
1413
colorPickerState: {

app/components/daterange-filter.tsx

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
import { PopoverClose } from "@radix-ui/react-popover";
2+
import { format } from "date-fns";
13
import { Clock } from "lucide-react";
2-
import { Button } from "./ui/button";
3-
import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
4-
import { Separator } from "./ui/separator";
4+
import { useEffect, useState } from "react";
5+
import { type DateRange } from "react-day-picker";
6+
import { useLoaderData, useSearchParams, useSubmit } from "react-router";
57
import { Badge } from "./ui/badge";
8+
import { Button } from "./ui/button";
9+
import { Calendar } from "./ui/calendar";
610
import {
711
Command,
812
CommandEmpty,
@@ -11,14 +15,10 @@ import {
1115
CommandItem,
1216
CommandList,
1317
} from "./ui/command";
14-
import { useEffect, useState } from "react";
15-
import { Calendar } from "./ui/calendar";
16-
import { useLoaderData, useSearchParams, useSubmit } from "@remix-run/react";
17-
import type { loader } from "~/routes/explore+/$deviceId+/_$deviceId";
18-
import type { DateRange } from "react-day-picker";
19-
import { PopoverClose } from "@radix-ui/react-popover";
18+
import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
19+
import { Separator } from "./ui/separator";
2020
import dateTimeRanges from "~/lib/date-ranges";
21-
import { format } from "date-fns";
21+
import { type loader } from "~/routes/explore.$deviceId.$sensorId.$";
2222

2323
export function DateRangeFilter() {
2424
// Get data from the loader
@@ -39,14 +39,15 @@ export function DateRangeFilter() {
3939
if (
4040
!date?.from &&
4141
!date?.to &&
42+
loaderData.sensors &&
43+
loaderData.sensors.length > 0 &&
44+
loaderData.sensors[0].data &&
4245
loaderData.sensors[0].data.length > 0
4346
) {
44-
// on initial load, without a selected time range, check what time rage the last 20000 data points are in
45-
const firstDate = loaderData.sensors[0].data[0].time;
47+
const firstDate = loaderData.sensors[0].data[0]?.time;
4648
const lastDate =
47-
loaderData.sensors[0].data[
48-
loaderData.sensors[0].data.length - 1
49-
].time;
49+
loaderData.sensors[0].data[loaderData.sensors[0].data.length - 1]?.time;
50+
5051
setDate({
5152
from: lastDate ? new Date(lastDate) : undefined,
5253
to: firstDate ? new Date(firstDate) : undefined,
@@ -157,7 +158,7 @@ export function DateRangeFilter() {
157158
<PopoverClose
158159
className="inline-flex h-10 items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground ring-offset-background transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
159160
onClick={() => {
160-
submit(searchParams);
161+
void submit(searchParams);
161162
}}
162163
>
163164
Apply

app/components/device-card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
CardHeader,
77
CardTitle,
88
} from "./ui/card";
9-
import type { Device } from "~/schema";
9+
import { type Device } from "~/schema";
1010

1111
interface DeviceCardProps {
1212
device: Device;

0 commit comments

Comments
 (0)