Merge pull request #10 from lksnjw/this-is-the-eding-branch

This is the eding branch
lksnjw · Oct 1, 2024 · 7ffc3d5 · 7ffc3d5
2 parents f47235f + 3650917
commit 7ffc3d5
Show file tree

Hide file tree

Showing 8 changed files with 354 additions and 182 deletions.
diff --git a/backend/controllers/DLDeliveryController.js b/backend/controllers/DLDeliveryController.js
@@ -200,4 +200,25 @@ export const updateDeliveryStatus = asyncHandler(async (req, res) => {
     } catch (error) {
         res.status(500).json({ message: 'Error updating delivery status', error });
     }
-});
+});
+
+
+
+
+// Controller to get all deliveries for a specific driver
+export const getDeliveriesByDriver = async (req, res) => {
+    const { driverID } = req.params; // Get driverID from route params
+
+    try {
+        // Fetch all deliveries where the driverID matches
+        const deliveries = await DLDelivery.find({ driverID: driverID });
+
+        if (!deliveries || deliveries.length === 0) {
+            return res.status(404).json({ message: 'No deliveries found for this driver.' });
+        }
+
+        res.status(200).json(deliveries); // Return deliveries as response
+    } catch (error) {
+        res.status(500).json({ message: 'Error fetching deliveries', error: error.message });
+    }
+};
diff --git a/backend/controllers/DLEmailController.js b/backend/controllers/DLEmailController.js
@@ -27,13 +27,34 @@ export const sendApprovalEmail = asyncHandler(async (req, res) => {
         },
     })
 
+
+
+        // The URL for the driver to follow (this could be your site's login or another relevant page)
+    const loginUrl = `http://localhost:5000/driver/login`
+
+
+
     // Email content
     const mailOptions = {
         from: process.env.EMAIL_USER,
         to: driver.email,
         subject: 'Approval Confirmation',
-        text: `Dear ${driver.fullName},\n\nCongratulations! Your driver registration has been approved.Enter Your ID to login in first time . \n\nRegards,\nFarmCart Team`,
-    }
+        html: `
+        <p>Dear ${driver.fullName},</p>
+        <p>Congratulations! Your driver registration has been approved. Please click the button below to log in and complete your registration:</p>
+        <a href="${loginUrl}" style="
+            background-color: #4CAF50; 
+            color: white; 
+            padding: 10px 20px; 
+            text-align: center; 
+            text-decoration: none; 
+            display: inline-block; 
+            border-radius: 5px;">
+            Click Here to Log In
+        </a>
+        <p>Alternatively, you can enter your ID to log in for the first time.</p>
+        <p>Regards,<br/>FarmCart Team</p>
+    `,    }
 
     // Send the email
     try {

diff --git a/backend/routes/DLDeliveryRoute.js b/backend/routes/DLDeliveryRoute.js
@@ -1,5 +1,5 @@
 import express from 'express';
-import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver,updateDeliveryStatus} from '../controllers/DLDeliveryController.js';
+import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver,updateDeliveryStatus,getDeliveriesByDriver} from '../controllers/DLDeliveryController.js';
 
 const router = express.Router();
 
@@ -26,5 +26,8 @@ router.get('/ongoing/:driverID', getOngoingDeliveriesByDriver);
 // Route to update delivery status
 router.put('/:deliveryId/status', updateDeliveryStatus);
 
+// Route to get all deliveries for a specific driver
+router.get('/driver/:driverID', getDeliveriesByDriver);
+
 
 export default router;
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
@@ -85,7 +85,7 @@ import DLAllDeliveries from './Pages/delivery/DLviewDeliveries'; // Import the D
 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
-
+import ViewDeliveries from './Pages/delivery/driver/ViewDeliveries'; // Import the ViewDeliveries page
 
 
 
@@ -189,7 +189,7 @@ const router = createBrowserRouter(
                 <Route path="/upload-image" element={<DLImageUpload />} />
              <Route path="/manager/approve-driver" element={<DLApproveDriver />} />
              <Route path="/manager/approve-driver/:id" element={<DLDriverAccept />} />
-             <Route path="/manager/approve-driver/:id/send-email" element={<DLSendEmail />} />
+             {/*<Route path="/manager/approve-driver/:id/send-email" element={<DLSendEmail />} />*/}
 
              <Route path="/driver/login" element={<DLLogin />} />  {/* Driver Login Route */}
              <Route path="/driver/dashboard" element={<DeliveryDashboard />} />
@@ -207,7 +207,7 @@ const router = createBrowserRouter(
             <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="/driver/deliveries" element={<ViewDeliveries />} />
 
                 <Route path="*" element={<NotFound />} />
             </Route>

diff --git a/frontend/src/Components/Home/Header.jsx b/frontend/src/Components/Home/Header.jsx
@@ -179,7 +179,7 @@ const Header = () => {
                                     Become a Seller
                                 </Link>
                                 <Link
-                                    to="/become-a-driver"
+                                    to="/register-driver"
                                     className="text-black hover:text-[#99DD05] cursor-pointer hover:underline text-sm"
                                 >
                                     Become a Driver