From a10aaf13e9456f9dc71958e178fabceb38a8dd48 Mon Sep 17 00:00:00 2001
From: reverend <reverend@reverend2048.de>
Date: Wed, 24 Apr 2019 08:17:55 +0200
Subject: [PATCH] ~reversed some changes
---
src/model/cfd.sqlite | Bin 65536 -> 65536 bytes
src/templates/frontend/frontend.css | 2 +-
src/templates/frontend/frontend.jinja | 96 +++++++++++++++++++++++++-
src/views/game.py | 6 +-
src/views/management.py | 2 +-
5 files changed, 99 insertions(+), 7 deletions(-)
diff --git a/src/model/cfd.sqlite b/src/model/cfd.sqlite
index 9298efbaf380e3a5cc9dacbf6d84e0b5d004abce..46213f4ef33c76c92b5ee1f8981382c008496381 100644
GIT binary patch
delta 570
zcmZvZ%}WA77{+I2XLHwTU+fT-ZbcZF6t&SMNTaVyMjr=*4nZP925CqTMWCmSrOnO$
zf$C7m9{Zw0)}>Dff({`Wi%^~V1DX}KE?ypH-g$mA&-+d)MN=u7ZX#IDxQ4mr7Oqqx
z%S;KlS)e&&E*}lI{?yz%BN50V$U|0l^lU??m)JB_#geoZN~~<eW03)WB(|D}uS7#u
z#oBkVeA3VHTLeY8<@hBy>je#4zJHQ91)t3BlMTCR$^iqx4;UPHh4vaj{R2p~pvo3)
zM+gxpAozv?w?2brTCKN<L+Fr)qp?t8y)_VB4KGGwwQzz&B}}1PDJfxCR}MHft=M5y
zupu7~@}7AD+{IwZ?evQ_q~TztHra#GPDTkky=Y<fi@0l$maX_N*?(XC=0K|mPm0De
znV~u}vk05!Jg(so7;N$gOQ2PrideZ!U4oC@B^z1(-mi$zhu|2tU>;tekKfh?yAvKP
zvck9rQ<k3e=tplwL6YQPa6BHN<sUwO_hN~a-g8{{inHaz+32#{Jk-^XeS#%DZ`@EU
Qvz^a5t|e3Tk*~A5U&?i{qW}N^
delta 334
zcmZo@U}<PznIOf)aCM@L6Oi1Pa8#CwgJW{yeU-`Ha)}`3#pf!UFUc7NvN7@>W8gow
zS<qk)|Kwx!c0m3U2L2~N{w;nMX=Yo_$>-}OCQV=gihp6?{{j?$#V^LqEX!G*SX5Az
zpO?zTz`(%B|BiwG9Z>EGzmg!cCZ|(oUSd(Df_G*~az<(%FMk;WGv7-Feto`|{JZ$x
z0M*^(oBVR$1V)#M6CIdbm?yv9C(md(ncrVU0Aw07|0<vh_>c3i;_n5jZQy6Ln&>FW
zEW>O&`CPr^<YVXUc$oRy82H!oxAEWLj|D0T;Aae)I8k--e|NUY)BKb+ue<+*nS+xv
zG}J3Ul?CkUeUG&mIVZn-yb(ywei8<j49m<_0ZDF_eY%2)k#qC0=O<VgIVShNi3E}_
LLF8uVw|j*E%xQ7Z
diff --git a/src/templates/frontend/frontend.css b/src/templates/frontend/frontend.css
index 7c9454c..9c049e0 100644
--- a/src/templates/frontend/frontend.css
+++ b/src/templates/frontend/frontend.css
@@ -1,4 +1,4 @@
-@font-face { font-family: PressStart2P; src: url('../static/PressStart2P-Regular.ttf'); }
+@font-face { font-family: PressStart2P; src: url('../../static/PressStart2P-Regular.ttf'); }
body{
font-family: PressStart2P;
diff --git a/src/templates/frontend/frontend.jinja b/src/templates/frontend/frontend.jinja
index 0b9be7c..a4b732f 100644
--- a/src/templates/frontend/frontend.jinja
+++ b/src/templates/frontend/frontend.jinja
@@ -4,9 +4,9 @@
<title>CFD Frontend</title>
<meta name="viewport" content="width = device-width, initial-scale = 1">
<link type="text/css" rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css">
- <link type="text/css" rel="stylesheet" href="frontend.css">
+ <!--<link type="text/css" rel="stylesheet" href="frontend.css"/>-->
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.8/socket.io.min.js"></script>
- <script src="frontend.js">
+ <script>
var socket = io.connect("ws://localhost:5000");
@@ -86,6 +86,98 @@
});
</script>
+ <style>
+ @font-face { font-family: PressStart2P; src: url('../../static/PressStart2P-Regular.ttf'); }
+
+ body{
+ font-family: PressStart2P;
+ }
+
+ #player_select{
+ display: none;
+ }
+
+ #final_screen{
+ display: none;
+ }
+
+ #oponents{
+ display: none;
+ }
+
+ h1, h2, h3, h4, h5 .h1, .h2, .h3, .h4, .h5{
+ font-family: PressStart2P;
+ }
+
+ .defult_row{
+ height: 33px;
+ }
+
+ .answer_row{
+ height: 298px;
+ }
+
+ .team_row{
+ height: 200px;
+ }
+
+ .answer_bg{
+ height: 50px;
+ font-size: 20px;
+ }
+
+ .fails{
+ height: 37px;
+ color: #c83200;
+ font-size: 34px;
+ font-family: PressStart2P;
+ margin-bottom: 7px;
+ }
+
+ .largest{
+ font-size: 150px;
+ }
+
+ .xxl{
+ font-size: 50px;
+ }
+
+ .xl{
+ font-size: 42px;
+ }
+
+ .l{
+ font-size: 34px;
+ }
+
+ .ccc-blue{
+ color: #0084b0;
+ }
+
+ .ccc-green{
+ color: #00a356;
+ }
+
+ .bg-black{
+ background-color: black !important;
+ }
+
+ .bg-grey{
+ background-color: #1e1e3c;
+ }
+
+ .table td{
+ border: none;
+ }
+
+ .vertical-center {
+ min-height: 100%; /* Fallback for browsers do NOT support vh unit */
+ min-height: 100vh; /* These two lines are counted as one :-) */
+
+ display: flex;
+ align-items: center;
+ }
+ </style>
</head>
<body class="bg-black text-light vertical-center">
diff --git a/src/views/game.py b/src/views/game.py
index bf4f260..a600058 100644
--- a/src/views/game.py
+++ b/src/views/game.py
@@ -122,7 +122,7 @@ def show_answer():
r.show_answer(answer_id)
question.save()
- os.system("mpv frontend/audio/frage.mp3 &")
+ os.system("mpv static/audio/frage.mp3 &")
return render_game_view(game)
@@ -229,7 +229,7 @@ def resolve_round():
question.save()
- os.system("mpv frontend/audio/frage.mp3 &")
+ os.system("mpv static/audio/frage.mp3 &")
return render_game_view(game)
@@ -290,7 +290,7 @@ def error_team():
r.save()
- os.system("mpv frontend/audio/failure.mp3 &")
+ os.system("mpv static/audio/failure.mp3 &")
return render_game_view(game)
diff --git a/src/views/management.py b/src/views/management.py
index aaae42d..c05410c 100644
--- a/src/views/management.py
+++ b/src/views/management.py
@@ -20,7 +20,7 @@ DEFAULT_LOGO = _generate_teamlogo_path("0_no_logo_00.png")
@mgmt.route("/frontend", methods=["GET"])
def render_frontend():
- return render_template("frontend.jinja")
+ return render_template("frontend/frontend.jinja")
@mgmt.route("/management", methods=["GET", "POST"])
def render_management_view():
--
GitLab