sheppy/tmnf-replay-server
1
0
Fork 0
mirror of https://github.com/FAUSheppy/tmnf-replay-server.git synced 2025-12-06 07:01:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: better UI & game selection

Browse Source
This commit is contained in:
Johnathen Sheppard
2023-11-26 16:15:18 +01:00
parent d58fc534fc
commit 0ed43ec049
6 changed files with 130 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server.py
View File

@@ -27,6 +27,7 @@ class Map(db.Model):
map_uid = Column(String, primary_key=True) map_uid = Column(String, primary_key=True)
mapname = Column(String) mapname = Column(String)
game = Column(String)
def get_best_replay(self): def get_best_replay(self):
@@ -268,7 +269,7 @@ def replay_from_path(fullpath, uploader=None):
game=ghost.game) game=ghost.game)
# build database map object from replay # # build database map object from replay #
m = Map(map_uid=replay.map_uid, mapname=replay.map_uid) m = Map(map_uid=replay.map_uid, mapname=replay.map_uid, game=replay.game)
# merge the map & commit and return the replay # # merge the map & commit and return the replay #
db.session.merge(m) db.session.merge(m)
@@ -323,7 +324,18 @@ def mapnames():
# TODO list by user # TODO list by user
player = flask.request.headers.get("X-Forwarded-Preferred-Username") player = flask.request.headers.get("X-Forwarded-Preferred-Username")
maps = db.session.query(Map).order_by(asc(Map.mapname)).all() maps_query = db.session.query(Map).order_by(asc(Map.mapname))
# limit leaderboard to game #
game = flask.request.args.get("game")
if game == "tm2020":
maps_query = maps_query.filter(Map.game=="tm2020")
elif game=="tmnf":
maps_query = maps_query.filter(Map.game!="tm2020")
else:
pass
maps = maps_query.all()
# FIXME better handling for unwanted maps # # FIXME better handling for unwanted maps #
allowed = ("A", "B", "C", "D", "E", "Fall", "Winter", "Spring", "Summer") allowed = ("A", "B", "C", "D", "E", "Fall", "Winter", "Spring", "Summer")
@@ -410,4 +422,4 @@ if __name__ == "__main__":
with app.app_context(): with app.app_context():
create_app() create_app()
app.run(host=args.interface, port=args.port) app.run(host=args.interface, port=args.port, debug=True)

55
static/site.css Normal file
View File

@@ -0,0 +1,55 @@
body{
background: #2b3035;
}
td{
border-bottom: 1px;
padding-top: 20px;
padding-bottom: 20px;
font-size: 17px !important;
background: #343a40;
}
tr{
margin-top: 2px;
margin-bottom: 2px;
color: white;
}
th{
margin-top: 2px;
margin-bottom: 2px;
font-weight: bold;
}
table{
border-collapse:separate;
border-spacing: 0 0.25em;
border-bottom: 3px solid;
border-color: transparent;
}
.m-auto{
margin: auto;
}
.margin-r{
margin-right: 20px;
}
.margin-l{
margin-left: 20px;
}
.margin-table-mid{
margin-left: 20px;
}
.self-record{
background: #354034;
}
select{
background: darkgray !important;
}
input{
background: darkgray !important;
}

2
templates/datatable.html
View File

@@ -1,5 +1,5 @@
<div style="font-size: 16px; font-weight: 300;" class="mt-5 mb-3 ml-2 mr-2" role="main"> <div style="font-size: 16px; font-weight: 300;" class="mt-5 mb-3 ml-2 mr-2" role="main">
<table id="tableMain" class="table table-striped table-bordered table-sm" <table id="tableMain" style="width: 100%;" class="table-sm"
cellspacing="0"> cellspacing="0">
<thead> <thead>
<tr> <tr>

3
templates/head.html
View File

@@ -25,4 +25,7 @@
<link href="https://cdn.atlantishq.de/css/mdb.min.css" rel="stylesheet"> <link href="https://cdn.atlantishq.de/css/mdb.min.css" rel="stylesheet">
<script defer src="https://cdn.atlantishq.de/js/mdb.min.js"></script> <script defer src="https://cdn.atlantishq.de/js/mdb.min.js"></script>
<!-- site.css -->
<link href="/static/site.css" rel="stylesheet">
</head> </head>

