diff --git a/acmsite/main/__init__.py b/acmsite/main/__init__.py index 0032b01..3da4c2d 100644 --- a/acmsite/main/__init__.py +++ b/acmsite/main/__init__.py @@ -1,4 +1,6 @@ +import datetime from flask import Blueprint, render_template +from acmsite.models import Event bp = Blueprint('main', __name__) @@ -8,7 +10,8 @@ def homepage(): @bp.route("/events") def events(): - return render_template("events.html") + events = Event.query.filter(Event.start_time > datetime.datetime.now()).all() + return render_template("events.html", events=events) @bp.route("/join") def join(): diff --git a/acmsite/templates/events.html b/acmsite/templates/events.html index 1c7b0f4..2507794 100644 --- a/acmsite/templates/events.html +++ b/acmsite/templates/events.html @@ -1,7 +1,19 @@ {% extends 'layout.html' %} +{% from 'bootstrap5/table.html' import render_table %} {% block app_content %} We're still working on this! Check back later. +
+ +{% if events == [] %} +

No upcoming events. If it's a break, enjoy your break!

+{% else %} +{% for e in events %} +

{{ e.name }}

+{{ e.start_time }} - {{ e.end_time }} - {{ e.location }} +

{{ e.description }}

+{% endfor %} +{% endif %} {% endblock %}