feat: complete calendar integration with UI improvements and code cleanup

Calendar Integration Tasks:
- Update upcoming meetings window from 30 to 120 minutes
- Include currently happening events in upcoming meetings API
- Create shared time utility functions (formatDateTime, formatCountdown, formatStartedAgo)
- Improve ongoing meetings UI logic with proper time detection
- Fix backend code organization and remove excessive documentation

UI/UX Improvements:
- Restructure room page layout using MinimalHeader pattern
- Remove borders from header and footer elements
- Change button text from "Leave Meeting" to "Leave Room"
- Remove "Back to Reflector" footer for cleaner design
- Extract WaitPageClient component for better separation

Backend Changes:
- calendar_events.py: Fix import organization and extend timing window
- rooms.py: Update API default from 30 to 120 minutes
- Enhanced test coverage for ongoing meeting scenarios

Frontend Changes:
- MinimalHeader: Add onLeave prop for custom navigation
- MeetingSelection: Complete layout restructure with shared utilities
- timeUtils: New shared utility file for consistent time formatting

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

server/reflector/db/calendar_events.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from typing import Any
 
 import sqlalchemy as sa
@@ -65,7 +65,6 @@ class CalendarEventController:
         start_after: datetime | None = None,
         end_before: datetime | None = None,
     ) -> list[CalendarEvent]:
-        """Get calendar events for a room."""
         query = calendar_events.select().where(calendar_events.c.room_id == room_id)
 
         if not include_deleted:
@@ -83,9 +82,9 @@ class CalendarEventController:
         return [CalendarEvent(**result) for result in results]
 
     async def get_upcoming(
-        self, room_id: str, minutes_ahead: int = 30
+        self, room_id: str, minutes_ahead: int = 120
     ) -> list[CalendarEvent]:
-        """Get upcoming events for a room within the specified minutes."""
+        """Get upcoming events for a room within the specified minutes, including currently happening events."""
         now = datetime.now(timezone.utc)
         future_time = now + timedelta(minutes=minutes_ahead)
 
@@ -95,8 +94,8 @@ class CalendarEventController:
                 sa.and_(
                     calendar_events.c.room_id == room_id,
                     calendar_events.c.is_deleted == False,
-                    calendar_events.c.start_time >= now,
                     calendar_events.c.start_time <= future_time,
+                    calendar_events.c.end_time >= now,
                 )
             )
             .order_by(calendar_events.c.start_time.asc())
@@ -106,7 +105,6 @@ class CalendarEventController:
         return [CalendarEvent(**result) for result in results]
 
     async def get_by_ics_uid(self, room_id: str, ics_uid: str) -> CalendarEvent | None:
