Merge pull request #23 from lksnjw/editing-the-final-one

Editing the final one
lksnjw · Oct 14, 2024 · 8960656 · 8960656
2 parents a74dc32 + 1a4a99c
commit 8960656
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git 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,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

diff --git 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>

diff --git 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() {

diff --git 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
@@ -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>