chore: refactor

Author: codeperfectplus

src/models/__init__.py

@@ -2,7 +2,7 @@
 from src.models.user_card_settings import UserCardSettings
 from src.models.dashboard_netowrk import DashboardNetworkSettings
 from src.models.user_dashboard_settings import UserDashboardSettings
-from src.models.feature_toggle_settings import FeatureToggleSettings
+from src.models.feature_toggle_settings import PageToggleSettings
 from src.models.application_general_settings import ApplicationGeneralSettings
 from src.models.smtp_configuration import SMTPSettings
 from src.models.network_speed_test_result import NetworkSpeedTestResult
@@ -25,7 +25,7 @@
         if not user.dashboard_settings:
             db.session.add(UserDashboardSettings(user_id=user.id))
             db.session.add(UserCardSettings(user_id=user.id))
-            db.session.add(FeatureToggleSettings(user_id=user.id))
+            db.session.add(PageToggleSettings(user_id=user.id))
             db.session.commit()
 
     pre_defined_users_json = os.path.join(ROOT_DIR, "src/assets/predefine_user.json")
@@ -57,19 +57,19 @@
 @app.context_processor
 def inject_settings():
     if current_user.is_anonymous:
-        return dict(user_dashboard_settings=None, card_settings=None, feature_toggles_settings=None, general_settings=None)
+        return dict(user_dashboard_settings=None, card_settings=None, page_toggles_settings=None, general_settings=None)
     general_settings = ApplicationGeneralSettings.query.first()
     card_settings = UserCardSettings.query.filter_by(user_id=current_user.id).first()
     user_dashboard_settings = UserDashboardSettings.query.filter_by(
         user_id=current_user.id
     ).first()  # Retrieve user-specific user_dashboard_settings from DB
