From b7a7ef4e9214e2262d8ecd267c9b1ce2c9118c78 Mon Sep 17 00:00:00 2001
From: SimolZimol <70102430+SimolZimol@users.noreply.github.com>
Date: Fri, 25 Oct 2024 16:03:06 +0200
Subject: [PATCH] 	modified:   app.py 	modified:  
 templates/user_dashboard.html

---
 app.py                        | 17 ++++++-----------
 templates/user_dashboard.html | 10 +++++++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app.py b/app.py
index 6d1230b..c18a41f 100644
--- a/app.py
+++ b/app.py
@@ -241,12 +241,11 @@ def callback():
    
 @app.route("/user_dashboard/<int:guild_id>")
 def user_dashboard(guild_id):
-    """Serverbasiertes User-Dashboard."""
-    if "discord_user" in session:
-        user_info = session["discord_user"]
-        user_id = user_info["id"]
+    """Serverbasiertes User-Dashboard"""
+    if g.user_info:
+        user_id = g.user_info["id"]
 
-        # Verbinde mit der Datenbank, um serverbezogene Nutzerdaten zu laden
+        # Hole die serverbezogenen Nutzerdaten
         connection = get_db_connection()
         cursor = connection.cursor(dictionary=True)
 
@@ -256,16 +255,12 @@ def user_dashboard(guild_id):
         cursor.close()
         connection.close()
 
-        # Überprüfe, ob serverbezogene Daten gefunden wurden
         if user_data:
-            g.guild_id = guild_id  # Setzt guild_id in g, falls es auf der Seite benötigt wird
-            g.user_data = user_data  # Setzt user_data in g für die Seite
+            g.user_data = user_data  # Setze user_data in g für den Zugang in den Templates
             return render_template("user_dashboard.html")
         else:
-            flash("No data found for this server.", "warning")
+            flash("You do not have access to this server's data.", "warning")
             return redirect(url_for("user_landing_page"))
-    
-    # Wenn der Benutzer nicht eingeloggt ist, zurück zur Landing Page
     return redirect(url_for("landing_page"))
 
 @app.route("/server_admin_dashboard/<int:guild_id>")
diff --git a/templates/user_dashboard.html b/templates/user_dashboard.html
index 0ca0373..343550b 100644
--- a/templates/user_dashboard.html
+++ b/templates/user_dashboard.html
@@ -12,9 +12,13 @@
     {% include 'navigation.html' %}
     <div class="container mt-5">
         <h1>Welcome, {{ g.user_info['username'] }}!</h1>
-        <p>Server ID: {{ g.guild_id }}</p>
-        <p>Your Points: {{ g.user_data['points'] }}</p>
-        <p>Level: {{ g.user_data['level'] }}</p>
+        {% if g.user_data %}
+            <p>Your Points: {{ g.user_data['points'] }}</p>
+            <p>Level: {{ g.user_data['level'] }}</p>
+            <p>Server ID: {{ g.guild_id }}</p>
+        {% else %}
+            <p class="text-danger">No data available for this server.</p>
+        {% endif %}
     </div>
 </body>