Merge branch 'develop' into 'main'

Develop

See merge request KaranJayachandra/match_up!12

1 files changed, 7 insertions, 26 deletions

diff --git a/src/match_up/routes.py b/src/match_up/routes.py
index c0e77aa..e5a3b99 100644
--- a/src/match_up/routes.py
+++ b/src/match_up/routes.py
@@ -15,31 +15,13 @@ def get_controls():
     return render_template("controls.j2", courts=_rg.courts.get_courts())
 
 
-@_app.route("/increment_guest", methods=["POST"])
-def increment_guests():
-    level = int(request.form["level"].split()[0])
-    t = re.from_string(
-        '{% from "macros.j2" import guest_control %}{{guest_control(level, value)}}'
-    )
-    value = _rg.players.increment_guests(level)
-    return render_template(t, level=level, value=value)
-
-
-@_app.route("/decrement_guest", methods=["POST"])
-def decrement_guests():
-    print(request.form["level"])
-    level = int(request.form["level"])
-    t = re.from_string(
-        '{% from "macros.j2" import guest_control %}{{guest_control(level, value)}}'
-    )
-    value = _rg.players.decrement_guests(level)
-    return render_template(t, level=level, value=value)
-
-
 @_app.route("/propose", methods=["POST"])
 def get_random_games():
-    levels = int(request.form["type"].split()[0])
-    return render_template("games.j2", games=_rg.propose(levels), title="Proposal")
+    levels = int(request.form["levels"].split()[0])
+    team_practice = request.form["team"] == "Teams"
+    return render_template(
+        "games.j2", games=_rg.propose(levels, team_practice), title="Proposal"
+    )
 
 
 @_app.route("/confirm", methods=["POST"])
@@ -69,10 +51,9 @@ def toggle_player(player_request):
 
 @_app.route("/players", methods=["GET"])
 def get_list_of_players():
-    all_players = _rg.players.get_all_players()
-    guests = _rg.players.get_guests()
+    regulars, guests = _rg.players.get_all_players()
     return re.get_template("players.j2").render(
-        players=all_players, guests=guests, url_for=url_for
+        regulars=regulars, guests=guests, url_for=url_for
     )