Update app.py

app.py

@@ -14,57 +14,31 @@ from urllib.parse import urlencode
 logging.basicConfig(filename='appointment_bot.log', level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
 
-# === Email Configuration ===
-SMTP_SERVER = "mail.mubashirdev.com"
-SMTP_PORT = 465
-SMTP_USERNAME = os.getenv("SMTP_USERNAME")
-SMTP_PASSWORD = os.getenv("SMTP_PASSWORD")
-if not SMTP_USERNAME or not SMTP_PASSWORD:
-    raise Exception("SMTP_USERNAME and SMTP_PASSWORD environment variables are not set.")
-
-FROM_EMAIL = SMTP_USERNAME
-FROM_NAME = "Mubashir Hussain"
-
-# === Excel File ===
+# === Constants ===
 EXCEL_FILE = "appointments.xlsx"
-
-# === Time Slots ===
 TIME_SLOTS = [f"{hour:02d}:00" for hour in range(9, 18)]  # 9 AM to 5 PM
-
-# === Date Options (Next 15 Days for Speed) ===
 DATE_OPTIONS = [
     (datetime.now() + timedelta(days=i)).strftime("%Y-%m-%d (%A)")
     for i in range(0, 15)
 ]
-
-# === Common Timezones (minimized for speed) ===
 COMMON_TIMEZONES = [
     "UTC", "Asia/Karachi", "US/Pacific", "US/Eastern",
     "Europe/London", "Asia/Tokyo", "America/New_York", "Asia/Dubai"
 ]
 
-# === Google Calendar Link Generator ===
-def generate_google_calendar_link(name, email, date_str, time_str, timezone):
-    try:
-        date_clean = date_str.split(" ")[0]  # Extract YYYY-MM-DD
-        tz = pytz.timezone(timezone)
-        start_time = datetime.strptime(f"{date_clean} {time_str}", "%Y-%m-%d %H:%M").replace(tzinfo=tz)
-        end_time = start_time + timedelta(hours=1)
-        start_time_utc = start_time.astimezone(pytz.UTC).strftime("%Y%m%dT%H%M%SZ")
-        end_time_utc = end_time.astimezone(pytz.UTC).strftime("%Y%m%dT%H%M%SZ")
-        event = {
-            "action": "TEMPLATE",
-            "text": f"Appointment with {FROM_NAME}",
-            "details": f"Appointment for {name} ({email}). Contact: https://mubashirdev.com",
-            "dates": f"{start_time_utc}/{end_time_utc}",
-            "ctz": timezone
-        }
-        return f"https://www.google.com/calendar/render?{urlencode(event)}"
-    except Exception as e:
-        logging.error(f"Google Calendar link error: {e}")
-        raise Exception("Failed to generate calendar link.")
+# === Email Configuration ===
+SMTP_SERVER = "mail.mubashirdev.com"
+SMTP_PORT = 465
+SMTP_USERNAME = os.getenv("SMTP_USERNAME")
+SMTP_PASSWORD = os.getenv("SMTP_PASSWORD")
+FROM_NAME = "Mubashir Hussain"
+
+# Validate environment variables
+if not SMTP_USERNAME or not SMTP_PASSWORD:
+    raise Exception("SMTP_USERNAME and SMTP_PASSWORD environment variables are not set.")
+FROM_EMAIL = SMTP_USERNAME
 
-# === Email Utility ===
+# === Utility Functions ===
 def send_email(to_email, subject, body):
     try:
         msg = MIMEMultipart()
@@ -73,58 +47,88 @@ def send_email(to_email, subject, body):
         msg["Subject"] = subject
         msg.attach(MIMEText(body, "plain"))
         context = ssl.create_default_context()
-        with smtplib.SMTP_SSL(SMTP_SERVER, SMTP_PORT, context=context, timeout=5) as server:
-            server.login(SMTP_USERNAME, SMTP_PASSWORD)
-            server.send_message(msg)
+        
+        # Try custom SMTP server first
+        try:
+            with smtplib.SMTP_SSL(SMTP_SERVER, SMTP_PORT, context=context, timeout=5) as server:
+                server.login(SMTP_USERNAME, SMTP_PASSWORD)
+                server.send_message(msg)
+        except Exception as e:
+            logging.warning(f"Custom SMTP failed: {e}. Falling back to Gmail.")
+            # Fallback to Gmail
+            with smtplib.SMTP("smtp.gmail.com", 587) as server:
+                server.starttls(context=context)
+                server.login(SMTP_USERNAME, SMTP_PASSWORD)
+                server.send_message(msg)
+        
         logging.info(f"Email sent to {to_email}")
         return True
     except Exception as e:
         logging.error(f"Email error: {e}")
         raise Exception(f"Failed to send email: {str(e)}")
 
-# === Save to Excel ===
-def save_to_excel(name, email, date_str, time_str, timezone, message):
+def save_to_excel(data):
     try:
-        date_clean = date_str.split(" ")[0]  # Extract YYYY-MM-DD
-        appointment_data = {
-            "Name": name,
-            "Email": email,
-            "Date": date_clean,
-            "Time": time_str,
-            "Timezone": timezone,
-            "Message": message or "No message",
-            "Timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        }
-        df = pd.DataFrame([appointment_data])
+        df = pd.DataFrame([data])
         mode = 'a' if os.path.exists(EXCEL_FILE) else 'w'
         with pd.ExcelWriter(EXCEL_FILE, engine='openpyxl', mode=mode, if_sheet_exists='overlay' if mode == 'a' else None) as writer:
             df.to_excel(writer, index=False, sheet_name='Sheet1', header=not os.path.exists(EXCEL_FILE))
-        logging.info(f"Appointment saved: {name}, {email}")
+        logging.info(f"Appointment saved: {data['Name']}, {data['Email']}")
         return True
     except Exception as e:
         logging.error(f"Excel save error: {e}")
         raise Exception(f"Failed to save appointment: {str(e)}")
 
-# === Appointment Handler ===
+def create_calendar_link(name, email, date, time, timezone):
+    try:
+        tz = pytz.timezone(timezone)
+        start_time = datetime.strptime(f"{date} {time}", "%Y-%m-%d %H:%M").replace(tzinfo=tz)
+        end_time = start_time + timedelta(hours=1)
+        start_time_utc = start_time.astimezone(pytz.UTC).strftime("%Y%m%dT%H%M%SZ")
+        end_time_utc = end_time.astimezone(pytz.UTC).strftime("%Y%m%dT%H%M%SZ")
+        event = {
+            "action": "TEMPLATE",
+            "text": f"Appointment with {FROM_NAME}",
+            "details": f"Appointment for {name} ({email}). Contact: https://mubashirdev.com",
+            "dates": f"{start_time_utc}/{end_time_utc}",
+            "ctz": timezone
+        }
+        return f"https://www.google.com/calendar/render?{urlencode(event)}"
+    except Exception as e:
+        logging.error(f"Calendar link error: {e}")
+        raise Exception("Failed to generate calendar link.")
+
+# === Core Logic ===
 def book_appointment(name, email, date, time, timezone, message):
     try:
+        # Input validation
         if not all([name, email, date, time, timezone]):
             raise Exception("Please fill out all required fields.")
 
         date_clean = date.split(" ")[0]  # Extract YYYY-MM-DD
-        datetime.strptime(date_clean, "%Y-%m-%d")
         tz = pytz.timezone(timezone)
         appointment_time = datetime.strptime(f"{date_clean} {time}", "%Y-%m-%d %H:%M").replace(tzinfo=tz)
         if appointment_time < datetime.now(tz):
             raise Exception("Appointments must be in the future.")
 
-        if not save_to_excel(name, email, date_clean, time, timezone, message):
-            raise Exception("Failed to save appointment.")
+        # Prepare data
+        data = {
+            "Name": name,
+            "Email": email,
+            "Date": date_clean,
+            "Time": time,
+            "Timezone": timezone,
+            "Message": message or "No message",
+            "Timestamp": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        }
+
+        # Save to Excel
+        save_to_excel(data)
 
-        calendar_link = generate_google_calendar_link(name, email, date_clean, time, timezone)
-        if not calendar_link:
-            raise Exception("Failed to generate calendar link.")
+        # Generate calendar link
+        calendar_link = create_calendar_link(name, email, date_clean, time, timezone)
 
+        # Send emails
         admin_msg = f"New Appointment:\nName: {name}\nEmail: {email}\nDate: {date_clean}\nTime: {time}\nTimezone: {timezone}\nMessage: {message or 'No message'}"
         send_email("admin@mubashirdev.com", "📅 New Appointment", admin_msg)
 
@@ -139,18 +143,18 @@ def book_appointment(name, email, date, time, timezone, message):
                 "datasets": [{
                     "label": "Appointment",
                     "data": [1],
-                    "backgroundColor": "#003087",
-                    "borderColor": "#001F5C",
+                    "backgroundColor": "#4E342E",
+                    "borderColor": "#3E2723",
                     "borderWidth": 2
                 }]
             },
             "options": {
                 "scales": {
-                    "y": {"beginAtZero": True, "ticks": {"stepSize": 1, "color": "#333"}, "title": {"display": True, "text": "Confirmed", "color": "#333"}},
-                    "x": {"title": {"display": True, "text": "Date & Time", "color": "#333"}, "ticks": {"color": "#333"}}
+                    "y": {"beginAtZero": True, "ticks": {"stepSize": 1, "color": "#FFFFFF"}, "title": {"display": True, "text": "Confirmed", "color": "#FFFFFF"}},
+                    "x": {"title": {"display": True, "text": "Date & Time", "color": "#FFFFFF"}, "ticks": {"color": "#FFFFFF"}}
                 },
                 "plugins": {
-                    "title": {"display": True, "text": f"Appointment for {name}", "color": "#003087", "font": {"size": 18}}
+                    "title": {"display": True, "text": f"Appointment for {name}", "color": "#FFFFFF", "font": {"size": 18}}
                 }
             }
         }
