From 32ce9cdaa72ddf60551bd3863008fe880ce5a6ba Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Mon, 9 Mar 2026 08:56:21 +0000 Subject: [PATCH] =?UTF-8?q?Merge=20Conflict=20Erros=20gel=C3=B6st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...storage-user-83ffc178-0f94-4ada-8ca6-1c51b99b4b9c.json | 2 +- data/setup_database.py | 8 +------- gui/match_history_gui.py | 3 +-- main.py | 3 ++- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.nicegui/storage-user-83ffc178-0f94-4ada-8ca6-1c51b99b4b9c.json b/.nicegui/storage-user-83ffc178-0f94-4ada-8ca6-1c51b99b4b9c.json index 912ee6c..748ef6e 100644 --- a/.nicegui/storage-user-83ffc178-0f94-4ada-8ca6-1c51b99b4b9c.json +++ b/.nicegui/storage-user-83ffc178-0f94-4ada-8ca6-1c51b99b4b9c.json @@ -1 +1 @@ -{"authenticated":true,"discord_id":"277898241750859776","discord_name":"mrteels","db_id":1,"display_name":"Daniel N.","discord_avatar_url":"https://cdn.discordapp.com/avatars/277898241750859776/7c3446bb51fafd72b1b4c21124b4994f.png"} \ No newline at end of file +{"authenticated":true,"discord_id":"277898241750859776","discord_name":"mrteels","db_id":1,"display_name":"Chaos Servitor","discord_avatar_url":"https://cdn.discordapp.com/avatars/277898241750859776/7c3446bb51fafd72b1b4c21124b4994f.png"} \ No newline at end of file diff --git a/data/setup_database.py b/data/setup_database.py index 557b776..9c4ce7c 100644 --- a/data/setup_database.py +++ b/data/setup_database.py @@ -1,9 +1,8 @@ import sqlite3 import os import json -from main import url - +dummy_is_in = True # 1. Sucht den exakten, absoluten Pfad zu diesem Skript (z.B. /srv/Diceghost-Liga-System/data/) BASE_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -12,11 +11,6 @@ DB_PATH = os.path.join(BASE_DIR, "league_database.db") def init_db(): - if url == "https://liga.au-fab.eu": - dummy_is_in = False - else: - dummy_is_in = True - connection = sqlite3.connect(DB_PATH) cursor = connection.cursor() diff --git a/gui/match_history_gui.py b/gui/match_history_gui.py index 911be5b..4357885 100644 --- a/gui/match_history_gui.py +++ b/gui/match_history_gui.py @@ -1,7 +1,6 @@ from nicegui import ui, app from data import data_api -# Falls du eine gui_style.py für Farben/Header hast, hier importieren! -# from gui import gui_style +from gui import gui_style def setup_routes(): @ui.page('/matchhistory', dark=True) diff --git a/main.py b/main.py index bdc6131..c0239f4 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,9 @@ import os +from nicegui import app from dotenv import load_dotenv from nicegui import ui -from gui import main_gui, match_gui, discord_login, league_statistic, admin_gui +from gui import main_gui, match_gui, discord_login, league_statistic, admin_gui, match_history_gui from data import database