Merge Conflict Erros gelöst

.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"}
+{"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"}

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

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)

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