updated driver

created . ongoing delivery

backend/controllers/DLDeliveryController.js

@@ -166,4 +166,38 @@ export const getOngoingDeliveriesByDriver = asyncHandler(async (req, res) => {
     } else {
         res.json({ message: 'No ongoing deliveries at the moment' });
     }
+});
+
+
+
+// Update delivery status
+export const updateDeliveryStatus = asyncHandler(async (req, res) => {
+    const { deliveryStatus } = req.body; // Get the new status from the request body
+
+    try {
+        const delivery = await DLDelivery.findById(req.params.deliveryId);
+
+        if (!delivery) {
+            return res.status(404).json({ message: 'Delivery not found' });
+        }
+
+        // Prevent moving back to previous statuses
+        if (delivery.deliveryStatus === 'Delivered') {
+            return res.status(400).json({ message: 'Cannot update the status of a delivered order' });
+        }
+
+        // Update the delivery status
+        delivery.deliveryStatus = deliveryStatus;
+
+        // If the delivery is marked as "Delivered", set the deliveredDateTime
+        if (deliveryStatus === 'Delivered') {
+            delivery.deliveredDateTime = Date.now();
+        }
+
+        await delivery.save();
+
+        res.status(200).json({ message: 'Delivery status updated successfully', delivery });
+    } catch (error) {
+        res.status(500).json({ message: 'Error updating delivery status', error });
+    }
 });

backend/routes/DLDeliveryRoute.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver} from '../controllers/DLDeliveryController.js';
+import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver,updateDeliveryStatus} from '../controllers/DLDeliveryController.js';
 
 const router = express.Router();
 
@@ -23,5 +23,8 @@ router.get('/ongoing/count', getOngoingDeliveries);
 // Route to get ongoing deliveries assigned to a driver
 router.get('/ongoing/:driverID', getOngoingDeliveriesByDriver);
 
+// Route to update delivery status
+router.put('/:deliveryId/status', updateDeliveryStatus);
+
 
 export default router;

frontend/src/App.jsx

@@ -83,7 +83,8 @@ import OrderTable from './Pages/delivery/DLOtable'; // Assuming you store it in
 import Od from './Pages/delivery/or/orderdelete'; //
 import DLAllDeliveries from './Pages/delivery/DLviewDeliveries'; // Import the DLAllDeliveries component
 import DLViewDelivery from './Pages/delivery/DLviewDelivery'; // Import the
-
+import OngoingDelivery from './Pages/delivery/driver/OngoingDelivery'; // Import the OngoingDelivery component
+import ViewDelivery from './Pages/delivery/driver/ViewDelivery'; // Import the ViewDelivery page
 
 
 
