Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions frontend/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
'use client';

import { useState, useCallback, useEffect } from 'react';
import { useState, useCallback } from 'react';
import { StatusBar } from '@/components/ui/StatusBar';
import { Header } from '@/components/passenger/Header';
import { TripCard } from '@/components/passenger/TripCard';
import { LostItemModal } from '@/components/passenger/LostItemModal';
import { BottomNav, type NavTab } from '@/components/ui/BottomNav';
import { Toast } from '@/components/ui/Toast';
import { mockUser, mockTrips, mockActiveTrip, formatRelativeTime } from '@/lib/mock-data';
import { mockUser, formatRelativeTime } from '@/lib/mock-data';
import { config } from '@/lib/config';
import { useCurrentTrip, useTrips } from '@/lib/hooks';
import { UI_LABELS } from '@/lib/labels';
import type { Trip, LostItem } from '@/lib/types';

Expand Down Expand Up @@ -177,20 +178,10 @@ export default function PassengerApp() {
type: 'success' | 'error' | 'info';
} | null>(null);
const [activeTab, setActiveTab] = useState<NavTab>('reisen');
const [isLoading, setIsLoading] = useState(true);
const [currentTrip, setCurrentTrip] = useState<Trip | null>(null);
const [recentTrips, setRecentTrips] = useState<Trip[]>([]);

// Load trips data (simulates API call)
useEffect(() => {
const loadData = async () => {
await new Promise((resolve) => setTimeout(resolve, config.demo.mockDelay));
setCurrentTrip(mockActiveTrip);
setRecentTrips(mockTrips);
setIsLoading(false);
};
loadData();
}, []);
const { data: currentTrip, isLoading: isLoadingCurrentTrip } = useCurrentTrip();
const { data: recentTripsData, isLoading: isLoadingTrips } = useTrips();
const recentTrips = recentTripsData ?? [];
const isLoading = isLoadingCurrentTrip || isLoadingTrips;

