modified: app.py

modified:   templates/admin_giveaways.html
	modified:   templates/redeem_giveaway.html
	modified:   templates/user_giveaways.html

app.py

@@ -411,154 +411,61 @@ def download_logs():
     return redirect(url_for("landing_page"))
 
 @app.route("/admin/giveaways", methods=["GET", "POST"])
-def manage_giveaways():
+def admin_giveaways():
-    """Verwalte alle Giveaways (nur für Admins)."""
+    """Zeigt eine Liste aller Giveaways an und ermöglicht das Bearbeiten und Sortieren."""
-    if "discord_user" in session:
+    if is_admin():
-        user_info = session["discord_user"]
+        connection = get_giveaway_db_connection()  # Verbindung zur Giveaway-Datenbank
-        user_id = user_info["id"]
-
-        # Überprüfe, ob der Benutzer Admin-Rechte hat
-        connection = get_db_connection()  # Verbindung zur User-Datenbank
         cursor = connection.cursor(dictionary=True)
 
-        cursor.execute("SELECT permission FROM user_data WHERE user_id = %s", (user_id,))
+        # Sortierung nach bestimmten Feldern
-        user_data = cursor.fetchone()
+        sort_field = request.args.get("sort", "id")  # Standardmäßig nach 'id' sortieren
+        order = request.args.get("order", "asc")  # Standardmäßig aufsteigend sortieren
 
-        if user_data and user_data["permission"] >= 8:
+        # Holen aller Giveaways aus der Datenbank
+        cursor.execute(f"SELECT * FROM giveaways ORDER BY {sort_field} {order}")
+        giveaways = cursor.fetchall()
+        
+        cursor.close()
         connection.close()
 
-            # Verbindung zur Giveaway-Datenbank herstellen
+        return render_template("admin_giveaways.html", giveaways=giveaways, sort_field=sort_field, order=order)
-            giveaway_connection = get_giveaway_db_connection()
-            giveaway_cursor = giveaway_connection.cursor(dictionary=True)
-
-            # Alle Giveaways aus der Giveaway-Datenbank abrufen
-            giveaway_cursor.execute("SELECT * FROM giveaways")
-            giveaways = giveaway_cursor.fetchall()
-
-            giveaway_cursor.close()
-            giveaway_connection.close()
-
-            return render_template("admin_giveaways.html", user_info=user_info, giveaways=giveaways)
-        else:
-            return redirect(url_for("user_dashboard"))
-
     return redirect(url_for("login"))
 
-
+@app.route("/admin/giveaways/edit/<int:giveaway_id>", methods=["GET", "POST"])
-@app.route("/admin/giveaway/edit/<int:id>", methods=["GET", "POST"])
+def edit_giveaway(giveaway_id):
-def edit_giveaway(id):
+    """Bearbeitet ein spezifisches Giveaway."""
-    """Bearbeite ein bestehendes Giveaway."""
+    if is_admin():
-    if "discord_user" in session:
+        connection = get_giveaway_db_connection()  # Verbindung zur Giveaway-Datenbank
-        user_info = session["discord_user"]
-        user_id = user_info["id"]
-
-        # Überprüfe, ob der Benutzer Admin-Rechte hat
-        connection = get_db_connection()
         cursor = connection.cursor(dictionary=True)
 
-        cursor.execute("SELECT permission FROM user_data WHERE user_id = %s", (user_id,))
-        user_data = cursor.fetchone()
-
-        if user_data and user_data["permission"] >= 8:
-            connection.close()
-
-            giveaway_connection = get_giveaway_db_connection()
-            cursor = giveaway_connection.cursor(dictionary=True)
-
         if request.method == "POST":
-                platform = request.form["platform"]
+            platform = request.form.get("platform")
-                name = request.form["name"]
+            name = request.form.get("name")
-                game_key = request.form["game_key"]
+            game_key = request.form.get("game_key")
-                winner_dc_id = request.form["winner_dc_id"]
+            winner_dc_id = request.form.get("winner_dc_id")
+            aktiv = bool(request.form.get("aktiv"))
 
