feat: Update dashboard templates and routes for card settings

- Update card settings in dashboard templates to use the new `card_settings` variable
- Update routes to use the `CardSettings` model instead of `DashboardSettings`

Author: codeperfectplus

src/models.py

@@ -32,6 +32,7 @@ class User(db.Model, UserMixin):
 
     # Backref renamed to avoid conflict
     dashboard_settings = db.relationship('DashboardSettings', backref='user', uselist=False)
+    card_settings = db.relationship('CardSettings', backref='user', uselist=False)
 
 class DashboardSettings(db.Model):
     __tablename__ = 'dashboard_settings'
@@ -40,7 +41,14 @@ class DashboardSettings(db.Model):
     user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
 
     speedtest_cooldown = db.Column(db.Integer, default=3600)
-    number_of_speedtests = db.Column(db.Integer, default=3)
+    number_of_speedtests = db.Column(db.Integer, default=1)
+    
+
+class FeatureTogglesSettings(db.Model):
+    __tablename__ = 'FeatureToggles'
+    
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
 
     # Feature Toggles
     is_cpu_info_enabled = db.Column(db.Boolean, default=True)
@@ -49,6 +57,12 @@ class DashboardSettings(db.Model):
     is_network_info_enabled = db.Column(db.Boolean, default=True)
     is_process_info_enabled = db.Column(db.Boolean, default=True)
 
