From 8cd9bfcb20009be508d996a2622be1df07fa5976 Mon Sep 17 00:00:00 2001
From: SimolZimol <70102430+SimolZimol@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:51:15 +0200
Subject: [PATCH] modified: app.py modified:
templates/index.html modified: templates/login.html modified:
templates/settings.html
---
app.py | 32 +++++++++-----------------------
templates/index.html | 4 ++--
templates/login.html | 1 -
templates/settings.html | 8 --------
4 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/app.py b/app.py
index 1ce1228..5a79fb7 100644
--- a/app.py
+++ b/app.py
@@ -1,6 +1,7 @@
from flask import Flask, render_template, redirect, url_for, request, session
import os
import subprocess
+import psutil
import mysql.connector
app = Flask(__name__)
@@ -10,13 +11,12 @@ app.secret_key = os.getenv("FLASK_SECRET_KEY", "default_secret_key")
DB_HOST = os.getenv("DB_HOST")
DB_PORT = os.getenv("DB_PORT")
DB_USER = os.getenv("DB_USER")
-DB_PASS = os.getenv("DB_PASS")
-DB_NAME = os.getenv("DB_NAME")
+DB_PASS = os.getenv("DB_PASSWORD")
+DB_NAME = os.getenv("DB_DATABASE")
-# Globale Variablen für die Intros und Themes
+# Globale Variablen für die Intros
INTRO_FILE = "introduction.txt"
ASKNOTES_INTRO_FILE = "asknotesintro.txt"
-THEME_FILE = "theme.txt"
# Speichern der Prozess-ID
bot_process = None
@@ -68,19 +68,10 @@ def get_db_connection():
database=DB_NAME
)
-def get_current_theme():
- """Lädt das aktuelle Theme."""
- return load_text_file(THEME_FILE) or "light" # Standard-Theme ist 'light'
-
-def set_current_theme(theme):
- """Speichert das aktuelle Theme."""
- save_text_file(THEME_FILE, theme)
-
@app.route("/")
def index():
if "username" in session:
- theme = get_current_theme()
- return render_template("index.html", bot_running=bot_status(), theme=theme)
+ return render_template("index.html", bot_running=bot_status())
return redirect(url_for("login"))
@app.route("/login", methods=["GET", "POST"])
@@ -93,8 +84,7 @@ def login():
return redirect(url_for("index"))
else:
return "Invalid credentials!"
- theme = get_current_theme()
- return render_template("login.html", theme=theme)
+ return render_template("login.html")
@app.route("/logout")
def logout():
@@ -121,21 +111,18 @@ def settings():
if request.method == "POST":
introduction = request.form.get("introduction")
asknotes_introduction = request.form.get("asknotes_introduction")
- theme = request.form.get("theme")
- # Speichern der Intros und des Themes
+ # Speichern der Intros
save_text_file(INTRO_FILE, introduction)
save_text_file(ASKNOTES_INTRO_FILE, asknotes_introduction)
- set_current_theme(theme)
return redirect(url_for("settings"))
# Laden der aktuellen Inhalte aus den Textdateien
introduction = load_text_file(INTRO_FILE)
asknotes_introduction = load_text_file(ASKNOTES_INTRO_FILE)
- current_theme = get_current_theme()
- return render_template("settings.html", introduction=introduction, asknotes_introduction=asknotes_introduction, current_theme=current_theme)
+ return render_template("settings.html", introduction=introduction, asknotes_introduction=asknotes_introduction)
return redirect(url_for("login"))
@app.route("/users")
@@ -148,8 +135,7 @@ def users():
users = cursor.fetchall()
cursor.close()
connection.close()
- theme = get_current_theme()
- return render_template("users.html", users=users, theme=theme)
+ return render_template("users.html", users=users)
return redirect(url_for("login"))
if __name__ == "__main__":
diff --git a/templates/index.html b/templates/index.html
index fa11c03..b89b708 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,10 +1,11 @@
+
Admin Panel
-
+
diff --git a/templates/login.html b/templates/login.html
index 52737d7..c47f0e7 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -4,7 +4,6 @@
-
Login
diff --git a/templates/settings.html b/templates/settings.html
index 8d92ecf..73c36d1 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -20,14 +20,6 @@
-
-
-
-
Back to Dashboard