From 89efe81931257d09e91f6403fe94a6bd7c596932 Mon Sep 17 00:00:00 2001
From: lakshan sanjeewa <lk.snjw@gmail.com>
Date: Mon, 14 Oct 2024 13:21:03 +0530
Subject: [PATCH 1/3] done

---
 backend/server.js                   | 18 +++---------------
 frontend/src/Layouts/BlogLayout.jsx |  1 -
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/backend/server.js b/backend/server.js
index 989ce072..940170d4 100644
--- a/backend/server.js
+++ b/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,11 +48,6 @@ 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'
@@ -64,10 +55,7 @@ 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
diff --git a/frontend/src/Layouts/BlogLayout.jsx b/frontend/src/Layouts/BlogLayout.jsx
index 41c17902..c5808565 100644
--- a/frontend/src/Layouts/BlogLayout.jsx
+++ b/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() {

From c89044a0505c30436a76f51f9a30306d5c5d062b Mon Sep 17 00:00:00 2001
From: lakshan sanjeewa <lk.snjw@gmail.com>
Date: Mon, 14 Oct 2024 13:23:29 +0530
Subject: [PATCH 2/3] done

---
 frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx | 2 +-
 frontend/src/Pages/delivery/DLLogin.jsx                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx b/frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx
index ff9b998f..a9becbec 100644
--- a/frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx
+++ b/frontend/src/Pages/delivery/DLDriverRegistrationForm.jsx
@@ -292,7 +292,7 @@ const RegisterDriverForm = () => {
                     <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
diff --git a/frontend/src/Pages/delivery/DLLogin.jsx b/frontend/src/Pages/delivery/DLLogin.jsx
index ec7e4f9e..16d161e5 100644
--- a/frontend/src/Pages/delivery/DLLogin.jsx
+++ b/frontend/src/Pages/delivery/DLLogin.jsx
@@ -32,7 +32,7 @@ const DLLogin = () => {
                 <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>

From 1a4a99c411097803bc7721316c0b2885e1cd2b55 Mon Sep 17 00:00:00 2001
From: lakshan sanjeewa <lk.snjw@gmail.com>
Date: Mon, 14 Oct 2024 13:31:15 +0530
Subject: [PATCH 3/3] done

---
 frontend/src/Components/Admin/admnlogins.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Components/Admin/admnlogins.jsx b/frontend/src/Components/Admin/admnlogins.jsx
index fa9a58d6..e8898337 100644
--- a/frontend/src/Components/Admin/admnlogins.jsx
+++ b/frontend/src/Components/Admin/admnlogins.jsx
@@ -62,7 +62,7 @@ const AdminLogin = ({ manager }) => {
                 <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>