~reversed some changes

a10aaf13 · leo · c49eee0c · a10aaf13 · a10aaf13 · a10aaf13
Commit a10aaf13 authored 6 years ago by leo
--- a/src/model/cfd.sqlite
+++ b/src/model/cfd.sqlite
--- a/src/templates/frontend/frontend.css
+++ b/src/templates/frontend/frontend.css
-@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;

--- 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">

--- 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)


--- 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():