feat: setting page improved and priority level set

Author: codeperfectplus

src/routes/auth.py

@@ -21,21 +21,36 @@ def load_user(user_id):
     return User.query.get(int(user_id))
 
 
-def get_admin_emails_for_email_alerts():
+def get_email_addresses(user_level=None, receive_email_alerts=True, fetch_all_users=False):
     with app.app_context():
-        admin_emails = User.query.filter_by(user_level='admin', receive_email_alerts=True).all()
-        print(admin_emails)
-        if not admin_emails:
-            return None
-        return [admin.email for admin in admin_emails]
-    
-def get_all_users_emails(receive_email_alerts=True):
-    with app.app_context():
-        users = User.query.filter_by(receive_email_alerts=receive_email_alerts).all()
+        # Build query filter based on the presence of `user_level`
+        filters = []
+        if user_level:
+            filters.append(User.user_level == user_level)
+        if not fetch_all_users:
+            filters.append(User.receive_email_alerts == receive_email_alerts)
+        
+        # Query the database with the constructed filters
+        users = User.query.filter(*filters).all()
+        
+        # Check if no users were found
         if not users:
             return None
+
+        # Return list of email addresses
         return [user.email for user in users]
 
+# Get Admin Emails with Alerts Enabled:
+# admin_emails = get_email_addresses(user_level='admin', receive_email_alerts=True)
+# Get All Admin Emails Regardless of Alert Preference:
+# all_admin_emails = get_email_addresses(user_level='admin', fetch_all_users=True)
+
+# Get All Users with Alerts Enabled:
+# all_user_emails = get_email_addresses(receive_email_alerts=True)
+# Get All Users Regardless of Alert Preference:
+# all_users_emails = get_email_addresses(fetch_all_users=True)
+
+
 
 
 @app.route('/login', methods=['GET', 'POST'])
@@ -46,7 +61,8 @@ def login():
         user = User.query.filter_by(username=username).first()
         if user and check_password_hash(user.password, password):
             login_user(user)
-            admin_email_address = get_admin_emails_for_email_alerts()
+            # Get Admin Emails with Alerts Enabled:
+            admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
             if admin_email_address:
                 send_email(admin_email_address, 'Login Alert', f'{user.username} logged in to the system.')
 
@@ -73,7 +89,8 @@ def signup():
         hashed_password = generate_password_hash(password)
         new_user = User(username=username, password=hashed_password)
 
-        admin_email_address = get_admin_emails_for_email_alerts()
+        # Get Admin Emails with Alerts Enabled:
+        admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
         # extends the signup user to send an email to the admin
         if admin_email_address:
             send_email(admin_email_address, 'New User Alert', f'{username} has signed up to the system.')
@@ -199,16 +216,25 @@ def send_email_page():
         receiver_email = request.form.get("recipient")
         subject = request.form.get("subject")
         body = request.form.get("body")
+        priority = request.form.get("priority")
         attachment = request.files.get("attachment")
 
         if not receiver_email or not subject or not body:
             flash("Please provide recipient, subject, and body.", "danger")
             return redirect(url_for('send_email_page'))
 
-        if receiver_email == "all_users":
-            receiver_email = get_all_users_emails()
-        elif receiver_email == "admin_users":
-            receiver_email = get_admin_emails_for_email_alerts()
+        # on high priority, send to all users or admin users even the receive_email_alerts is False
+        if priority == "high" and receiver_email == "all_users":
+            receiver_email = get_email_addresses(fetch_all_users=True)
+        elif priority == "high" and receiver_email == "admin_users":
+            receiver_email = get_email_addresses(user_level='admin', fetch_all_users=True)
+
+        # priority is low, send to users with receive_email_alerts is True
+        if priority == "low" and receiver_email == "all_users":
+            receiver_email = get_email_addresses(receive_email_alerts=True)
+        elif priority == "low" and receiver_email == "admin_users":
+            receiver_email = get_email_addresses(user_level='admin', receive_email_alerts=True)    
+
 
         if not receiver_email:
             flash("No users found to send email to.", "danger")

src/routes/settings.py

@@ -1,10 +1,69 @@
-from flask import render_template, request, flash, blueprints
+from flask import render_template, request, flash, blueprints, redirect, url_for
 from src.config import app, db
 from src.models import DashboardSettings
 from flask_login import login_required, current_user
 
 settings_bp = blueprints.Blueprint("settings", __name__)
 
