feat: 🔨 refactored the code

Author: codeperfectplus

app.py

@@ -1,4 +1,5 @@
-from src.config import app
+from src.config import app, db
+
 from src.blueprints import (
     additional_bp,
     admin_bp,
@@ -7,15 +8,18 @@
     health_bp,
     homepage_bp,
     silver_calculator_bp,
+    users_bp
 )
 
+
 app.register_blueprint(additional_bp)
-app.register_blueprint(admin_bp, url_prefix='/admin')
+app.register_blueprint(admin_bp, url_prefix='/')
 app.register_blueprint(auth_bp, url_prefix='/auth')
 app.register_blueprint(gold_calculator_bp)
 app.register_blueprint(health_bp)
 app.register_blueprint(homepage_bp)
 app.register_blueprint(silver_calculator_bp)
+app.register_blueprint(users_bp)
 
 
 

requirements.txt

@@ -5,4 +5,5 @@ gunicorn
 flask-sqlalchemy
 Flask-Login
 Flask-Bcrypt
-psutil
+psutil
+flask-admin

src/blueprints/__init__.py

@@ -1,10 +1,11 @@
 from src.blueprints.additional import additional_bp
-from src.blueprints.admin import admin_bp
+from src.blueprints.admin_dashboard import admin_bp
 from src.blueprints.auth import auth_bp
 from src.blueprints.gold_calculator import gold_calculator_bp
 from src.blueprints.health import health_bp
 from src.blueprints.homepage import homepage_bp
 from src.blueprints.silver_calculator import silver_calculator_bp
+from src.blueprints.users import users_bp
 
 __all__ = [
     'additional_bp',

src/blueprints/additional.py

@@ -5,16 +5,16 @@
 
 @additional_bp.route('/pricing')
 def pricing() -> str:
-    return render_template('pricing.html')
+    return render_template('others/pricing.html')
 
 @additional_bp.route('/features')
 def features() -> str:
-    return render_template('features.html')
+    return render_template('others/features.html')
 
 @additional_bp.route('/about')
 def about() -> str:
-    return render_template('about.html')
+    return render_template('others/about.html')
 
 @additional_bp.route('/permission-denied')
 def permission_denied():
-    return render_template('permission_denied.html')
+    return render_template('others/permission_denied.html')

src/blueprints/admin.py src/blueprints/admin_dashboard.pysrc/blueprints/admin.py renamed to src/blueprints/admin_dashboard.py

@@ -10,30 +10,8 @@
 from src.models import User, AuditLog, Settings, log_action
 from src.models import GoldTransaction, SilverTransaction, JewellerDetails, Settings
 
-admin_bp = Blueprint('admin', __name__)
+admin_bp = Blueprint('admin_', __name__)
 
-@admin_bp.route('/manage_users', methods=['GET', 'POST'])
-@login_required
-def manage_users():
-    system_settings = Settings.query.first()
-    if current_user.user_level != 'admin':
-        return redirect(url_for('additional.permission_denied'))
-
-    users = User.query.all()
-
-    if request.method == 'POST':
-        user_id = request.form.get('user_id')
-        new_level = request.form.get('user_level')
-        
-        user = User.query.get(user_id)
-        if user:
-            user.user_level = new_level
-            db.session.commit()
-            flash(f"User {user.username}'s level updated to {new_level}.", 'success')
-        else:
-            flash("User not found.", 'danger')
-
-    return render_template('manage_users.html', users=users, settings=system_settings)
 
 @admin_bp.route('/settings', methods=['GET', 'POST'])
 @login_required
@@ -94,7 +72,7 @@ def str_to_bool(value):
         # if not settings changes add no changed done message, and dont't commit
         if not logs:
             flash("No changes made.", 'info')
-            return redirect(url_for('admin.settings'))
+            return redirect(url_for('admin_.settings'))
 
         log_action(current_user.id, current_user.username, 'System Settings Change', details=logs)
 
@@ -120,10 +98,10 @@ def str_to_bool(value):
         db.session.commit()
         for log in logs:
             flash(log, 'success')
-        return redirect(url_for('admin.settings'))
+        return redirect(url_for('admin_.settings'))
 
     settings = Settings.query.first()
-    return render_template('settings.html', settings=settings)
+    return render_template('dashboard/settings.html', settings=settings)
 
 
 @admin_bp.route('/audit_log')
@@ -133,7 +111,7 @@ def audit_log():
         return redirect(url_for('home'))
 
     logs = AuditLog.query.order_by(AuditLog.timestamp.desc()).all()
-    return render_template('audit_log.html', logs=logs)
+    return render_template('dashboard/audit_log.html', logs=logs)
 
 
 @admin_bp.route("/dashboard")
@@ -158,7 +136,7 @@ def dashboard():
         else:
             system_health = "Good"
 
-        return render_template('admin_dashboard.html', 
+        return render_template('dashboard/admin_dashboard.html', 
                             total_users=total_users, 
                             active_sessions=active_sessions, 
                             system_health=system_health,
@@ -168,7 +146,8 @@ def dashboard():
                             settings=system_settings,
                             current_user=current_user)
     elif current_user.user_level == 'customer':
-        return render_template('customer_dashboard.html', audit_logs=audit_logs)
+        audit_logs = AuditLog.query.filter_by(user_id=current_user.id)
+        return render_template('dashboard/customer_dashboard.html', settings=system_settings)
 
 # Silver calculator route
 @admin_bp.route('/history', methods=['GET'])
@@ -200,7 +179,7 @@ def history():
                           'purity': t.purity, 'service_charge': t.service_charge, 'tax': t.tax, 'total': t.total, 'currency': t.currency,
                           'timestamp': t.timestamp} for t in silver_transactions]
 