+class CardSettings(db.Model):
+    __tablename__ = 'CardSettings'
+    
+    id = db.Column(db.Integer, primary_key=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
+    
     # Card Toggles
     is_user_card_enabled = db.Column(db.Boolean, default=True)
     is_server_card_enabled = db.Column(db.Boolean, default=True)
@@ -122,17 +136,13 @@ class SmptEamilPasswordConfig(db.Model):
     print("Creating tables")
     db.create_all()
 
-    # Initialize default settings
-    general_settings = GeneralSettings.query.first()
-    if not general_settings:
-        db.session.add(GeneralSettings())
-        db.session.commit()
-
     # initialize default dashboard settings for users
     users = User.query.all()
     for user in users:
         if not user.dashboard_settings:
             db.session.add(DashboardSettings(user_id=user.id))
+            db.session.add(CardSettings(user_id=user.id))
+            db.session.add(FeatureTogglesSettings(user_id=user.id))
             db.session.commit()
 
     pre_defined_users_json = "src/assets/predefine_user.json"
@@ -147,12 +157,20 @@ class SmptEamilPasswordConfig(db.Model):
             db.session.add(user)
             db.session.commit()
 
+    # Initialize default settings
+    general_settings = GeneralSettings.query.first()
+    if not general_settings:
+        db.session.add(GeneralSettings())
+        db.session.commit()
+
 # ibject for all templates
 @app.context_processor
 def inject_settings():
     if current_user.is_anonymous:
-        return dict(settings=None)
-    settings = DashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
+        return dict(settings=None, card_settings=None)
     general_settings = GeneralSettings.query.first()
-    all_settings = dict(settings=settings, general_settings=general_settings)
+    card_settings = CardSettings.query.filter_by(user_id=current_user.id).first()
+    settings = DashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
+    feature_toggles_settings = FeatureTogglesSettings.query.filter_by(user_id=current_user.id).first()
+    all_settings = dict(settings=settings, general_settings=general_settings, card_settings=card_settings, feature_toggles_settings=feature_toggles_settings)
     return all_settings

src/routes/auth.py

@@ -5,7 +5,7 @@
 
 from src.scripts.email_me import send_smpt_email
 from src.config import app, db
-from src.models import User, DashboardSettings
+from src.models import User, DashboardSettings, CardSettings, FeatureTogglesSettings
 from src.utils import render_template_from_file
 from src.routes.helper import get_email_addresses
 
@@ -111,6 +111,10 @@ def signup():
 
         db.session.add(new_user)
         db.session.commit()
+        db.session.add(DashboardSettings(user_id=new_user.id))
+        db.session.add(CardSettings(user_id=new_user.id))
+        db.session.add(FeatureTogglesSettings(user_id=new_user.id))
+        db.session.commit()
         flash('Account created successfully, please log in.')
         return redirect(url_for('login'))
 

src/routes/cpu_info.py

@@ -5,15 +5,15 @@
 
 from src.config import app
 from src.utils import get_cpu_core_count, get_cpu_frequency, cpu_usage_percent, get_cpu_temp, get_cached_value
-from src.models import DashboardSettings
+from src.models import DashboardSettings, FeatureTogglesSettings
 
 cpu_info_bp = blueprints.Blueprint("cpu_usage", __name__)
 
 @app.route("/cpu_usage")
 @login_required
 def cpu_usage():
-    settings = DashboardSettings.query.first()
-    if not settings.is_cpu_info_enabled:
+    feature_toggles_settings = FeatureTogglesSettings.query.first()
+    if not feature_toggles_settings.is_cpu_info_enabled:
         flash("You do not have permission to view this page.", "danger")
         return render_template("error/permission_denied.html")
 

src/routes/dashbaord.py

@@ -3,7 +3,7 @@
 from flask_login import login_required, current_user
 
 from src.config import app
-from src.models import SpeedTestResult, DashboardSettings, SystemInfo
+from src.models import SpeedTestResult, DashboardSettings, CardSettings
 from src.utils import datetimeformat, get_system_info
 
 dashboard_bp = blueprints.Blueprint("dashboard", __name__)

src/routes/disk_info.py

@@ -4,15 +4,15 @@
 from flask_login import login_required
 from src.config import app
 from src.utils import get_cached_value, get_disk_free, get_disk_total, get_disk_used, get_disk_usage_percent
-from src.models import DashboardSettings
+from src.models import DashboardSettings, FeatureTogglesSettings
 
 disk_info_bp = blueprints.Blueprint("disk_usage", __name__)
 
 @app.route("/disk_usage")
 @login_required
 def disk_usage():
-    settings = DashboardSettings.query.first()
-    if not settings.is_disk_info_enabled:
+    feature_toggles_settings = FeatureTogglesSettings.query.first()
+    if not feature_toggles_settings.is_disk_info_enabled:
         flash("You do not have permission to view this page.", "danger")
         return render_template("error/permission_denied.html")
     disk_total = get_cached_value("disk_total", get_disk_total)

src/routes/memory_info.py

@@ -4,16 +4,16 @@
 
 from src.config import app
 from src.utils import get_cached_value, get_memory_percent, get_memory_available, get_memory_used, get_swap_memory_info
-from src.models import DashboardSettings
+from src.models import DashboardSettings, FeatureTogglesSettings
 
 memory_info_bp = blueprints.Blueprint("memory_usage", __name__)
 
 
 @app.route("/memory_usage")
 @login_required
 def memory_usage():
-    settings = DashboardSettings.query.first()
-    if not settings.is_memory_info_enabled:
+    feature_toggles_settings = FeatureTogglesSettings.query.first()
+    if not feature_toggles_settings.is_memory_info_enabled:
         flash("You do not have permission to view this page.", "danger")
         return render_template("error/permission_denied.html")
     memory_available = get_cached_value("memory_available", get_memory_available) 

src/routes/network_info.py

@@ -3,15 +3,15 @@
 from flask_login import login_required
 from src.config import app
 from src.utils import get_established_connections
-from src.models import DashboardSettings
+from src.models import DashboardSettings, FeatureTogglesSettings
 
 network_info_bp = blueprints.Blueprint("network_stats", __name__)
 
 @app.route("/network_stats")
 @login_required
 def network_stats():
-    settings = DashboardSettings.query.first()
-    if not settings.is_network_info_enabled:
+    feature_toggles_settings = FeatureTogglesSettings.query.first()
+    if not feature_toggles_settings.is_network_info_enabled:
         flash("You do not have permission to view this page.", "danger")
         return render_template("error/permission_denied.html")
     net_io = psutil.net_io_counters()

src/routes/process.py

@@ -3,16 +3,16 @@
 from flask_login import login_required, current_user
 from src.config import app
 from src.utils import get_top_processes, render_template_from_file
-from src.models import DashboardSettings
+from src.models import DashboardSettings, FeatureTogglesSettings
 from src.scripts.email_me import send_smpt_email
 
 process_bp = blueprints.Blueprint("process", __name__)
 
 @app.route("/process", methods=["GET", "POST"])
 @login_required
 def process():
-    settings = DashboardSettings.query.first()
-    if not settings.is_process_info_enabled:
+    feature_toggles_settings = FeatureTogglesSettings.query.first()
+    if not feature_toggles_settings.is_process_info_enabled:
         flash("You do not have permission to view this page.", "danger")
         return render_template("error/permission_denied.html")
     if current_user.user_level != "admin":

src/routes/settings.py

@@ -1,7 +1,7 @@
 import datetime
 from flask import render_template, request, flash, blueprints, redirect, url_for
 from src.config import app, db
-from src.models import DashboardSettings, User, GeneralSettings
+from src.models import DashboardSettings, User, GeneralSettings, CardSettings
 from flask_login import login_required, current_user
 from src.utils import render_template_from_file
 from src.scripts.email_me import send_smpt_email
@@ -62,24 +62,24 @@ def feature_toggles():
 @app.route('/settings/card-toggles', methods=['GET', 'POST'])
 @login_required
 def card_toggles():
-    settings = DashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
+    card_settings = CardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific 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_speedtest_enabled = 'is_speedtest_enabled' in request.form
+        card_settings.is_user_card_enabled = 'is_user_card_enabled' in request.form
+        card_settings.is_server_card_enabled = 'is_server_card_enabled' in request.form
+        card_settings.is_battery_card_enabled = 'is_battery_card_enabled' in request.form
+        card_settings.is_cpu_core_card_enabled = 'is_cpu_core_card_enabled' in request.form
+        card_settings.is_cpu_usage_card_enabled = 'is_cpu_usage_card_enabled' in request.form
+        card_settings.is_cpu_temp_card_enabled = 'is_cpu_temp_card_enabled' in request.form
+        card_settings.is_dashboard_memory_card_enabled = 'is_dashboard_memory_card_enabled' in request.form
+        card_settings.is_memory_usage_card_enabled = 'is_memory_usage_card_enabled' in request.form
+        card_settings.is_disk_usage_card_enabled = 'is_disk_usage_card_enabled' in request.form
+        card_settings.is_system_uptime_card_enabled = 'is_system_uptime_card_enabled' in request.form
+        card_settings.is_network_statistic_card_enabled = 'is_network_statistic_card_enabled' in request.form
+        card_settings.is_speedtest_enabled = 'is_speedtest_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)
+    return render_template('card_toggles.html', card_settings=card_settings)
 
 @app.route("/settings", methods=["GET", "POST"])
 @login_required
@@ -90,40 +90,40 @@ def settings():
         flash("Please contact your administrator for more information.", "danger")
         return render_template("error/permission_denied.html")
 
-    # Fetch the settings from the database
-    settings = DashboardSettings.query.filter_by(user_id=current_user.id).first()
+    # # Fetch the settings from the database
+    # settings = DashboardSettings.query.filter_by(user_id=current_user.id).first()
 
-    if settings:
-        if request.method == "POST":
-            # Update settings only if the form field is provided, otherwise keep the current value
-            if "speedtest_cooldown" in request.form:
-                settings.speedtest_cooldown = int(request.form["speedtest_cooldown"])
-            if "number_of_speedtests" in request.form:
-                settings.number_of_speedtests = int(request.form["number_of_speedtests"])
+    # if settings:
+    #     if request.method == "POST":
+    #         # Update settings only if the form field is provided, otherwise keep the current value
+    #         if "speedtest_cooldown" in request.form:
+    #             settings.speedtest_cooldown = int(request.form["speedtest_cooldown"])
+    #         if "number_of_speedtests" in request.form:
+    #             settings.number_of_speedtests = int(request.form["number_of_speedtests"])
 
-            # Feature settings
-            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
+    #         # Feature settings
+    #         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
 
-            # Card settings
-            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_speedtest_enabled = "is_speedtest_enabled" in request.form
+    #         # Card settings
+    #         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_speedtest_enabled = "is_speedtest_enabled" in request.form
 
-            # Commit the changes to the database
-            db.session.commit()
-            flash("Settings updated successfully!", "success")
+    #         # Commit the changes to the database
+    #         db.session.commit()
+    #         flash("Settings updated successfully!", "success")
 
-        return render_template("settings.html", settings=settings)
+    return render_template("settings.html", settings=settings)

src/routes/user.py

@@ -1,10 +1,10 @@
 import datetime
 from flask import render_template, redirect, url_for, request, blueprints, flash, blueprints
-from flask_login import LoginManager, login_required, current_user
+from flask_login import login_required, current_user
 from werkzeug.security import generate_password_hash
 
 from src.config import app, db
-from src.models import User
+from src.models import User, DashboardSettings, CardSettings, FeatureTogglesSettings
 from src.utils import render_template_from_file
 from src.scripts.email_me import send_smpt_email
 from src.routes.helper import get_email_addresses
@@ -37,6 +37,7 @@ def add_user():
             receive_email_alerts=receive_email_alerts
         )
 
