some more changes

Author: HarshalGunjalOp

app/__init__.py

@@ -22,8 +22,8 @@ def create_default_admin():
     existing_admin = Admin.query.filter_by(username=default_username).first()
     if not existing_admin:
         admin = Admin(
-            fname="Default",
-            lname="Admin",
+            fname="Admin",
+            lname="User",
             username=default_username,
             password_hash=generate_password_hash(default_password),
             email=default_email
@@ -50,7 +50,7 @@ def create_app():
     app.config["REMEMBER_COOKIE_DURATION"] = timedelta(days=31)
     app.config.update(
         MAIL_SERVER='localhost',
-        MAIL_PORT=1025,
+        MAIL_PORT=2525,
         MAIL_USE_TLS=False,
         MAIL_USE_SSL=False,
         MAIL_USERNAME=None,
@@ -59,7 +59,7 @@ def create_app():
     print("Configured to use local SMTP debugging server.")
 
     # Start the local SMTP debugging server
-    smtpd_command = ['python', '-m', 'aiosmtpd', '-n', '-l', 'localhost:1025']
+    smtpd_command = ['python', '-m', 'aiosmtpd', '-n', '-l', 'localhost:2525']
     subprocess.Popen(smtpd_command)
     print("Local SMTP debugging server started.")
 
@@ -70,7 +70,9 @@ def create_app():
     from .customer import customer
     from .professional import professional
     from .auth import auth
-
+    from .api import api
+    
+    app.register_blueprint(api, url_prefix='/api')
     app.register_blueprint(admin, url_prefix="/admin")
     app.register_blueprint(customer, url_prefix="/")
     app.register_blueprint(professional, url_prefix="/professional")

app/admin.py

@@ -12,11 +12,34 @@
 @login_required
 @role_required('admin')
 def admin_dashboard():
-    customers = Customer.query.all()
-    professionals = Professional.query.all()
+    # Service Request Data
     services = Service.query.all()
-    
-    return render_template('admin_dashboard.html', customers=customers, professionals=professionals, services=services)
+    service_request_data = {
+        "labels": [service.name for service in services],
+        "data": [len(service.requests) for service in services]
+    }
+
+    # Professional Performance Data
+    professionals = Professional.query.all()
+    professional_performance_data = {
+        "labels": [pro.fname + " " + pro.lname for pro in professionals],
+        "data": [round(pro.rating or 0, 2) for pro in professionals]
+    }
+
+    # Customer Engagement Data
+    customers = Customer.query.all()
+    customer_engagement_data = {
+        "labels": [customer.fname + " " + customer.lname for customer in customers],
+        "data": [len(customer.requests) for customer in customers]
+    }
+
+    return render_template(
+        'admin_dashboard.html',
+        service_request_data=service_request_data,
+        professional_performance_data=professional_performance_data,
+        customer_engagement_data=customer_engagement_data
+    )
+
 
 
 @admin.route('/admin/approve-professional/<int:professional_id>')
@@ -25,41 +48,38 @@ def admin_dashboard():
 def approve_professional(professional_id):
     try:
         professional = Professional.query.get(professional_id)
-        if professional:
-            professional.is_verified = True 
+        if professional and not professional.is_verified:
+            professional.is_verified = True
             db.session.commit()
             flash("Professional verified successfully.", "success")
         else:
-            flash("Professional not found.", "warning")
+            flash("Professional not found or already verified.", "warning")
     except SQLAlchemyError:
         db.session.rollback()
-        flash("An error occurred while approving the professional.", "warning")
+        flash("An error occurred while verifying the professional.", "warning")
 
-    return redirect(url_for('admin_dashboard'))
+    return redirect(url_for('admin.admin_dashboard'))
 
 
 @admin.route('/admin/block-user/<int:user_id>/<string:user_type>')
 @login_required
 @role_required('admin')
 def block_user(user_id, user_type):
     try:
-        if user_type == 'customer':
-            user = Customer.query.get(user_id)
-        else:
-            user = Professional.query.get(user_id)
-
+        user = Customer.query.get(user_id) if user_type == 'customer' else Professional.query.get(user_id)
         if user:
-            user.is_blocked = not user.is_blocked 
+            user.is_blocked = not user.is_blocked
             db.session.commit()
             status = "unblocked" if not user.is_blocked else "blocked"
-            flash(f"User successfully {status}.", "success")
+            flash(f"User {status} successfully.", "success")
         else:
             flash("User not found.", "warning")
     except SQLAlchemyError:
         db.session.rollback()
-        flash("An error occurred while updating the user.", "warning")
+        flash("An error occurred while blocking/unblocking the user.", "warning")
 
-    return redirect(url_for('admin_dashboard'))
+    return redirect(url_for('admin.admin_dashboard'))
+
 
 
 @admin.route('/admin/create-service', methods=['GET', 'POST'])

app/api.py

@@ -0,0 +1,80 @@
+from flask import Blueprint, jsonify, request
+from .models import db, Customer, Professional, Service, Request
+from flask_login import login_required
+
+api = Blueprint('api', __name__)
+
+# Get all users
+@api.route('/users', methods=['GET'])
+@login_required
+def get_users():
+    users = Customer.query.all()
+    professionals = Professional.query.all()
+    return jsonify({
+        "customers": [{"id": user.id, "name": f"{user.fname} {user.lname}"} for user in users],
+        "professionals": [{"id": pro.id, "name": f"{pro.fname} {pro.lname}"} for pro in professionals]
+    })
+
+# Get all services
+@api.route('/services', methods=['GET'])
+def get_services():
+    services = Service.query.all()
+    return jsonify([{
+        "id": service.id,
+        "name": service.name,
+        "price": service.price,
+        "time_required": service.time_required_in_hours,
+        "description": service.description,
+        "provider_id": service.provider
+    } for service in services])
+
+# Create a new service
+@api.route('/services', methods=['POST'])
+@login_required
+def create_service():
+    data = request.json
+    new_service = Service(
+        name=data['name'],
+        price=data['price'],
+        time_required_in_hours=data['time_required'],
+        description=data['description'],
+        provider=data['provider_id']
+    )
+    db.session.add(new_service)
+    db.session.commit()
+    return jsonify({"message": "Service created successfully!"}), 201
+
+# Get a specific service
+@api.route('/services/<int:service_id>', methods=['GET'])
+def get_service(service_id):
+    service = Service.query.get_or_404(service_id)
+    return jsonify({
+        "id": service.id,
+        "name": service.name,
+        "price": service.price,
+        "time_required": service.time_required_in_hours,
+        "description": service.description,
+        "provider_id": service.provider
+    })
+
+# Update a service
+@api.route('/services/<int:service_id>', methods=['PUT'])
+@login_required
+def update_service(service_id):
+    service = Service.query.get_or_404(service_id)
+    data = request.json
+    service.name = data.get('name', service.name)
+    service.price = data.get('price', service.price)
+    service.time_required_in_hours = data.get('time_required', service.time_required_in_hours)
+    service.description = data.get('description', service.description)
+    db.session.commit()
+    return jsonify({"message": "Service updated successfully!"})
+
+# Delete a service
+@api.route('/services/<int:service_id>', methods=['DELETE'])
+@login_required
+def delete_service(service_id):
+    service = Service.query.get_or_404(service_id)
+    db.session.delete(service)
+    db.session.commit()
+    return jsonify({"message": "Service deleted successfully!"})

app/auth.py

@@ -10,7 +10,7 @@
 # Helper functions for validation
 def is_valid_email(email):
     regex = r'^[a-z0-9]+[\._]?[a-z0-9]+[@]\w+[.]\w+$'
-    return re.match(regex, email) is not None
+    return re.match(regex, str(email)) is not None
 
 def is_valid_password(password):  
     if len(password) < 8:  
@@ -29,42 +29,38 @@ def login():
     if request.method == "POST":
         username = request.form.get('username')
         password = request.form.get('password')
-        role = request.form.get('role').lower()
+        role = request.form.get('role')
         remember = request.form.get('remember') == "on"
 
-        if not username or not password:
-            flash("Username and password are required.", "warning")
-            return redirect(url_for('auth.login'))
-    
-        try:
-            if role == "customer":
-                user = Customer.query.filter_by(username=username).first()  
-            elif role == "professional":
-                user = Professional.query.filter_by(username=username).first()
-            elif role == "admin":
-                user = Admin.query.filter_by(username=username).first()
-            else:
-                flash("Invalid role. Please select a role and try again.", "warning")
-                return redirect(url_for('auth.login'))
-        except SQLAlchemyError:
-            flash("User not found. Please check your details and try again.", "warning")
+        # Validate input
+        if not username or not password or not role:
+            flash("All fields are required.", "warning")
             return redirect(url_for('auth.login'))
 
+        # Fetch user based on role
+        user = None
+        if role == "customer":
+            user = Customer.query.filter_by(username=username).first()
+        elif role == "professional":
+            user = Professional.query.filter_by(username=username).first()
+        elif role == "admin":
+            user = Admin.query.filter_by(username=username).first()
+
+        # Authenticate user
         if user and check_password_hash(user.password_hash, password):
-            try:
-                login_user(user, remember=remember)
-                flash("Logged in successfully", "success")
-                next_page = request.args.get('next')
-                session['role'] = role
-
-                if next_page in [url_for('auth.login'), url_for('auth.signup'), url_for('auth.signup_as_customer'), url_for('auth.signup_as_professional')]:
-                    return redirect(url_for('customer.home'))
-
-                return redirect(next_page or url_for('customer.home'))
-            except Exception as e:
-                flash("An error occurred during login: " + str(e), "warning")
+            if user.role != role:
+                flash("Invalid role for this account.", "warning")
+                return redirect(url_for('auth.login'))
+            if getattr(user, 'is_blocked', False):  # Check if the user is blocked
+                flash("Your account has been blocked. Please contact support.", "warning")
+                return redirect(url_for('auth.login'))
+
+            login_user(user, remember=remember)
+            session['role'] = role
+            flash("Logged in successfully!", "success")
+            return redirect(url_for('customer.home'))
         else:
-            flash("Invalid username or password", "warning")
+            flash("Invalid username or password.", "warning")
     return render_template("login.html")
 
 
@@ -143,11 +139,14 @@ def signup_as_professional():
         email = request.form.get('email')
         phone = request.form.get('phone')
         address = request.form.get('address')
+        service_type = request.form.get('service_type')  # New
+        experience = request.form.get('experience')  # New
 
-        if not username or not password or not email or not phone:
-            flash("Username, password, email, and phone are required.", "warning")
+        # Basic validation
+        if not username or not password or not email or not phone or not service_type or not experience:
+            flash("All fields are required.", "warning")
             return redirect(url_for('auth.signup_as_professional'))
-        
+
         if not is_valid_email(email):
             flash("Invalid email address.", "warning")
             return redirect(url_for('auth.signup_as_professional'))
@@ -163,7 +162,6 @@ def signup_as_professional():
         if Professional.query.filter_by(email=email).first():
             flash("Email already in use. Please login instead.", "warning")
             return redirect(url_for('auth.signup_as_professional'))
-
         try:
             user = Professional(
                 username=username,
@@ -172,11 +170,13 @@ def signup_as_professional():
                 password_hash=generate_password_hash(password),
                 email=email,
                 phone=phone,
-                address=address
+                address=address,
+                service_type=service_type,
+                experience=int(experience)  # Ensure integer
             )
             db.session.add(user)
             db.session.commit()
-            flash("User registered successfully", "success")
+            flash("Professional registered successfully!", "success")
             return redirect(url_for('auth.login'))
         except SQLAlchemyError:
             db.session.rollback()