-    feature_toggles_settings = FeatureToggleSettings.query.filter_by(
+    page_toggles_settings = PageToggleSettings.query.filter_by(
         user_id=current_user.id
     ).first()
     all_settings = dict(
         user_dashboard_settings=user_dashboard_settings,
         general_settings=general_settings,
         card_settings=card_settings,
-        feature_toggles_settings=feature_toggles_settings,
+        page_toggles_settings=page_toggles_settings,
     )
     return all_settings

src/models/feature_toggle_settings.py

@@ -1,7 +1,7 @@
 import datetime
 from src.config import db
 
-class FeatureToggleSettings(db.Model):
+class PageToggleSettings(db.Model):
     __tablename__ = 'feature_toggle_settings'
 
     id = db.Column(db.Integer, primary_key=True)
@@ -13,5 +13,3 @@ class FeatureToggleSettings(db.Model):
     is_disk_info_enabled = db.Column(db.Boolean, default=True)
     is_network_info_enabled = db.Column(db.Boolean, default=True)
     is_process_info_enabled = db.Column(db.Boolean, default=True)
-    refresh_interval = db.Column(db.Integer, default=10)
-

src/models/user_dashboard_settings.py

@@ -8,4 +8,4 @@ class UserDashboardSettings(db.Model):
     user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
     speedtest_cooldown = db.Column(db.Integer, default=60)
     number_of_speedtests = db.Column(db.Integer, default=1)
-    
+    refresh_interval = db.Column(db.Integer, default=10)

src/routes/auth.py

@@ -1,12 +1,12 @@
 import os
 import datetime
 from flask import render_template, redirect, url_for, request, blueprints, flash
-from flask_login import LoginManager, login_user, login_required, logout_user, current_user
+from flask_login import LoginManager, login_user, logout_user, current_user
 from werkzeug.security import generate_password_hash, check_password_hash
 
 from src.scripts.email_me import send_smpt_email
 from src.config import app, db
-from src.models import UserProfile, UserCardSettings, FeatureToggleSettings, UserDashboardSettings
+from src.models import UserProfile, UserCardSettings, PageToggleSettings, UserDashboardSettings
 from src.utils import render_template_from_file, ROOT_DIR
 from src.routes.helper import get_email_addresses
 
@@ -29,41 +29,41 @@ def login():
         if user and check_password_hash(user.password, password):
             login_user(user)
             receiver_email = current_user.email
-            admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
-            # if receiver_email in admin_email_address don't send email to the admin
+            admin_emails_with_alerts = get_email_addresses(user_level='admin', receive_email_alerts=True)
+            # if receiver_email in admin_emails_with_alerts don't send email to the admin
             # log in alert to admin
 
-            if admin_email_address:
-                if receiver_email in admin_email_address:
-                    admin_email_address.remove(receiver_email)
-                if admin_email_address:
+            if admin_emails_with_alerts:
+                if receiver_email in admin_emails_with_alerts:
+                    admin_emails_with_alerts.remove(receiver_email)
+                if admin_emails_with_alerts:
                     context = {"username": current_user.username, "login_time": datetime.datetime.now()}
 
                     login_alert_template = os.path.join(ROOT_DIR, "src/templates/email_templates/admin_login_alert.html")
-                    html_body = render_template_from_file(login_alert_template, **context)
+                    email_body = render_template_from_file(login_alert_template, **context)
 
-                    send_smpt_email(admin_email_address, 'Login Alert', html_body, is_html=True)
+                    send_smpt_email(admin_emails_with_alerts, 'Login Alert', email_body, is_html=True)
 
             # log in alert to user
             if receiver_email:
                 context = {"username": current_user.username, "login_time": datetime.datetime.now()}
 
                 login_message_template = os.path.join(ROOT_DIR, "src/templates/email_templates/login.html") 
-                html_body = render_template_from_file(login_message_template, **context)
+                email_body = render_template_from_file(login_message_template, **context)
 
-                send_smpt_email(receiver_email, 'Login Alert', html_body, is_html=True)
+                send_smpt_email(receiver_email, 'Login Alert', email_body, is_html=True)
             return redirect(url_for('dashboard'))
         flash('Invalid username or password', 'danger')
-    return render_template('login.html')
+    return render_template('auths/login.html')
 
 @app.route('/logout')
 def logout():
     receiver_email = current_user.email
     if receiver_email:
         context = {"username": current_user.username}
         logout_message_template = os.path.join(ROOT_DIR, "src/templates/email_templates/logout.html")
-        html_body = render_template_from_file(logout_message_template, **context)
-        send_smpt_email(receiver_email, 'Logout Alert', html_body, is_html=True)
+        email_body = render_template_from_file(logout_message_template, **context)
+        send_smpt_email(receiver_email, 'Logout Alert', email_body, is_html=True)
     logout_user()
     return redirect(url_for('login'))
 
@@ -96,18 +96,18 @@ def signup():
                         profession=profession)
 
         # Get Admin Emails with Alerts Enabled:
-        admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
-        if admin_email_address:
+        admin_emails_with_alerts = get_email_addresses(user_level='admin', receive_email_alerts=True)
+        if admin_emails_with_alerts:
             subject = "New User Alert"
             context = {
                 "username": new_user.username,
                 "email": new_user.email,
-                "signup_time": datetime.datetime.now(),
+                "registration_time": datetime.datetime.now(),
                 "user_level": new_user.user_level
             }
             new_user_alert_template = os.path.join(ROOT_DIR, "src/templates/email_templates/new_user_alert.html")
-            html_body = render_template_from_file(new_user_alert_template, **context)
-            send_smpt_email(admin_email_address, subject, html_body, is_html=True)
+            email_body = render_template_from_file(new_user_alert_template, **context)
+            send_smpt_email(admin_emails_with_alerts, subject, email_body, is_html=True)
 
         # Send email to the new user
         subject = "Welcome to the systemGuard"  
@@ -116,75 +116,16 @@ def signup():
             "email": new_user.email,
         }
         welcome_template = os.path.join(ROOT_DIR, "src/templates/email_templates/welcome.html")
