fix api

Author: Toowise

client/src/components/AppHeader.js

@@ -18,7 +18,10 @@ import { cilBell, cilMenu, cilSun, cilMoon, cilContrast } from '@coreui/icons'
 import io from 'socket.io-client'
 import { AppHeaderDropdown } from './header/index'
 
-const socket = io(VITE_SOCKET_URL)
+const socket = io(VITE_SOCKET_URL, {
+  transports: ['websocket', 'polling'],
+  withCredentials: true,
+})
 
 const AppHeader = ({ admin = false }) => {
   const headerRef = useRef()
@@ -37,21 +40,16 @@ const AppHeader = ({ admin = false }) => {
 
     // Listen for real-time shipment updates
     socket.on('shipmentUpdate', (update) => {
-      // If the shipment is at a hub or sorting center, display a special notification
-      if (update.isAtHub) {
+      if (update.critical) {
         setNotifications((prev) => [
           {
             ...update,
-            message: `Shipment arrived at ${update.location}!`,
+            message: update.message,
           },
           ...prev,
         ])
-      } else {
-        // Regular shipment update
-        setNotifications((prev) => [update, ...prev])
+        setUnreadCount((prev) => prev + 1)
       }
-
-      setUnreadCount((prev) => prev + 1)
     })
 
     return () => socket.off('shipmentUpdate')

client/src/views/dashboard/ShipmentHistory/ShipmentHistory.js

@@ -13,7 +13,7 @@ const ShipmentHistory = () => {
   useEffect(() => {
     const fetchShipmentHistory = async () => {
       try {
-        const response = await axios.get('/history')
+        const response = await axios.get('/api/history')
         const data = response.data
         if (data.status === 'success') {
           setShipmentHistory(data.data)
@@ -33,7 +33,7 @@ const ShipmentHistory = () => {
   const handleDelete = async (trackingNumber) => {
     if (window.confirm('Are you sure you want to delete this shipment?')) {
       try {
-        const response = await axios.delete(`/track/${trackingNumber}`)
+        const response = await axios.delete(`/api/track/${trackingNumber}`)
 
         if (response.data.status === 'success') {
           setShipmentHistory((prevHistory) =>

client/src/views/dashboard/ShipmentInfo/ShipmentInfo.js

@@ -10,8 +10,8 @@ const ShipmentInfo = ({ data }) => {
   const [showDetails, setShowDetails] = useState(false)
 
   useEffect(() => {
-    const socket = io('https://backend-core2.axleshift.com',{
-          transports: ['websocket', 'polling'],
+    const socket = io('https://core2.axleshift.com', {
+      transports: ['websocket', 'polling'],
     })
     socket.emit('joinRoom', data.trackingNumber)
 

client/src/views/dashboard/Track/TrackingForm.js

@@ -33,7 +33,6 @@ const TrackingForm = () => {
   const markerRef = useRef(null)
   const [directions, setDirections] = useState(null)
   const isSocketInitialized = useRef(false)
-  // ✅ useJsApiLoader replaces <LoadScript>
   const { isLoaded } = useJsApiLoader({
     googleMapsApiKey: VITE_APP_GOOGLE_MAP,
     libraries: GOOGLE_MAPS_LIBRARIES,
@@ -124,7 +123,7 @@ const TrackingForm = () => {
     }
 
     try {
-      const response = await axios.post('/track', { trackingNumber })
+      const response = await axios.post('/api/track', { trackingNumber })
       const data = response.data
 
       if (data.status === 'error') {

client/src/views/driver/driverlogin.js

@@ -35,7 +35,7 @@ const DriverLogin = () => {
 
     try {
       // Send login request to the backend
-      const response = await axios.post('/driverlogin', {
+      const response = await axios.post('/api/driverlogin', {
         username,
         password,
       })

client/src/views/driver/drivermanagement.js

@@ -21,7 +21,7 @@ const DriverManagement = () => {
   useEffect(() => {
     const fetchShipments = async () => {
       try {
-        const res = await fetch('https://backend-core2.axleshift.com/driver/shipments')
+        const res = await fetch('https://core2.axleshift.com/api/driver/shipments')
         const data = await res.json()
         setShipments(data)
       } catch (error) {
@@ -33,7 +33,7 @@ const DriverManagement = () => {
 
     fetchShipments()
 
-    const socket = io('https://backend-core2.axleshift.com',{
+    const socket = io('https://backend-core2.axleshift.com', {
       transports: ['websocket', 'polling'],
     })
 

client/src/views/driver/drivertracking.js

@@ -38,7 +38,7 @@ const DriverTracking = () => {
 
   useEffect(() => {
     axios
-      .get('/driver/shipments')
+      .get('/api/driver/shipments')
       .then((response) => {
         setShipments(Array.isArray(response.data) ? response.data : [])
       })
@@ -135,7 +135,7 @@ const DriverTracking = () => {
   }
   const assignShipmentToDriver = async (trackingNumber, driverUsername) => {
     try {
-      await axios.post('/driver/select-shipment', {
+      await axios.post('/api/driver/select-shipment', {
         trackingNumber,
         driverUsername,
       })

client/src/views/pages/login/Login.js

@@ -38,7 +38,7 @@ const Login = () => {
     setErrorMessage(null)
 
     try {
-      const response = await axios.post('/login', { username, password })
+      const response = await axios.post('/api/login', { username, password })
 
       // Proceed to 2FA step
       setStep(2)
@@ -56,7 +56,7 @@ const Login = () => {
     setErrorMessage(null)
 
     try {
-      const response = await axios.post('/verify-2fa', { username, code })
+      const response = await axios.post('/api/verify-2fa', { username, code })
       const { token, user } = response.data
 
       sessionStorage.setItem('token', token)

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

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

server/index.js

@@ -8,6 +8,7 @@ const socketIo = require('socket.io');
 const bcryptjs = require('bcryptjs');
 const jwt = require('jsonwebtoken');
 const nodemailer = require('nodemailer')
+const path = require('path');
 const { updateShipmentStatus } = require('./utils/statusUpdate');
 const admin = require("firebase-admin");
 const rateLimit = require('express-rate-limit');
@@ -119,7 +120,7 @@ io.on("connection", (socket) => {
         shipment.events.push({
           status: newStatus,
           date: new Date().toISOString(),
-          location: { latitude, longitude },
+          location: locationName,
           coordinates: { latitude, longitude },
         });
 
@@ -225,7 +226,7 @@ const transporter = nodemailer.createTransport({
 })
 
 //Login
-app.post('/login', async (req, res) => {
+app.post('/api/login', async (req, res) => {
   const { username, password } = req.body
 
   try {
@@ -255,7 +256,7 @@ app.post('/login', async (req, res) => {
 })
 
 // Verify 
-app.post('/verify-2fa', async (req, res) => {
+app.post('/api/verify-2fa', async (req, res) => {
   const { username, code } = req.body
   const entry = twoFACodes[username]
 
@@ -282,7 +283,7 @@ app.post('/verify-2fa', async (req, res) => {
 })
 
 //Signup 
-app.post("/signup", async (req, res) => {
+app.post("/api/signup", async (req, res) => {
   try {
     console.log("Incoming signup request:", req.body); 
     const { fullname, username, email, password, address } = req.body;
@@ -355,7 +356,7 @@ app.post("/signup", async (req, res) => {
   }
 });
 //Driver Login
-app.post('/driverlogin', async (req, res) => {
+app.post('/api/driverlogin', async (req, res) => {
   const { username, password } = req.body;
   console.log(`Incoming request: ${req.method} ${req.url}`);
 
@@ -382,7 +383,7 @@ app.post('/driverlogin', async (req, res) => {
 });
 
 //Driver get shipments
-app.get('/driver/shipments', async (req, res) => {
+app.get('/api/driver/shipments', async (req, res) => {
   try {
     const activeShipments = await TrackData.find({}, {
       trackingNumber: 1,
@@ -401,7 +402,7 @@ app.get('/driver/shipments', async (req, res) => {
   }
 })
 // Driver selects shipments to track
-app.post('/driver/select-shipment', async (req, res) => {
+app.post('/api/driver/select-shipment', async (req, res) => {
   const { trackingNumber, driverUsername } = req.body;
   console.log('Received for assign:', { trackingNumber, driverUsername })
 
@@ -424,7 +425,7 @@ app.post('/driver/select-shipment', async (req, res) => {
 
 
 //  Email
-app.post("/verify-email", async (req, res) => {
+app.post("/api/verify-email", async (req, res) => {
   try {
     const { email } = req.body;
     // Get user from Firebase
@@ -472,7 +473,7 @@ const resendEmailLimiter = rateLimit({
 });
 
 // Resend Verification Email Route
-app.post('/resend-verification', resendEmailLimiter, async (req, res) => {
+app.post('/api/resend-verification', resendEmailLimiter, async (req, res) => {
   try {
     const { email } = req.body;
     const userRecord = await admin.auth().getUserByEmail(email);
@@ -497,7 +498,7 @@ app.post('/resend-verification', resendEmailLimiter, async (req, res) => {
 });
 
 // Delete 
-app.delete('/track/:trackingNumber', async (req, res) => {
+app.delete('/api/track/:trackingNumber', async (req, res) => {
   const { trackingNumber } = req.params;
   try {
     const deletedShipment = await TrackData.findOneAndDelete({ trackingNumber });
@@ -513,7 +514,7 @@ app.delete('/track/:trackingNumber', async (req, res) => {
 });
 
 // Track Shipment
-app.post('/track', async (req, res) => {
+app.post('/api/track', async (req, res) => {
   const { trackingNumber } = req.body;
 
   try {
@@ -574,17 +575,8 @@ app.post('/track', async (req, res) => {
 });
 
 // Notifications 
-const hubs = [
-  "Fortis Residences",
-  "Warehouse1",
-  "Sorting Center A",
-  "Sorting Center B",
-  "Hub2",
-  "Warehouse2"
-];
-const lastKnownLocations = new Map();
-
-let dbReady = false;
+const criticalStatuses = ["Out for delivery", "Delivered", "Exception"];
+const lastStatusMap = new Map();
 
 setInterval(async () => {
   if (!dbReady) return;
@@ -593,30 +585,43 @@ setInterval(async () => {
     const recentShipments = await TrackData.find().sort({ updatedAt: -1 }).limit(10);
 
     recentShipments.forEach((shipment) => {
-      const isAtHub = hubs.some(hub => hub.toLowerCase() === shipment.location.toLowerCase());
-      const lastLocation = lastKnownLocations.get(shipment.trackingNumber);
+      const lastStatus = lastStatusMap.get(shipment.trackingNumber);
 
-      // Only notify if newly arrived at a hub (i.e., location changed)
-      if (isAtHub && lastLocation !== shipment.location) {
-        lastKnownLocations.set(shipment.trackingNumber, shipment.location); // update memory
+      if (criticalStatuses.includes(shipment.status) && shipment.status !== lastStatus) {
+        lastStatusMap.set(shipment.trackingNumber, shipment.status); 
 
         io.emit("shipmentUpdate", {
           trackingNumber: shipment.trackingNumber,
           status: shipment.status,
           location: shipment.location,
           timestamp: new Date(shipment.updatedAt).toLocaleString(),
-          isAtHub: true,
+          critical: true,
+          message: getStatusMessage(shipment.status, shipment.location),
         });
 
-        console.log(` Emitted hub update for ${shipment.trackingNumber} at ${shipment.location}`);
+        console.log(` Emitted critical update: ${shipment.trackingNumber} - ${shipment.status}`);
       }
     });
   } catch (err) {
-    console.error(" Error during hub check:", err);
+    console.error(" Error during status check:", err);
   }
 }, 10000);
 
-app.get('/history', async (req, res) => {
+function getStatusMessage(status, location) {
+  switch (status) {
+    case "Out for delivery":
+      return `Shipment is out for delivery from ${location}`;
+    case "Delivered":
+      return `Shipment has been delivered successfully.`;
+    case "Exception":
+      return `Shipment has encountered an issue. Please contact support.`;
+    default:
+      return `Shipment update: ${status}`;
+  }
+}
+
+
+app.get('/api/history', async (req, res) => {
   try {
     const shippedData = await TrackData.find();
     if (shippedData.length > 0) {
@@ -629,6 +634,18 @@ app.get('/history', async (req, res) => {
     res.status(500).json({ status: 'error', message: 'An error occurred while fetching shipment data.' });
   }
 }); 
+app.use('/api/*', (_req, res) => {
+  res.status(404).json({ message: 'API route not found' });
+});
+app.use(express.static(path.join(__dirname, "../client/build"))); 
+// Catch-all route to serve React's `index.html`
+app.get("*", (_req, res) => {
+  res.sendFile(path.join(__dirname, "../client/build/index.html"));
+});
+app.use((err, req, res, next) => {
+  console.error(err.stack);
+  res.status(500).json({ message: 'Something broke!' });
+});
 // Start Server
 server.listen(PORT, () => {
   console.log(` Server running on PORT: ${PORT}`);