fix driver assign shipment

Author: Toowise

client/src/views/driver/driverlogin.js

@@ -48,6 +48,7 @@ const DriverLogin = () => {
 
       // Store token and navigate
       sessionStorage.setItem('driverToken', data.token)
+      sessionStorage.setItem('driverUsername', data.driver.username)
       window.dispatchEvent(new Event('storage'))
       navigate('/drivertracking')
     } catch (error) {

client/src/views/driver/drivermanagement.js

@@ -12,6 +12,7 @@ import {
   CTableDataCell,
   CSpinner,
 } from '@coreui/react'
+import io from 'socket.io-client'
 
 const DriverManagement = () => {
   const [shipments, setShipments] = useState([])
@@ -20,7 +21,7 @@ const DriverManagement = () => {
   useEffect(() => {
     const fetchShipments = async () => {
       try {
-        const res = await fetch('https:backend-core.axleshift.com/driver/shipments')
+        const res = await fetch('http://localhost:5052/driver/shipments')
         const data = await res.json()
         setShipments(data)
       } catch (error) {
@@ -31,6 +32,31 @@ const DriverManagement = () => {
     }
 
     fetchShipments()
+
+    const socket = io('http://localhost:5052')
+
+    // Listen for shipment location updates
+    socket.on('shipmentLocationUpdate', (data) => {
+      // Update the state with the new location data
+      setShipments((prevShipments) =>
+        prevShipments.map((shipment) =>
+          shipment.trackingNumber === data.trackingNumber
+            ? {
+                ...shipment,
+                latitude: data.latitude,
+                longitude: data.longitude,
+                updated_at: data.updated_at,
+                driverUsername: data.driverUsername,
+              }
+            : shipment,
+        ),
+      )
+    })
+
+    // Cleanup the socket connection when the component unmounts
+    return () => {
+      socket.disconnect()
+    }
   }, [])
 
   return (

client/src/views/driver/drivertracking.js

@@ -125,13 +125,32 @@ const DriverTracking = () => {
 
       if (!prev.includes(trackingNumber)) {
         socket.emit('joinTracking', trackingNumber)
+        onShipmentSelect(trackingNumber)
       } else {
         socket.emit('leaveTracking', trackingNumber)
       }
 
       return updatedList
     })
   }
+  const assignShipmentToDriver = async (trackingNumber, driverUsername) => {
+    try {
+      await fetch('http://localhost:5052/driver/select-shipment', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ trackingNumber, driverUsername }),
+      })
+    } catch (error) {
+      console.error('Failed to assign shipment:', error)
+    }
+  }
+  const onShipmentSelect = (trackingNumber) => {
+    const driverUsername = sessionStorage.getItem('driverUsername')
+    console.log('Assigning shipment to driver:', driverUsername)
+    assignShipmentToDriver(trackingNumber, driverUsername)
+  }
 
   return (
     <div className="driver-tracking-container">

client/src/views/pages/login/signup/Signup.js

@@ -118,6 +118,7 @@ const Signup = () => {
         const response = await axios.post('/signup', userData)
         console.log('Signup successful:', response.data)
 
+        await axios.post('/verify-email', { email: formData.email })
         setSuccessMessage('User registered successfully! Redirecting to login...')
         setTimeout(() => navigate('/login'), 3000)
       } else {

server/index.js

@@ -19,7 +19,7 @@ const app = express();
 const server = http.createServer(app);
 const io = socketIo (server,{
   cors: {
-    origin: 'https://core2.axleshift.com',
+    origin: 'http://localhost:3000',
     methods: ["GET", "POST"],
   },
 });
@@ -31,7 +31,7 @@ if (!admin.apps.length) {
   });
 }
 app.use(cors({
-  origin: ['https://core2.axleshift.com'],
+  origin: ['http://localhost:3000'],
   methods: ['GET', 'POST'],
   credentials: true
 }));
@@ -314,6 +314,28 @@ app.get('/driver/shipments', async (req, res) => {
     res.status(500).json({ success: false, message: "Server error" })
   }
 })
+// Driver selects shipments to track
+app.post('/driver/select-shipment', async (req, res) => {
+  const { trackingNumber, driverUsername } = req.body;
+  console.log('Received for assign:', { trackingNumber, driverUsername })
+
+  try {
+    const shipment = await TrackData.findOne({ trackingNumber });
+
+    if (!shipment) {
+      return res.status(404).json({ message: "Shipment not found" });
+    }
+
+    shipment.driverUsername = driverUsername; 
+    await shipment.save();
+
+    res.json({ message: "Shipment successfully assigned to the driver", shipment });
+  } catch (error) {
+    console.error("Error assigning shipment:", error);
+    res.status(500).json({ message: "Server error" });
+  }
+});
+
 
 //  Email
 app.post("/verify-email", async (req, res) => {