-    return render_template('history.html', transactions=transactions, selected_type=selected_type)
+    return render_template('dashboard/history.html', transactions=transactions, selected_type=selected_type)
 
 @admin_bp.route('/download_audit_log', methods=['POST'])
 def download_audit_log():
@@ -284,7 +263,7 @@ def update_jeweller_details():
         db.session.commit()
 
         flash('Jeweller details updated successfully!', 'success')
-        return redirect(url_for('admin.update_jeweller_details'))
+        return redirect(url_for('admin_.update_jeweller_details'))
 
     jeweller = JewellerDetails.query.first()
-    return render_template('config.html', jeweller=jeweller, settings=system_settings)
+    return render_template('dashboard/config.html', jeweller=jeweller, settings=system_settings)

src/blueprints/auth.py

@@ -27,7 +27,7 @@ def register():
         db.session.add(user)
         db.session.commit()
         return redirect(url_for('auth.login'))
-    return render_template('register.html')
+    return render_template('admin/register.html')
 
 @auth_bp.route("/login", methods=['GET', 'POST'])
 def login():
@@ -41,10 +41,10 @@ def login():
             log_action(user.id, user.username, 'Login', f'User {user.username} logged in.')
 
             flash(f'Login successful as {user.username}', 'success')
-            return redirect(url_for('admin.dashboard'))
+            return redirect(url_for('admin_.dashboard'))
         else:
             flash('Login failed. Please check your credentials.', 'danger')
-    return render_template('login.html', settings=system_settings)
+    return render_template('admin/login.html', settings=system_settings)
 
 @auth_bp.route("/change-password", methods=['GET', 'POST'])
 @login_required
@@ -69,9 +69,9 @@ def change_password():
     # if current user password_changed false, flash a message
     if not current_user.password_changed:
         flash('You need to change your password first to continue.', 'warning')
-        return render_template('change_password.html', settings=system_settings)
+        return render_template('admin/change_password.html', settings=system_settings)
 
-    return render_template('change_password.html', settings=system_settings)
+    return render_template('admin/change_password.html', settings=system_settings)
 
 
 @auth_bp.route("/logout")

src/blueprints/gold_calculator.py

@@ -69,7 +69,7 @@ def gold_calculator():
             flash("Bill generated successfully!", 'success')
             flash("Please consider giving a star on GitHub if you find this project useful!", 'info')
 
