From 00bcf87b652632cd3e8d337828c42e5e644b44c4 Mon Sep 17 00:00:00 2001 From: Hyperbel Date: Mon, 21 Nov 2022 11:46:50 +0100 Subject: [PATCH 1/9] removed blank lines --- main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.py b/main.py index 10e28dc..eabee35 100644 --- a/main.py +++ b/main.py @@ -183,6 +183,7 @@ def session(id): @app.route("/mate", methods=['POST']) def mate(): log_server("called /mate") + if session: mateFlaschen = request.form['mateFlaschen'] mateSorte = request.form['mateSorte'] @@ -195,8 +196,6 @@ def mate(): con.close() except sqlite3.Error as e: error_log(f"error while executing sql: {e}") - - return render_template("404.html") else: warning_log(" called /mate without being logged in") From 1f88565369862199f342541441c88c71fc65f740 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 07:28:23 +0100 Subject: [PATCH 2/9] MATE SQL FIX --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index eabee35..279a896 100644 --- a/main.py +++ b/main.py @@ -187,7 +187,7 @@ def mate(): if session: mateFlaschen = request.form['mateFlaschen'] mateSorte = request.form['mateSorte'] - mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", {mateFlaschen}, {session});" + mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{session}\');" try: con = sqlite3.connect("party.db") cur = con.cursor() From bf307b5d4e5e3cd62ce2191e4d208c95b44a9739 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 07:30:18 +0100 Subject: [PATCH 3/9] mate --- templates/session.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/session.html b/templates/session.html index 194ebcd..3a9f1ed 100644 --- a/templates/session.html +++ b/templates/session.html @@ -35,15 +35,16 @@ + + + - - - + From e72fbaa37d09c7cd3562a08aaed3faa37845f791 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 07:46:22 +0100 Subject: [PATCH 5/9] logging --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index 279a896..2a27f6d 100644 --- a/main.py +++ b/main.py @@ -190,10 +190,12 @@ def mate(): mateSql = f"INSERT INTO mate VALUES (\"{mateSorte}\", \'{mateFlaschen}\', \'{session}\');" try: con = sqlite3.connect("party.db") + warning_log("Verbindung mit Datenbank wurde aufgenommen /mate") cur = con.cursor() cur.execute(mateSql) con.commit() con.close() + log_server("mate wurde in Datenbank eingefügt") except sqlite3.Error as e: error_log(f"error while executing sql: {e}") return render_template("404.html") From eb6304af724a0a0ca303bc944d2733aa863597be Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 13:49:28 +0100 Subject: [PATCH 6/9] more sql --- main.py | 14 ++++++++++---- party.sql | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 2a27f6d..61f508d 100644 --- a/main.py +++ b/main.py @@ -146,7 +146,8 @@ def get_planer(): log_server("event entered successfully /get_planer") except: error_log("unable to insert event") - return "{ \"message\": \"planer\"'}" + return redirect(f'/session/{sessionID}') + else: warning_log(" called /get_planer without being logged in") return render_template('404.html') @@ -229,7 +230,7 @@ def get_creat_session(): log_server("called /get_creat_session with POST") sessionname = request.form['sessionname'] sessionID = request.form['sessionid'] - l = f"INSERT INTO seession VALUES( \'{sessionID}\', \'{sessionname}\', '0', '0', 'online','public');" + l = f"INSERT INTO seession VALUES( \'{sessionID}\', \'{sessionname}\', 'online','public');" log_server("neue Session") try: con = sqlite3.connect("party.db") @@ -366,9 +367,14 @@ def new(): sessionId = request.form['sessionID'] userId = request.form['sessionID'] info = "normal" - userstatus = "normal" l = f"INSERT INTO user VALUES \'{userid}\',\'{username}\',\'{sessionId}\',\'{info}\';" - account = dbcon(l) + con = sqlite3.connect("party.db") + warning_log("verbindung mit db wurde aufgenommen") + cur = con.cursor() + cur.execute(l) + con.commit() + con.close() + account = True if account: session['loggedin'] = True user_count = +1 diff --git a/party.sql b/party.sql index 56d476c..dee446d 100644 --- a/party.sql +++ b/party.sql @@ -1,6 +1,6 @@ PRAGMA foreign_keys=ON; -CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY,username TEXT sessionID INTEGER, info TEXT); -CREATE TABLE seession (sessionID INTEGER UNIQUE PRIMARY KEY, sessionname TEXT, useranzahl INTEGER, aktiveuser INTEGER, sesionstatus TEXT, seessiontyp TEXT, startzeit TEXT, bild TEXT); +CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY AUTOINCREMENT,username TEXT sessionID INTEGER, info TEXT); +CREATE TABLE seession (sessionID INTEGER UNIQUE PRIMARY KEY, sessionname TEXT, sesionstatus TEXT, seessiontyp TEXT); CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEXT); CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT); CREATE TABLE uploadgame (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielstand TEXT); From dd5839287490b56daccb1b1c1c3c1841088fd278 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 14:09:27 +0100 Subject: [PATCH 7/9] sql --- party.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/party.sql b/party.sql index dee446d..252b526 100644 --- a/party.sql +++ b/party.sql @@ -1,5 +1,5 @@ PRAGMA foreign_keys=ON; -CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY AUTOINCREMENT,username TEXT sessionID INTEGER, info TEXT); +CREATE TABLE user (userID INTEGER UNIQUE PRIMARY KEY AUTOINCREMENT,username TEXT, sessionID INTEGER, info TEXT); CREATE TABLE seession (sessionID INTEGER UNIQUE PRIMARY KEY, sessionname TEXT, sesionstatus TEXT, seessiontyp TEXT); CREATE TABLE chat (sessionID INTEGER, userID INTEGER, chatmessage TEXT, ZEIT TEXT); CREATE TABLE game (sessionID INTEGER, userID INTEGER, Spielname TEXT, Spielaktivität TEXT, ZEIT TEXT); From 933b63d701b669c3f93369d0e314fb1ff4ad31b3 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Tue, 22 Nov 2022 16:38:31 +0100 Subject: [PATCH 8/9] sessionstorage --- templates/createSession.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/createSession.html b/templates/createSession.html index 82b4a68..2220cbe 100644 --- a/templates/createSession.html +++ b/templates/createSession.html @@ -22,7 +22,7 @@