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 ( -