From 4200f24cad188b7481b116c8afbd7c57d28f82e9 Mon Sep 17 00:00:00 2001
From: lakshan sanjeewa <lk.snjw@gmail.com>
Date: Mon, 14 Oct 2024 13:12:15 +0530
Subject: [PATCH] done editing

---
 backend/server.js                            | 15 ++++++++++
 frontend/src/Components/Home/DHeader.jsx     | 19 ------------
 frontend/src/Components/delivery/DHeader.jsx | 31 ++++++++++++++++++++
 frontend/src/Layouts/DLayout.jsx             |  2 +-
 4 files changed, 47 insertions(+), 20 deletions(-)
 delete mode 100644 frontend/src/Components/Home/DHeader.jsx
 create mode 100644 frontend/src/Components/delivery/DHeader.jsx

diff --git a/backend/server.js b/backend/server.js
index 2eab4db2..989ce072 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -33,11 +33,17 @@ 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()
@@ -46,6 +52,11 @@ 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'
@@ -53,6 +64,10 @@ 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/Components/Home/DHeader.jsx b/frontend/src/Components/Home/DHeader.jsx
deleted file mode 100644
index 71d899f2..00000000
--- a/frontend/src/Components/Home/DHeader.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react'
-import { Link } from 'react-router-dom'
-import logo from '../../assets/Logo.png'
-
-const Header = () => {
-    return (
-        <div>
-            <div className="flex items-center justify-between py-6 mx-auto border-b max-w-7xl">
-                <div>
-                    <Link to="/">
-                        <img src={logo} alt="Logo" width={160} height={160} />
-                    </Link>
-                </div>
-            </div>
-        </div>
-    )
-}
-
-export default Header
diff --git a/frontend/src/Components/delivery/DHeader.jsx b/frontend/src/Components/delivery/DHeader.jsx
new file mode 100644
index 00000000..ccf7c8f1
--- /dev/null
+++ b/frontend/src/Components/delivery/DHeader.jsx
@@ -0,0 +1,31 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+import logo from '../../assets/Logo.png'
+
+const Header = () => {
+    return (
+        <div>
+            <div className="flex items-center justify-between py-6 mx-auto border-b max-w-7xl">
+                <div>
+                    <Link to="/">
+                        <img src={logo} alt="Logo" width={160} height={160} />
+                    </Link>
+                </div>
+
+                <div className="flex items-center gap-4 text-sm">
+                    <div className="flex items-center gap-4">
+                        <h1>Welcome to FarmCart🌱 </h1>
+                        <Link
+                            to="/help"
+                            className="text-black hover:text-[#99DD05] cursor-pointer hover:underline text-sm"
+                        >
+                            Help & Support
+                        </Link>
+                    </div>
+                </div>
+            </div>
+        </div>
+    )
+}
+
+export default Header
diff --git a/frontend/src/Layouts/DLayout.jsx b/frontend/src/Layouts/DLayout.jsx
index e1f0552e..23709275 100644
--- a/frontend/src/Layouts/DLayout.jsx
+++ b/frontend/src/Layouts/DLayout.jsx
@@ -1,7 +1,7 @@
 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 DHeader from '../Components/delivery/DHeader'
 
 function DLayout() {
     return (