67
templates/index.html
View File

@@ -3,41 +3,78 @@
</head> </head>
<body> <body>
{% include "upload-button.html" %} {% include "upload-button.html" %}
<table> <button class="ml-4 mt-4 mb-4 btn btn-info" onclick="window.location.href='/?game=tmnf'">
TMNF
</button>
<button class="mt-4 mb-4 btn btn-info" onclick="window.location.href='/?game=tm2020'">
TM2020
</button>
<button class="mt-4 mb-4 btn btn-info" onclick="window.location.href='/'">
All
</button>
<table class="m-auto">
<thead> <thead>
<tr> <tr>
<th class="px-2">Map</th> <th class="px-2">
<div class="margin-table-mid">Map</div>
</th>
{% if player %} {% if player %}
<th class="px-2">Personal Best</th> <th class="px-2">
<div class="margin-table-mid">Personal Best</div>
</th>
{% endif %} {% endif %}
<th class="px-2">Record</th> <th class="px-2">
<th class="px-2">Record Holder</th> <div class="margin-table-mid">Record</div>
<th class="px-2">Record Age</th> </th>
<th class="px-2">Runner Up (%)</th> <th class="px-2">
<div class="margin-table-mid">Record Holder</div>
</th>
<th class="px-2">
<div class="margin-table-mid">Record Age</div>
</th>
<th class="px-2">
<div class="margin-table-mid">Runner Up (%)</div>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for map in maps %} {% for map in maps %}
<tr> <tr>
<td class="px-2"> <td class="px-2">
<a href="/map-info?map_uid={{ map.map_uid }}">{{ map.mapname }}</a> <a class="margin-l" href="/map-info?map_uid={{ map.map_uid }}">{{ map.mapname }}</a>
</td> </td>
{% if player %} {% if player %}
{% set pb = map.get_best_replay_for_player(player) %} {% set pb = map.get_best_replay_for_player(player) %}
{% if pb and pb.race_time != map.get_best_replay().race_time %} {% if pb and pb.race_time != map.get_best_replay().race_time %}
<td class="px-2">{{ pb.get_human_readable_time() }}</td> <td class="px-2">
<div class="margin-table-mid">{{ pb.get_human_readable_time() }}</div>
</td>
{% elif pb %} {% elif pb %}
<td class="px-2" style="color: darkgreen">CRH</td> <td class="px-2" style="color: darkgreen">
<div class="margin-table-mid">CRH</div>
</td>
{% else %} {% else %}
<td class="px-2">-</td> <td class="px-2">
<div class="margin-table-mid">-</div>
</td>
{% endif %} {% endif %}
{% endif %} {% endif %}
<td class="px-2">{{ map.get_best_replay_repr().split(" ")[0] }}</td> <td class="px-2">
<td class="px-2">{{ map.get_best_replay().clean_login() }}</td> <div class="margin-table-mid">{{ map.get_best_replay_repr().split(" ")[0] }}</div>
<td class="px-2">{{ map.get_best_replay_age() }} days</td> </td>
<td class="px-2">{{ map.get_record_replay_percent_diff() }}</td> <td class="px-2">
<div class="margin-table-mid">{{ map.get_best_replay().clean_login() }}</div>
</td>
<td class="px-2">
<div class="margin-table-mid">{{ map.get_best_replay_age() }} days</div>
</td>
<td class="px-2">
<div class="margin-r">{{ map.get_record_replay_percent_diff() }}</div>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<div style="padding-bottom: 30px;">
</div>
</body> </body>

2
templates/map-info.html
View File

@@ -1,7 +1,7 @@
<head> <head>
{% include "head.html" %} {% include "head.html" %}
</head> </head>
<body> <body style="color: white;" >
{% include "upload-button.html" %} {% include "upload-button.html" %}
{% include "home-button.html" %} {% include "home-button.html" %}
</br> </br>