Merge branch 'nmdra:master' into master

lksnjw · Oct 12, 2024 · 645b068 · 645b068
2 parents 3f5bd11 + cad4964
commit 645b068
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/backend/middlewares/farmerauthMiddleware.js b/backend/middlewares/farmerauthMiddleware.js
@@ -19,7 +19,7 @@ export const protect = async (req, res, next) => {
             req.user = await Farmer.findById(decoded.userId).select('-password')
             next()
         } catch (err) {
-            console.error('Token verification failed:', error)
+            console.error('Token verification failed:', err)
             res.status(401)
             throw new Error('Not authorized, token failed')
         }

diff --git a/frontend/src/Components/Address.jsx b/frontend/src/Components/Address.jsx
@@ -140,6 +140,8 @@ const Address = () => {
                             onChange={handleInputChange}
                             className="block w-full px-4 py-2 border rounded-md"
                             placeholder="Zip Code"
+                            min="10000"  // Minimum value
+                            max="99999"  // Maximum value
                             required
                         />
                     </div>

diff --git a/frontend/src/Pages/Customer/UserAllOrders.jsx b/frontend/src/Pages/Customer/UserAllOrders.jsx
@@ -10,7 +10,7 @@ function UserAllOrders() {
     const [orders, setOrders] = useState([])
     const user = JSON.parse(localStorage.getItem('user'))
 
-    const rowsPerPage = 5
+    const rowsPerPage = 8
     const pages = Math.ceil(orders?.length / rowsPerPage)
 
     const items = useMemo(() => {

diff --git a/frontend/src/Pages/Customer/UserDashboard.jsx b/frontend/src/Pages/Customer/UserDashboard.jsx
@@ -52,7 +52,7 @@ function Dashboard() {
     }
 
     return (
-        <div className="relative min-h-screen bg-neutral-100 pr-8 pl-8 pb-6">
+        <div className="relative min-h-screen bg-neutral-100 pr-8 pl-8 pb-6 pt-6">
             {/* Main Content */}
             {/* <Breadcrumbs /> Breadcrumbs at the top */}
             {/* Membership Banner */}

diff --git a/frontend/src/Pages/farmer/FarmerDashboard.jsx b/frontend/src/Pages/farmer/FarmerDashboard.jsx
@@ -460,6 +460,9 @@ const Dashboard = () => {
                                                 <option value="Ready">
                                                     Ready
                                                 </option>
+                                                <option value=" Ready. ">
+                                                    Ready
+                                                </option> 
                                                 <option value="Pickup">
                                                     Pickup
                                                 </option>