Editing the final one

backend/server.js

@@ -33,17 +33,13 @@ import {
     startSyncDeliveryOrderStatus,
 } from './controllers/DLOcontroller.js' // Import the periodic check
 
-<<<<<<< HEAD
-=======
+
 
 //Help Routes
 import routes from './routes/Help/index.js'
 
 
-<<<<<<< Updated upstream
-=======
->>>>>>> f32c50044c74728373eafb28103c74438c160c64
->>>>>>> Stashed changes
+
 // Production-only delivery task scheduling
 if (process.env.SERVER_ENV === 'production') {
     checkForAvailableDrivers()
@@ -52,22 +48,14 @@ if (process.env.SERVER_ENV === 'production') {
     cleanUpDuplicateDeliveries()
 }
 
-<<<<<<< Updated upstream
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Stashed changes
 // Blog, Comments, and News Imports (Merged Content)
 import blogRouter from './routes/Blog.js'
 import commentRoutes from './routes/comments.js'
 import newsRoutes from './routes/newsRoutes.js'
 
 
 // Error handling
-<<<<<<< Updated upstream
-=======
->>>>>>> f32c50044c74728373eafb28103c74438c160c64
->>>>>>> Stashed changes
+
 import { errorHandler, notFound } from './middlewares/errorMiddleware.js'
 
 // Set up port from environment or default to 8000

frontend/src/Components/Admin/admnlogins.jsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { ToastContainer, toast } from 'react-toastify'
 import 'react-toastify/dist/ReactToastify.css'
 import farmcartLogo from '../../assets/logo.png' // Update with correct path if needed
 
 const AdminLogin = ({ manager }) => {
     // Receive the manager prop
     const navigate = useNavigate()
     const [email, setEmail] = useState('')
@@ -62,7 +62,7 @@
                 <img
                     src={farmcartLogo} // Replace with the path to your logo image
                     alt="Logo"
-                    className="h-16 w-auto mb-4 mx-auto"
+                    className="h-10 w-auto mb-4 mx-auto"
                 />
                 <div className="text-left mb-5">
                     <h2 className="text-3xl font-bold">Admin Login</h2>

frontend/src/Layouts/BlogLayout.jsx

@@ -1,7 +1,6 @@
 import { Outlet } from 'react-router-dom'
 // import Footer from '../Components/Home/Footer'
 import Footer from '../Components/Home/FooterDashboard'
-import DHeader from '../Components/Home/DHeader'
 import BlogHeader from '../Components/Home/BlogHeader'
 
 function BlogLayout() {

frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx

@@ -1,4 +1,4 @@
 import React, { useState } from 'react'
 import axios from '../../axios' // Import your axios instance with baseURL and interceptor
 import { useNavigate } from 'react-router-dom'
 import Swal from 'sweetalert2' // For user-friendly alerts
@@ -36,7 +36,7 @@
         license: false,
         personal: false,
     })
     const [successMessage, setSuccessMessage] = useState('')
     const navigate = useNavigate()
 
     // Function to calculate age from birth date
@@ -133,7 +133,7 @@
             // Ensure the NIC is not longer than 12 characters
             if (value.length > 12) {
                 return
                 errorMessage = 'NIC cannot exceed 12 characters.'
             } else if (!nicRegex.test(value)) {
                 errorMessage = 'Please enter a valid NIC.'
             } else if (!value.startsWith(birthYear)) {
@@ -292,7 +292,7 @@
                     <img
                         src={farmcartLogo} // Replace with the path to your logo image
                         alt="Logo"
-                        className="h-16 w-auto mb-4 mx-auto" // Adjust the height as needed
+                        className="h-10 w-auto mb-4 mx-auto" // Adjust the height as needed
                     />
                     <h2 className="text-3xl font-bold mb-6 text-center">
                         Driver Registration Form

frontend/src/Pages/delivery/DLLogin.jsx

@@ -1,4 +1,4 @@
 import React, { useState } from 'react'
 import { useNavigate, Link } from 'react-router-dom'
 import axios from 'axios'
 import { ToastContainer, toast } from 'react-toastify'
@@ -32,7 +32,7 @@
                 <img
                     src={farmcartLogo} // Replace with the path to your logo image
                     alt="Logo"
-                    className="h-16 w-auto mb-4 mx-auto" // Adjust the height as needed
+                    className="h-10 w-auto mb-4 mx-auto" // Adjust the height as needed
                 />
                 <div className="text-left mb-5">
                     <h2 className="text-3xl font-bold">Driver Login</h2>
@@ -87,7 +87,7 @@
                     </Link>
                 </div>
                 <div className="mt-4">
                     <span>If you don't have an account?</span>{' '}
                     <Link
                         to="/register-driver"
                         className="text-blue-600 hover:underline"