From 093ee906eae5361bbf47ae2fdc4003f95696656a Mon Sep 17 00:00:00 2001 From: Ariel Costas Guerrero Date: Thu, 6 Nov 2025 15:44:58 +0100 Subject: Rename schedules table --- src/frontend/app/routes/estimates-$id.tsx | 26 +++++++++++++------------- src/frontend/app/routes/timetable-$id.tsx | 18 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/frontend/app/routes') diff --git a/src/frontend/app/routes/estimates-$id.tsx b/src/frontend/app/routes/estimates-$id.tsx index 60d533a..f213105 100644 --- a/src/frontend/app/routes/estimates-$id.tsx +++ b/src/frontend/app/routes/estimates-$id.tsx @@ -7,13 +7,13 @@ import { RegularTable } from "../components/RegularTable"; import { useApp } from "../AppContext"; import { GroupedTable } from "../components/GroupedTable"; import { useTranslation } from "react-i18next"; -import { TimetableTable, type TimetableEntry } from "../components/TimetableTable"; -import { EstimatesTableSkeleton, EstimatesGroupedSkeleton } from "../components/EstimatesTableSkeleton"; -import { TimetableSkeleton } from "../components/TimetableSkeleton"; -import { ErrorDisplay } from "../components/ErrorDisplay"; -import { PullToRefresh } from "../components/PullToRefresh"; -import { useAutoRefresh } from "../hooks/useAutoRefresh"; -import { type RegionId, getRegionConfig } from "../data/RegionConfig"; +import { SchedulesTable, type ScheduledTable } from "~/components/SchedulesTable"; +import { SchedulesTableSkeleton, EstimatesGroupedSkeleton } from "~/components/SchedulesTableSkeleton"; +import { TimetableSkeleton } from "~/components/TimetableSkeleton"; +import { ErrorDisplay } from "~/components/ErrorDisplay"; +import { PullToRefresh } from "~/components/PullToRefresh"; +import { useAutoRefresh } from "~/hooks/useAutoRefresh"; +import { type RegionId, getRegionConfig } from "~/data/RegionConfig"; export interface Estimate { line: string; @@ -43,7 +43,7 @@ const loadData = async (region: RegionId, stopId: string): Promise = return await resp.json(); }; -const loadTimetableData = async (region: RegionId, stopId: string): Promise => { +const loadTimetableData = async (region: RegionId, stopId: string): Promise => { const regionConfig = getRegionConfig(region); // Check if timetable is available for this region @@ -79,7 +79,7 @@ export default function Estimates() { const [estimatesError, setEstimatesError] = useState(null); // Timetable data state - const [timetableData, setTimetableData] = useState([]); + const [timetableData, setTimetableData] = useState([]); const [timetableLoading, setTimetableLoading] = useState(true); const [timetableError, setTimetableError] = useState(null); @@ -114,7 +114,7 @@ export default function Estimates() { const body = await loadData(region, params.id!); setData(body); setDataDate(new Date()); - + // Load stop data from StopDataProvider const stop = await StopDataProvider.getStopById(region, stopIdNum); setStopData(stop); @@ -237,7 +237,7 @@ export default function Estimates() { {tableStyle === "grouped" ? ( ) : ( - + )} @@ -281,7 +281,7 @@ export default function Estimates() { tableStyle === "grouped" ? ( ) : ( - + ) ) : estimatesError ? ( ) : timetableData.length > 0 ? ( <> - diff --git a/src/frontend/app/routes/timetable-$id.tsx b/src/frontend/app/routes/timetable-$id.tsx index 1942ce8..702989a 100644 --- a/src/frontend/app/routes/timetable-$id.tsx +++ b/src/frontend/app/routes/timetable-$id.tsx @@ -2,13 +2,13 @@ import { useEffect, useState, useRef } from "react"; import { useParams, Link } from "react-router"; import StopDataProvider from "../data/StopDataProvider"; import { ArrowLeft, Eye, EyeOff } from "lucide-react"; -import { TimetableTable, type TimetableEntry } from "../components/TimetableTable"; -import { TimetableSkeleton } from "../components/TimetableSkeleton"; -import { ErrorDisplay } from "../components/ErrorDisplay"; +import { type ScheduledTable } from "~/components/SchedulesTable"; +import { TimetableSkeleton } from "~/components/TimetableSkeleton"; +import { ErrorDisplay } from "~/components/ErrorDisplay"; import LineIcon from "../components/LineIcon"; import { useTranslation } from "react-i18next"; -import { type RegionId, getRegionConfig } from "../data/RegionConfig"; -import { useApp } from "../AppContext"; +import { type RegionId, getRegionConfig } from "~/data/RegionConfig"; +import { useApp } from "~/AppContext"; import "./timetable-$id.css"; interface ErrorInfo { @@ -17,7 +17,7 @@ interface ErrorInfo { message?: string; } -const loadTimetableData = async (region: RegionId, stopId: string): Promise => { +const loadTimetableData = async (region: RegionId, stopId: string): Promise => { const regionConfig = getRegionConfig(region); // Check if timetable is available for this region @@ -49,7 +49,7 @@ const timeToMinutes = (time: string): number => { }; // Filter past entries (keep only a few recent past ones) -const filterTimetableData = (data: TimetableEntry[], currentTime: string, showPast: boolean = false): TimetableEntry[] => { +const filterTimetableData = (data: ScheduledTable[], currentTime: string, showPast: boolean = false): ScheduledTable[] => { if (showPast) return data; const currentMinutes = timeToMinutes(currentTime); @@ -111,7 +111,7 @@ export default function Timetable() { const { region } = useApp(); const params = useParams(); const stopIdNum = parseInt(params.id ?? ""); - const [timetableData, setTimetableData] = useState([]); + const [timetableData, setTimetableData] = useState([]); const [customName, setCustomName] = useState(undefined); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); @@ -282,7 +282,7 @@ export default function Timetable() { // Custom component for the full timetable with scroll reference const TimetableTableWithScroll: React.FC<{ - data: TimetableEntry[]; + data: ScheduledTable[]; showAll: boolean; currentTime: string; nextEntryRef: React.RefObject; -- cgit v1.3