Merge pull request #22 from lksnjw/friday-mor

done editing

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,13 +52,22 @@ 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/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

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 (