Merge branch 'develop' into 'main'

Develop

See merge request KaranJayachandra/match_up!19

1 files changed, 16 insertions, 14 deletions

diff --git a/app/__init__.py b/app/__init__.py
index 3d3b498..0e0ea09 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -31,7 +31,7 @@ g = Session()
 
 @app.route("/", methods=["GET"])
 def home():
-    return render_template("index.j2", url_for=url_for)
+    return render_template("index.j2", url_for=url_for, login_status=is_logged_in())
 
 
 @app.route("/control", methods=["GET"])
@@ -46,6 +46,7 @@ def get_list_of_players():
         regulars=g.players.regulars(),
         guests=g.players.guests(),
         url_for=url_for,
+        login_status=is_logged_in(),
     )
 
 
@@ -54,19 +55,29 @@ def get_list_of_courts():
     return render_template("courts.j2", courts=g.courts.all())
 
 
+def login_required(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        if not is_logged_in():
+            response = Response("User isn't logged in!")
+            response.headers["HX-Redirect"] = url_for("simplelogin.login")
+            return response
+        return f(*args, **kwargs)
+
+    return decorated_function
+
+
 @app.route("/propose", methods=["POST"])
+@login_required
 def get_random_games():
-    if not is_logged_in():
-        return redirect(url_for("login"))
     g.levels = int(request.form["levels"].split()[0])
     g.teams = request.form["team"] == "Teams"
     return render_template("games.j2", games=g.propose(), title="Proposal")
 
 
 @app.route("/confirm", methods=["POST"])
+@login_required
 def confirm_games():
-    if not is_logged_in():
-        return redirect(url_for("simplelogin.login"))
     return render_template("games.j2", games=g.confirm(), title=f"Round: {g.round()}")
 
 
@@ -76,15 +87,6 @@ def clear_games():
         "games.j2", games=g.current_round(), title=f"Round: {g.round()}"
     )
 
-def login_required(f):
-    @wraps(f)
-    def decorated_function(*args, **kwargs):
-        if not is_logged_in():
-            response = Response("User isn't logged in!")
-            response.headers["HX-Redirect"] = url_for("simplelogin.login")
-            return response
-        return f(*args, **kwargs)
-    return decorated_function
 
 @app.route("/reset", methods=["POST"])
 @login_required