@@ -204,6 +205,8 @@ const router = createBrowserRouter(
              <Route path="/d" element={<Od/>} />
               <Route path="/DLAllDeliveries" element={<DLAllDeliveries/>} />
             <Route path="/manager/delivery/:id" element={<DLViewDelivery />} />
+            <Route path="/ongoing" element={<OngoingDelivery />} />
+            <Route path="/driver/delivery/:id" element={<ViewDelivery />} /> {/* Route for viewing a specific delivery */}
 
 
                 <Route path="*" element={<NotFound />} />

frontend/src/Components/delivery/DeliverySidebar.jsx

@@ -77,7 +77,7 @@ const DeliverySidebar = ({ driver }) => {
                     </li>
                     <li>
                         <NavLink
-                            to="/driver/ongoing-deliveries"
+                            to="/ongoing"
                             className={({ isActive }) =>
                                 `flex items-center p-2 text-gray-700 rounded-md hover:bg-gray-100 ${
                                     isActive ? 'bg-gray-100 border-l-4 border-green-700' : ''

frontend/src/Pages/delivery/driver/OngoingDelivery.jsx

@@ -0,0 +1,191 @@
+import React, { useEffect, useState } from 'react'
+import axios from 'axios'
+import { useNavigate } from 'react-router-dom'
+import DeliverySidebar from '../../../Components/delivery/DeliverySidebar'
+import Swal from 'sweetalert2'
+
+const OngoingDelivery = () => {
+    const [deliveries, setDeliveries] = useState([]);
+    const [loading, setLoading] = useState(true);
+    const [driver, setDriver] = useState(null);
+    const driverToken = localStorage.getItem('driverToken');
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        const fetchDriverAndDeliveries = async () => {
+            if (!driverToken) {
+                navigate('/driver/login'); // Redirect to login if not logged in
+                return;
+            }
+
+            try {
+                // Fetch driver profile
+                const driverRes = await axios.get('/api/drivers/profile', {
+                    headers: {
+                        Authorization: `Bearer ${driverToken}`,
+                    },
+                });
+                setDriver(driverRes.data);
+
+                // Fetch ongoing deliveries for the driver
+                const deliveriesRes = await axios.get(`/api/delivery/ongoing/${driverRes.data._id}`, {
+                    headers: {
+                        Authorization: `Bearer ${driverToken}`,
+                    },
+                });
+
+                setDeliveries(deliveriesRes.data);
+                setLoading(false);
+            } catch (error) {
+                console.error('Error fetching deliveries:', error);
+            }
+        };
+
+        fetchDriverAndDeliveries();
+    }, [driverToken, navigate]);
+
+    const handleStatusUpdate = async (deliveryId, currentStatus) => {
+        let newStatus;
+
+        // Determine next status
+        if (currentStatus === 'Ready') {
+            newStatus = 'Picked Up';
+        } else if (currentStatus === 'Picked Up') {
+            newStatus = 'On The Way';
+        } else if (currentStatus === 'On The Way') {
+            newStatus = 'Delivered';
+        } else {
+            return; // If already delivered or status is not eligible for change, do nothing
+        }
+
+        // Show SweetAlert confirmation
+        const result = await Swal.fire({
+            title: `Are you sure you want to mark this delivery as ${newStatus}?`,
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: `Yes, ${newStatus}!`,
+        });
+
+        if (result.isConfirmed) {
+            try {
+                // Update status in the backend
+                await axios.put(
+                    `/api/delivery/${deliveryId}/status`,
+                    { deliveryStatus: newStatus },
+                    {
+                        headers: {
+                            Authorization: `Bearer ${driverToken}`,
+                        },
+                    }
+                );
+
+                // Update the state with the new status
+                setDeliveries((prevDeliveries) =>
+                    prevDeliveries.map((delivery) =>
+                        delivery._id === deliveryId
+                            ? { ...delivery, deliveryStatus: newStatus }
+                            : delivery
+                    )
+                );
+
+                // Show success message
+                Swal.fire('Updated!', `Delivery marked as ${newStatus}.`, 'success');
+            } catch (error) {
+                Swal.fire('Error', 'Failed to update delivery status', 'error');
+            }
+        }
+    };
+
+    const handleViewDelivery = (deliveryId) => {
+        navigate(`/driver/delivery/${deliveryId}`); // Navigate to delivery view page
+    };
+
+    if (loading) {
+        return <div>Loading...</div>;
+    }
+
+    return (
+        <div className="flex min-h-screen bg-gray-50">
+            {/* Sidebar */}
+            <aside className="fixed top-0 left-0 bottom-0 w-64 bg-gray-50 shadow-md pl-8 pt-16 mt-16">
+                <DeliverySidebar driver={driver} />
+            </aside>
+
+            {/* Main content */}
+            <main className="flex-1 ml-64 p-16 overflow-y-auto">
+                <div className="max-w-7xl mx-auto p-8 bg-white shadow-lg rounded-lg">
+                    <h1 className="text-3xl font-bold mb-6 text-center">Ongoing Deliveries</h1>
+
+                    {deliveries.length > 0 ? (
+                        <div className="overflow-x-auto">
+                            <table className="min-w-full bg-white border border-gray-200">
+                                <thead>
+                                    <tr className="bg-gray-200">
+                                        <th className="px-4 py-2 border">Tracking ID</th>
+                                        <th className="px-4 py-2 border">Order ID</th>
+                                        <th className="px-4 py-2 border">Driver ID</th>
+                                        <th className="px-4 py-2 border">Shop Name</th>
+                                        <th className="px-4 py-2 border">Pickup Address</th>
+                                        <th className="px-4 py-2 border">Customer Name</th>
+                                        <th className="px-4 py-2 border">Dropoff Address</th>
+                                        <th className="px-4 py-2 border">Assigned Time</th>
+                                        <th className="px-4 py-2 border">Status</th>
+                                        <th className="px-4 py-2 border">Actions</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {deliveries.map((delivery) => (
+                                        <tr key={delivery._id} className="hover:bg-gray-100">
+                                            <td className="px-4 py-2 border">{delivery.trackingID}</td>
+                                            <td className="px-4 py-2 border">{delivery.oID}</td>
+                                            <td className="px-4 py-2 border">{delivery.drID}</td>
+                                            <td className="px-4 py-2 border">{delivery.shopName}</td>
+                                            <td className="px-4 py-2 border">{delivery.pickupAddress}</td>
+                                            <td className="px-4 py-2 border">{delivery.customerName}</td>
+                                            <td className="px-4 py-2 border">{delivery.dropOffAddress}</td>
+                                            <td className="px-4 py-2 border">{new Date(delivery.assignDateTime).toLocaleString()}</td>
+                                            <td className="px-4 py-2 border">{delivery.deliveryStatus}</td>
+                                            <td className="px-4 py-2 border space-y-2">
+                                                <button
+                                                    onClick={() => handleStatusUpdate(delivery._id, delivery.deliveryStatus)}
+                                                    className={`block w-full px-4 py-2 ${
+                                                        delivery.deliveryStatus === 'Ready'
+                                                            ? 'bg-yellow-500 hover:bg-yellow-600'
+                                                            : delivery.deliveryStatus === 'Picked Up'
+                                                            ? 'bg-blue-500 hover:bg-blue-600'
+                                                            : delivery.deliveryStatus === 'On The Way'
+                                                            ? 'bg-green-500 hover:bg-green-600'
+                                                            : 'bg-gray-400 cursor-not-allowed'
+                                                    } text-white rounded-md`}
+                                                    disabled={delivery.deliveryStatus === 'Delivered'}
+                                                >
+                                                    {delivery.deliveryStatus === 'Ready'
+                                                        ? 'Picked Up'
+                                                        : delivery.deliveryStatus === 'Picked Up'
+                                                        ? 'On The Way'
+                                                        : delivery.deliveryStatus === 'On The Way'
+                                                        ? 'Delivered'
+                                                        : 'Completed'}
+                                                </button>
+                                                <button
+                                                    onClick={() => handleViewDelivery(delivery._id)}
+                                                    className="block w-full px-4 py-2 bg-gray-500 text-white rounded-md hover:bg-gray-600"
+                                                >
+                                                    View
+                                                </button>
+                                            </td>
+                                        </tr>
+                                    ))}
+                                </tbody>
+                            </table>
+                        </div>
+                    ) : (
+                        <p className="text-center text-gray-600">No ongoing deliveries at the moment.</p>
+                    )}
+                </div>
+            </main>
+        </div>
+    );
+};
+
+export default OngoingDelivery;

frontend/src/Pages/delivery/driver/ViewDelivery.jsx

@@ -0,0 +1,118 @@
+import React, { useState, useEffect } from 'react';
+import { useParams, useNavigate } from 'react-router-dom';
+import axios from 'axios';
+import DeliverySidebar from '../../../Components/delivery/DeliverySidebar';
+
+const ViewDelivery = () => {
+    const { id } = useParams(); // Get the delivery ID from the URL
+    const [delivery, setDelivery] = useState(null); // State for storing delivery data
+    const [driver, setDriver] = useState(null); // State for driver info
+    const [loading, setLoading] = useState(true); // Loading state
+    const driverToken = localStorage.getItem('driverToken'); // Get driver token from localStorage
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        const fetchDelivery = async () => {
+            if (!driverToken) {
+                navigate('/driver/login'); // Redirect to login if token is missing
+                return;
+            }
+
+            try {
+                // Fetch the driver profile
+                const driverRes = await axios.get('/api/drivers/profile', {
+                    headers: {
+                        Authorization: `Bearer ${driverToken}`,
+                    },
+                });
+                setDriver(driverRes.data); // Set driver profile
+
+                // Fetch the delivery details using the delivery ID from the URL
+                const deliveryRes = await axios.get(`/api/delivery/d/${id}`, {
+                    headers: {
+                        Authorization: `Bearer ${driverToken}`,
+                    },
+                });
+                setDelivery(deliveryRes.data); // Set delivery details
+                setLoading(false); // Set loading to false when data is fetched
+            } catch (error) {
+                console.error('Error fetching delivery details:', error);
+                setLoading(false);
+            }
+        };
+
+        fetchDelivery();
+    }, [driverToken, id, navigate]);
+
+    if (loading) return <div>Loading...</div>;
+
+    return (
+        <div className="flex min-h-screen bg-gray-50">
+            {/* Sidebar */}
+            <aside className="fixed top-0 left-0 bottom-0 w-64 bg-gray-50 shadow-md pl-8 pt-16 mt-16">
+                <DeliverySidebar driver={driver} />
+            </aside>
+
+            {/* Main content */}
+            <main className="flex-1 ml-64 p-16 overflow-y-auto">
+                <div className="max-w-5xl mx-auto p-8 bg-white shadow-lg rounded-lg">
+                    <h1 className="text-3xl font-bold mb-6 text-center">Delivery Details</h1>
+
+                    {delivery ? (
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            {/* Displaying all delivery details */}
+                            <div>
+                                <h3 className="font-semibold">Tracking ID:</h3>
+                                <p>{delivery.trackingID}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Order ID:</h3>
+                                <p>{delivery.oID}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Driver ID:</h3>
+                                <p>{delivery.drID}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Shop Name:</h3>
+                                <p>{delivery.shopName}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Pickup Address:</h3>
+                                <p>{delivery.pickupAddress}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Customer Name:</h3>
+                                <p>{delivery.customerName}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Dropoff Address:</h3>
+                                <p>{delivery.dropOffAddress}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Assigned Time:</h3>
+                                <p>{new Date(delivery.assignDateTime).toLocaleString()}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Delivery Status:</h3>
+                                <p>{delivery.deliveryStatus}</p>
+                            </div>
+                            <div>
+                                <h3 className="font-semibold">Delivered Time:</h3>
+                                <p>
+                                    {delivery.deliveredDateTime
+                                        ? new Date(delivery.deliveredDateTime).toLocaleString()
+                                        : 'Not Delivered Yet'}
+                                </p>
+                            </div>
+                        </div>
+                    ) : (
+                        <p className="text-center text-gray-600">No delivery details found.</p>
+                    )}
+                </div>
+            </main>
+        </div>
+    );
+};
+
+export default ViewDelivery;