chore: refactored code

Author: codeperfectplus

src/models.py

@@ -105,6 +105,13 @@ class User(db.Model, UserMixin):
         db.session.add(admin_user)
         db.session.commit()
 
+    # create a user if not exists
+    if not User.query.filter_by(username='user').first():
+        hashed_password = generate_password_hash('userpassword')
+        user = User(username='user', password=hashed_password, user_level='user')
+        db.session.add(user)
+        db.session.commit()
+
 # ibject for all templates
 @app.context_processor
 def inject_settings():

src/routes/cpu_info.py

@@ -1,5 +1,5 @@
 import psutil
-from flask import render_template, blueprints
+from flask import render_template, blueprints, flash
 
 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
@@ -11,7 +11,8 @@
 def cpu_usage():
     settings = DashboardSettings.query.first()
     if not settings.is_cpu_info_enabled:
-        return render_template("error/404.html")
+        flash("You do not have permission to view this page.", "danger")
+        return render_template("error/permission_denied.html")
 
     current_temp, high_temp, critical_temp = get_cpu_temp()
     cpu_core = get_cached_value("cpu_core", get_cpu_core_count)
@@ -23,4 +24,4 @@ def cpu_usage():
         "high_temp": high_temp,
         "critical_temp": critical_temp,
     }
-    return render_template("cpu_info.html", system_info=system_info)
+    return render_template("info_pages/cpu_info.html", system_info=system_info)

src/routes/disk_info.py

@@ -1,6 +1,6 @@
 import psutil
 
-from flask import render_template, blueprints
+from flask import render_template, blueprints, flash
 
 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
@@ -12,13 +12,14 @@
 def disk_usage():
     settings = DashboardSettings.query.first()
     if not settings.is_disk_info_enabled:
-        return render_template("error/404.html")
+        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)
     system_info = {
         "disk_usage": get_disk_usage_percent(),
         "disk_total": disk_total,
         "disk_used": get_disk_used(),
         "disk_free": get_disk_free(),
     }
-    return render_template("disk_info.html", system_info=system_info)
+    return render_template("info_pages/disk_info.html", system_info=system_info)
 

src/routes/memory_info.py

@@ -1,5 +1,5 @@
 import psutil
-from flask import render_template, blueprints
+from flask import render_template, blueprints, flash
 
 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
@@ -12,7 +12,8 @@
 def memory_usage():
     settings = DashboardSettings.query.first()
     if not settings.is_memory_info_enabled:
