Working app, guests implementation pending

1 files changed, 20 insertions, 9 deletions

diff --git a/app/routes.py b/app/routes.py
index bc85e48..cffbae9 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,14 +1,25 @@
 from app import app
 from app.forms import LoginForm
 from app.controller import Session
-from flask import render_template, request, url_for, Response, flash, redirect, get_template_attribute, render_template_string
+from flask import (
+    render_template,
+    request,
+    url_for,
+    Response,
+    flash,
+    redirect,
+    get_template_attribute,
+)
+from flask import render_template_string as render_string
 
 g = Session()
 
+
 @app.route("/", methods=["GET"])
 def home():
     return render_template("index.j2", url_for=url_for)
 
+
 @app.route("/login", methods=["GET", "POST"])
 def login():
     form = LoginForm()
@@ -17,6 +28,7 @@ def login():
         return redirect("/")
     return render_template("login.j2", form=form)
 
+
 @app.route("/control", methods=["GET"])
 def get_controls():
     return render_template("controls.j2", courts=g.courts.all())
@@ -26,9 +38,7 @@ def get_controls():
 def get_random_games():
     g.levels = int(request.form["levels"].split()[0])
     g.teams = request.form["team"] == "Teams"
-    return render_template(
-        "games.j2", games=g.propose(), title="Proposal"
-    )
+    return render_template("games.j2", games=g.propose(), title="Proposal")
 
 
 @app.route("/confirm", methods=["POST"])
@@ -51,14 +61,15 @@ def toggle_player(player_request):
     id = int(player_request)
     player = g.players.toggle(id)
     button = get_template_attribute("macros.j2", "player_button")
-    t = '{% from "macros.j2" import player_button %}'
-    return render_template_string("{{player_button(player)}}", player=player, player_button=button)
+    return render_string("{{button(player)}}", player=player, button=button)
 
 
 @app.route("/players", methods=["GET"])
 def get_list_of_players():
     regulars, guests = g.players.all()
-    return render_template("players.j2", regulars=regulars, guests=guests, url_for=url_for)
+    return render_template(
+        "players.j2", regulars=regulars, guests=guests, url_for=url_for
+    )
 
 
 @app.route("/reset_players", methods=["POST"])
@@ -73,8 +84,8 @@ def reset_all_players():
 def toggle_court(court_number):
     id = int(court_number)
     status = g.courts.toggle(id)
-    t =  '{% from "macros.j2" import court_button %}{{ court_button(id, status) }}'
-    return render_template(t, id=id, status=status)
+    button = get_template_attribute("macros.j2", "court_button")
+    return render_string("{{button(id, status)}}", id=id, status=status, button=button)
 
 
 @app.route("/courts", methods=["GET"])