const handleReportLost = useCallback((trip: Trip) => {
setSelectedTrip(trip);
Expand Down
58 changes: 30 additions & 28 deletions frontend/app/staff/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,24 @@ import { StaffHeader } from '@/components/staff/StaffHeader';
import { NotificationCard } from '@/components/staff/NotificationCard';
import { StaffStatusBar } from '@/components/staff/StaffStatusBar';
import type { StaffNotification, NotificationStatus } from '@/lib/types';
import { mockStaffNotifications, mockStaff, mockVehicle } from '@/lib/mock-data';
import { mockStaff, mockVehicle } from '@/lib/mock-data';
import { config } from '@/lib/config';
import { useDriverNotificationsApi } from '@/lib/hooks';
import { UI_LABELS } from '@/lib/labels';

export default function StaffPage() {
const [notifications, setNotifications] = useState<StaffNotification[]>([]);
const [isLoading, setIsLoading] = useState(true);
// Injected demo notification, prepended ahead of the fetched/mock list below.
const [demoNotifications, setDemoNotifications] = useState<StaffNotification[]>([]);
const [activeFilter, setActiveFilter] = useState<'all' | 'pending' | 'resolved'>('all');
const [showNewNotification, setShowNewNotification] = useState(false);

useEffect(() => {
// Simulate loading notifications
const timer = setTimeout(() => {
setNotifications(mockStaffNotifications);
setIsLoading(false);
}, config.demo.mockDelay);
const {
data: fetchedNotifications,
isLoading,
updateNotification,
} = useDriverNotificationsApi(mockVehicle.id);

return () => clearTimeout(timer);
}, []);
const notifications = [...demoNotifications, ...(fetchedNotifications ?? [])];

// Simulate incoming notification for demo
useEffect(() => {
Expand All @@ -50,7 +49,7 @@ export default function StaffPage() {
},
};

setNotifications((prev) => [newNotification, ...prev]);
setDemoNotifications((prev) => [newNotification, ...prev]);

// Play notification sound (if available)
if (typeof window !== 'undefined' && 'vibrate' in navigator) {
Expand All @@ -63,23 +62,26 @@ export default function StaffPage() {

const handleUpdateStatus = useCallback(
async (notificationId: string, status: NotificationStatus, notes?: string) => {
// Simulate API call
await new Promise((resolve) => setTimeout(resolve, config.demo.mockDelay));

setNotifications((prev) =>
prev.map((n) =>
n.id === notificationId
? {
...n,
status,
respondedAt: new Date().toISOString(),
response: notes ? { notes, foundItem: status === 'found' } : undefined,
}
: n,
),
);
if (demoNotifications.some((n) => n.id === notificationId)) {
setDemoNotifications((prev) =>
prev.map((n) =>
n.id === notificationId
? {
...n,
status,
respondedAt: new Date().toISOString(),
response: notes ? { notes, foundItem: status === 'found' } : undefined,
}
: n,
),
);
return;
}

if (status !== 'found' && status !== 'not_found') return;
await updateNotification(notificationId, status, notes);
},
[],
[demoNotifications, updateNotification],
);

const filteredNotifications = notifications.filter((n) => {
Expand Down
20 changes: 12 additions & 8 deletions frontend/components/passenger/LostItemModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from '@/lib/types';
import { formatTime, getTimeSinceTrip } from '@/lib/mock-data';
import { config } from '@/lib/config';
import { useReportLostItem } from '@/lib/hooks';
import { LoadingSpinner } from '@/components/ui/LoadingSpinner';

interface LostItemModalProps {
Expand All @@ -25,19 +26,23 @@ export function LostItemModal({ trip, onClose, onSubmit }: LostItemModalProps) {
const [category, setCategory] = useState<ItemCategory | null>(null);
const [description, setDescription] = useState('');
const [location, setLocation] = useState<ItemLocation | null>(null);
const [isSubmitting, setIsSubmitting] = useState(false);
const { reportItem, isSubmitting } = useReportLostItem();

const { minutes, isUrgent } = getTimeSinceTrip(trip.arrivalTime);

const handleSubmit = useCallback(async () => {
if (!category || !description.trim()) return;

setIsSubmitting(true);

// Simulate API call
await new Promise((resolve) => setTimeout(resolve, config.demo.mockDelay));
const result = await reportItem({
tripId: trip.id,
category,
description,
location: location || 'unknown',
});

const newItem: LostItem = {
// No backend configured (or it errored): fall back to a locally built
// item so the demo flow still completes.
const newItem: LostItem = result.item ?? {
id: `lost-${Date.now()}`,
userId: 'user-001',
tripId: trip.id,
Expand All @@ -49,14 +54,13 @@ export function LostItemModal({ trip, onClose, onSubmit }: LostItemModalProps) {
updatedAt: new Date().toISOString(),
};

setIsSubmitting(false);
setStep('success');

// Notify parent after showing success
setTimeout(() => {
onSubmit(newItem);
}, config.timing.successMessageDelay);
}, [category, description, location, trip.id, onSubmit]);
}, [category, description, location, trip.id, onSubmit, reportItem]);

const handleSelectCategory = (cat: ItemCategory) => {
setCategory(cat);
Expand Down
15 changes: 9 additions & 6 deletions frontend/lib/hooks/useApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useState, useEffect, useCallback } from 'react';
import { api } from '../api';
import { config } from '../config';
import type { Trip, DriverNotification, LostItem } from '../types';
import { mockTrips, mockDriverNotifications, mockActiveTrip } from '../mock-data';
import { mockTrips, mockStaffNotifications, mockActiveTrip } from '../mock-data';

interface UseApiState<T> {
data: T | null;
Expand Down Expand Up @@ -107,7 +107,7 @@ export function useDriverNotificationsApi(
const response = await api.getDriverNotifications(vehicleId, filter);
return response;
},
mockDriverNotifications,
mockStaffNotifications,
[vehicleId, filter],
);

Expand All @@ -116,10 +116,13 @@ export function useDriverNotificationsApi(

const updateNotification = useCallback(
async (id: string, status: 'found' | 'not_found', notes?: string) => {
// Optimistic update
// Optimistic update. `prev` is localData, which starts out null until this
// runs once — fall back to the fetched/mock list so the first response
// actually applies instead of updating nothing.
setLocalData((prev) => {
if (!prev) return prev;
return prev.map((n) =>
const base = prev ?? baseState.data;
if (!base) return prev;
return base.map((n) =>
n.id === id
? {
...n,
Expand All @@ -138,7 +141,7 @@ export function useDriverNotificationsApi(
console.log('API update failed, keeping local state');
}
},
[],
[baseState.data],
);

return {
Expand Down
3 changes: 0 additions & 3 deletions frontend/lib/mock-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,3 @@ export const mockStaffNotifications: StaffNotification[] = [
},
},
];

/** @deprecated Use mockStaffNotifications instead */
export const mockDriverNotifications = mockStaffNotifications;
Loading