-                # Update the giveaway
+            # Update der Giveaways-Daten
             cursor.execute("""
                 UPDATE giveaways
-                    SET platform = %s, name = %s, game_key = %s, winner_dc_id = %s
+                SET platform = %s, name = %s, game_key = %s, winner_dc_id = %s, aktiv = %s
                 WHERE id = %s
-                """, (platform, name, game_key, winner_dc_id, id))
+            """, (platform, name, game_key, winner_dc_id, aktiv, giveaway_id))
-                giveaway_connection.commit()
+            connection.commit()
 
-                cursor.close()
+            flash("Giveaway updated successfully!", "success")
-                giveaway_connection.close()
+            return redirect(url_for("admin_giveaways"))
 
-                return redirect(url_for("manage_giveaways"))
+        # Daten des spezifischen Giveaways laden
-
+        cursor.execute("SELECT * FROM giveaways WHERE id = %s", (giveaway_id,))
-            # Hole die aktuellen Daten des Giveaways
-            cursor.execute("SELECT * FROM giveaways WHERE id = %s", (id,))
         giveaway = cursor.fetchone()
         
         cursor.close()
-            giveaway_connection.close()
+        connection.close()
 
         return render_template("edit_giveaway.html", giveaway=giveaway)
-
     return redirect(url_for("login"))
 
-@app.route("/admin/giveaway/delete/<int:id>", methods=["POST"])
-def delete_giveaway(id):
-    """Lösche ein Giveaway aus der Datenbank."""
-    if "discord_user" in session:
-        user_info = session["discord_user"]
-        user_id = user_info["id"]
-
-        connection = get_db_connection()
-        cursor = connection.cursor(dictionary=True)
-
-        cursor.execute("SELECT permission FROM user_data WHERE user_id = %s", (user_id,))
-        user_data = cursor.fetchone()
-
-        if user_data and user_data["permission"] >= 8:
-            connection.close()
-
-            # Verbindung zur Giveaway-Datenbank herstellen
-            giveaway_connection = get_giveaway_db_connection()
-            cursor = giveaway_connection.cursor()
-
-            cursor.execute("DELETE FROM giveaways WHERE id = %s", (id,))
-            giveaway_connection.commit()
-
-            cursor.close()
-            giveaway_connection.close()
-
-            return redirect(url_for("manage_giveaways"))
-
-    return redirect(url_for("login"))
-
-@app.route("/admin/giveaway/toggle_active/<int:id>", methods=["POST"])
-def toggle_active(id):
-    """Aktiviere oder deaktiviere ein Giveaway."""
-    if "discord_user" in session:
-        user_info = session["discord_user"]
-        user_id = user_info["id"]
-
-        connection = get_db_connection()
-        cursor = connection.cursor(dictionary=True)
-
-        cursor.execute("SELECT permission FROM user_data WHERE user_id = %s", (user_id,))
-        user_data = cursor.fetchone()
-
-        if user_data and user_data["permission"] >= 8:
-            connection.close()
-
-            giveaway_connection = get_giveaway_db_connection()
-            cursor = giveaway_connection.cursor(dictionary=True)
-
-            # Hole den aktuellen Status
-            cursor.execute("SELECT aktiv FROM giveaways WHERE id = %s", (id,))
-            giveaway = cursor.fetchone()
-
-            # Toggle den Aktiv-Status
-            new_status = not giveaway["aktiv"]
-            cursor.execute("UPDATE giveaways SET aktiv = %s WHERE id = %s", (new_status, id))
-            giveaway_connection.commit()
-
-            cursor.close()
-            giveaway_connection.close()
-
-            return redirect(url_for("manage_giveaways"))
-
-    return redirect(url_for("login"))
 
 @app.route("/user/giveaways", methods=["GET"])
 def user_giveaways():

templates/admin_giveaways.html

@@ -4,8 +4,14 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Manage Giveaways</title>
+    <title>Admin - Giveaways</title>
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        th a {
+            color: inherit;
+            text-decoration: none;
+        }
+    </style>
 </head>
 
 <body>
@@ -25,15 +31,12 @@
 
     <div class="container mt-5">
         <h1 class="text-center">Giveaways Management</h1>
-        <p class="text-center">Manage all active and inactive giveaways in the system.</p>
+        <table class="table table-bordered table-hover mt-4">
-
+            <thead class="thead-dark">
-        <table class="table table-striped mt-4">
-            <thead>
                 <tr>
-                    <th>ID</th>
+                    <th><a href="{{ url_for('admin_giveaways', sort='id', order='asc' if sort_field == 'id' and order == 'desc' else 'desc') }}">ID</a></th>
-                    <th>Platform</th>
+                    <th><a href="{{ url_for('admin_giveaways', sort='platform', order='asc' if sort_field == 'platform' and order == 'desc' else 'desc') }}">Platform</a></th>
-                    <th>Name</th>
+                    <th><a href="{{ url_for('admin_giveaways', sort='name', order='asc' if sort_field == 'name' and order == 'desc' else 'desc') }}">Name</a></th>
-                    <th>UUID</th>
                     <th>Game Key</th>
                     <th>Winner Discord ID</th>
                     <th>Active</th>
@@ -46,26 +49,26 @@
                     <td>{{ giveaway.id }}</td>
                     <td>{{ giveaway.platform }}</td>
                     <td>{{ giveaway.name }}</td>
-                    <td>{{ giveaway.uuid }}</td>
                     <td>{{ giveaway.game_key }}</td>
-                    <td>{{ giveaway.winner_dc_id }}</td>
+                    <td>{{ giveaway.winner_dc_id or 'Not Assigned' }}</td>
-                    <td>{{ 'Yes' if giveaway.aktiv else 'No' }}</td>
                     <td>
-                        <a href="{{ url_for('edit_giveaway', id=giveaway.id) }}" class="btn btn-sm btn-primary">Edit</a>
+                        {% if giveaway.aktiv %}
-                        <form method="POST" action="{{ url_for('delete_giveaway', id=giveaway.id) }}" style="display: inline;">
+                        <span class="badge badge-success">Active</span>
-                            <button type="submit" class="btn btn-sm btn-danger">Delete</button>
+                        {% else %}
-                        </form>
+                        <span class="badge badge-danger">Inactive</span>
-                        <form method="POST" action="{{ url_for('toggle_active', id=giveaway.id) }}" style="display: inline;">
+                        {% endif %}
-                            <button type="submit" class="btn btn-sm {{ 'btn-success' if not giveaway.aktiv else 'btn-warning' }}">
+                    </td>
-                                {{ 'Activate' if not giveaway.aktiv else 'Deactivate' }}
+                    <td>
-                            </button>
+                        <a href="{{ url_for('edit_giveaway', giveaway_id=giveaway.id) }}" class="btn btn-primary btn-sm">Edit</a>
-                        </form>
                     </td>
                 </tr>
                 {% endfor %}
             </tbody>
         </table>
     </div>
+
+    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.2/dist/js/bootstrap.bundle.min.js"></script>
 </body>
 
 </html>

templates/redeem_giveaway.html

@@ -6,38 +6,58 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Redeem Giveaway</title>
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .redeem-card {
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+            padding: 20px;
+            border-radius: 10px;
+            background-color: #f8f9fa;
+        }
+        
+        .claim-btn {
+            background-color: #28a745;
+            color: white;
+        }
+
+        .claim-btn:hover {
+            background-color: #218838;
+        }
+
+        .key-display {
+            font-size: 1.5rem;
+            color: #007bff;
+        }
+    </style>
 </head>
 
 <body>
     <div class="container mt-5">
         <h1 class="text-center">Giveaway Prize</h1>
-        <p class="text-center">Congratulations! You have won the giveaway for <strong>{{ giveaway.name }}</strong> on
+        <p class="text-center text-muted">Congratulations! You've won <strong>{{ giveaway.name }}</strong> on <strong>{{ giveaway.platform }}</strong>.</p>
-            <strong>{{ giveaway.platform }}</strong>.</p>
 
+        <div class="redeem-card mx-auto">
             {% if key %}
             <!-- Wenn der Key aufgedeckt wurde -->
-        <div class="card mt-4">
+            <h5 class="text-center">Your Game Key</h5>
-            <div class="card-body">
+            <p class="text-center key-display">{{ key }}</p>
-                <h5 class="card-title">Your Key</h5>
+            <div class="text-center">
-                <p class="card-text">{{ key }}</p>
-            </div>
-        </div>
                 <a href="{{ url_for('user_giveaways') }}" class="btn btn-primary mt-4">Back to Giveaways</a>
+            </div>
             {% else %}
             <!-- Wenn der Key noch nicht aufgedeckt wurde -->
-        <div class="card mt-4">
+            <h5 class="text-center">Claim Your Key</h5>
-            <div class="card-body">
+            <p class="text-center">Do you want to reveal your game key? Once revealed, it will be marked as claimed and cannot be undone.</p>
-                <h5 class="card-title">Claim Your Key</h5>
+            <div class="text-center">
-                <p class="card-text">Do you want to reveal your game key? Once revealed, it will be marked as claimed and cannot be undone.</p>
-
                 <form method="POST">
-                    <button type="submit" class="btn btn-success">Reveal Key</button>
+                    <button type="submit" class="btn claim-btn">Reveal Key</button>
                 </form>
             </div>
+            <div class="text-center mt-3">
+                <a href="{{ url_for('user_giveaways') }}" class="btn btn-secondary">Back to Giveaways</a>
             </div>
-        <a href="{{ url_for('user_giveaways') }}" class="btn btn-secondary mt-4">Back to Giveaways</a>
             {% endif %}
         </div>
+    </div>
 </body>
 
 </html>

templates/user_giveaways.html

@@ -6,29 +6,50 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Your Giveaways</title>
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .giveaway-card {
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+            transition: transform 0.2s;
+        }
+        
+        .giveaway-card:hover {
+            transform: scale(1.05);
+        }
+
+        .no-giveaway {
+            background-color: #f8f9fa;
+            padding: 40px;
+            border-radius: 10px;
+            text-align: center;
+        }
+    </style>
 </head>
 
 <body>
     <div class="container mt-5">
         <h1 class="text-center">Your Giveaways</h1>
-        <p class="text-center">Here you can view the giveaways you've won.</p>
+        <p class="text-center text-muted">Here are the giveaways you've won. Click "Claim Your Key" to receive your prize.</p>
 
         <div class="row mt-4">
             {% if giveaways %}
             {% for giveaway in giveaways %}
             <div class="col-md-4">
-                <div class="card">
+                <div class="card giveaway-card mb-4">
-                    <div class="card-body">
+                    <div class="card-body text-center">
                         <h5 class="card-title">{{ giveaway.name }}</h5>
                         <p class="card-text">Platform: {{ giveaway.platform }}</p>
-                        <a href="{{ url_for('redeem_giveaway', uuid=giveaway.uuid) }}" class="btn btn-primary">Claim Your
+                        <a href="{{ url_for('redeem_giveaway', uuid=giveaway.uuid) }}" class="btn btn-primary">Claim Your Key</a>
-                            Key</a>
                     </div>
                 </div>
             </div>
             {% endfor %}
             {% else %}
-            <p class="text-center">You haven't won any giveaways yet.</p>
+            <div class="col-12">
+                <div class="no-giveaway">
+                    <h3>No Giveaways Won</h3>
+                    <p>It looks like you haven't won any giveaways yet. Keep participating and good luck!</p>
+                </div>
+            </div>
             {% endif %}
         </div>
     </div>