-        return render_template("error/404.html")
+        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) 
     system_info = {
         "memory_percent": get_memory_percent(),
@@ -23,4 +24,4 @@ def memory_usage():
     swap_info = get_swap_memory_info()
     system_info.update(swap_info)
 
-    return render_template("memory_info.html", system_info=system_info)
+    return render_template("info_pages/memory_info.html", system_info=system_info)

src/routes/network_info.py

@@ -1,5 +1,5 @@
 import psutil
-from flask import render_template, blueprints
+from flask import render_template, blueprints, flash
 
 from src.config import app
 from src.utils import get_established_connections
@@ -11,7 +11,8 @@
 def network_stats():
     settings = DashboardSettings.query.first()
     if not settings.is_network_info_enabled:
-        return render_template("error/404.html")
+        flash("You do not have permission to view this page.", "danger")
+        return render_template("error/permission_denied.html")
     net_io = psutil.net_io_counters()
     ipv4_ip, ipv6_ip = get_established_connections()
     system_info = {
@@ -20,5 +21,5 @@ def network_stats():
         "ipv4_ip": ipv4_ip,
         "ipv6_ip": ipv6_ip,
     }
-    return render_template("network_info.html", system_info=system_info)
+    return render_template("info_pages/network_info.html", system_info=system_info)
 

src/routes/process.py

@@ -12,10 +12,11 @@
 def process():
     settings = DashboardSettings.query.first()
     if not settings.is_process_info_enabled:
-        return render_template("error/404.html")
+        flash("You do not have permission to view this page.", "danger")
+        return render_template("error/permission_denied.html")
     if current_user.user_level != "admin":
         flash("You do not have permission to view this page.", "danger")
-        return redirect(url_for("dashboard"))
+        return render_template("error/permission_denied.html")
 
     # Retrieve number of processes from session or set default
     number_of_processes = session.get('number_of_processes', 50)
@@ -49,4 +50,4 @@ def process():
     elif sort_by == 'name':
         top_processes.sort(key=lambda x: x[0], reverse=(order == 'desc'))
 
-    return render_template("process.html", processes=top_processes, number=number_of_processes, toggle_order=toggle_order)
+    return render_template("info_pages/process.html", processes=top_processes, number=number_of_processes, toggle_order=toggle_order)

src/routes/settings.py

@@ -1,11 +1,18 @@
 from flask import render_template, request, flash, blueprints
 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", methods=["GET", "POST"])
+@login_required
 def settings():
+    if current_user.user_level != 'admin':
+        flash("Your account does not have permission to view this page.", "danger")
+        flash("User level for this account is: " + current_user.user_level, "danger")
+        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.first()
     if settings:

src/scripts/dashboard.sh

@@ -13,6 +13,7 @@ REQUIREMENTS_FILE="${REQUIREMENTS_FILE:-$PROJECT_DIR/requirements.txt}"
 FLASK_PORT="${FLASK_PORT:-5050}"
 LOG_FILE="/home/$(whoami)/logs/systemguard_flask.log"
 USERNAME="$(whoami)"
+CONDA_ENV_NAME="systemguard"
 
 # Ensure log directory exists
 LOG_DIR="$(dirname "$LOG_FILE")"
@@ -45,9 +46,6 @@ fi
 # Initialize Conda
 source "$CONDA_SETUP_SCRIPT"
 
-# Define Conda environment name
-CONDA_ENV_NAME="dashboar"
-
 echo "Conda environment name: $CONDA_ENV_NAME"
 
 # Check if the Conda environment exists and create it if not

src/templates/error/permission_denied.html

@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+{% block title %}Page not found{% endblock %}
+{% block extra_head %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/404.css')}}">
+{% endblock %}
+
+{% block content %}
+<div class="container">
+    {% include 'ext/message.html' %}
+    <h1>Permission Denied</h1>
+    <p>Oops! You do not have permission to access this page.</p>
+    <a href="{{ url_for('dashboard') }}" class="btn">Go Back Home</a>
+</div>
+{% endblock %}

src/templates/ext/message.html

@@ -1 +1,18 @@
-{% with messages=get_flashed_messages(with_categories=true) %}{% if messages %}<div id="flash-messages">{% for category, message in messages %} <div class="alert alert-{{ category}}" role="alert">{{ message}} </div>{% endfor %}</div>{% endif %}{% endwith %}<script>// Automatically remove flash messages after 5 seconds setTimeout(function (){ var flashMessages=document.getElementById('flash-messages'); if (flashMessages){ flashMessages.style.transition='opacity 0.5s ease'; flashMessages.style.opacity='0'; setTimeout(function (){ flashMessages.remove();}, 500); // Additional time for the fade-out effect}}, 5000); // 5 seconds delay</script>
+{% with messages=get_flashed_messages(with_categories=true) %}{% if messages %}<div id="flash-messages">{% for category,
+    message in messages %} <div class="alert alert-{{ category}}" role="alert">{{ message}} </div>{% endfor %}</div>{%
+endif %}{% endwith %}
+
+
+<script>
+    // Automatically remove flash messages after 5 seconds
+    setTimeout(function() {
+        var flashMessages = document.getElementById('flash-messages');
+        if (flashMessages) {
+            flashMessages.style.transition = 'opacity 0.5s ease';
+            flashMessages.style.opacity = '0';
+            setTimeout(function() {
+                flashMessages.remove();
+            }, 500); // Additional time for the fade-out effect
+        }
+    }, 3000 ); // 5 seconds delay
+</script>