diff --git a/backend/src/main/java/com/rit/portal/controller/CollabController.java b/backend/src/main/java/com/rit/portal/controller/CollabController.java index 927223d..63b977c 100644 --- a/backend/src/main/java/com/rit/portal/controller/CollabController.java +++ b/backend/src/main/java/com/rit/portal/controller/CollabController.java @@ -136,6 +136,9 @@ public class CollabController { @RequestParam String status) { return collabApplicationRepository.findById(applicationId).map(app -> { String newStatus = status.toUpperCase(); + if ("DECLINED".equals(newStatus) || "DECLINE".equals(newStatus) || "REJECT".equals(newStatus)) { + newStatus = "REJECTED"; + } String oldStatus = app.getStatus(); app.setStatus(newStatus); CollabApplication updated = collabApplicationRepository.save(app); diff --git a/src/pages/DevCollab/DevCollab.tsx b/src/pages/DevCollab/DevCollab.tsx index a7876ba..405970f 100644 --- a/src/pages/DevCollab/DevCollab.tsx +++ b/src/pages/DevCollab/DevCollab.tsx @@ -107,7 +107,7 @@ export default function DevCollab() { const { user, isAuthenticated, isVerifiedStudent, loginWithGoogle } = useAuth(); const [activeTab, setActiveTab] = useState<'explore' | 'my-requests' | 'my-applications'>('explore'); - const [requests, setRequests] = useState(INITIAL_MOCK_REQUESTS); + const [requests, setRequests] = useState([]); const [myRequests, setMyRequests] = useState([]); const [myApplications, setMyApplications] = useState([]); const [loading, setLoading] = useState(false); @@ -176,7 +176,7 @@ export default function DevCollab() { return res.json(); }) .then((data) => { - if (Array.isArray(data) && data.length > 0) { + if (Array.isArray(data)) { setRequests(data); } }) @@ -804,7 +804,7 @@ export default function DevCollab() { {myApplications.map((app) => { const status = app.status?.toUpperCase() || 'PENDING'; const isAccepted = status === 'ACCEPTED'; - const isRejected = status === 'REJECTED'; + const isRejected = status === 'REJECTED' || status === 'DECLINED'; return (