Update main.py

Author: GitTimeraider

app/main.py

@@ -4,13 +4,14 @@
 from app.models import db, User
 from app.auth import auth_bp
 from app.admin import admin_bp
+from app.settings import settings_bp
 from app.directadmin_api import DirectAdminAPI
 from app.config import Config
 import os
 
 def create_app():
     app = Flask(__name__, 
-                static_folder='../static',  # Fix static path
+                static_folder='../static',
                 template_folder='templates')
     app.config.from_object(Config)
 
@@ -34,6 +35,7 @@ def load_user(user_id):
 
     app.register_blueprint(auth_bp)
     app.register_blueprint(admin_bp)
+    app.register_blueprint(settings_bp)  # Register settings blueprint
 
     # Initialize database
     with app.app_context():
@@ -49,30 +51,44 @@ def load_user(user_id):
         except Exception as e:
             print(f"Database initialization error: {e}")
 
-    # Static file serving for development
     @app.route('/static/<path:filename>')
     def serve_static(filename):
         return send_from_directory(app.static_folder, filename)
 
     @app.route('/')
     @login_required
     def index():
+        # Check if user has configured DirectAdmin settings
+        if not current_user.has_da_config():
+            return redirect(url_for('settings.index'))
         return redirect(url_for('dashboard'))
 
     @app.route('/dashboard')
     @login_required
     def dashboard():
+        # Check if user has configured DirectAdmin settings
+        if not current_user.has_da_config():
+            flash('Please configure your DirectAdmin settings first.', 'warning')
+            return redirect(url_for('settings.index'))
+
         # Update last login
         current_user.last_login = datetime.utcnow()
         db.session.commit()
-        return render_template('dashboard.html', domain=Config.DA_DOMAIN)
+        return render_template('dashboard.html', domain=current_user.da_domain)
 
     @app.route('/api/email-accounts')
     @login_required
     def get_email_accounts():
+        if not current_user.has_da_config():
+            return jsonify({'error': 'DirectAdmin not configured'}), 400
+
         try:
-            api = DirectAdminAPI(Config.DA_SERVER, Config.DA_USERNAME, Config.DA_PASSWORD)
-            accounts = api.get_email_accounts(Config.DA_DOMAIN)
+            api = DirectAdminAPI(
+                current_user.da_server,
+                current_user.da_username,
+                current_user.get_da_password()
+            )
+            accounts = api.get_email_accounts(current_user.da_domain)
             return jsonify(accounts)
         except Exception as e:
             print(f"Error getting email accounts: {e}")
@@ -81,9 +97,16 @@ def get_email_accounts():
     @app.route('/api/forwarders')
     @login_required
     def get_forwarders():
+        if not current_user.has_da_config():
+            return jsonify({'error': 'DirectAdmin not configured'}), 400
+
         try:
-            api = DirectAdminAPI(Config.DA_SERVER, Config.DA_USERNAME, Config.DA_PASSWORD)
-            forwarders = api.get_forwarders(Config.DA_DOMAIN)
+            api = DirectAdminAPI(
+                current_user.da_server,
+                current_user.da_username,
+                current_user.get_da_password()
+            )
+            forwarders = api.get_forwarders(current_user.da_domain)
             return jsonify(forwarders)
         except Exception as e:
             print(f"Error getting forwarders: {e}")
@@ -92,10 +115,17 @@ def get_forwarders():
     @app.route('/api/forwarders', methods=['POST'])
     @login_required
     def create_forwarder():
+        if not current_user.has_da_config():
+            return jsonify({'error': 'DirectAdmin not configured'}), 400
+
         try:
             data = request.json
-            api = DirectAdminAPI(Config.DA_SERVER, Config.DA_USERNAME, Config.DA_PASSWORD)
-            success = api.create_forwarder(Config.DA_DOMAIN, data['alias'], data['destination'])
+            api = DirectAdminAPI(
+                current_user.da_server,
+                current_user.da_username,
+                current_user.get_da_password()
+            )
+            success = api.create_forwarder(current_user.da_domain, data['alias'], data['destination'])
             return jsonify({'success': success})
         except Exception as e:
             print(f"Error creating forwarder: {e}")
@@ -104,9 +134,16 @@ def create_forwarder():
     @app.route('/api/forwarders/<alias>', methods=['DELETE'])
     @login_required
     def delete_forwarder(alias):
+        if not current_user.has_da_config():
+            return jsonify({'error': 'DirectAdmin not configured'}), 400
+
         try:
-            api = DirectAdminAPI(Config.DA_SERVER, Config.DA_USERNAME, Config.DA_PASSWORD)
-            success = api.delete_forwarder(Config.DA_DOMAIN, alias)
+            api = DirectAdminAPI(
+                current_user.da_server,
+                current_user.da_username,
+                current_user.get_da_password()
+            )
+            success = api.delete_forwarder(current_user.da_domain, alias)
             return jsonify({'success': success})
         except Exception as e:
             print(f"Error deleting forwarder: {e}")