Merge branch 'thapar'

Author: SuryaKTiwari11

backend/controllers/user.controller.js

@@ -41,12 +41,10 @@ export const claimItem = async (req, res) => {
     });
 
     if (rejectedClaim) {
-      return res
-        .status(403)
-        .json({
-          message:
-            "You cannot claim this item as your previous claim was rejected",
-        });
+      return res.status(403).json({
+        message:
+          "You cannot claim this item as your previous claim was rejected",
+      });
     }
 
     // Create new claim
@@ -431,10 +429,12 @@ export const updateProfile = async (req, res) => {
   const schema = Joi.object({
     // Limit name length to reasonable size
     name: Joi.string().min(2).max(100),
-    // Require numeric roll numbers (accept number or numeric string)
+    // Accept only numeric roll numbers for updates (6-15 digits)
     rollNo: Joi.alternatives().try(
-      Joi.number().integer().min(1),
-      Joi.string().pattern(/^\d+$/),
+      Joi.number().integer().min(100000).max(999999999999999),
+      Joi.string()
+        .pattern(/^\d{6,15}$/)
+        .message("Roll number must be 6-15 digits"),
     ),
     phone: Joi.string()
       .pattern(/^\d{10,15}$/)

frontend/src/pages/Profile.jsx

@@ -590,7 +590,7 @@ const Profile = () => {
                       }`}>
                         <div className="flex justify-between items-center">
                           <p className={`text-sm ${darkMode ? 'text-yellow-200' : 'text-yellow-800'}`}>
-                            <strong>Next Steps:</strong> Visit the admin office during office hours for verification.
+                            <strong>Pending:</strong> Please visit the admin office during office hours to collect your item.
                           </p>
                           <button
                             onClick={() => handleRemoveClaim(claim._id, claim.item?.name || 'this item')}
@@ -606,12 +606,22 @@ const Profile = () => {
                       </div>
                     )}
 
-                    {claim.status === 'approved' && !claim.remarks && (
+                    {claim.status === 'approved' && (
                       <div className={`p-4 rounded-lg border ${
                         darkMode ? 'bg-green-900/20 border-green-800' : 'bg-green-50 border-green-200'
                       }`}>
                         <p className={`text-sm ${darkMode ? 'text-green-200' : 'text-green-800'}`}>
-                          <strong>Approved!</strong> Your claim has been approved. Please visit the admin office to collect your item.
+                          <strong>Approved!</strong> This item is now in your possession. You have successfully claimed this item.
+                        </p>
+                      </div>
+                    )}
+
+                    {claim.status === 'rejected' && (
+                      <div className={`p-4 rounded-lg border ${
+                        darkMode ? 'bg-red-900/20 border-red-800' : 'bg-red-50 border-red-200'
+                      }`}>
+                        <p className={`text-sm ${darkMode ? 'text-red-200' : 'text-red-800'}`}>
+                          <strong>Rejected:</strong> Your claim was not approved.
                         </p>
                       </div>
                     )}