From bafb5e1c72c41a0632df1b807a4257a697806185 Mon Sep 17 00:00:00 2001 From: Stephanos A Date: Tue, 2 Jun 2026 21:11:19 +0300 Subject: [PATCH 1/2] Removed remaining old files --- .../backoffice/src/app/dashboard/page.tsx | 2 +- .../src/pages/dashboard/DashboardPage.tsx | 13 ------- .../src/pages/passengers/PassengersPage.tsx | 10 ----- .../pages/schedules/ScheduleDetailPage.tsx | 36 ------------------ .../src/pages/schedules/SchedulesPage.tsx | 20 ---------- .../src/pages/stations/StationsPage.tsx | 32 ---------------- .../src/pages/tickets/BookTicketPage.tsx | 32 ---------------- .../src/pages/tickets/TicketDetailPage.tsx | 38 ------------------- .../portal/src/pages/tickets/TicketsPage.tsx | 28 -------------- 9 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 apps/edr-passenger-web/portal/src/pages/dashboard/DashboardPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/passengers/PassengersPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/schedules/ScheduleDetailPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/schedules/SchedulesPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/stations/StationsPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/tickets/BookTicketPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/tickets/TicketDetailPage.tsx delete mode 100644 apps/edr-passenger-web/portal/src/pages/tickets/TicketsPage.tsx diff --git a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx index 82b7c8cf5..2133fb396 100644 --- a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx +++ b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx @@ -20,7 +20,7 @@ export default function DashboardPage() { queryFn: () => dashboardApi.getRevenueChart(30), }); - const { data: recentBookingsData, isLoading: bookingsLoading } = useQuery({ + const { data: recentBookingsData, isLoading: bookingsLoading } = useQuery({ queryKey: ['recent-bookings'], queryFn: () => dashboardApi.getRecentBookings(10), }); diff --git a/apps/edr-passenger-web/portal/src/pages/dashboard/DashboardPage.tsx b/apps/edr-passenger-web/portal/src/pages/dashboard/DashboardPage.tsx deleted file mode 100644 index 71bc2e539..000000000 --- a/apps/edr-passenger-web/portal/src/pages/dashboard/DashboardPage.tsx +++ /dev/null @@ -1,13 +0,0 @@ -const DashboardPage = () => ( -
-

- Passenger Dashboard -

-

- Daily ridership, ticket sales, occupancy by class, and schedule status go - here. -

-
-); - -export default DashboardPage; diff --git a/apps/edr-passenger-web/portal/src/pages/passengers/PassengersPage.tsx b/apps/edr-passenger-web/portal/src/pages/passengers/PassengersPage.tsx deleted file mode 100644 index 936b5f573..000000000 --- a/apps/edr-passenger-web/portal/src/pages/passengers/PassengersPage.tsx +++ /dev/null @@ -1,10 +0,0 @@ -const PassengersPage = () => ( -
-

Passengers

-

- Passenger directory. Connect to /passengers when ready. -

-
-); - -export default PassengersPage; diff --git a/apps/edr-passenger-web/portal/src/pages/schedules/ScheduleDetailPage.tsx b/apps/edr-passenger-web/portal/src/pages/schedules/ScheduleDetailPage.tsx deleted file mode 100644 index 304b3c020..000000000 --- a/apps/edr-passenger-web/portal/src/pages/schedules/ScheduleDetailPage.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { useParams } from "react-router-dom"; - -import { useSchedule } from "@/hooks/useSchedules"; - -const ScheduleDetailPage = () => { - const { id } = useParams<{ id: string }>(); - const { data, isLoading } = useSchedule(id ?? ""); - - if (isLoading) return
Loading…
; - if (!data) - return
Schedule not found.
; - - return ( -
-

- Schedule {data.trainCode} -

-
-
Status
-
{data.status}
-
Departure
-
- {new Date(data.departureTime).toLocaleString()} -
-
Arrival
-
- {new Date(data.arrivalTime).toLocaleString()} -
-
Base price
-
{data.basePrice.toFixed(2)}
-
-
- ); -}; - -export default ScheduleDetailPage; diff --git a/apps/edr-passenger-web/portal/src/pages/schedules/SchedulesPage.tsx b/apps/edr-passenger-web/portal/src/pages/schedules/SchedulesPage.tsx deleted file mode 100644 index a51d63f91..000000000 --- a/apps/edr-passenger-web/portal/src/pages/schedules/SchedulesPage.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import ScheduleTable from "../../components/schedules/ScheduleTable"; -import { useSchedules } from "../../hooks/useSchedules"; - -const SchedulesPage = () => { - const { data, isLoading } = useSchedules(); - const items = data ?? []; - - return ( -
-

Schedules

- {isLoading ? ( -
Loading…
- ) : ( - - )} -
- ); -}; - -export default SchedulesPage; diff --git a/apps/edr-passenger-web/portal/src/pages/stations/StationsPage.tsx b/apps/edr-passenger-web/portal/src/pages/stations/StationsPage.tsx deleted file mode 100644 index 53c5ae1fb..000000000 --- a/apps/edr-passenger-web/portal/src/pages/stations/StationsPage.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { Table, type TableColumn } from "@edr/ui-common"; -import type { Passenger } from "@edr/types"; - -import { useStations } from "../../hooks/useStations"; - -const columns: TableColumn[] = [ - { key: "code", header: "Code" }, - { key: "name", header: "Name" }, - { key: "city", header: "City" }, - { key: "country", header: "Country" }, -]; - -const StationsPage = () => { - const { data, isLoading } = useStations(); - return ( -
-

Stations

- {isLoading ? ( -
Loading…
- ) : ( - row.id} - emptyMessage="No stations" - /> - )} - - ); -}; - -export default StationsPage; diff --git a/apps/edr-passenger-web/portal/src/pages/tickets/BookTicketPage.tsx b/apps/edr-passenger-web/portal/src/pages/tickets/BookTicketPage.tsx deleted file mode 100644 index 8f02a9264..000000000 --- a/apps/edr-passenger-web/portal/src/pages/tickets/BookTicketPage.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { useMutation, useQueryClient } from "@tanstack/react-query"; -import { useNavigate } from "react-router-dom"; - -import TicketForm from "../../components/tickets/TicketForm"; -import { ticketsService } from "../../services/tickets.service"; - -const BookTicketPage = () => { - const navigate = useNavigate(); - const queryClient = useQueryClient(); - - const mutation = useMutation({ - mutationFn: ticketsService.create, - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ["tickets"] }); - navigate("/tickets"); - }, - }); - - return ( -
-

- Issue ticket -

- -
- ); -}; - -export default BookTicketPage; diff --git a/apps/edr-passenger-web/portal/src/pages/tickets/TicketDetailPage.tsx b/apps/edr-passenger-web/portal/src/pages/tickets/TicketDetailPage.tsx deleted file mode 100644 index d53614726..000000000 --- a/apps/edr-passenger-web/portal/src/pages/tickets/TicketDetailPage.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import { useParams } from "react-router-dom"; - -import { useTicket } from "../../hooks/useTickets"; - -const TicketDetailPage = () => { - const { id } = useParams<{ id: string }>(); - const { data, isLoading } = useTicket(id ?? ""); - - if (isLoading) return
Loading…
; - if (!data) - return
Ticket not found.
; - - return ( -
-

- Ticket {data.reference} -

-
-
Passenger ID
-
{data.passengerId}
-
Schedule ID
-
{data.scheduleId}
-
Seat ID
-
{data.seatId}
-
Status
-
{data.status}
-
Issued
-
- {new Date(data.issuedAt).toLocaleString()} -
-
Price paid
-
{data.pricePaid.toFixed(2)}
-
-
- ); -}; - -export default TicketDetailPage; diff --git a/apps/edr-passenger-web/portal/src/pages/tickets/TicketsPage.tsx b/apps/edr-passenger-web/portal/src/pages/tickets/TicketsPage.tsx deleted file mode 100644 index b33471fac..000000000 --- a/apps/edr-passenger-web/portal/src/pages/tickets/TicketsPage.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { Link } from "react-router-dom"; -import { Button } from "@edr/ui-common"; - -import TicketTable from "../../components/tickets/TicketTable"; -import { useTickets } from "../../hooks/useTickets"; - -const TicketsPage = () => { - const { data, isLoading } = useTickets(); - const items = data?.items ?? []; - - return ( -
-
-

Tickets

- - - -
- {isLoading ? ( -
Loading…
- ) : ( - - )} -
- ); -}; - -export default TicketsPage; From c0e6e23c7627e7218e554fadd5e4bacb80308d9b Mon Sep 17 00:00:00 2001 From: Stephanos A Date: Tue, 2 Jun 2026 21:14:10 +0300 Subject: [PATCH 2/2] Fix redundant line in recent bookings data assignment on passenger backoffice dashboard --- apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx index f5f625784..ee4f5b9ce 100644 --- a/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx +++ b/apps/edr-passenger-web/backoffice/src/app/dashboard/page.tsx @@ -27,8 +27,7 @@ export default function DashboardPage() { const recentBookings = Array.isArray(recentBookingsData) ? recentBookingsData - : recentBookingsData?.items || recentBookingsData?.data || []; - : recentBookingsData?.items || recentBookingsData?.data || []; + : recentBookingsData?.items || recentBookingsData?.data || []; const columns = [ { key: 'reference', label: 'Reference', render: (item: any) => item.bookingRef || item.reference },