Update app.py

app.py

@@ -1,9 +1,6 @@
 from flask import Flask, render_template, request, redirect, url_for, session, flash
 from pymongo import MongoClient
 import bcrypt
-import smtplib
-from email.mime.text import MIMEText
-from email.mime.multipart import MIMEMultipart
 from datetime import datetime
 from bson.objectid import ObjectId
 
@@ -13,83 +10,60 @@ app.secret_key = 'carwala_secret_key_2024'
 # MongoDB configuration
 MONGODB_URI = "mongodb+srv://arshbir:arshbir123@arshbir.9pulohe.mongodb.net/carwala1?retryWrites=true&w=majority"
 
-# Initialize db as None first
-db = None
-
 try:
-    client = MongoClient(MONGODB_URI, serverSelectionTimeoutMS=5000)
-    client.admin.command('ping')
+    client = MongoClient(MONGODB_URI)
     db = client.carwala1
     print("✅ MongoDB connected successfully!")
 except Exception as e:
     print(f"❌ MongoDB connection failed: {e}")
     db = None
 
-# Email configuration
-SMTP_EMAIL = "singharshbir76@gmail.com"
-SMTP_PASSWORD = "wpiy tuxp pgpf wljz"
-
 # Admin credentials
 ADMIN_EMAIL = "singharshbir76@gmail.com"
 ADMIN_PASSWORD = "arshbir"
 
 def initialize_database():
-    """Initialize database and create collections"""
-    if db is None:  # Fixed: compare with None instead of using 'not db'
-        print("❌ Database not available for initialization")
+    """Initialize database with sample data"""
+    if db is None:
         return
     
     try:
+        # Create collections if they don't exist
         users = db.users
         cars = db.cars
         appointments = db.appointments
         
-        # Create admin user
-        if not users.find_one({"email": ADMIN_EMAIL}):
-            hashed = bcrypt.hashpw(ADMIN_PASSWORD.encode('utf-8'), bcrypt.gensalt())
-            users.insert_one({
-                "name": "Admin User", 
-                "email": ADMIN_EMAIL, 
-                "password": hashed,
-                "role": "admin", 
-                "address": "Delhi, India",
-                "phone": "9876543210",
-                "approved": True, 
+        # Create admin user if not exists
+        if users.find_one({"email": ADMIN_EMAIL}) is None:
+            hashed_password = bcrypt.hashpw(ADMIN_PASSWORD.encode('utf-8'), bcrypt.gensalt())
+            admin_data = {
+                "name": "Admin User",
+                "email": ADMIN_EMAIL,
+                "password": hashed_password,
+                "role": "admin",
+                "approved": True,
                 "created_at": datetime.now()
-            })
+            }
+            users.insert_one(admin_data)
             print("✅ Admin user created")
         
-        # Add sample cars
+        # Add sample cars if none exist
         if cars.count_documents({}) == 0:
             sample_cars = [
                 {
-                    "name": "Maruti Suzuki Swift", 
-                    "year": 2022, 
-                    "price": 650000, 
-                    "description": "Excellent condition, low mileage, fuel efficient.",
-                    "seller_id": "admin",
-                    "seller_email": ADMIN_EMAIL,
+                    "name": "Maruti Suzuki Swift",
+                    "year": 2022,
+                    "price": 650000,
+                    "description": "Excellent condition with low mileage",
                     "status": "approved",
                     "created_at": datetime.now()
                 },
                 {
                     "name": "Hyundai Creta", 
-                    "year": 2021, 
-                    "price": 1250000, 
-                    "description": "Well maintained, single owner, all services done.",
-                    "seller_id": "admin",
-                    "seller_email": ADMIN_EMAIL,
-                    "status": "approved",
-                    "created_at": datetime.now()
-                },
-                {
-                    "name": "Toyota Fortuner", 
-                    "year": 2020, 
-                    "price": 3200000, 
-                    "description": "Powerful engine, premium SUV, 4x4 drive.",
-                    "seller_id": "admin",
-                    "seller_email": ADMIN_EMAIL,
-                    "status": "approved",
+                    "year": 2021,
+                    "price": 1250000,
+                    "description": "Well maintained SUV",
+                    "status": "approved", 
                     "created_at": datetime.now()
                 }
             ]
@@ -97,120 +71,115 @@ def initialize_database():
             print("✅ Sample cars added")
             
     except Exception as e:
-        print(f"❌ Database init error: {e}")
+        print(f"Database initialization error: {e}")
 
+# Initialize database
 initialize_database()
 
-# Safe price formatting function
+# Price formatting filter
 def format_price(price):
-    """Format price safely - handle None and other types"""
     try:
