chore: fix added for some page

Author: codeperfectplus

requirements.txt

@@ -6,4 +6,6 @@ flask-sqlalchemy
 Flask-Login
 Flask-Bcrypt
 psutil
-flask-admin
+flask-admin
+flask-wtf
+email-validator

src/blueprints/admin_dashboard.py

@@ -133,8 +133,14 @@ def dashboard():
 
         if cpu_utilization > 80:
             system_health = "Warning"
-        else:
+        elif cpu_utilization > 60:
+            system_health = "Moderate"
+        elif cpu_utilization > 40:
+            system_health = "Fair"
+        elif cpu_utilization > 20:
             system_health = "Good"
+        else:
+            system_health = "Excellent"
 
         return render_template('dashboard/admin_dashboard.html', 
                             total_users=total_users, 
@@ -145,6 +151,7 @@ def dashboard():
                             audit_logs=audit_logs,
                             settings=system_settings,
                             current_user=current_user)
+    
     elif current_user.user_level == 'customer':
         audit_logs = AuditLog.query.filter_by(user_id=current_user.id)
         return render_template('dashboard/customer_dashboard.html', settings=system_settings)

src/blueprints/users.py

@@ -4,7 +4,7 @@
 from flask_login import  login_required, current_user
 
 from src.config import db
-from src.models import User
+from src.models import User, Settings
 
 users_bp = Blueprint('users_', __name__)
 
@@ -64,4 +64,4 @@ def delete_user(user_id):
         db.session.commit()
         flash('User deleted successfully!', 'success')
         return redirect(url_for('users_.manage_users'))
-    return render_template('users/delete_user.html', user=user)
+    return render_template('users/delete_user.html', user=user)

src/templates/dashboard/admin_dashboard.html

@@ -9,9 +9,9 @@
 {% endblock %}
 
 {% block content %}
-<div class="admin-dashboard">
+<div class="admin-dashboard m-4">
     <h2 class="dashboard-title"><i class="fas fa-tachometer-alt"></i> Admin Dashboard</h2>
-    <p class="welcome-message">Welcome, {{ current_user.username }}!</p>
+    <p class="welcome-message">Welcome, {{ current_user.fname }}!</p>
     <!-- Display flash messages -->
     {% include "ext/flash_message.html" %}
 
@@ -54,19 +54,11 @@ <h3><i class="fas fa-tools"></i> Admin Tools</h3>
         <div class="button-grid">
             <a href="{{ url_for('users_.manage_users') }}" class="btn btn-large"><i class="fas fa-user-cog"></i> User Management</a>
             <a href="{{ url_for('admin_.history') }}" class="btn btn-large"><i class="fas fa-history"></i>Transaction History</a>
-            <a href="{{ url_for('admin_.settings') }}" class="btn btn-large"><i class="fas fa-cog"></i> System Settings</a>
             <a href="{{ url_for('admin_.audit_log') }}" class="btn btn-large"><i class="fas fa-clipboard-list"></i> Audit Logs</a>
-            <a href="{{ url_for('admin_.update_jeweller_details') }}" class="btn btn-large"><i class="fas fa-cog"></i>Jewellers Config Settings</a>
             <a href="{{ url_for('auth.change_password') }}" class="btn btn-large"><i class="fas fa-key"></i> Change Password</a>
+            <a href="{{ url_for('admin_.update_jeweller_details') }}" class="btn btn-large"><i class="fas fa-cog"></i>Jewellers Config Settings</a>
+            <a href="{{ url_for('admin_.settings') }}" class="btn btn-large"><i class="fas fa-cog"></i> System Settings</a>            
         </div>
     </div>
-    <div class="admin-dashboard">
-        <h3><i class="fas fa-history"></i> Recent Activity</h3>
-        {% for log in audit_logs %}
-        <p>{{ log.timestamp }} - {{ log.action }}</p>
-        <p> {{ log.details }}</p>
-        <hr>
-        {% endfor %}
-    </div>
 </div>
 {% endblock %}