Merge branch 'sanjeewa' into sanjeewa_merge

nmdra · Oct 7, 2024 · 3a802c7 · 3a802c7
2 parents 64bc423 + ee6521a
commit 3a802c7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/frontend/src/Pages/delivery/DLDriverAccept.jsx b/frontend/src/Pages/delivery/DLDriverAccept.jsx
@@ -104,7 +104,6 @@ const DLDriverAccept = () => {
         return <div className="text-center mt-10">Loading...</div>
 
     // Construct the full URL for each image
-    // const baseUrl = 'http://localhost:3000/'
     const idCardImageUrl = `${driverDetails.idCardImageUrl}`
     const licenseImageUrl = `${driverDetails.licenseImageUrl}`
     const personalImageUrl = `${driverDetails.personalImageUrl}`

diff --git a/frontend/src/Pages/delivery/DLImageUpload.jsx b/frontend/src/Pages/delivery/DLImageUpload.jsx
@@ -28,7 +28,7 @@ const DLImageUpload = () => {
 
         try {
             const response = await axios.post(
-                'http://localhost:3000/api/delivery/images/upload',
+                '/api/delivery/images/upload',
                 formData,
                 {
                     headers: {

diff --git a/frontend/src/Pages/delivery/DLViewDriver.jsx b/frontend/src/Pages/delivery/DLViewDriver.jsx
@@ -29,7 +29,6 @@ const DLViewDriver = () => {
     }
 
     // Construct the full URL for each image
-    //const baseUrl = 'http://localhost:3000/'
     const idCardImageUrl = `${driverDetails.idCardImageUrl}`
     const licenseImageUrl = `${driverDetails.licenseImageUrl}`
     const personalImageUrl = `${driverDetails.personalImageUrl}`

diff --git a/frontend/src/Pages/delivery/DLeditdriver.jsx b/frontend/src/Pages/delivery/DLeditdriver.jsx
@@ -31,10 +31,10 @@ const DLViewDriver = () => {
     }
 
     // Construct the full URL for each image
-    const baseUrl = 'http://localhost:3000/'
-    const idCardImageUrl = `${baseUrl}${driverDetails.idCardImageUrl}`
-    const licenseImageUrl = `${baseUrl}${driverDetails.licenseImageUrl}`
-    const personalImageUrl = `${baseUrl}${driverDetails.personalImageUrl}`
+    //const baseUrl = 'http://localhost:3000/'
+    const idCardImageUrl = `${driverDetails.idCardImageUrl}`
+    const licenseImageUrl = `${driverDetails.licenseImageUrl}`
+    const personalImageUrl = `${driverDetails.personalImageUrl}`
 
     // Handler to open image in a modal
     const handleImageClick = (imageUrl) => {

diff --git a/frontend/src/Pages/delivery/DLoooo.jsx b/frontend/src/Pages/delivery/DLoooo.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import axios from '../../axios'
+import axios from 'axios'
 
 const CreateOrderForm = () => {
     const [orderID, setOrderID] = useState('')
@@ -36,7 +36,7 @@ const CreateOrderForm = () => {
 
         try {
             const response = await axios.post(
-                'http://localhost:3000/api/od/a',
+                '/api/od/a',
                 newOrder
             )
             console.log('Order created:', response.data)

diff --git a/frontend/src/Pages/delivery/or/orderdelete.jsx b/frontend/src/Pages/delivery/or/orderdelete.jsx
@@ -9,7 +9,7 @@ const OrdersTable = () => {
         const fetchOrders = async () => {
             try {
                 const response = await axios.get(
-                    'http://localhost:3000/api/od/g'
+                    '/api/od/g'
                 ) // Ensure this route is correct
                 setOrders(response.data)
             } catch (error) {
@@ -25,7 +25,7 @@ const OrdersTable = () => {
         if (window.confirm('Are you sure you want to delete this order?')) {
             try {
                 // Send DELETE request to the backend
-                await axios.delete(`http://localhost:3000/api/od/d/${id}`)
+                await axios.delete(`/api/od/d/${id}`)
 
                 // Remove the order from the UI after successful deletion
                 setOrders(orders.filter((order) => order._id !== id))