+
+@app.route('/settings/speedtest', methods=['GET', 'POST'])
+def speedtest_settings():
+    settings = DashboardSettings.query.first()  # Retrieve settings from DB
+    if request.method == 'POST':
+        settings.speedtest_cooldown = request.form.get('speedtest_cooldown')
+        settings.number_of_speedtests = request.form.get('number_of_speedtests')
+        db.session.commit()
+        flash('Speedtest settings updated successfully!', 'success')
+        return redirect(url_for('speedtest_settings'))
+    return render_template('speedtest_settings.html', settings=settings)
+
+@app.route('/settings/general', methods=['GET', 'POST'])
+def general_settings():
+    settings = DashboardSettings.query.first()  # Retrieve settings from DB
+    if request.method == 'POST':
+        settings.timezone = request.form.get('timezone')
+        settings.enable_cache = 'enable_cache' in request.form
+        db.session.commit()
+        flash('General settings updated successfully!', 'success')
+        return redirect(url_for('general_settings'))
+    return render_template('general_settings.html', settings=settings)
+
+@app.route('/settings/feature-toggles', methods=['GET', 'POST'])
+def feature_toggles():
+    settings = DashboardSettings.query.first()  # Retrieve settings from DB
+    if request.method == 'POST':
+        settings.is_cpu_info_enabled = 'is_cpu_info_enabled' in request.form
+        settings.is_memory_info_enabled = 'is_memory_info_enabled' in request.form
+        settings.is_disk_info_enabled = 'is_disk_info_enabled' in request.form
+        settings.is_network_info_enabled = 'is_network_info_enabled' in request.form
+        settings.is_process_info_enabled = 'is_process_info_enabled' in request.form
+        db.session.commit()
+        flash('Feature toggles updated successfully!', 'success')
+        return redirect(url_for('feature_toggles'))
+    return render_template('feature_toggles.html', settings=settings)
+
+@app.route('/settings/card-toggles', methods=['GET', 'POST'])
+def card_toggles():
+    settings = DashboardSettings.query.first()  # Retrieve settings from DB
+    if request.method == 'POST':
+        settings.is_user_card_enabled = 'is_user_card_enabled' in request.form
+        settings.is_server_card_enabled = 'is_server_card_enabled' in request.form
+        settings.is_battery_card_enabled = 'is_battery_card_enabled' in request.form
+        settings.is_cpu_core_card_enabled = 'is_cpu_core_card_enabled' in request.form
+        settings.is_cpu_usage_card_enabled = 'is_cpu_usage_card_enabled' in request.form
+        settings.is_cpu_temp_card_enabled = 'is_cpu_temp_card_enabled' in request.form
+        settings.is_dashboard_memory_card_enabled = 'is_dashboard_memory_card_enabled' in request.form
+        settings.is_memory_usage_card_enabled = 'is_memory_usage_card_enabled' in request.form
+        settings.is_disk_usage_card_enabled = 'is_disk_usage_card_enabled' in request.form
+        settings.is_system_uptime_card_enabled = 'is_system_uptime_card_enabled' in request.form
+        settings.is_network_statistic_card_enabled = 'is_network_statistic_card_enabled' in request.form
+        settings.is_network_usage_card_enabled = 'is_network_usage_card_enabled' in request.form
+        db.session.commit()
+        flash('Card toggles updated successfully!', 'success')
+        return redirect(url_for('card_toggles'))
+    return render_template('card_toggles.html', settings=settings)
+
+
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
 def settings():

src/static/css/send_email.css

@@ -1,51 +1,88 @@
-/* send_email.css */
-.container {
+.email-container {
     max-width: 600px;
     margin: 0 auto;
-    padding: 20px;
-    background-color: #f8f9fa;
-    border-radius: 8px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    padding: 30px;
+    background-color: #ffffff;
+    border-radius: 12px;
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1);
+    border: 1px solid #e0e0e0;
 }
 
 h2 {
     margin-bottom: 20px;
     color: #343a40;
+    font-size: 28px;
+    font-weight: 700;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+h2 i {
+    color: #007bff;
 }
 
 .form-group {
-    margin-bottom: 15px;
+    margin-bottom: 20px;
 }
 
 .form-group label {
     font-weight: 600;
     color: #495057;
     display: block;
-    margin-bottom: 5px;
+    margin-bottom: 8px;
 }
 
 .form-group input,
-.form-group textarea {
+.form-group textarea,
+.form-group select {
     width: 100%;
-    padding: 8px;
+    padding: 12px;
     border: 1px solid #ced4da;
-    border-radius: 4px;
-    background-color: #ffffff;
+    border-radius: 8px;
+    background-color: #f8f9fa;
     font-size: 16px;
+    box-sizing: border-box;
+    transition: border-color 0.3s ease, box-shadow 0.3s ease;
+}
+
+.form-group input:focus,
+.form-group textarea:focus,
+.form-group select:focus {
+    border-color: #007bff;
+    box-shadow: 0 0 5px rgba(0, 123, 255, 0.3);
 }
 
 .btn-primary {
-    padding: 10px 20px;
+    padding: 12px 24px;
     background-color: #007bff;
     color: #ffffff;
     border: none;
-    border-radius: 4px;
+    border-radius: 8px;
     cursor: pointer;
     font-size: 16px;
     text-align: center;
-    transition: background-color 0.3s ease;
+    transition: background-color 0.3s ease, transform 0.2s ease;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.btn-primary i {
+    font-size: 18px;
 }
 
 .btn-primary:hover {
     background-color: #0056b3;
+    transform: scale(1.05);
+}
+
+@media (max-width: 768px) {
+    .email-container {
+        padding: 20px;
+    }
+
+    h2 {
+        font-size: 24px;
+    }
 }

src/static/css/settings.css

@@ -5,6 +5,7 @@
     background-color: #f8f9fa;
     border-radius: 8px;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    margin-top: 50px;
 }
 
 .settings-title {
@@ -16,7 +17,7 @@
 
 .settings-buttons {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
     gap: 15px;
     margin-bottom: 30px;
 }
@@ -31,13 +32,28 @@
     text-decoration: none;
     font-size: 16px;
     transition: background-color 0.3s ease, transform 0.2s ease;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+}
+
+.settings-buttons .btn i {
+    font-size: 20px;
 }
 
 .settings-buttons .btn:hover {
     background-color: #0056b3;
     transform: scale(1.05);
 }
 
+@media (max-width: 768px) {
+    .settings-buttons {
+        grid-template-columns: 1fr;
+    }
+}
+
+
 .settings-form {
     display: flex;
     flex-direction: column;