Running application

11 files changed, 38 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/templates/controls.j2 b/app/templates/controls.j2
index 0183c97..0183c97 100644
--- a/templates/controls.j2
+++ b/app/templates/controls.j2
diff --git a/templates/games.j2 b/app/templates/games.j2
index 46150f7..46150f7 100644
--- a/templates/games.j2
+++ b/app/templates/games.j2
diff --git a/templates/index.j2 b/app/templates/index.j2
index ce0d531..ce0d531 100644
--- a/templates/index.j2
+++ b/app/templates/index.j2
diff --git a/templates/macros.j2 b/app/templates/macros.j2
index 2974744..2974744 100644
--- a/templates/macros.j2
+++ b/app/templates/macros.j2
diff --git a/templates/players.j2 b/app/templates/players.j2
index 0beeee9..0beeee9 100644
--- a/templates/players.j2
+++ b/app/templates/players.j2
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]:
diff --git a/matchup.py b/matchup.py
new file mode 100644
index 0000000..e524e69
--- /dev/null
+++ b/matchup.py
@@ -0,0 +1 @@
+from app import app
\ No newline at end of file