Update app.py

app.py

@@ -13,6 +13,9 @@ 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')
@@ -32,7 +35,8 @@ ADMIN_PASSWORD = "arshbir"
 
 def initialize_database():
     """Initialize database and create collections"""
-    if not db:
+    if db is None:  # Fixed: compare with None instead of using 'not db'
+        print("❌ Database not available for initialization")
         return
     
     try:
@@ -44,16 +48,50 @@ def initialize_database():
         if not users.find_one({"email": ADMIN_EMAIL}):
             hashed = bcrypt.hashpw(ADMIN_PASSWORD.encode('utf-8'), bcrypt.gensalt())
             users.insert_one({
-                "name": "Admin", "email": ADMIN_EMAIL, "password": hashed,
-                "role": "admin", "approved": True, "created_at": datetime.now()
+                "name": "Admin User", 
+                "email": ADMIN_EMAIL, 
+                "password": hashed,
+                "role": "admin", 
+                "address": "Delhi, India",
+                "phone": "9876543210",
+                "approved": True, 
+                "created_at": datetime.now()
             })
             print("✅ Admin user created")
         
         # Add sample cars
         if cars.count_documents({}) == 0:
             sample_cars = [
-                {"name": "Maruti Swift", "year": 2022, "price": 650000, "status": "approved"},
-                {"name": "Hyundai Creta", "year": 2021, "price": 1250000, "status": "approved"}
+                {
+                    "name": "Maruti Suzuki Swift", 
+                    "year": 2022, 
+                    "price": 650000, 
+                    "description": "Excellent condition, low mileage, fuel efficient.",
+                    "seller_id": "admin",
+                    "seller_email": ADMIN_EMAIL,
+                    "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",
+                    "created_at": datetime.now()
+                }
             ]
             cars.insert_many(sample_cars)
             print("✅ Sample cars added")
@@ -78,7 +116,7 @@ app.jinja_env.filters['format_price'] = format_price
 @app.route('/')
 def index():
     cars = []
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             cars = list(db.cars.find({"status": "approved"}))
         except Exception as e:
@@ -106,7 +144,7 @@ def login():
             return redirect(url_for('admin_dashboard'))
         
         # Regular user login
-        if db:
+        if db is not None:  # Fixed: compare with None
             try:
                 user = db.users.find_one({"email": email})
                 if user and bcrypt.checkpw(password.encode('utf-8'), user['password']):
@@ -118,6 +156,8 @@ def login():
                     session['role'] = user['role']
                     session['email'] = email
                     
+                    flash(f'Welcome back, {user["name"]}!')
+                    
                     if user['role'] == 'buyer':
                         return redirect(url_for('index'))
                     else:
@@ -146,7 +186,7 @@ def register():
             flash('Please fill all fields')
             return render_template('register.html')
         
-        if not db:
+        if db is None:  # Fixed: compare with None
             flash('Database unavailable')
             return render_template('register.html')
         
@@ -157,8 +197,13 @@ def register():
             
             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',
+                "name": name, 
+                "email": email, 
+                "password": hashed, 
+                "role": role,
+                "phone": phone, 
+                "address": address, 
+                "approved": role == 'buyer',
                 "created_at": datetime.now()
             }
             
@@ -187,7 +232,7 @@ def admin_dashboard():
     pending_sellers = []
     pending_cars = []
     
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             pending_sellers = list(db.users.find({"role": "seller", "approved": False}))
             pending_cars = list(db.cars.find({"status": "pending"}))
@@ -203,7 +248,7 @@ def approve_seller(user_id):
     if session.get('role') != 'admin':
         return redirect(url_for('login'))
     
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             db.users.update_one({"_id": ObjectId(user_id)}, {"$set": {"approved": True}})
             flash('Seller approved')
@@ -219,7 +264,7 @@ def seller_dashboard():
         return redirect(url_for('login'))
     
     cars = []
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             user = db.users.find_one({"_id": ObjectId(session['user_id'])})
             if not user.get('approved', False):
@@ -246,12 +291,16 @@ def add_car():
         flash('Car name required')
         return redirect(url_for('seller_dashboard'))
     
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             car_data = {
-                "name": name, "year": int(year), "price": int(price),
-                "description": description, "seller_id": session['user_id'],
-                "seller_email": session['email'], "status": "pending",
+                "name": name, 
+                "year": int(year), 
+                "price": int(price),
+                "description": description, 
+                "seller_id": session['user_id'],
+                "seller_email": session.get('email', ''), 
+                "status": "pending",
                 "created_at": datetime.now()
             }
             db.cars.insert_one(car_data)
@@ -267,7 +316,7 @@ def approve_car(car_id):
     if session.get('role') != 'admin':
         return redirect(url_for('login'))
     
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             db.cars.update_one({"_id": ObjectId(car_id)}, {"$set": {"status": "approved"}})
             flash('Car approved')
@@ -281,7 +330,7 @@ def book_appointment(car_id):
     if session.get('role') != 'buyer':
         return redirect(url_for('login'))
     
-    if not db:
+    if db is None:  # Fixed: compare with None
         flash('Database unavailable')
         return redirect(url_for('index'))
     
@@ -296,15 +345,25 @@ def book_appointment(car_id):
             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)
             
             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, "status": "pending", "created_at": datetime.now()
+                "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()
             }
             
             db.appointments.insert_one(appointment_data)
@@ -326,7 +385,7 @@ def seller_appointments(car_id):
     appointments = []
     car = {}
     
-    if db:
+    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 {}
@@ -340,7 +399,7 @@ def approve_appointment(appointment_id):
     if session.get('role') != 'seller':
         return redirect(url_for('login'))
     
-    if db:
+    if db is not None:  # Fixed: compare with None
         try:
             meeting_data = {
                 "status": "approved",