From 2548273d89e55efc24a2df101b621b06a6a83313 Mon Sep 17 00:00:00 2001 From: omagdy7 Date: Fri, 22 Dec 2023 20:32:40 +0200 Subject: Added rendering passenger requests --- driver/src/pages/Home.tsx | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'driver/src/pages') diff --git a/driver/src/pages/Home.tsx b/driver/src/pages/Home.tsx index 81f1fb9..5a2d981 100644 --- a/driver/src/pages/Home.tsx +++ b/driver/src/pages/Home.tsx @@ -5,9 +5,10 @@ import { Button } from "@/components/ui/button" import { CardTitle, CardHeader, CardContent, Card } from "@/components/ui/card" import { auth, db } from "@/firebase/firebase_config" import { fetchUserDetails } from "@/utils/fetchUserDetails" -import { DocumentData, collection, doc, getDoc, getDocs, query, where } from "firebase/firestore" +import { Toaster } from "@/components/ui/toaster" import { useEffect, useState } from "react" import { Navigate } from "react-router-dom" +import { fetchRideRequests } from "@/utils/fetchRideRequests" interface IDriver { uid: string, @@ -21,6 +22,8 @@ interface IDriver { interface IPassengerRequest { passengerName: string, + phoneNumber: string, + status: string, pickUp: string, dropOff: string, } @@ -30,12 +33,18 @@ interface ITrip { dropOff: string, } -function PassengerRequestCard({ passengerName, pickUp, dropOff }: IPassengerRequest) { +function PassengerRequestCard({ passengerName, pickUp, dropOff, status, phoneNumber }: IPassengerRequest) { return (
  • Passenger: {passengerName}

    +

    + Phone number: {phoneNumber} +

    +

    + Status: {status} +

    Pickup: {pickUp}

    @@ -57,13 +66,18 @@ function PassengerRequestCard({ passengerName, pickUp, dropOff }: IPassengerRequ export default function Home() { const [driverData, setDriverData] = useState() + const [rideRequests, setRideRequests] = useState([]) const [currentTrip, setCurrentTrip] = useState() - useEffect(() => { + const user = auth.currentUser; async function fetchData() { - const data: IDriver | null | undefined = await fetchUserDetails(); + const data: IDriver | null | undefined = await fetchUserDetails(user?.uid); + const rideReqs = await fetchRideRequests() + console.log("RideRequests:", rideReqs) setDriverData(data) + setRideRequests(rideReqs) + console.log("Length: ", rideRequests?.length) } fetchData() }, [auth.currentUser, db]); @@ -134,16 +148,34 @@ export default function Home() {
      - + {rideRequests?.map((rideReq) => { + return ( + < PassengerRequestCard + passengerName={rideReq?.name} + pickUp={rideReq?.pickUp} + dropOff={rideReq?.dropOff} + phoneNumber={rideReq?.phoneNumber} + status={rideReq?.status} + /> + ) + })}
    - +
    + ) ) -- cgit v1.2.3