diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/__init__.py | 25 | ||||
| -rw-r--r-- | app/controller.py | 6 | ||||
| -rw-r--r-- | app/model.py | 6 | ||||
| -rw-r--r-- | app/routes.py | 63 | ||||
| -rw-r--r-- | app/templates/controls.j2 | 47 | ||||
| -rw-r--r-- | app/templates/games.j2 | 21 | ||||
| -rw-r--r-- | app/templates/index.j2 | 13 | ||||
| -rw-r--r-- | app/templates/macros.j2 | 99 | ||||
| -rw-r--r-- | app/templates/players.j2 | 31 | ||||
| -rw-r--r-- | app/utilities.py | 4 |
10 files changed, 248 insertions, 67 deletions
diff --git a/app/__init__.py b/app/__init__.py index bccd0e7..96c8ef5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,26 +1,5 @@ from flask import Flask -from waitress import serve -from argparse import ArgumentParser -from importlib.resources import path -from match_up.controller import RoundGenerator +app = Flask(__name__) -with path("match_up", "static") as p: - static_folder = p -with path("match_up", "templates") as p: - template_folder = p -_app = Flask( - "Match Up! Backend", static_folder=static_folder, template_folder=template_folder -) -_rg = RoundGenerator() - - -from match_up import routes - - -def main(): - parser = ArgumentParser() - parser.add_argument("-d", "--database", help="CSV database", default=None) - args = parser.parse_args() - _rg.update_player_list(csv_location=args.database) - serve(_app, port=80) +from app import routes diff --git a/app/controller.py b/app/controller.py index b00bf6b..498715d 100644 --- a/app/controller.py +++ b/app/controller.py @@ -1,8 +1,8 @@ from typing import Tuple from operator import attrgetter -from match_up.data import Game, PLAYER_PER_COURT -from match_up.model import Player, PlayerList, CourtList -from match_up.utilities import ( +from app.data import Game, PLAYER_PER_COURT +from app.model import Player, PlayerList, CourtList +from app.utilities import ( _create_placeholders, _select_players, _create_shuffle_games, diff --git a/app/model.py b/app/model.py index 467310b..b2b6470 100644 --- a/app/model.py +++ b/app/model.py @@ -3,12 +3,11 @@ from typing import Tuple from os.path import isfile from pandas import read_csv from dataclasses import dataclass -from importlib.resources import path from random import getrandbits, randint from sqlalchemy.orm import sessionmaker from sqlalchemy import create_engine, not_ from names import get_first_name, get_last_name -from match_up.data import ( +from app.data import ( MIN_LEVEL, MAX_LEVEL, PLAYER_PER_COURT, @@ -103,8 +102,7 @@ def _init_random_database(session, player_count: int = 80) -> None: class PlayerList: def __init__(self, csv_location=None) -> None: - with path("match_up", "players.db") as p: - self.db_location = p + self.db_location = "players.db" db_file_found = True if not isfile(self.db_location): db_file_found = False diff --git a/app/routes.py b/app/routes.py index e5a3b99..c18d93b 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,80 +1,73 @@ -from match_up import _app, _rg -from jinja2 import Environment, PackageLoader +from app import app +from app.controller import RoundGenerator from flask import render_template, request, url_for, Response -re = Environment(loader=PackageLoader("match_up")) +rg = RoundGenerator() - -@_app.route("/", methods=["GET"]) +@app.route("/", methods=["GET"]) def home(): - return re.get_template("index.j2").render(url_for=url_for) + return render_template("index.j2", url_for=url_for) -@_app.route("/control", methods=["GET"]) +@app.route("/control", methods=["GET"]) def get_controls(): - return render_template("controls.j2", courts=_rg.courts.get_courts()) + return render_template("controls.j2", courts=rg.courts.get_courts()) -@_app.route("/propose", methods=["POST"]) +@app.route("/propose", methods=["POST"]) def get_random_games(): 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" + "games.j2", games=rg.propose(levels, team_practice), title="Proposal" ) -@_app.route("/confirm", methods=["POST"]) +@app.route("/confirm", methods=["POST"]) def confirm_games(): - return render_template("games.j2", games=_rg.confirm(), title=f"Round: {_rg.round}") + return render_template("games.j2", games=rg.confirm(), title=f"Round: {rg.round}") -@_app.route("/clear", methods=["POST"]) +@app.route("/clear", methods=["POST"]) def clear_games(): - return render_template("games.j2", games=_rg.clear(), title=f"Round: {_rg.round}") + return render_template("games.j2", games=rg.clear(), title=f"Round: {rg.round}") -@_app.route("/reset", methods=["POST"]) +@app.route("/reset", methods=["POST"]) def reset_games(): - return render_template("games.j2", games=_rg.reset(), title=f"Round: {_rg.round}") + return render_template("games.j2", games=rg.reset(), title=f"Round: {rg.round}") -@_app.route("/player-toggle/<player_request>", methods=["POST"]) +@app.route("/player-toggle/<player_request>", methods=["POST"]) def toggle_player(player_request): id = int(player_request) - player = _rg.players.toggle_player_status(id) - t = re.from_string( - '{% from "macros.j2" import player_button %}{{player_button(player)}}' - ) + player = rg.players.toggle_player_status(id) + t = '{% from "macros.j2" import player_button %}{{player_button(player)}}' return render_template(t, player=player) -@_app.route("/players", methods=["GET"]) +@app.route("/players", methods=["GET"]) def get_list_of_players(): - regulars, guests = _rg.players.get_all_players() - return re.get_template("players.j2").render( - regulars=regulars, guests=guests, url_for=url_for - ) + regulars, guests = rg.players.get_all_players() + return render_template("players.j2", regulars=regulars, guests=guests, url_for=url_for) -@_app.route("/reset_players", methods=["POST"]) +@app.route("/reset_players", methods=["POST"]) def reset_all_players(): - _rg.players.reset_all_players() + rg.players.reset_all_players() response = Response("Players reset!") response.headers["HX-Refresh"] = "true" return response -@_app.route("/court-toggle/<court_number>", methods=["POST"]) +@app.route("/court-toggle/<court_number>", methods=["POST"]) def toggle_court(court_number): id = int(court_number) - status = _rg.courts.toggle_court_status(id) - t = re.from_string( - '{% from "macros.j2" import court_button %}{{ court_button(id, status) }}' - ) + status = rg.courts.toggle_court_status(id) + t = '{% from "macros.j2" import court_button %}{{ court_button(id, status) }}' return render_template(t, id=id, status=status) -@_app.route("/courts", methods=["GET"]) +@app.route("/courts", methods=["GET"]) def get_list_of_courts(): - return render_template("courts.j2", courts=_rg.courts.get_courts()) + return render_template("courts.j2", courts=rg.courts.get_courts()) diff --git a/app/templates/controls.j2 b/app/templates/controls.j2 new file mode 100644 index 0000000..0183c97 --- /dev/null +++ b/app/templates/controls.j2 @@ -0,0 +1,47 @@ +{% from "macros.j2" import court_button %} +<div class="fixed-grid has-6-cols"> + <div class="grid"> + {% for key, value in courts.items() %} + {{ court_button(key, value) }} + {% endfor %} + </div> +</div> +<div class="columns"> + <div class="column"> + <div class="select is-responsive"> + <select name="levels"> + <option>10 Levels</option> + <option>8 Levels</option> + <option>6 Levels</option> + <option>4 Levels</option> + <option>2 Levels</option> + <option>0 Levels</option> + </select> + </div> + </div> + <div class="column"> + <div class="select is-responsive"> + <select name="team"> + <option>Random</option> + <option>Teams</option> + </select> + </div> + </div> + <div class="column"> + <button class="button is-dark is-responsive" + hx-post="/propose" + hx-target="#games" + hx-include="[name='levels'], [name='team']">Generate</button> + </div> + <div class="column"></div> + <div class="column"> + <button class="button is-dark is-responsive" + hx-post="/confirm" + hx-target="#games">Confirm</button> + </div> + <div class="column"> + <button class="button is-dark is-responsive" + hx-post="/reset" + hx-target="#games">RESET!</button> + </div> +</div>
\ No newline at end of file diff --git a/app/templates/games.j2 b/app/templates/games.j2 new file mode 100644 index 0000000..46150f7 --- /dev/null +++ b/app/templates/games.j2 @@ -0,0 +1,21 @@ +<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth" id="games"> +<thead> + <th colspan="5" align="center"> {{ title }} </th> +</thead> +<thead> + <th align="center"> Court </th> + <th colspan="2" align="center"> Team 1 </th> + <th colspan="2" align="center"> Team 2 </th> +</thead> +<tbody> +{% for game in games %} + <tr {% if game.team1.player1.first == 'RESERVED' %} class="is-danger" {% endif %}> + <th align="center" style="width: 8%;">{{ game.court }}</th> + <td style="width: 23%;"><strong>{{ game.team1.player1.first }}</strong>{{ " " + game.team1.player1.last }}</th> + <td style="width: 23%;"><strong>{{ game.team1.player2.first }}</strong>{{ " " + game.team1.player2.last }}</th> + <td style="width: 23%;"><strong>{{ game.team2.player1.first }}</strong>{{ " " + game.team2.player1.last }}</th> + <td style="width: 23%;"><strong>{{ game.team2.player2.first }}</strong>{{ " " + game.team2.player2.last }}</th> + </tr> +{% endfor %} +</tbody> +</table>
\ No newline at end of file diff --git a/app/templates/index.j2 b/app/templates/index.j2 new file mode 100644 index 0000000..ce0d531 --- /dev/null +++ b/app/templates/index.j2 @@ -0,0 +1,13 @@ +{% from "macros.j2" import header, footer, navbar %} +<!doctype html> +<html lang="en"> + {{ header(url_for) }} + <body> + <section class="section"> + {{ navbar(url_for) }} + <div hx-post="/clear" hx-swap="outerHTML" hx-trigger="load"></div> + <div hx-get="/control" hx-swap="outerHTML" hx-trigger="load"></div> + {{ footer() }} + </section> + </body> +</html> diff --git a/app/templates/macros.j2 b/app/templates/macros.j2 new file mode 100644 index 0000000..2974744 --- /dev/null +++ b/app/templates/macros.j2 @@ -0,0 +1,99 @@ +{% macro court_button(id, status) -%} +<button class= "button is-responsive {% if status %}is-success{% else %}is-danger{% endif %}" + hx-post="{{ "/court-toggle/" ~ id}}" + hx-swap="outerHTML"> Court {{ id }}</button> +{%- endmacro %} + +{% macro player_button(player) -%} +<button class="button is-responsive {% if player.status %}is-success{% else %}is-danger {% endif %}" + hx-post="{{ "/player-toggle/" ~ player.id}}" + hx-swap="outerHTML"> {{ player.first + " " + player.last}} </button> +{%- endmacro %} + +{% macro guest_control(level, value) -%} +<div class="field center has-addons is-centered" id="guests_{{level}}"> + <div class="control"> + <button class="button is-responsive is-dark" + hx-post="/decrement_guest" + hx-swap="outerHTML" + hx-vals='{"level": "{{ level }}"}' + hx-target="#guests_{{ level }}"><span class="icon"><i class="fas fa-light fa-minus"></i></span></button> + </div> + <div class="control"> + <input class="input is-responsive" type="text" style="text-align:center" value="{{ value }}" disabled> + </div> + <div class="control"> + <button class="button is-responsive is-dark" + hx-post="/increment_guest" + hx-swap="outerHTML" + hx-vals='{"level": "{{ level }}"}' + hx-target="#guests_{{ level }}"><span class="icon"><i class="fas fa-light fa-plus"></i></span></button> + </div> +</div> +{%- endmacro %} + +{% macro header(url_for) -%} +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>Match Up!</title> + <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}"> + <link rel="stylesheet" href="{{ url_for('static', filename='bulma.min.css') }}"> + <link rel="stylesheet" href="{{ url_for('static', filename='notyf.min.css') }}"> + <link rel="stylesheet" href="{{ url_for('static', filename='custom.css') }}"> + <script src="{{ url_for('static', filename='htmx.min.js') }}"></script> + <script src="{{ url_for('static', filename='notyf.min.js') }}"></script> + <script src="{{ url_for('static', filename='fontawesome.js') }}"></script> + <script defer src="{{ url_for('static', filename='custom.js') }}"></script> +</head> +{%- endmacro %} + +{% macro footer() -%} +<div class="content has-text-centered">Made by <a href="https://karanjayachandra.com/">Karan</a> using <a href="https://flask.palletsprojects.com">Flask</a>, <a href="https://htmx.org/">HTMX</a>, <a href="https://carlosroso.com/notyf/">Notyf</a> and <a href="https://bulma.io">Bulma</a></div> +{%- endmacro %} + +{% macro navbar(url_for) -%} +<nav class="level"> + <p class="level-item has-text-centered"> + <button class="button is-link" onclick="location.href = '/';">Games</button> + </p> + <p class="level-item has-text-centered"> + <button class="button is-link" onclick="location.href = '/players';">Players</button> + </p> + <div class="level-item has-text-centered"></div> + <div class="level-left"> + <div class="level-item"> + <figure class="image container is-128x128"> + <img src="{{ url_for('static', filename='logo.png') }}"/> + </figure> + </div> + </div> + <div class="level-item has-text-centered"> + <p class="title">Match Up!</p> + </div> + <div class="level-item has-text-centered"></div> + <div class="level-item has-text-centered"></div> + <div class="level-right"> + <div class="field has-addons has-addons-centered"> + <div class="control"><button class="button is-dark" id="timer-dec"> + <span class="icon"><i class="fas fa-light fa-minus"></i></span> + </button></div> + <p class="control has-icons-left has-icons-right"> + <input class="input is-responsive" id="timer-display" type="text" style="text-align:center; " readonly> + <span class="icon is-small is-left"> + <i class="fas fa-light fa-clock"></i> + </span> + </p> + <div class="control"><button class="button is-dark" id="timer-inc"> + <span class="icon"><i class="fas fa-light fa-plus"></i></span> + </button></div> + <div class="control"><button class="button is-dark" id="timer-start"> + <span class="icon"><i class="fas fa-light fa-play"></i></span> + </button></div> + <div class="control"><button class="button is-dark" id="timer-stop"> + <span class="icon"><i class="fas fa-light fa-stop"></i></span> + </button></div> + </div> + </div> +</nav> +{%- endmacro %}
\ No newline at end of file diff --git a/app/templates/players.j2 b/app/templates/players.j2 new file mode 100644 index 0000000..0beeee9 --- /dev/null +++ b/app/templates/players.j2 @@ -0,0 +1,31 @@ +{% from "macros.j2" import header, navbar, footer, player_button, guest_control %} +<!doctype html> +<html lang="en"> + {{ header(url_for) }} + <body> + <section class="section"> + {{ navbar(url_for) }} + <h4 class="title is-4">Members</h4> + <div class="fixed-grid has-4-cols"> + <div class="grid"> + {% for regular in regulars %} + <div class="cell"> {{ player_button(regular) }} </div> + {% endfor %} + </div> + <h4 class="title is-4">Guests</h4> + <div class="fixed-grid has-4-cols"> + <div class="grid"> + {% for guest in guests %} + <div class="cell"> {{ player_button(guest) }} </div> + {% endfor %} + </div> + </section> + <section class="section"> + <div class="column"> + <button class="button is-dark is-responsive" + hx-post="/reset_players">RESET!</button> + </div> + {{ footer() }} + </section> + </body> +</html>
\ No newline at end of file diff --git a/app/utilities.py b/app/utilities.py index 7140a5f..e324161 100644 --- a/app/utilities.py +++ b/app/utilities.py @@ -1,7 +1,7 @@ from typing import Tuple from random import shuffle, sample -from match_up.data import Player, DisplayPlayer, Team, Game -from match_up.data import MAX_LEVEL, PLAYER_PER_COURT +from app.data import Player, DisplayPlayer, Team, Game +from app.data import MAX_LEVEL, PLAYER_PER_COURT def _shuffle_two_lists(a: list, b: list) -> Tuple[list, list]: |