@@ -164,14 +168,14 @@ def book_appointment(name, email, date, time, timezone, message):
         logging.error(f"Booking error: {str(e)}")
         return str(e), []
 
-# === JavaScript for Date Dropdown Enhancement ===
+# === UI Enhancements ===
 JS_ENHANCEMENT = """
 <script>
 document.addEventListener('DOMContentLoaded', function() {
     const dateDropdown = document.querySelector('select[id*="date"]');
     if (dateDropdown) {
-        dateDropdown.style.background = '#E6F0FA';
-        dateDropdown.style.border = '2px solid #003087';
+        dateDropdown.style.background = '#FFFFFF';
+        dateDropdown.style.border = '2px solid #8D6E63';
         dateDropdown.style.borderRadius = '8px';
         dateDropdown.style.padding = '12px';
         dateDropdown.style.fontSize = '16px';
@@ -179,7 +183,7 @@ document.addEventListener('DOMContentLoaded', function() {
         Array.from(dateDropdown.options).forEach(option => {
             if (option.value.includes(today)) {
                 option.style.fontWeight = 'bold';
-                option.style.color = '#003087';
+                option.style.color = '#4E342E';
             }
         });
     }
@@ -192,33 +196,34 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
     .gradio-container {
         max-width: 700px;
         margin: 20px auto;
-        background: brown;
+        background: #5D4037;  /* Brown background */
         padding: 24px;
         border-radius: 16px;
-        box-shadow: 0 4px 16px rgba(0,0,0,0.1);
+        box-shadow: 0 4px 16px rgba(0,0,0,0.3);
     }
     .welcome {
         text-align: center;
         font-size: 28px;
-        color: #003087;
+        color: #FFFFFF;  /* White text */
         margin: 0 0 20px;
         font-weight: 700;
     }
     .gr-textbox, .gr-dropdown {
         border-radius: 8px;
-        border: 2px solid #003087;
+        border: 2px solid #8D6E63;  /* Light brown border */
         padding: 12px;
         font-size: 16px;
-        background: white;
+        background: #FFFFFF;  /* White background */
+        color: #4E342E;  /* Dark brown text */
         transition: border-color 0.2s;
     }
     .gr-textbox:focus, .gr-dropdown:focus {
-        border-color: #001F5C;
+        border-color: #4E342E;  /* Darker brown on focus */
         outline: none;
     }
     .gr-button {
-        background: #003087;
-        color: white;
+        background: #4E342E;  /* Dark brown button */
+        color: #FFFFFF;  /* White text */
         font-size: 16px;
         font-weight: 600;
         padding: 12px 32px;
@@ -229,26 +234,26 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
         transition: background 0.2s;
     }
     .gr-button:hover {
-        background: #001F5C;
+        background: #6D4C41;  /* Lighter brown on hover */
     }
     .gr-textbox[label="Result"] {
-        background: #E8F5E9;
-        border-color: #2E7D32;
-        color: #1B5E20;
+        background: #EFEBE9;  /* Soft beige for success */
+        border-color: #8D6E63;  /* Light brown border */
+        color: #4E342E;  /* Dark brown text */
         font-weight: 500;
         padding: 16px;
         border-radius: 8px;
     }
     .gr-column {
-        background: white;
+        background: #FFFFFF;  /* White background for form container */
         padding: 20px;
         border-radius: 12px;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+        box-shadow: 0 2px 8px rgba(0,0,0,0.1);
     }
     .footer {
         text-align: center;
         font-size: 14px;
-        color: #003087;
+        color: #FFFFFF;  /* White text */
         margin-top: 20px;
     }
     .logo {
@@ -258,7 +263,18 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
     }
     .required::after {
         content: " *";
-        color: #D32F2F;
+        color: #D32F2F;  /* Red for required fields */
+    }
+    p {
+        text-align: center;
+        color: #FFFFFF !important;  /* White text for instructions */
+    }
+    a {
+        color: #EFEBE9 !important;  /* Soft beige for links */
+        text-decoration: none;
+    }
+    a:hover {
+        text-decoration: underline;
     }
     @media (max-width: 600px) {
         .gradio-container {
@@ -277,7 +293,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
         f"""
         <img src="https://ik.imagekit.io/kqeykkpy5/WhatsApp_Image_2024-12-20_at_02.57.39-removebg-preview.png?updatedAt=1747857266922" class="logo" alt="Mubashir Hussain Logo">
         <div class="welcome">Schedule Your Appointment</div>
-        <p style="text-align: center; color: #333;">Select a date and time below to book with Mubashir Hussain. You'll receive a confirmation email with a Google Calendar link.</p>
+        <p>Select a date and time below to book with Mubashir Hussain. You'll receive a confirmation email with a Google Calendar link.</p>
         {JS_ENHANCEMENT}
         """
     )
@@ -294,7 +310,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
     
     gr.Markdown(
         """
-        <div class="footer">Powered by <a href="https://mubashirdev.com" style="color: #003087; text-decoration: none;">mubashirdev.com</a></div>
+        <div class="footer">Powered by <a href="https://mubashirdev.com">mubashirdev.com</a></div>
         """
     )