-            return render_template('gold_bill.html',
+            return render_template('calculators/gold_bill.html',
                                    bill=bill_details,
                                    weight=weight,
                                    price_per_gram=gold_price_per_gram,
@@ -88,7 +88,7 @@ def gold_calculator():
     gold_service_charge = session.get('gold_service_charge', 0)
     gold_tax = session.get('gold_tax', 0)
 
-    return render_template('gold_calculator.html',
+    return render_template('calculators/gold_calculator.html',
                            price_per_gram=gold_price_per_gram,
                            service_charge=gold_service_charge,
                            tax=gold_tax,

src/blueprints/health.py

@@ -12,4 +12,4 @@ def health():
         "version": "1.0.0",
         "timestamp": datetime.now().isoformat()
     }
-    return render_template('health.html', **health_info)
+    return render_template('others/health.html', **health_info)

src/blueprints/silver_calculator.py

@@ -66,7 +66,7 @@ def silver_calculator():
             flash("Bill generated successfully!", 'success')
             flash("Please consider giving a star on GitHub if you find this project useful!", 'info')
 
-            return render_template('silver_bill.html',
+            return render_template('calculators/silver_bill.html',
                                    bill=bill_details,
                                    weight=weight,
                                    price_per_gram=silver_price_per_gram,
@@ -84,7 +84,7 @@ def silver_calculator():
     silver_service_charge = session.get('silver_service_charge', 0)
     silver_tax = session.get('silver_tax', 0)
 
-    return render_template('silver_calculator.html',
+    return render_template('calculators/silver_calculator.html',
                            price_per_gram=silver_price_per_gram,
                            service_charge=silver_service_charge,
                            tax=silver_tax,

src/blueprints/users.py

@@ -0,0 +1,67 @@
+from datetime import datetime
+from flask import render_template, request, redirect, url_for,  Blueprint, flash
+from flask_bcrypt import generate_password_hash
+from flask_login import  login_required, current_user
+
+from src.config import db
+from src.models import User
+
+users_bp = Blueprint('users_', __name__)
+
+@users_bp.route('/users', methods=['GET', 'POST'])
+@login_required
+def manage_users():
+    if current_user.user_level != 'admin':
+        return redirect(url_for('additional.permission_denied'))
+    users = User.query.all()
+    return render_template('users/manage_users.html', users=users)
+
+@users_bp.route('/users/edit/<int:user_id>', methods=['GET', 'POST'])
+@login_required
+def edit_user(user_id):
+    user = User.query.get_or_404(user_id)
+    
+    if current_user.user_level != 'admin':
+        return redirect(url_for('additional.permission_denied'))
+        
+    if request.method == 'POST':
+        user.fname = request.form['fname']
+        user.lname = request.form['lname']
+        user.username = request.form['username']
+        user.email = request.form['email']
+        user.user_level = request.form['user_level']
+        db.session.commit()
+        flash('User updated successfully!', 'success')
+        return redirect(url_for('users_.manage_users'))
+    return render_template('users/edit_user.html', user=user)
+
+@users_bp.route('/users/create', methods=['GET', 'POST'])
+@login_required
+def create_user():
+    if current_user.user_level != 'admin':
+        return redirect(url_for('additional.permission_denied'))
+    if request.method == 'POST':
+        new_user = User(
+            fname=request.form['fname'],
+            lname=request.form['lname'],
+            username=request.form['username'],
+            email=request.form['email'],
+            password=generate_password_hash(request.form['password']),
+            user_level=request.form['user_level']
+        )
+        db.session.add(new_user)
+        db.session.commit()
+        flash('User created successfully!', 'success')
+        return redirect(url_for('users_.manage_users'))
+    return render_template('users/create_user.html')
+
+@users_bp.route('/users/delete/<int:user_id>', methods=['GET', 'POST'])
+@login_required
+def delete_user(user_id):
+    user = User.query.get_or_404(user_id)
+    if request.method == 'POST':
+        db.session.delete(user)
+        db.session.commit()
+        flash('User deleted successfully!', 'success')
+        return redirect(url_for('users_.manage_users'))
+    return render_template('users/delete_user.html', user=user)