Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
209 lines
5.6 KiB
TypeScript
209 lines
5.6 KiB
TypeScript
import { useCallback, useEffect, useState, type FormEvent } from "react";
|
|
import { api } from "../lib/api";
|
|
|
|
type Driver = {
|
|
id: number;
|
|
first_name: string;
|
|
last_name: string;
|
|
profile_image_url: string | null;
|
|
car_image_url: string | null;
|
|
car_seats: number;
|
|
rating: string;
|
|
service: string;
|
|
online: boolean;
|
|
car_model: string | null;
|
|
total_rides: number;
|
|
revenue: number;
|
|
};
|
|
|
|
const EMPTY = {
|
|
first_name: "",
|
|
last_name: "",
|
|
profile_image_url: "",
|
|
car_image_url: "",
|
|
car_seats: 4,
|
|
rating: 4.5,
|
|
};
|
|
|
|
export default function Drivers() {
|
|
const [drivers, setDrivers] = useState<Driver[]>([]);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [editing, setEditing] = useState<Driver | "new" | null>(null);
|
|
|
|
const load = useCallback(async () => {
|
|
try {
|
|
const res = await api<{ data: Driver[] }>("/admin/drivers");
|
|
setDrivers(res.data);
|
|
setError(null);
|
|
} catch (e) {
|
|
setError((e as Error).message);
|
|
}
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
load();
|
|
}, [load]);
|
|
|
|
const remove = async (id: number) => {
|
|
if (!confirm("Delete this driver?")) return;
|
|
try {
|
|
await api(`/admin/drivers/${id}`, { method: "DELETE" });
|
|
await load();
|
|
} catch (e) {
|
|
setError((e as Error).message);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<h2>Drivers & fleet</h2>
|
|
<div className="toolbar">
|
|
<button onClick={() => setEditing("new")}>Add driver</button>
|
|
</div>
|
|
{error && <div className="error">{error}</div>}
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>ID</th>
|
|
<th>Name</th>
|
|
<th>Service</th>
|
|
<th>Seats</th>
|
|
<th>Rating</th>
|
|
<th>Online</th>
|
|
<th>Rides</th>
|
|
<th>Revenue</th>
|
|
<th></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{drivers.map((d) => (
|
|
<tr key={d.id}>
|
|
<td>{d.id}</td>
|
|
<td>
|
|
{d.first_name} {d.last_name}
|
|
</td>
|
|
<td>
|
|
<span className={`tag tag-${d.service}`}>{d.service}</span>
|
|
</td>
|
|
<td>{d.car_seats}</td>
|
|
<td>{d.rating}</td>
|
|
<td>{d.online ? "● online" : "○ off"}</td>
|
|
<td>{d.total_rides}</td>
|
|
<td>{d.revenue.toLocaleString()}</td>
|
|
<td>
|
|
<div className="row-actions">
|
|
<button className="secondary" onClick={() => setEditing(d)}>
|
|
Edit
|
|
</button>
|
|
<button className="danger" onClick={() => remove(d.id)}>
|
|
Delete
|
|
</button>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
|
|
{editing && (
|
|
<DriverForm
|
|
initial={editing === "new" ? null : editing}
|
|
onClose={() => setEditing(null)}
|
|
onSaved={() => {
|
|
setEditing(null);
|
|
load();
|
|
}}
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
}
|
|
|
|
function DriverForm({
|
|
initial,
|
|
onClose,
|
|
onSaved,
|
|
}: {
|
|
initial: Driver | null;
|
|
onClose: () => void;
|
|
onSaved: () => void;
|
|
}) {
|
|
const [form, setForm] = useState(
|
|
initial
|
|
? {
|
|
first_name: initial.first_name,
|
|
last_name: initial.last_name,
|
|
profile_image_url: initial.profile_image_url ?? "",
|
|
car_image_url: initial.car_image_url ?? "",
|
|
car_seats: initial.car_seats,
|
|
rating: Number(initial.rating),
|
|
}
|
|
: { ...EMPTY },
|
|
);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [busy, setBusy] = useState(false);
|
|
|
|
const set = (key: keyof typeof form) => (e: { target: { value: string } }) =>
|
|
setForm((f) => ({
|
|
...f,
|
|
[key]:
|
|
key === "car_seats" || key === "rating"
|
|
? Number(e.target.value)
|
|
: e.target.value,
|
|
}));
|
|
|
|
const submit = async (e: FormEvent) => {
|
|
e.preventDefault();
|
|
setBusy(true);
|
|
try {
|
|
await api(initial ? `/admin/drivers/${initial.id}` : "/admin/drivers", {
|
|
method: initial ? "PATCH" : "POST",
|
|
body: JSON.stringify(form),
|
|
});
|
|
onSaved();
|
|
} catch (err) {
|
|
setError((err as Error).message);
|
|
} finally {
|
|
setBusy(false);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<div className="modal-backdrop" onClick={onClose}>
|
|
<form className="modal" onClick={(e) => e.stopPropagation()} onSubmit={submit}>
|
|
<h3>{initial ? `Edit driver #${initial.id}` : "New driver"}</h3>
|
|
<input placeholder="First name" value={form.first_name} onChange={set("first_name")} required />
|
|
<input placeholder="Last name" value={form.last_name} onChange={set("last_name")} required />
|
|
<input placeholder="Profile image URL" value={form.profile_image_url} onChange={set("profile_image_url")} />
|
|
<input placeholder="Car image URL" value={form.car_image_url} onChange={set("car_image_url")} />
|
|
<label>
|
|
Seats{" "}
|
|
<select value={form.car_seats} onChange={set("car_seats")}>
|
|
{[2, 4, 6, 7].map((n) => (
|
|
<option key={n} value={n}>
|
|
{n}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</label>
|
|
<input
|
|
type="number"
|
|
step="0.1"
|
|
min="1"
|
|
max="5"
|
|
placeholder="Rating"
|
|
value={form.rating}
|
|
onChange={set("rating")}
|
|
/>
|
|
{error && <div className="error">{error}</div>}
|
|
<div className="row-actions">
|
|
<button disabled={busy}>{busy ? "Saving…" : "Save"}</button>
|
|
<button type="button" className="secondary" onClick={onClose}>
|
|
Cancel
|
|
</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
);
|
|
}
|