+        # Send email alerts to admins
         admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
         if admin_email_address:
             subject = "New User Alert"
@@ -50,22 +51,32 @@ def add_user():
             html_body = render_template_from_file("src/templates/email_templates/new_user_create.html", **context)
             send_smpt_email(admin_email_address, subject, html_body, is_html=True)
 
+        # Send welcome email to new user
         subject = "Welcome to the systemGuard"  
         context = {
             "username": new_user.username,
             "email": new_user.email,
         }
         html_body = render_template_from_file("src/templates/email_templates/welcome.html", **context)
         send_smpt_email(email, subject, html_body, is_html=True)
-            
+
+        # Add and commit the new user to get the correct user ID
         db.session.add(new_user)
+        db.session.commit()  # Commit to generate the ID
+        
+        print("new user", new_user.id)  # Now the ID should be available
+
+        # Now you can use the new user's ID to create related settings
+        db.session.add(DashboardSettings(user_id=new_user.id))
+        db.session.add(CardSettings(user_id=new_user.id))
+        db.session.add(FeatureTogglesSettings(user_id=new_user.id))
         db.session.commit()
+
         flash('User created successfully!', 'success')
         return redirect(url_for('view_users'))
 
     return render_template('add_user.html')
 
-
 @app.route('/users')
 @login_required
 def view_users():