${details.description}
-Schedule: ${details.schedule}
-Availability: ${spotsLeft} spots left
- `; + + // Create participants list HTML + let participantsHTML = ''; + if (details.participants.length > 0) { + participantsHTML = ` +No one has signed up yet.
+${details.description}
+Schedule: ${details.schedule}
+Availability: ${spotsLeft} spots left
+ ${participantsHTML} + `; activitiesList.appendChild(activityCard); + // Add event listeners for delete icons + activityCard.querySelectorAll('.delete-participant').forEach(icon => { + icon.addEventListener('click', async (e) => { + const activityName = icon.getAttribute('data-activity'); + const email = icon.getAttribute('data-email'); + if (confirm(`Unregister ${email} from ${activityName}?`)) { + try { + const response = await fetch(`/activities/${encodeURIComponent(activityName)}/unregister?email=${encodeURIComponent(email)}`, { + method: 'DELETE', + }); + const result = await response.json(); + if (response.ok) { + fetchActivities(); // Refresh list + messageDiv.textContent = result.message; + messageDiv.style.color = 'green'; + } else { + messageDiv.textContent = result.detail || 'Failed to unregister.'; + messageDiv.style.color = 'red'; + } + } catch (err) { + messageDiv.textContent = 'Error unregistering participant.'; + messageDiv.style.color = 'red'; + } + } + }); + }); + // Add option to select dropdown const option = document.createElement("option"); option.value = name; diff --git a/src/static/styles.css b/src/static/styles.css index a533b32..88510e6 100644 --- a/src/static/styles.css +++ b/src/static/styles.css @@ -63,6 +63,8 @@ section h3 { border: 1px solid #ddd; border-radius: 5px; background-color: #f9f9f9; + box-shadow: 0 2px 8px rgba(0, 102, 204, 0.08); + transition: box-shadow 0.2s; } .activity-card h4 { @@ -74,6 +76,63 @@ section h3 { margin-bottom: 8px; } +.participants-section { + margin-top: 12px; + padding: 10px 12px; + background: #e3f2fd; + border-radius: 4px; + border: 1px solid #bbdefb; +} + +.participants-section strong { + color: #1976d2; + font-size: 15px; + display: block; + margin-bottom: 6px; +} + + +.participants-list { + list-style-type: none; + margin-left: 0; + margin-bottom: 0; + padding-left: 0; +} + +.participant-item { + display: flex; + align-items: center; + margin-bottom: 4px; + color: #333; + font-size: 14px; +} + +.participant-email { + flex: 1; +} + +.delete-participant { + cursor: pointer; + color: #d32f2f; + margin-left: 10px; + font-size: 16px; + transition: color 0.2s; +} +.delete-participant:hover { + color: #b71c1c; + text-shadow: 0 0 2px #d32f2f; +} + +.participants-section.empty { + background: #fffde7; + border: 1px solid #ffe082; +} +.participants-section.empty p { + color: #bdb76b; + font-style: italic; + margin-bottom: 0; +} + .form-group { margin-bottom: 15px; } diff --git a/tests/test_app.py b/tests/test_app.py new file mode 100644 index 0000000..30b25b0 --- /dev/null +++ b/tests/test_app.py @@ -0,0 +1,61 @@ +import pytest +from fastapi.testclient import TestClient +from src.app import app + +client = TestClient(app) + +# Test GET /activities +def test_get_activities(): + response = client.get("/activities") + assert response.status_code == 200 + data = response.json() + assert "Chess Club" in data + assert "Programming Class" in data + assert "Gym Class" in data + +# Test POST /activities/{activity_name}/signup +@pytest.mark.parametrize("activity,email", [ + ("Chess Club", "newstudent@mergington.edu"), + ("Programming Class", "newcoder@mergington.edu"), +]) +def test_signup_for_activity(activity, email): + response = client.post(f"/activities/{activity}/signup?email={email}") + assert response.status_code == 200 + assert f"Signed up {email} for {activity}" in response.json()["message"] + +# Test duplicate signup +def test_duplicate_signup(): + activity = "Chess Club" + email = "michael@mergington.edu" + response = client.post(f"/activities/{activity}/signup?email={email}") + assert response.status_code == 400 + assert "already signed up" in response.json()["detail"] + +# Test DELETE /activities/{activity_name}/unregister +@pytest.mark.parametrize("activity,email", [ + ("Chess Club", "daniel@mergington.edu"), + ("Programming Class", "emma@mergington.edu"), +]) +def test_unregister_from_activity(activity, email): + response = client.delete(f"/activities/{activity}/unregister?email={email}") + assert response.status_code == 200 + assert f"Unregistered {email} from {activity}" in response.json()["message"] + +# Test unregister non-existent participant +def test_unregister_nonexistent(): + activity = "Chess Club" + email = "notfound@mergington.edu" + response = client.delete(f"/activities/{activity}/unregister?email={email}") + assert response.status_code == 400 + assert "Participant not found" in response.json()["detail"] + +# Test activity not found +@pytest.mark.parametrize("endpoint", [ + "/activities/Unknown/signup?email=test@mergington.edu", + "/activities/Unknown/unregister?email=test@mergington.edu", +]) +def test_activity_not_found(endpoint): + method = "post" if "signup" in endpoint else "delete" + response = getattr(client, method)(endpoint) + assert response.status_code == 404 + assert "Activity not found" in response.json()["detail"]