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

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

diff --git a/app.py b/app.py
index c18a41f..3a80739 100644
--- a/app.py
+++ b/app.py
@@ -239,16 +239,17 @@ def callback():
         flash("Ein Fehler ist beim Authentifizierungsprozess aufgetreten.", "danger")
         return redirect(url_for("landing_page"))
    
-@app.route("/user_dashboard/<int:guild_id>")
-def user_dashboard(guild_id):
-    """Serverbasiertes User-Dashboard"""
-    if g.user_info:
-        user_id = g.user_info["id"]
+@app.route("/user_server_data/<int:guild_id>")
+def user_server_data(guild_id):
+    """Zeigt die serverbezogenen Nutzerdaten für den ausgewählten Server an."""
+    if "discord_user" in session:
+        user_info = session["discord_user"]
+        user_id = user_info["id"]
 
-        # Hole die serverbezogenen Nutzerdaten
         connection = get_db_connection()
         cursor = connection.cursor(dictionary=True)
 
+        # Hole die serverbezogenen Nutzerdaten
         cursor.execute("SELECT * FROM user_data WHERE user_id = %s AND guild_id = %s", (user_id, guild_id))
         user_data = cursor.fetchone()
 
@@ -256,11 +257,11 @@ def user_dashboard(guild_id):
         connection.close()
 
         if user_data:
-            g.user_data = user_data  # Setze user_data in g für den Zugang in den Templates
-            return render_template("user_dashboard.html")
+            return render_template("user_server_data.html", user_info=user_info, user_data=user_data, guild_id=guild_id)
         else:
-            flash("You do not have access to this server's data.", "warning")
+            flash("Keine Daten für diesen Server gefunden.", "warning")
             return redirect(url_for("user_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 343550b..470563d 100644
--- a/templates/user_dashboard.html
+++ b/templates/user_dashboard.html
@@ -12,13 +12,9 @@
     {% include 'navigation.html' %}
     <div class="container mt-5">
         <h1>Welcome, {{ g.user_info['username'] }}!</h1>
-        {% 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 %}
+        <p>Your Points: {{ g.user_data['points'] }}</p>
+        <p>Level: {{ g.user_data['level'] }}</p>
+        <p>Server ID: {{ g.guild_id }}</p>
     </div>
 </body>