From 4f1c11df5cbdc8d0d4a42bbc2c908e68e51a4514 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:08:02 +0100 Subject: [PATCH 1/3] re split versuch --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index fc6dadb..2c05ddd 100644 --- a/main.py +++ b/main.py @@ -5,6 +5,7 @@ import os import time import qrcode import shutil +import re starttime = 0 user_count = 0 @@ -209,6 +210,7 @@ def session(id): cur = con.cursor() l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() + #eventtime = re.split(",", eventzeit) con.commit() cur.close() From eb94792c4e18ac00322ae93b649ad0b3a036128b Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:23:04 +0100 Subject: [PATCH 2/3] stopuhr fix --- main.py | 3 ++- static/js/game.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 2c05ddd..dcea394 100644 --- a/main.py +++ b/main.py @@ -210,7 +210,8 @@ def session(id): cur = con.cursor() l = f"SELECT eventzeit FROM planer WHERE sessionID = \'{id}\' ORDER BY eventzeit;" eventzeit = cur.execute(l).fetchall() - #eventtime = re.split(",", eventzeit) + print (eventzeit) + #eventtime = re.split(',', eventzeit) con.commit() cur.close() diff --git a/static/js/game.js b/static/js/game.js index 9b913df..af729ed 100644 --- a/static/js/game.js +++ b/static/js/game.js @@ -37,4 +37,5 @@ stop.onclick = function() { reset.onclick = function() { h1.textContent = "00:00:00"; seconds = 0; minutes = 0; hours = 0; + sec = 0; min = 0; hrs = 0; } From 75252a8802b25295f0527545ac0dc7d1b89504df Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Sat, 10 Dec 2022 15:32:06 +0100 Subject: [PATCH 3/3] style css --- static/css/style.css | 12 ++++++++---- templates/login.html | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 4c6bb9c..03dc34d 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -10,7 +10,7 @@ a { /* Set a style for all buttons */ button { background-color: #6d4087; - color: white; + color: rgb(29, 24, 24); padding: 14px 20px; margin: 8px 0; border: none; @@ -90,10 +90,11 @@ a { margin: 8px 0; padding: 12px 20px; display: inline-block; - border: 2px solid green; + border: 2px solid rgb(58, 58, 58); box-sizing: border-box; border-radius: 12px; - color: #839c87; + color: #050705; + background-color: rgb(142, 142, 143); } @@ -177,9 +178,12 @@ a { details[open] summary::marker { content: " "; - }table, th, td, caption { + } + table, th, td, caption { border: thick solid #33363d; border-collapse: collapse; } + + \ No newline at end of file diff --git a/templates/login.html b/templates/login.html index 4d46f60..f04f55f 100644 --- a/templates/login.html +++ b/templates/login.html @@ -39,7 +39,7 @@
- +
@@ -60,7 +60,7 @@
- +