-        if price is None:
-            return "₹0"
         return f"₹{int(price):,}"
-    except (ValueError, TypeError):
+    except:
         return "₹0"
 
 app.jinja_env.filters['format_price'] = format_price
 
 @app.route('/')
 def index():
-    cars = []
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        if db is not None:
             cars = list(db.cars.find({"status": "approved"}))
-        except Exception as e:
-            print(f"Error fetching cars: {e}")
-            flash("Error loading cars")
-    
-    return render_template('index.html', cars=cars)
+        else:
+            cars = []
+        return render_template('index.html', cars=cars)
+    except Exception as e:
+        print(f"Error in index route: {e}")
+        return render_template('index.html', cars=[])
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     if request.method == 'POST':
-        email = request.form.get('email', '').strip()
-        password = request.form.get('password', '')
-        
-        if not email or not password:
-            flash('Please fill all fields')
-            return render_template('login.html')
-        
-        # Admin login
-        if email == ADMIN_EMAIL and password == ADMIN_PASSWORD:
-            session['user_id'] = 'admin'
-            session['role'] = 'admin'
-            session['email'] = email
-            flash('Admin login successful!')
-            return redirect(url_for('admin_dashboard'))
-        
-        # Regular user login
-        if db is not None:  # Fixed: compare with None
-            try:
+        try:
+            email = request.form.get('email')
+            password = request.form.get('password')
+            
+            # Admin login
+            if email == ADMIN_EMAIL and password == ADMIN_PASSWORD:
+                session['user_id'] = 'admin'
+                session['role'] = 'admin'
+                session['email'] = email
+                flash('Admin login successful!')
+                return redirect(url_for('admin_dashboard'))
+            
+            # Regular user login
+            if db is not None:
                 user = db.users.find_one({"email": email})
                 if user and bcrypt.checkpw(password.encode('utf-8'), user['password']):
-                    if user['role'] == 'seller' and not user.get('approved', False):
-                        flash('Seller account pending approval')
-                        return redirect(url_for('login'))
-                    
                     session['user_id'] = str(user['_id'])
                     session['role'] = user['role']
                     session['email'] = email
                     
-                    flash(f'Welcome back, {user["name"]}!')
-                    
                     if user['role'] == 'buyer':
                         return redirect(url_for('index'))
-                    else:
-                        return redirect(url_for('seller_dashboard'))
+                    elif user['role'] == 'seller':
+                        if user.get('approved', False):
+                            return redirect(url_for('seller_dashboard'))
+                        else:
+                            flash('Seller account pending approval')
+                            return redirect(url_for('login'))
                 else:
-                    flash('Invalid credentials')
-            except Exception as e:
-                print(f"Login error: {e}")
-                flash('Login error occurred')
-        else:
-            flash('Database unavailable')
+                    flash('Invalid email or password')
+            else:
+                flash('Database connection issue')
+                
+        except Exception as e:
+            print(f"Login error: {e}")
+            flash('Login failed')
     
     return render_template('login.html')
 
 @app.route('/register', methods=['GET', 'POST'])
 def register():
     if request.method == 'POST':
-        name = request.form.get('name', '').strip()
-        email = request.form.get('email', '').strip()
-        password = request.form.get('password', '')
-        role = request.form.get('role', 'buyer')
-        phone = request.form.get('phone', '').strip()
-        address = request.form.get('address', '').strip()
-        
-        if not all([name, email, password, phone, address]):
-            flash('Please fill all fields')
-            return render_template('register.html')
-        
-        if db is None:  # Fixed: compare with None
-            flash('Database unavailable')
-            return render_template('register.html')
-        
         try:
-            if db.users.find_one({"email": email}):
-                flash('Email already registered')
-                return render_template('register.html')
-            
-            hashed = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
-            user_data = {
-                "name": name, 
-                "email": email, 
-                "password": hashed, 
-                "role": role,
-                "phone": phone, 
-                "address": address, 
-                "approved": role == 'buyer',
-                "created_at": datetime.now()
-            }
-            
-            db.users.insert_one(user_data)
-            flash('Registration successful! Please login.' if role == 'buyer' else 'Registration pending approval')
-            return redirect(url_for('login'))
+            name = request.form.get('name')
+            email = request.form.get('email')
+            password = request.form.get('password')
+            role = request.form.get('role')
+            phone = request.form.get('phone')
+            address = request.form.get('address')
             
