diff --git a/TFR/server/__init__.py b/TFR/server/__init__.py index a100871..68885f0 100644 --- a/TFR/server/__init__.py +++ b/TFR/server/__init__.py @@ -50,6 +50,7 @@ def load_user(user_id): def error_page(err): if not isinstance(err, HTTPException): abort(500) + return ( render_template( "error.html", error=err.code, msg=err.description, image=str(randint(1, 3)) diff --git a/TFR/server/api.py b/TFR/server/api.py index 41d5628..755e0e2 100644 --- a/TFR/server/api.py +++ b/TFR/server/api.py @@ -7,7 +7,14 @@ from werkzeug.security import check_password_hash from server.models import Scores, Sessions, Users from server.extensions import db -from server.config import GAME_VERSION, GAME_VERSIONS, GAME_DIFFICULTIES, USER_MAX_TOKENS, MAX_SEARCH_RESULTS, USER_REGEX +from server.config import ( + GAME_VERSION, + GAME_VERSIONS, + GAME_DIFFICULTIES, + USER_MAX_TOKENS, + MAX_SEARCH_RESULTS, + USER_REGEX, +) blueprint = Blueprint("api", __name__, url_prefix="/api") @@ -85,7 +92,11 @@ def search(): if not search_arg: return "No search query provided!", 400 - users = Users.query.filter(Users.username.icontains(search_arg)).limit(MAX_SEARCH_RESULTS).all() + users = ( + Users.query.filter(Users.username.icontains(search_arg)) + .limit(MAX_SEARCH_RESULTS) + .all() + ) return jsonify([user.username for user in users]) @@ -109,7 +120,7 @@ def login(): user_id=user.id, auth_key=str(shortuuid.ShortUUID().random(length=32)), ip_address=request.remote_addr, - device_type=device + device_type=device, ) db.session.add(session) db.session.commit() @@ -128,4 +139,4 @@ def authenticate(): user_data = Users.query.filter_by(id=session.user_id).first() - return jsonify({'username':user_data.username}) + return jsonify({"username": user_data.username}) diff --git a/TFR/server/config.py b/TFR/server/config.py index c588107..95b118a 100644 --- a/TFR/server/config.py +++ b/TFR/server/config.py @@ -30,4 +30,4 @@ INSTANCE_DIR = "/data/storage/instance" # SQLite SECRET_KEY = "dev" SQLALCHEMY_DATABASE_URI = "sqlite:///tfr.db" -""" \ No newline at end of file +""" diff --git a/TFR/server/models.py b/TFR/server/models.py index e897659..ea6d0d6 100644 --- a/TFR/server/models.py +++ b/TFR/server/models.py @@ -14,6 +14,7 @@ class Scores(db.Model): then the username must be provided. Otherwise, it's grabbed from the user table """ + id = db.Column(db.Integer, primary_key=True) score = db.Column(db.Float, nullable=False) @@ -37,6 +38,7 @@ class Sessions(db.Model): """ Sessions table """ + id = db.Column(db.Integer, primary_key=True) user_id = db.Column(db.Integer, db.ForeignKey("users.id", use_alter=True)) auth_key = db.Column(db.String, nullable=False, unique=True) @@ -58,6 +60,7 @@ class Users(db.Model, UserMixin): """ User table """ + id = db.Column(db.Integer, primary_key=True) alt_id = db.Column(db.String, nullable=False, unique=True) @@ -69,9 +72,8 @@ class Users(db.Model, UserMixin): server_default=db.func.now(), ) - - scores = db.relationship("Scores", backref=db.backref('users', lazy=True)) - tokens = db.relationship("Sessions", backref=db.backref('users', lazy=True)) + scores = db.relationship("Scores", backref=db.backref("users", lazy=True)) + tokens = db.relationship("Sessions", backref=db.backref("users", lazy=True)) def get_id(self): return str(self.alt_id) diff --git a/TFR/server/static/background.png b/TFR/server/static/images/background.png similarity index 100% rename from TFR/server/static/background.png rename to TFR/server/static/images/background.png diff --git a/TFR/server/static/background.webp b/TFR/server/static/images/background.webp similarity index 100% rename from TFR/server/static/background.webp rename to TFR/server/static/images/background.webp diff --git a/TFR/server/static/error-images/1.jpg b/TFR/server/static/images/error/1.jpg similarity index 100% rename from TFR/server/static/error-images/1.jpg rename to TFR/server/static/images/error/1.jpg diff --git a/TFR/server/static/error-images/2.jpg b/TFR/server/static/images/error/2.jpg similarity index 100% rename from TFR/server/static/error-images/2.jpg rename to TFR/server/static/images/error/2.jpg diff --git a/TFR/server/static/error-images/3.jpg b/TFR/server/static/images/error/3.jpg similarity index 100% rename from TFR/server/static/error-images/3.jpg rename to TFR/server/static/images/error/3.jpg diff --git a/TFR/server/static/images/logo.png b/TFR/server/static/images/logo.png new file mode 100644 index 0000000..53a4fed Binary files /dev/null and b/TFR/server/static/images/logo.png differ diff --git a/TFR/server/static/title.png b/TFR/server/static/images/title.png similarity index 100% rename from TFR/server/static/title.png rename to TFR/server/static/images/title.png diff --git a/TFR/server/static/title.webp b/TFR/server/static/images/title.webp similarity index 100% rename from TFR/server/static/title.webp rename to TFR/server/static/images/title.webp diff --git a/TFR/server/templates/base.html b/TFR/server/templates/base.html index f9de408..72db985 100644 --- a/TFR/server/templates/base.html +++ b/TFR/server/templates/base.html @@ -1,10 +1,14 @@ + Front Rooms Highscores + - Front Rooms Highscores + + + {% assets "scripts" %}{% endassets %} @@ -16,8 +20,8 @@ - - The Front Rooms Level select render + + The Front Rooms Level select render
@@ -34,8 +38,8 @@
- - The Front Rooms logo + + The Front Rooms logo