add driver,customer,farmer count.Add PDF generator (#88)

Co-authored-by: IT22171856 <142132191+IT22171856@users.noreply.github.com>
Co-authored-by: NIMENDRA <nimendradilshan11@gmail.com>

backend/controllers/Admin/AcustomerController.js

@@ -11,6 +11,8 @@ export const getAllUsers = async (req, res) => {
     }
 }
 
+
+
 // Fetch single user by ID
 export const getUserById = async (req, res) => {
     try {
@@ -24,6 +26,7 @@ export const getUserById = async (req, res) => {
     }
 }
 
+
 // Update user by ID
 export const updateUserById = async (req, res) => {
     const {
@@ -96,3 +99,12 @@ export const validateUserPassword = async (req, res) => {
         res.status(500).json({ message: 'Error validating password', error })
     }
 }
+
+export const getUserCount = async (req, res) => {
+    try {
+        const count = await User.countDocuments()
+        res.status(200).json({ count })
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching user count' })
+    }
+}

backend/controllers/Admin/Afarmer.js

@@ -0,0 +1,20 @@
+
+import Farmer from '../../models/farmerModel'
+import mongoose from 'mongoose'
+export const getFarmersCount = async (req, res) => {
+    try {
+        const count = await Farmer.countDocuments()
+        res.status(200).json({ count })
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching staff count' })
+    }
+}
+
+export const getAllFarmers = async (req, res) => {
+    try {
+        const farmer = await Farmer.find({}) // Change sorting to firstName
+        res.status(200).json(farmer)
+    } catch (error) {
+        res.status(500).json({ message: error.message })
+    }
+}

backend/controllers/DLDriverController.js

@@ -378,3 +378,4 @@ export {
     verifyPassword,
     getAllDrivers,
 }
+

backend/controllers/couponController.js

@@ -90,3 +90,11 @@ export const deleteCoupon = async (req, res) => {
         res.status(500).json({ message: error.message })
     }
 }
+export const getCouponCount = async (req, res) => {
+    try {
+        const count = await Coupon.countDocuments()
+        res.status(200).json({ count })
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching coupon count' })
+    }
+}

backend/controllers/farmerController.js

@@ -285,3 +285,20 @@ export {
     deleteFarmerAccount,
     getFarmerById,
 }
+export const getAllFarmers = async (req, res) => {
+    try {
+        const farmer = await Farmer.find({}) // Change sorting to firstName
+        res.status(200).json(farmer)
+    } catch (error) {
+        res.status(500).json({ message: error.message })
+    }
+}
+
+export const getFarmersCount = async (req, res) => {
+    try {
+        const count = await Farmer.countDocuments()
+        res.status(200).json({ count })
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching staff count' })
+    }
+}

backend/routes/Admin/AfarmerRoute.js

@@ -0,0 +1,12 @@
+import express from 'express'
+import {
+    getFarmersCount,
+getAllFarmers,
+} from '../../controllers/Admin/Afarmer'
+
+const router = express.Router()
+
+router.get('/', getAllFarmers)
+router.post('/count', getFarmersCount)
+
+export default router

backend/routes/Admin/AuserRoute.js

@@ -5,10 +5,13 @@ import {
     updateUserById,
     deleteUserById,
     validateUserPassword,
+    getUserCount
 } from '../../controllers/Admin/AcustomerController.js'
 
 const router = express.Router()
 
+router.get('/count',getUserCount)
+
 // Get all users
 router.get('/', getAllUsers)
 

backend/routes/couponRouter.js

@@ -1,5 +1,6 @@
 import express from 'express'
 import {
+    getCouponCount,
     createCoupon,
     validCoupon,
     getAllCoupons,
@@ -10,6 +11,7 @@ import {
 
 const couponRouter = express.Router()
 
+couponRouter.get('/count', getCouponCount)
 couponRouter.post('/valid-coupon', validCoupon)
 couponRouter.post('/', createCoupon)
 couponRouter.get('/', getAllCoupons)

backend/routes/farmerRoute.js

@@ -7,6 +7,8 @@ import {
     logoutFarmer,
     deleteFarmerAccount,
     getFarmerById,
+    getAllFarmers,
+    getFarmersCount,
 } from '../controllers/farmerController.js'
 import { protect } from '../middlewares/farmerauthMiddleware.js'
 
@@ -15,6 +17,9 @@ const router = express.Router()
 // Register a new farmer
 router.post('/register', registerFarmer)
 
+router.get('/',getAllFarmers)
+router.get('/count',getFarmersCount)
+
 // Authenticate farmer and get token
 router.post('/login', authFarmer)
 

frontend/src/App.jsx

@@ -50,6 +50,7 @@ import AddStaff from './Pages/Admin/AaddStaff'
 import UpdateStaff from './Pages/Admin/AupdateStaff'
 import AddCoupon from './Pages/Admin/AaddCoupons'
 import UpdateCoupon from './Pages/Admin/AupdateCoupon'
+import AdminLayout from './Layouts/Alayout'
 import AdminLogin from './Components/Admin/admnlogins'
 
 // Farmer Pages
@@ -174,7 +175,8 @@ const router = createBrowserRouter(
             </Route>
 
             {/* Admin Routes */}
-            <Route path="/">
+            <Route path="/" element={<AdminLayout/>}>
+
                 <Route path="/AdminDashboard" element={<AdminDashboard />} />
 
                 {/* Staff */}

frontend/src/Components/Admin/Aheader.jsx

@@ -0,0 +1,29 @@
+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/Components/Admin/AsideBar.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
-import { FaHome, FaUsers, FaStore, FaCog, FaSignOutAlt } from 'react-icons/fa'
+import { FaHome, FaUsers, FaUserAlt, FaTags, FaChartLine, FaSignOutAlt } from 'react-icons/fa'
 
 const AdminSidebar = () => {
     return (
@@ -13,7 +13,7 @@ const AdminSidebar = () => {
                             className="flex items-center px-4 py-2 text-gray-700 hover:bg-green-500 hover:text-white rounded text-left"
                         >
                             <FaHome className="w-5 h-5 mr-3" />
-                            <span>Home</span>
+                            <span>Dashboard</span>
                         </Link>
                     </li>
                     <li>
@@ -30,28 +30,37 @@ const AdminSidebar = () => {
                             to="/users"
                             className="flex items-center px-4 py-2 text-gray-700 hover:bg-green-500 hover:text-white rounded text-left"
                         >
-                            <FaStore className="w-5 h-5 mr-3" />
+                            <FaUserAlt className="w-5 h-5 mr-3" />
                             <span>Users</span>
                         </Link>
                     </li>
                     <li>
                         <Link
-                            to="/coupens"
+                            to="/coupons"
                             className="flex items-center px-4 py-2 text-gray-700 hover:bg-green-500 hover:text-white rounded text-left"
                         >
-                            <FaCog className="w-5 h-5 mr-3" />
-                            <span>Coupens</span>
+                            <FaTags className="w-5 h-5 mr-3" />
+                            <span>Coupons</span>
                         </Link>
                     </li>
                     <li>
                         <Link
                             to="/finance"
                             className="flex items-center px-4 py-2 text-gray-700 hover:bg-green-500 hover:text-white rounded text-left"
                         >
-                            <FaSignOutAlt className="w-5 h-5 mr-3" />
+                            <FaChartLine className="w-5 h-5 mr-3" />
                             <span>Finance</span>
                         </Link>
                     </li>
+                    <li>
+                        <Link
+                            to="/logout"
+                            className="flex items-center px-4 py-2 text-gray-700 hover:bg-green-500 hover:text-white rounded text-left"
+                        >
+                            <FaSignOutAlt className="w-5 h-5 mr-3" />
+                            <span>Logout</span>
+                        </Link>
+                    </li>
                 </ul>
             </nav>
         </div>

frontend/src/Components/Admin/DailyOrdersChart.jsx

@@ -102,27 +102,28 @@ const DailyOrdersChart = () => {
             }
         }
     }
-
-    return (
-        <div className="max-w-4xl mx-auto p-6 bg-white shadow-md rounded-lg mt-8">
-            <h2 className="text-2xl font-bold text-green-600 mb-6">
-                Daily Orders
-            </h2>
-            {chartData.labels ? (
-                <>
-                    <Line data={chartData} ref={chartRef} id="bidStatus" />
-                    <button
-                        onClick={downloadChart}
-                        className="mt-6 px-4 py-2 bg-green-500 text-white font-semibold rounded hover:bg-green-600"
-                    >
-                        Download Chart as PNG
-                    </button>
-                </>
-            ) : (
-                <p>Loading chart...</p>
-            )}
-        </div>
-    )
-}
-
-export default DailyOrdersChart
+  };
+
+  return (
+    <div className="max-w-4xl mx-auto p-6 bg-white shadow-md rounded-lg mt-8">
+      <h2 className="text-2xl font-bold text-black mb-6">Daily Orders</h2>
+      {chartData.labels ? (
+        <>
+          <Line data={chartData} ref={chartRef} id="bidStatus" />
+          <button
+  onClick={downloadChart}
+  className="mt-6 px-6 py-2 ml-0 border-2 rounded-full border-[#99DD05] text-grey font-semibold flex items-center gap-2 hover:bg-[#f5fce6] hover:text-black transition-all"
+>
+  Download Chart as PNG
+</button>
+
+
+        </>
+      ) : (
+        <p>Loading chart...</p>
+      )}
+    </div>
+  );
+};
+
+export default DailyOrdersChart;

frontend/src/Layouts/Alayout.jsx

@@ -0,0 +1,21 @@
+import { Outlet } from 'react-router-dom'
+import Footer from '../Components/Home/FooterDashboard'
+import Header from '../Components/Admin/Aheader'
+
+function AdminLayout() {
+    return (
+        <>
+            <div className="sticky top-0 bg-white shadow-md bg-opacity-70 backdrop-blur-md z-50">
+                <Header />
+
+            </div>
+
+            <Outlet />
+            <div className="sticky top-0 bg-white shadow-md bg-opacity-70 backdrop-blur-md z-50">
+                <Footer />
+            </div>
+        </>
+    )
+}
+
+export default AdminLayout