+            if db is not None:
+                # Check if user exists
+                if db.users.find_one({"email": email}):
+                    flash('Email already registered')
+                    return redirect(url_for('register'))
+                
+                # Create new user
+                hashed_password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())
+                user_data = {
+                    "name": name,
+                    "email": email,
+                    "password": hashed_password,
+                    "role": role,
+                    "phone": phone,
+                    "address": address,
+                    "approved": role == 'buyer',
+                    "created_at": datetime.now()
+                }
+                
+                db.users.insert_one(user_data)
+                
+                if role == 'buyer':
+                    flash('Registration successful! Please login.')
+                else:
+                    flash('Registration submitted. Waiting for admin approval.')
+                
+                return redirect(url_for('login'))
+            else:
+                flash('Database connection issue')
+                
         except Exception as e:
             print(f"Registration error: {e}")
             flash('Registration failed')
@@ -226,35 +195,37 @@ def logout():
 @app.route('/admin')
 def admin_dashboard():
     if session.get('role') != 'admin':
-        flash('Admin access required')
+        flash('Please login as admin')
         return redirect(url_for('login'))
     
-    pending_sellers = []
-    pending_cars = []
-    
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        if db is not None:
             pending_sellers = list(db.users.find({"role": "seller", "approved": False}))
             pending_cars = list(db.cars.find({"status": "pending"}))
-        except Exception as e:
-            print(f"Admin dashboard error: {e}")
-    
-    return render_template('admin.html', 
-                         pending_sellers=pending_sellers, 
-                         pending_cars=pending_cars)
+        else:
+            pending_sellers = []
+            pending_cars = []
+        
+        return render_template('admin.html', 
+                             pending_sellers=pending_sellers, 
+                             pending_cars=pending_cars)
+    except Exception as e:
+        print(f"Admin dashboard error: {e}")
+        flash('Error loading admin dashboard')
+        return render_template('admin.html', pending_sellers=[], pending_cars=[])
 
 @app.route('/approve_seller/<user_id>')
 def approve_seller(user_id):
     if session.get('role') != 'admin':
         return redirect(url_for('login'))
     
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        if db is not None:
             db.users.update_one({"_id": ObjectId(user_id)}, {"$set": {"approved": True}})
-            flash('Seller approved')
-        except Exception as e:
-            print(f"Approve seller error: {e}")
-            flash('Approval failed')
+            flash('Seller approved successfully')
+    except Exception as e:
+        print(f"Approve seller error: {e}")
+        flash('Error approving seller')
     
     return redirect(url_for('admin_dashboard'))
 
@@ -263,51 +234,54 @@ def seller_dashboard():
     if session.get('role') != 'seller':
         return redirect(url_for('login'))
     
-    cars = []
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        if db is not None:
+            # Verify seller is approved
             user = db.users.find_one({"_id": ObjectId(session['user_id'])})
-            if not user.get('approved', False):
-                flash('Account pending approval')
+            if not user or not user.get('approved', False):
+                flash('Seller account not approved')
                 return redirect(url_for('login'))
             
             cars = list(db.cars.find({"seller_id": session['user_id']}))
-        except Exception as e:
-            print(f"Seller dashboard error: {e}")
-    
-    return render_template('seller_dashboard.html', cars=cars)
+        else:
+            cars = []
+        
+        return render_template('seller_dashboard.html', cars=cars)
+    except Exception as e:
+        print(f"Seller dashboard error: {e}")
+        flash('Error loading seller dashboard')
+        return render_template('seller_dashboard.html', cars=[])
 
 @app.route('/add_car', methods=['POST'])
 def add_car():
     if session.get('role') != 'seller':
         return redirect(url_for('login'))
     
-    name = request.form.get('name', '').strip()
-    year = request.form.get('year', '0')
-    price = request.form.get('price', '0')
-    description = request.form.get('description', '').strip()
-    
-    if not name:
-        flash('Car name required')
-        return redirect(url_for('seller_dashboard'))
-    
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        name = request.form.get('name')
+        year = request.form.get('year')
+        price = request.form.get('price')
+        description = request.form.get('description')
+        
+        if db is not None:
             car_data = {
-                "name": name, 
-                "year": int(year), 
+                "name": name,
+                "year": int(year),
                 "price": int(price),
-                "description": description, 
+                "description": description,
                 "seller_id": session['user_id'],
-                "seller_email": session.get('email', ''), 
+                "seller_email": session.get('email', ''),
                 "status": "pending",
                 "created_at": datetime.now()
             }
             db.cars.insert_one(car_data)
-            flash('Car added - pending approval')
-        except Exception as e:
-            print(f"Add car error: {e}")
-            flash('Error adding car')
+            flash('Car added successfully. Waiting for admin approval.')
+        else:
+            flash('Database connection issue')
+            
+    except Exception as e:
+        print(f"Add car error: {e}")
+        flash('Error adding car')
     
     return redirect(url_for('seller_dashboard'))
 