-        """Get a calendar event by its ICS UID."""
         query = calendar_events.select().where(
             sa.and_(
                 calendar_events.c.room_id == room_id,
@@ -117,11 +115,9 @@ class CalendarEventController:
         return CalendarEvent(**result) if result else None
 
     async def upsert(self, event: CalendarEvent) -> CalendarEvent:
-        """Create or update a calendar event."""
         existing = await self.get_by_ics_uid(event.room_id, event.ics_uid)
 
         if existing:
-            # Update existing event
             event.id = existing.id
             event.created_at = existing.created_at
             event.updated_at = datetime.now(timezone.utc)
@@ -132,7 +128,6 @@ class CalendarEventController:
                 .values(**event.model_dump())
             )
         else:
-            # Insert new event
             query = calendar_events.insert().values(**event.model_dump())
 
         await get_database().execute(query)
@@ -144,7 +139,6 @@ class CalendarEventController:
         """Soft delete future events that are no longer in the calendar."""
         now = datetime.now(timezone.utc)
 
-        # First, get the IDs of events to delete
         select_query = calendar_events.select().where(
             sa.and_(
                 calendar_events.c.room_id == room_id,
@@ -160,7 +154,6 @@ class CalendarEventController:
         delete_count = len(to_delete)
 
         if delete_count > 0:
-            # Now update them
             update_query = (
                 calendar_events.update()
                 .where(
@@ -181,13 +174,9 @@ class CalendarEventController:
         return delete_count
 
     async def delete_by_room(self, room_id: str) -> int:
-        """Hard delete all events for a room (used when room is deleted)."""
         query = calendar_events.delete().where(calendar_events.c.room_id == room_id)
         result = await get_database().execute(query)
         return result.rowcount
 
 
-# Add missing import
-from datetime import timedelta
-
 calendar_events_controller = CalendarEventController()

server/reflector/views/rooms.py

@@ -431,7 +431,7 @@ async def rooms_list_meetings(
 async def rooms_list_upcoming_meetings(
     room_name: str,
     user: Annotated[Optional[auth.UserInfo], Depends(auth.current_user_optional)],
-    minutes_ahead: int = 30,
+    minutes_ahead: int = 120,
 ):
     user_id = user["sub"] if user else None
     room = await rooms_controller.get_by_name(room_name)

server/tests/test_calendar_event.py

@@ -132,6 +132,16 @@ async def test_calendar_event_get_upcoming():
     )
     await calendar_events_controller.upsert(upcoming_event)
 
+    # Currently happening event (started 10 minutes ago, ends in 20 minutes)
+    current_event = CalendarEvent(
+        room_id=room.id,
+        ics_uid="current-event",
+        title="Current Meeting",
+        start_time=now - timedelta(minutes=10),
+        end_time=now + timedelta(minutes=20),
+    )
+    await calendar_events_controller.upsert(current_event)
+
     # Future event beyond 30 minutes
     future_event = CalendarEvent(
         room_id=room.id,
@@ -142,20 +152,83 @@ async def test_calendar_event_get_upcoming():
     )
     await calendar_events_controller.upsert(future_event)
 
-    # Get upcoming events (default 30 minutes)
+    # Get upcoming events (default 120 minutes) - should include current, upcoming, and future
     upcoming = await calendar_events_controller.get_upcoming(room.id)
 
-    assert len(upcoming) == 1
-    assert upcoming[0].ics_uid == "upcoming-event"
+    assert len(upcoming) == 3
+    # Events should be sorted by start_time (current event first, then upcoming, then future)
+    assert upcoming[0].ics_uid == "current-event"
+    assert upcoming[1].ics_uid == "upcoming-event"
+    assert upcoming[2].ics_uid == "future-event"
 
     # Get upcoming with custom window
     upcoming_extended = await calendar_events_controller.get_upcoming(
         room.id, minutes_ahead=180
     )
 
-    assert len(upcoming_extended) == 2
-    assert upcoming_extended[0].ics_uid == "upcoming-event"
-    assert upcoming_extended[1].ics_uid == "future-event"
+    assert len(upcoming_extended) == 3
+    # Events should be sorted by start_time
+    assert upcoming_extended[0].ics_uid == "current-event"
+    assert upcoming_extended[1].ics_uid == "upcoming-event"
+    assert upcoming_extended[2].ics_uid == "future-event"
+
+
+@pytest.mark.asyncio
+async def test_calendar_event_get_upcoming_includes_currently_happening():
+    """Test that get_upcoming includes currently happening events but excludes ended events."""
+    # Create room
+    room = await rooms_controller.add(
+        name="current-happening-room",
+        user_id="test-user",
+        zulip_auto_post=False,
+        zulip_stream="",
+        zulip_topic="",
+        is_locked=False,
+        room_mode="normal",
+        recording_type="cloud",
+        recording_trigger="automatic-2nd-participant",
+        is_shared=False,
+    )
+
+    now = datetime.now(timezone.utc)
+
+    # Event that ended in the past (should NOT be included)
+    past_ended_event = CalendarEvent(
+        room_id=room.id,
+        ics_uid="past-ended-event",
+        title="Past Ended Meeting",
+        start_time=now - timedelta(hours=2),
+        end_time=now - timedelta(minutes=30),
+    )
+    await calendar_events_controller.upsert(past_ended_event)
+
+    # Event currently happening (started 10 minutes ago, ends in 20 minutes) - SHOULD be included
+    currently_happening_event = CalendarEvent(
+        room_id=room.id,
+        ics_uid="currently-happening",
+        title="Currently Happening Meeting",
+        start_time=now - timedelta(minutes=10),
+        end_time=now + timedelta(minutes=20),
+    )
+    await calendar_events_controller.upsert(currently_happening_event)
+
+    # Event starting soon (in 5 minutes) - SHOULD be included
+    upcoming_soon_event = CalendarEvent(
+        room_id=room.id,
+        ics_uid="upcoming-soon",
+        title="Upcoming Soon Meeting",
+        start_time=now + timedelta(minutes=5),
+        end_time=now + timedelta(minutes=35),
+    )
+    await calendar_events_controller.upsert(upcoming_soon_event)
+
+    # Get upcoming events
+    upcoming = await calendar_events_controller.get_upcoming(room.id, minutes_ahead=30)
+
+    # Should only include currently happening and upcoming soon events
+    assert len(upcoming) == 2
+    assert upcoming[0].ics_uid == "currently-happening"
+    assert upcoming[1].ics_uid == "upcoming-soon"
 
 
 @pytest.mark.asyncio

server/tests/test_room_ics_api.py

@@ -357,8 +357,9 @@ async def test_list_upcoming_meetings(authenticated_client):
     response = await client.get(f"/rooms/{room.name}/meetings/upcoming")
     assert response.status_code == 200
     data = response.json()
-    assert len(data) == 1
+    assert len(data) == 2
     assert data[0]["title"] == "Soon"
+    assert data[1]["title"] == "Later"
 
     response = await client.get(
         f"/rooms/{room.name}/meetings/upcoming", params={"minutes_ahead": 180}