KrikoriosandClaude
f50ff27e11
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>
58 lines
1.7 KiB
TypeScript
58 lines
1.7 KiB
TypeScript
// The services offered on the home screen.
|
|
//
|
|
// English-only for now. When the app gets a real language layer these are the
|
|
// intended Arabic names, chosen Levantine rather than formal MSA — "موتور" is
|
|
// what a motorcycle taxi is actually called in Lebanon, where "دراجة نارية"
|
|
// reads like a textbook translation:
|
|
// car → سيارة
|
|
// moto → موتور
|
|
// courier → توصيل طرود
|
|
// chauffeur → سائق خاص
|
|
|
|
export type ServiceId = "car" | "moto" | "courier" | "chauffeur";
|
|
|
|
export type Service = {
|
|
id: ServiceId;
|
|
/** MaterialCommunityIcons glyph name. */
|
|
icon: "car" | "motorbike" | "package-variant-closed" | "steering";
|
|
/** Kept to one short word so four tiles fit a phone width without scrolling. */
|
|
label: string;
|
|
/** Shown under the row once the service is selected. */
|
|
tagline: string;
|
|
/** Multiplier applied to the base fare for this service (car = 1.0). */
|
|
fareMultiplier: number;
|
|
};
|
|
|
|
export const SERVICES: Service[] = [
|
|
{
|
|
id: "car",
|
|
icon: "car",
|
|
label: "Car",
|
|
tagline: "An everyday ride, up to 4 seats.",
|
|
fareMultiplier: 1.0,
|
|
},
|
|
{
|
|
id: "moto",
|
|
icon: "motorbike",
|
|
label: "Moto",
|
|
tagline: "Beat the traffic — one passenger, no luggage.",
|
|
fareMultiplier: 0.7,
|
|
},
|
|
{
|
|
id: "courier",
|
|
icon: "package-variant-closed",
|
|
label: "Courier",
|
|
tagline: "Send a parcel across town without riding along.",
|
|
fareMultiplier: 0.85,
|
|
},
|
|
{
|
|
id: "chauffeur",
|
|
icon: "steering",
|
|
label: "My Car",
|
|
tagline: "A driver comes to you and drives your own car.",
|
|
fareMultiplier: 1.5,
|
|
},
|
|
];
|
|
|
|
export const DEFAULT_SERVICE: ServiceId = "car";
|