-        html_body = render_template_from_file(welcome_template, **context)
-        send_smpt_email(email, subject, html_body, is_html=True)
+        email_body = render_template_from_file(welcome_template, **context)
+        send_smpt_email(email, subject, email_body, is_html=True)
 
         db.session.add(new_user)
         db.session.commit()
         db.session.add(UserDashboardSettings(user_id=new_user.id))
         db.session.add(UserCardSettings(user_id=new_user.id))
-        db.session.add(FeatureToggleSettings(user_id=new_user.id))
+        db.session.add(PageToggleSettings(user_id=new_user.id))
         db.session.commit()
         flash('Account created successfully, please log in.')
         return redirect(url_for('login'))
 
-    return render_template('signup.html')
-
-@app.route("/send_email", methods=["GET", "POST"])
-@login_required
-def send_email_page():
-    dasboard_settings = UserCardSettings.query.first()
-    receiver_email = get_email_addresses(user_level='admin', receive_email_alerts=True)    
-    if dasboard_settings:
-        enable_alerts = dasboard_settings.enable_alerts
-    if request.method == "POST":
-        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'))
-        
-        print("Priority:", priority)
-        print("receiver_email:", receiver_email)
-
-        # 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":
-            print("Sending to all users")
-            receiver_email = get_email_addresses(fetch_all_users=True)
-        elif priority == "high" and receiver_email == "admin_users":
-            print("Sending to 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":
-            print("Sending to all users with receive_email_alerts=True")
-            receiver_email = get_email_addresses(receive_email_alerts=True)
-        elif priority == "low" and receiver_email == "admin_users":
-            print("Sending to admin users with receive_email_alerts=True")
-            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")
-            return redirect(url_for('send_email_page'))
-        
-        # Save attachment if any
-        attachment_path = None
-        if attachment:
-            attachment_path = f"/tmp/{attachment.filename}"
-            attachment.save(attachment_path)
-        try:
-            respose = send_smpt_email(receiver_email, subject, body, attachment_path)
-            print(respose)
-            if respose and respose.get("status") == "success":
-                flash(respose.get("message"), "success")
-        except Exception as e:
-            flash(f"Failed to send email: {str(e)}", "danger")
-        
-        return redirect(url_for('send_email_page'))
-
-    return render_template("send_email.html", enable_alerts=enable_alerts)
-
+    return render_template('auths/signup.html')

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 FeatureToggleSettings
+from src.models import PageToggleSettings
 
 cpu_info_bp = blueprints.Blueprint("cpu_usage", __name__)
 
 @app.route("/cpu_usage")
 @login_required
 def cpu_usage():
-    feature_toggles_settings = FeatureToggleSettings.query.first()
-    if not feature_toggles_settings.is_cpu_info_enabled:
+    page_toggles_settings = PageToggleSettings.query.first()
+    if not page_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/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 FeatureToggleSettings
+from src.models import PageToggleSettings
 
 disk_info_bp = blueprints.Blueprint("disk_usage", __name__)
 
 @app.route("/disk_usage")
 @login_required
 def disk_usage():
-    feature_toggles_settings = FeatureToggleSettings.query.first()
-    if not feature_toggles_settings.is_disk_info_enabled:
+    page_toggles_settings = PageToggleSettings.query.first()
+    if not page_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 FeatureToggleSettings
+from src.models import PageToggleSettings
 
 memory_info_bp = blueprints.Blueprint("memory_usage", __name__)
 
 
 @app.route("/memory_usage")
 @login_required
 def memory_usage():
-    feature_toggles_settings = FeatureToggleSettings.query.first()
-    if not feature_toggles_settings.is_memory_info_enabled:
+    page_toggles_settings = PageToggleSettings.query.first()
+    if not page_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  FeatureToggleSettings
+from src.models import  PageToggleSettings
 
 network_info_bp = blueprints.Blueprint("network_stats", __name__)
 
 @app.route("/network_stats")
 @login_required
 def network_stats():
-    feature_toggles_settings = FeatureToggleSettings.query.first()
-    if not feature_toggles_settings.is_network_info_enabled:
+    page_toggles_settings = PageToggleSettings.query.first()
+    if not page_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()