Add past events page

new-registration-app/main.py

@@ -1,7 +1,7 @@
 import locale
 from contextlib import asynccontextmanager
-from datetime import datetime
+from datetime import datetime, timedelta
-from typing import Annotated, Union
+from typing import Annotated
 
 import starlette.status as status
 from fastapi import Depends, FastAPI, Request
@@ -45,13 +45,37 @@ SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @app.get("/")
-async def read_root(request: Request, session: SessionDep):
+async def index(request: Request, session: SessionDep):
-    statement = select(Event).order_by(Event.event_time)
+    """Displays coming events and a button to register new ones"""
+    now = datetime.now()
+    # TODO: Once we refactored to use SQLAlchemy directly, we can probably do a nicer filtering on the date alone
+    statement = (
+        select(Event)
+        .order_by(Event.event_time)
+        .where(Event.event_time >= now - timedelta(days=1))
+    )
     events = session.exec(statement).all()
     return templates.TemplateResponse(
         request=request,
         name="index.html",
-        context={"events": events, "current_page": "home", "now": datetime.now()},
+        context={"events": events, "current_page": "home", "now": now},
+    )
+
+
+@app.get("/past_events")
+async def past_events(request: Request, session: SessionDep):
+    now = datetime.now()
+    # TODO: Once we refactored to use SQLAlchemy directly, we can probably do a nicer filtering on the date alone
+    statement = (
+        select(Event)
+        .order_by(Event.event_time)
+        .where(Event.event_time < now - timedelta(days=1))
+    )
+    events = session.exec(statement).all()
+    return templates.TemplateResponse(
+        request=request,
+        name="index.html",
+        context={"events": events, "current_page": "past", "now": now},
     )
 
 

new-registration-app/templates/base.html

@@ -24,7 +24,7 @@
                     <a class="nav-link {% if current_page == 'home' %}active{% endif %}" {% if current_page == 'home' %}aria-current="page"{% endif %} href="/">Home</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link {% if current_page == 'vergangene' %}active{% endif %}" {% if current_page == 'vergangene' %}aria-current="page"{% endif %} href="/vergangene">Vergangene</a>
+                    <a class="nav-link {% if current_page == 'past' %}active{% endif %}" {% if current_page == 'past' %}aria-current="page"{% endif %} href="/past_events">Vergangene</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if current_page == 'preise' %}active{% endif %}" {% if current_page == 'preise' %}aria-current="page"{% endif %} href="/preise">Preise</a>

new-registration-app/templates/index.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="row mt-4 mb-3">
     <div class="col d-flex justify-content-between align-items-center">
-        <h2>Kommende Events</h2>
+        <h2>{% if current_page == "home" %}Kommende{% else %}Vergangene{% endif %} Kochabende</h2>
         <a href="/event/add" class="btn btn-primary">
             <i class="bi bi-plus-circle"></i> Neues Event erstellen
         </a>