@@ -316,12 +290,13 @@ def approve_car(car_id):
     if session.get('role') != 'admin':
         return redirect(url_for('login'))
     
-    if db is not None:  # Fixed: compare with None
-        try:
+    try:
+        if db is not None:
             db.cars.update_one({"_id": ObjectId(car_id)}, {"$set": {"status": "approved"}})
-            flash('Car approved')
-        except Exception as e:
-            print(f"Approve car error: {e}")
+            flash('Car approved successfully')
+    except Exception as e:
+        print(f"Approve car error: {e}")
+        flash('Error approving car')
     
     return redirect(url_for('admin_dashboard'))
 
@@ -330,90 +305,38 @@ def book_appointment(car_id):
     if session.get('role') != 'buyer':
         return redirect(url_for('login'))
     
-    if db is None:  # Fixed: compare with None
-        flash('Database unavailable')
-        return redirect(url_for('index'))
-    
     try:
-        car = db.cars.find_one({"_id": ObjectId(car_id)})
-        if not car:
-            flash('Car not found')
-            return redirect(url_for('index'))
-        
-        if request.method == 'POST':
-            name = request.form.get('name', '').strip()
-            email = request.form.get('email', '').strip()
-            address = request.form.get('address', '').strip()
-            phone = request.form.get('phone', '').strip()
-            preferred_date = request.form.get('preferred_date', '')
-            preferred_time = request.form.get('preferred_time', '')
-            
-            if not all([name, email, address, phone]):
-                flash('Please fill all fields')
-                return render_template('appointment.html', car=car)
+        if db is not None:
+            car = db.cars.find_one({"_id": ObjectId(car_id)})
+            if not car:
+                flash('Car not found')
+                return redirect(url_for('index'))
             
-            appointment_data = {
-                "car_id": car_id, 
-                "car_name": car['name'], 
-                "buyer_id": session['user_id'],
-                "buyer_name": name, 
-                "buyer_email": email, 
-                "buyer_address": address,
-                "buyer_phone": phone, 
-                "preferred_date": preferred_date,
-                "preferred_time": preferred_time,
-                "status": "pending", 
-                "created_at": datetime.now()
-            }
+            if request.method == 'POST':
+                appointment_data = {
+                    "car_id": car_id,
+                    "car_name": car['name'],
+                    "buyer_id": session['user_id'],
+                    "buyer_name": request.form.get('name'),
+                    "buyer_email": request.form.get('email'),
+                    "buyer_phone": request.form.get('phone'),
+                    "buyer_address": request.form.get('address'),
+                    "status": "pending",
+                    "created_at": datetime.now()
+                }
+                db.appointments.insert_one(appointment_data)
+                flash('Appointment booked successfully!')
+                return redirect(url_for('index'))
             
-            db.appointments.insert_one(appointment_data)
-            flash('Appointment booked successfully!')
+            return render_template('appointment.html', car=car)
+        else:
+            flash('Database connection issue')
             return redirect(url_for('index'))
-        
-        return render_template('appointment.html', car=car)
-        
+            
     except Exception as e:
-        print(f"Appointment error: {e}")
-        flash('Error processing appointment')
+        print(f"Book appointment error: {e}")
+        flash('Error booking appointment')
         return redirect(url_for('index'))
 
-@app.route('/seller_appointments/<car_id>')
-def seller_appointments(car_id):
-    if session.get('role') != 'seller':
-        return redirect(url_for('login'))
-    
-    appointments = []
-    car = {}
-    
-    if db is not None:  # Fixed: compare with None
-        try:
-            appointments = list(db.appointments.find({"car_id": car_id}))
-            car = db.cars.find_one({"_id": ObjectId(car_id)}) or {}
-        except Exception as e:
-            print(f"Appointments error: {e}")
-    
-    return render_template('seller.html', appointments=appointments, car=car)
-
-@app.route('/approve_appointment/<appointment_id>', methods=['POST'])
-def approve_appointment(appointment_id):
-    if session.get('role') != 'seller':
-        return redirect(url_for('login'))
-    
-    if db is not None:  # Fixed: compare with None
-        try:
-            meeting_data = {
-                "status": "approved",
-                "meeting_date": request.form.get('meeting_date', ''),
-                "meeting_time": request.form.get('meeting_time', ''),
-                "meeting_place": request.form.get('meeting_place', '')
-            }
-            db.appointments.update_one({"_id": ObjectId(appointment_id)}, {"$set": meeting_data})
-            flash('Appointment approved')
-        except Exception as e:
-            print(f"Approve appointment error: {e}")
-            flash('Approval failed')
-    
-    return redirect(url_for('seller_dashboard'))
-
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860, debug=False)