Build driver app, Uber-style dispatch, POI suggestions; fix map tiles
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>
This commit is contained in:
Vendored
+47
-6
@@ -1,13 +1,20 @@
|
||||
import { TextInputProps, TouchableOpacityProps } from "react-native";
|
||||
|
||||
declare interface Driver {
|
||||
driver_id: number;
|
||||
id: number;
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
profile_image_url: string;
|
||||
car_image_url: string;
|
||||
car_seats: number;
|
||||
rating: number;
|
||||
service: string;
|
||||
online?: boolean;
|
||||
latitude?: number | null;
|
||||
longitude?: number | null;
|
||||
user_id?: string | null;
|
||||
car_model?: string | null;
|
||||
last_seen?: string | null;
|
||||
}
|
||||
|
||||
declare interface MarkerData {
|
||||
@@ -21,6 +28,9 @@ declare interface MarkerData {
|
||||
rating: number;
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
service?: string;
|
||||
online?: boolean;
|
||||
car_model?: string | null;
|
||||
time?: number;
|
||||
price?: string;
|
||||
}
|
||||
@@ -34,6 +44,7 @@ declare interface MapProps {
|
||||
}
|
||||
|
||||
declare interface Ride {
|
||||
ride_id?: number;
|
||||
origin_address: string;
|
||||
destination_address: string;
|
||||
origin_latitude: number;
|
||||
@@ -43,16 +54,46 @@ declare interface Ride {
|
||||
ride_time: number;
|
||||
fare_price: number;
|
||||
payment_status: string;
|
||||
driver_id: number;
|
||||
user_email: string;
|
||||
status: string;
|
||||
service: string;
|
||||
driver_id: number | null;
|
||||
user_id?: string;
|
||||
payment_order_id?: string | null;
|
||||
created_at: string;
|
||||
completed_at?: string | null;
|
||||
cancelled_at?: string | null;
|
||||
driver: {
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
car_seats: number;
|
||||
id: number | null;
|
||||
first_name: string | null;
|
||||
last_name: string | null;
|
||||
car_seats: number | null;
|
||||
profile_image_url: string | null;
|
||||
car_image_url: string | null;
|
||||
rating: number | null;
|
||||
service: string | null;
|
||||
car_model: string | null;
|
||||
};
|
||||
}
|
||||
|
||||
declare interface RideOffer {
|
||||
id: number;
|
||||
ride_id: number;
|
||||
driver_id: number;
|
||||
status: string;
|
||||
offered_at: string;
|
||||
responded_at: string | null;
|
||||
ride?: Ride;
|
||||
}
|
||||
|
||||
declare interface NearbyPlace {
|
||||
name: string;
|
||||
address: string;
|
||||
latitude: number;
|
||||
longitude: number;
|
||||
distanceMeters?: number;
|
||||
category?: string;
|
||||
}
|
||||
|
||||
declare interface ButtonProps extends TouchableOpacityProps {
|
||||
title: string;
|
||||
bgVariant?: "primary" | "secondary" | "danger" | "outline" | "success";
|
||||
|
||||
Reference in New Issue
Block a user