Register Phone Number
@@ -541,7 +575,7 @@ export function AdminTools() {
className="flex-1 px-3 py-2 bg-background text-foreground border border-input rounded-md focus:outline-none focus:ring-2 focus:ring-primary"
/>
)}
+ {/* CAPTCHA Challenge Modal */}
+ {showCaptcha && (
+
+
+
+
CAPTCHA Verification Required
+
+
+ Signal requires CAPTCHA verification to register this number. Follow these steps:
+
+
+ -
+
+ Open the CAPTCHA page
+
+
+ - Solve the CAPTCHA puzzle
+ - When the "Open Signal" button appears, right-click it
+ - Select "Copy link address" or "Copy Link"
+ - Paste the full link below (starts with
signalcaptcha://)
+
+
+
setCaptchaToken(e.target.value)}
+ placeholder="signalcaptcha://signal-hcaptcha..."
+ className="w-full px-3 py-2 bg-background text-foreground border border-input rounded-md focus:outline-none focus:ring-2 focus:ring-primary font-mono text-sm"
+ />
+
+
+
+
+
+
+ )}
+
{/* Verify Code */}
{showVerify && (
diff --git a/frontend/src/pages/CommandCenter.tsx b/frontend/src/pages/CommandCenter.tsx
index f3eae70..3550a86 100644
--- a/frontend/src/pages/CommandCenter.tsx
+++ b/frontend/src/pages/CommandCenter.tsx
@@ -153,6 +153,18 @@ export function CommandCenter() {
},
});
+ // Compute awaiting confirmation BEFORE any conditional returns (for hooks)
+ const now = currentTime;
+ const awaitingConfirmation = (events || []).filter((event) => {
+ if (event.status !== 'SCHEDULED' || event.type !== 'TRANSPORT') return false;
+ const start = new Date(event.startTime);
+ return start <= now;
+ });
+
+ // Check which awaiting events have driver responses since the event started
+ // MUST be called before any conditional returns to satisfy React's rules of hooks
+ const { data: respondedEventIds } = useDriverResponseCheck(awaitingConfirmation);
+
// Update clock every second
useEffect(() => {
const clockInterval = setInterval(() => {
@@ -242,7 +254,6 @@ export function CommandCenter() {
return ;
}
- const now = currentTime;
const fifteenMinutes = new Date(now.getTime() + 15 * 60 * 1000);
const thirtyMinutes = new Date(now.getTime() + 30 * 60 * 1000);
const twoHoursLater = new Date(now.getTime() + 2 * 60 * 60 * 1000);
@@ -253,17 +264,6 @@ export function CommandCenter() {
(event) => event.status === 'IN_PROGRESS' && event.type === 'TRANSPORT'
);
- // Trips that SHOULD be active (past start time but still SCHEDULED)
- // These are awaiting driver confirmation
- const awaitingConfirmation = events.filter((event) => {
- if (event.status !== 'SCHEDULED' || event.type !== 'TRANSPORT') return false;
- const start = new Date(event.startTime);
- return start <= now;
- });
-
- // Check which awaiting events have driver responses since the event started
- const { data: respondedEventIds } = useDriverResponseCheck(awaitingConfirmation);
-
// Upcoming trips in next 2 hours
const upcomingTrips = events
.filter((event) => {
diff --git a/frontend/src/pages/DriverProfile.tsx b/frontend/src/pages/DriverProfile.tsx
index ef8ceac..3f65378 100644
--- a/frontend/src/pages/DriverProfile.tsx
+++ b/frontend/src/pages/DriverProfile.tsx
@@ -2,8 +2,23 @@ import { useState, useEffect } from 'react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { api } from '@/lib/api';
import { Loading } from '@/components/Loading';
-import { User, Phone, Save, CheckCircle, AlertCircle } from 'lucide-react';
+import {
+ User,
+ Phone,
+ Save,
+ CheckCircle,
+ AlertCircle,
+ MapPin,
+ Navigation,
+ Route,
+ Gauge,
+ Car,
+ Clock,
+ Shield,
+} from 'lucide-react';
import toast from 'react-hot-toast';
+import { useMyGpsStatus, useMyGpsStats, useUpdateGpsConsent } from '@/hooks/useGps';
+import { formatDistanceToNow } from 'date-fns';
interface DriverProfileData {
id: string;
@@ -221,6 +236,182 @@ export function DriverProfile() {
Trip start confirmation request
+
+ {/* GPS Tracking Section */}
+
+
+ );
+}
+
+function GpsStatsSection() {
+ const { data: gpsStatus, isLoading: statusLoading } = useMyGpsStatus();
+ const { data: gpsStats, isLoading: statsLoading } = useMyGpsStats();
+ const updateConsent = useUpdateGpsConsent();
+
+ if (statusLoading) {
+ return (
+
+
+
+
+
+
GPS Tracking
+
+
+
+ {gpsStatus.isActive ? 'Active' : 'Inactive'}
+
+
+
+ {gpsStatus.lastActive && (
+
+ Last seen: {formatDistanceToNow(new Date(gpsStatus.lastActive), { addSuffix: true })}
+
+ )}
+
+
+ {/* Stats Grid */}
+ {statsLoading ? (
+
+
+
+ ) : gpsStats ? (
+
+
+ Stats for the last 7 days ({new Date(gpsStats.period.from).toLocaleDateString()} - {new Date(gpsStats.period.to).toLocaleDateString()})
+
+
+
+
+
+
{gpsStats.stats.totalMiles}
+
Miles Driven
+
+
+
+
+
{gpsStats.stats.topSpeedMph}
+
Top Speed (mph)
+
+
+
+
+
{gpsStats.stats.averageSpeedMph}
+
Avg Speed (mph)
+
+
+
+
+
{gpsStats.stats.totalTrips}
+
Total Trips
+
+
+
+ {gpsStats.stats.topSpeedTimestamp && (
+
+ Top speed recorded on {new Date(gpsStats.stats.topSpeedTimestamp).toLocaleString()}
+
+ )}
+
+ ) : (
+
+
+
No driving data available yet
+
Start driving to see your stats!
+
+ )}
+
+ {/* Revoke Consent Option */}
+
+
+