Upload 3 files

app.py

@@ -190,6 +190,19 @@ st.markdown("""
         margin: 0.5rem 0;
         border-radius: 5px;
     }
+
+    .signup-form {
+        background: #f8f9fa;
+        padding: 2rem;
+        border-radius: 10px;
+        border: 2px solid #4a7c59;
+        margin: 1rem 0;
+    }
+
+    .auth-container {
+        max-width: 600px;
+        margin: 0 auto;
+    }
 </style>
 """, unsafe_allow_html=True)
 
@@ -218,6 +231,34 @@ def load_auth_config():
         st.error(f"Error loading authentication config: {e}")
         return None
 
+def save_auth_config(config):
+    """Save authentication configuration to Google Drive and local file"""
+    try:
+        config_manager = st.session_state.config_manager
+        
+        # Convert config to YAML string
+        import yaml
+        yaml_content = yaml.dump(config, default_flow_style=False, sort_keys=False)
+        
+        # Save to Google Drive if enabled
+        if config_manager.google_drive_enabled:
+            if config_manager.drive_manager.upload_file('config.yaml', yaml_content):
+                print("✅ Auth config saved to Google Drive")
+            else:
+                print("❌ Failed to save auth config to Google Drive")
+        
+        # Also save locally as backup
+        with open('config.yaml', 'w') as file:
+            yaml.dump(config, file, default_flow_style=False, sort_keys=False)
+        
+        # Update session state
+        st.session_state.auth_config = config
+        return True
+        
+    except Exception as e:
+        st.error(f"Error saving authentication config: {e}")
+        return False
+
 def get_user_folder_from_username(username):
     """Get the user folder based on username using wedding mappings"""
     try:
@@ -272,41 +313,63 @@ def get_wedding_info_for_user(username):
         st.error(f"Error getting wedding info for {username}: {e}")
         return None
 
-def main():
-    # Initialize session state
-    if 'config_manager' not in st.session_state:
-        st.session_state.config_manager = ConfigManager()
-    
-    # Load authentication configuration
-    if 'auth_config' not in st.session_state:
-        st.session_state.auth_config = load_auth_config()
-    
-    if st.session_state.auth_config is None:
-        st.error("Failed to load authentication configuration. Please check your Google Drive setup.")
-        st.stop()
-    
-    # Create authenticator (auto_hash=True by default, so passwords will be hashed automatically)
-    authenticator = stauth.Authenticate(
-        st.session_state.auth_config['credentials'],
-        st.session_state.auth_config['cookie']['name'],
-        st.session_state.auth_config['cookie']['key'],
-        st.session_state.auth_config['cookie']['expiry_days']
-    )
-    
-    # Check authentication status
-    if 'authentication_status' not in st.session_state:
-        st.session_state.authentication_status = None
-    
-    # Check if user is already authenticated
-    if st.session_state.get('authentication_status'):
-        # User is authenticated, show main app
-        show_main_app(authenticator)
-    else:
-        # Show login page and handle authentication
-        show_login_page(authenticator)
+def create_new_wedding_folder(folder_name):
+    """Create a new wedding folder in Google Drive with initial data files"""
+    try:
+        config_manager = st.session_state.config_manager
+        
+        if not config_manager.google_drive_enabled:
+            return False
+        
+        # Create empty data files for the new wedding
+        initial_files = {
+            'wedding_config.json': {
+                'wedding_info': {
+                    'partner1_name': '',
+                    'partner2_name': '',
+                    'wedding_start_date': '',
+                    'wedding_end_date': '',
+                    'venue_city': ''
+                },
+                'custom_settings': {
+                    'custom_tags': [
+                        "Wedding Party", "Urgent", "Rehearsal", "Timeline",
+                        "Maid of Honor", "Best Man", "Bridesmaid", "Groomsman",
+                        "Flower Girl", "Ring Bearer", "Usher", "Reader",
+                        "Venue", "Catering", "Photography", "Videography", "Music/DJ", 
+                        "Flowers", "Decor", "Attire", "Hair & Makeup", "Transportation",
+                        "Invitations", "Cake", "Officiant", "Other",
+                        "Decorations", "Centerpieces", "Favors", "Signage", "Linens", 
+                        "Tableware", "Lighting", "Accessories", "Stationery", "Gifts",
+                        "Vendor", "Item", "Deposit Required", "Final Payment", "Installment",
+                        "Food & Beverage", "Music", "Entertainment", "Lodging"
+                    ],
+                    'task_assignees': []
+                },
+                'wedding_events': []
+            },
+            'guest_list_data.json': [],
+            'rsvp_data.json': {},
+            'tasks.json': [],
+            'vendors.json': [],
+            'wedding_party.json': []
+        }
+        
+        # Upload each file to the new folder
+        for filename, content in initial_files.items():
+            full_path = f"{folder_name}/{filename}"
+            if not config_manager.drive_manager.upload_file(full_path, content):
+                st.error(f"Failed to create {filename} in {folder_name}")
+                return False
+        
+        return True
+        
+    except Exception as e:
+        st.error(f"Error creating wedding folder: {e}")
+        return False
 
-def show_login_page(authenticator):
-    """Show the login page"""
+def show_signup_page(authenticator):
+    """Show the signup page with user registration"""
     
     # Hero Section
     st.markdown("""
@@ -319,42 +382,103 @@ def show_login_page(authenticator):
         margin-bottom: 3rem;
         box-shadow: 0 10px 30px rgba(0,0,0,0.2);
     ">
-        <h1 style="font-size: 3.5rem; margin-bottom: 1rem; font-weight: 700;">💒 Wedding Planner</h1>
+        <h1 style="font-size: 3.5rem; margin-bottom: 1rem; font-weight: 700;">💒 Create Your Wedding Account</h1>
         <h2 style="font-size: 1.8rem; margin-bottom: 2rem; font-weight: 300; opacity: 0.9;">
-            Your Complete Wedding Planning Solution
+            Join thousands of couples planning their perfect day
         </h2>
         <p style="font-size: 1.2rem; max-width: 600px; margin: 0 auto; line-height: 1.6;">
-            Organize your special day with our comprehensive wedding planning tool. 
-            Manage guests, track tasks, coordinate vendors, and create unforgettable memories.
+            Create your personalized wedding planning workspace with guest management, 
+            task tracking, vendor coordination, and so much more.
         </p>
     </div>
     """, unsafe_allow_html=True)
     
-    # Add signup/login toggle
-    col1, col2 = st.columns([1, 1])
-    with col1:
-        if st.button("🔐 Login", type="primary", use_container_width=True):
-            st.session_state.show_signup = False
-            st.rerun()
-    with col2:
-        if st.button("📝 Sign Up", use_container_width=True):
-            st.session_state.show_signup = True
-            st.rerun()
+    # Registration Section
+    st.markdown('<div class="auth-container">', unsafe_allow_html=True)
     
-    # Show appropriate form based on state
-    if st.session_state.get('show_signup', False):
-        show_signup_page(authenticator)
-    else:
-        show_login_form(authenticator)
+    # Create tabs for signup and login
+    tab1, tab2 = st.tabs(["Create Account", "Login"])
     
-    # Show features section only if not showing signup
-    if not st.session_state.get('show_signup', False):
-        show_features_section()
-
-def show_login_form(authenticator):
-    """Show the login form"""
-    # Features Section
-    st.markdown("## ✨ What You Can Do")
+    with tab1:
+        st.markdown("## ✨ Create Your Wedding Planning Account")
+        
+        # User Registration Form
+        try:
+            email, username, name = authenticator.register_user(
+                location='main',
+                pre_authorized=None,  # Allow any user to register
+                captcha=False,  # Disable captcha for simplicity
+                clear_on_submit=False,
+                key='register_user'
+            )
+            
+            if email:
+                st.success(f"✅ Account created successfully for {name}!")
+                st.success("🎉 Now let's set up your wedding details...")
+                
+                # Update auth config and create wedding folder
+                auth_config = st.session_state.auth_config
+                
+                if auth_config:
+                    # Create wedding folder name (using username)
+                    wedding_folder = username.lower().replace(' ', '_')
+                    
+                    # Add new wedding mapping
+                    if 'wedding_mappings' not in auth_config:
+                        auth_config['wedding_mappings'] = {}
+                    
+                    auth_config['wedding_mappings'][wedding_folder] = {
+                        'wedding_name': f"{name}'s Wedding",
+                        'folder': wedding_folder,
+                        'users': [username]
+                    }
+                    
+                    # Save updated auth config
+                    if save_auth_config(auth_config):
+                        # Create wedding folder with initial files
+                        if create_new_wedding_folder(wedding_folder):
+                            st.success("📁 Wedding workspace created in Google Drive!")
+                            
+                            # Show wedding setup form
+                            st.session_state['show_wedding_setup'] = True
+                            st.session_state['new_user_folder'] = wedding_folder
+                            st.rerun()
+                        else:
+                            st.warning("Account created but failed to create wedding workspace. You can set up your wedding details after login.")
+                    else:
+                        st.warning("Account created but failed to save wedding mapping. Please contact support.")
+                        
+        except Exception as e:
+            if "Username already taken" in str(e):
+                st.error("❌ Username already exists. Please choose a different username.")
+            elif "Email already taken" in str(e):
+                st.error("❌ Email already registered. Please use a different email or login instead.")
+            else:
+                st.error(f"Registration error: {e}")
+    
+    with tab2:
+        st.markdown("## 🔐 Login to Your Account")
+        
+        # Login form
+        try:
+            authenticator.login(location='main')
+        except Exception as e:
+            st.error(f"Login error: {e}")
+        
+        # Check authentication status and show appropriate message
+        if st.session_state.get('authentication_status') is False:
+            st.error("❌ Invalid username or password")
+        elif st.session_state.get('authentication_status') is None:
+            st.info("📝 Please enter your username and password")
+        elif st.session_state.get('authentication_status'):
+            st.success(f"✅ Welcome back, {st.session_state.get('name', 'User')}!")
+            st.rerun()  # Refresh to show main app
+    
+    st.markdown('</div>', unsafe_allow_html=True)
+    
+    # Features showcase (same as before)
+    st.markdown("---")
+    st.markdown("## ✨ What You Get With Your Wedding Account")
     
     col1, col2, col3 = st.columns(3)
     
@@ -417,194 +541,22 @@ def show_login_form(authenticator):
             </ul>
         </div>
         """, unsafe_allow_html=True)
-    
-    # Additional Features
-    col4, col5, col6 = st.columns(3)
-    
-    with col4:
-        st.markdown("""
-        <div style="
-            background: #f8f9fa;
-            padding: 2rem;
-            border-radius: 10px;
-            border-left: 4px solid #4a7c59;
-            margin-bottom: 2rem;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-        ">
-            <h3 style="color: #2d5016; margin-bottom: 1rem;">👰 Wedding Party</h3>
-            <ul style="color: #666; line-height: 1.8;">
-                <li>Manage bridal party</li>
-                <li>Track responsibilities</li>
-                <li>Coordinate schedules</li>
-                <li>Store contact info</li>
-            </ul>
-        </div>
-        """, unsafe_allow_html=True)
-    
-    with col5:
-        st.markdown("""
-        <div style="
-            background: #f8f9fa;
-            padding: 2rem;
-            border-radius: 10px;
-            border-left: 4px solid #4a7c59;
-            margin-bottom: 2rem;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-        ">
-            <h3 style="color: #2d5016; margin-bottom: 1rem;">📊 Dashboard</h3>
-            <ul style="color: #666; line-height: 1.8;">
-                <li>Visual progress tracking</li>
-                <li>Key metrics overview</li>
-                <li>Timeline management</li>
-                <li>Quick insights</li>
-            </ul>
-        </div>
-        """, unsafe_allow_html=True)
-    
-    with col6:
-        st.markdown("""
-        <div style="
-            background: #f8f9fa;
-            padding: 2rem;
-            border-radius: 10px;
-            border-left: 4px solid #4a7c59;
-            margin-bottom: 2rem;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-        ">
-            <h3 style="color: #2d5016; margin-bottom: 1rem;">☁️ Cloud Sync</h3>
-            <ul style="color: #666; line-height: 1.8;">
-                <li>Google Drive integration</li>
-                <li>Automatic backups</li>
-                <li>Multi-device access</li>
-                <li>Real-time updates</li>
-            </ul>
-        </div>
-        """, unsafe_allow_html=True)
-    
-    st.markdown("---")
-    
-    # Login Section
-    st.markdown("## 🔐 Login to Your Wedding Planner")
-    
-    # Login form
-    try:
-        authenticator.login(location='main')
-    except Exception as e:
-        st.error(f"Login error: {e}")
-    
-    # Check authentication status and show appropriate message
-    if st.session_state.get('authentication_status') is False:
-        st.error("❌ Invalid username or password")
-    elif st.session_state.get('authentication_status') is None:
-        st.info("🔐 Please enter your username and password")
-    elif st.session_state.get('authentication_status'):
-        st.success(f"✅ Welcome, {st.session_state.get('name', 'User')}!")
-        st.rerun()  # Refresh to show main app
-
-def show_features_section():
-    """Show the features section"""
-    # This function is called from show_login_form, so we don't duplicate the features here
-    pass
 
-def show_signup_page(authenticator):
-    """Show the signup page with wedding setup"""
-    st.markdown("## 📝 Create Your Wedding Account")
-    
-    # Initialize session state for signup if not exists
-    if 'signup_step' not in st.session_state:
-        st.session_state.signup_step = 1  # 1: Account info, 2: Wedding setup
-    
-    if st.session_state.signup_step == 1:
-        show_account_signup_form(authenticator)
-    else:
-        show_wedding_setup_for_signup()
-
-def show_account_signup_form(authenticator):
-    """Show the account signup form"""
-    st.markdown("### Step 1: Create Your Account")
+def show_wedding_setup_form():
+    """Show the wedding setup form for creating a new wedding"""
+    st.markdown("### 📝 Set Up Your Wedding Details")
     
-    with st.form("account_signup"):
-        st.markdown("#### Personal Information")
-        
-        col1, col2 = st.columns(2)
-        with col1:
-            first_name = st.text_input("First Name", placeholder="Enter your first name")
-            last_name = st.text_input("Last Name", placeholder="Enter your last name")
-        
-        with col2:
-            email = st.text_input("Email Address", placeholder="Enter your email address")
-            username = st.text_input("Username", placeholder="Choose a username")
-        
-        st.markdown("#### Security")
-        col1, col2 = st.columns(2)
-        with col1:
-            password = st.text_input("Password", type="password", placeholder="Choose a secure password")
-        with col2:
-            confirm_password = st.text_input("Confirm Password", type="password", placeholder="Confirm your password")
-        
-        # Terms and conditions
-        terms_accepted = st.checkbox("I agree to the terms and conditions", value=False)
-        
-        form_submitted = st.form_submit_button("Create Account", type="primary")
-        
-        if form_submitted:
-            # Validate form
-            errors = []
-            
-            if not first_name or not last_name:
-                errors.append("Please enter your first and last name")
-            
-            if not email or "@" not in email:
-                errors.append("Please enter a valid email address")
-            
-            if not username or len(username) < 3:
-                errors.append("Username must be at least 3 characters long")
-            
-            if not password or len(password) < 6:
-                errors.append("Password must be at least 6 characters long")
-            
-            if password != confirm_password:
-                errors.append("Passwords do not match")
-            
-            if not terms_accepted:
-                errors.append("Please accept the terms and conditions")
-            
-            # Check if username already exists
-            if username in st.session_state.auth_config.get('credentials', {}).get('usernames', {}):
-                errors.append("Username already exists. Please choose a different username.")
-            
-            # Check if email already exists
-            existing_emails = [user.get('email', '') for user in st.session_state.auth_config.get('credentials', {}).get('usernames', {}).values()]
-            if email in existing_emails:
-                errors.append("Email address already registered. Please use a different email.")
-            
-            if errors:
-                for error in errors:
-                    st.error(error)
-            else:
-                # Store account info in session state
-                st.session_state.signup_account_info = {
-                    'first_name': first_name,
-                    'last_name': last_name,
-                    'email': email,
-                    'username': username,
-                    'password': password
-                }
-                
-                # Move to wedding setup step
-                st.session_state.signup_step = 2
-                st.success("Account information saved! Now let's set up your wedding.")
-                st.rerun()
-
-def show_wedding_setup_for_signup():
-    """Show wedding setup form for new signups"""
-    st.markdown("### Step 2: Set Up Your Wedding")
+    # Get the new user folder from session state
+    new_user_folder = st.session_state.get('new_user_folder')
+    if not new_user_folder:
+        st.error("No wedding folder found. Please try registering again.")
+        return
     
     # Initialize session state for events and form data if not exists
-    if 'signup_events' not in st.session_state:
-        st.session_state.signup_events = []
-    if 'signup_form_data' not in st.session_state:
-        st.session_state.signup_form_data = {
+    if 'setup_events' not in st.session_state:
+        st.session_state.setup_events = []
+    if 'setup_form_data' not in st.session_state:
+        st.session_state.setup_form_data = {
             'partner1_name': '',
             'partner2_name': '',
             'venue_city': '',
@@ -615,93 +567,111 @@ def show_wedding_setup_for_signup():
         }
     
     # Basic wedding information form
-    with st.form("wedding_signup_setup"):
+    with st.form("wedding_setup"):
         st.markdown("#### Basic Wedding Information")
         
         col1, col2 = st.columns(2)
+        
         with col1:
-            partner1_name = st.text_input("Partner 1 Name", value=st.session_state.signup_form_data['partner1_name'], placeholder="Enter first partner's name")
-            partner2_name = st.text_input("Partner 2 Name", value=st.session_state.signup_form_data['partner2_name'], placeholder="Enter second partner's name")
-            venue_city = st.text_input("City", value=st.session_state.signup_form_data['venue_city'], placeholder="Enter city")
+            if st.button("📥 Sync from Google Drive", help="Download latest data from Google Drive"):
+                with st.spinner("Syncing from Google Drive..."):
+                    if config_manager.manual_sync_from_drive():
+                        st.success("Successfully synced from Google Drive!")
+                        st.rerun()
+                    else:
+                        st.error("Failed to sync from Google Drive")
         
         with col2:
-            st.markdown("**Wedding Date Range**")
-            wedding_start_date = st.date_input("Start Date", value=st.session_state.signup_form_data['wedding_start_date'])
-            wedding_end_date = st.date_input("End Date", value=st.session_state.signup_form_data['wedding_end_date'])
+            # Show different button text based on whether there are modified files
+            modified_files = config_manager.get_modified_files()
+            if modified_files:
+                button_text = f"📤 Sync {len(modified_files)} Modified Files to Drive"
+                button_help = f"Upload {len(modified_files)} modified files to Google Drive"
+            else:
+                button_text = "📤 Sync to Google Drive"
+                button_help = "Upload current data to Google Drive (no changes to sync)"
             
-            if wedding_end_date < wedding_start_date:
-                st.error("End date must be after start date")
-                wedding_end_date = wedding_start_date
-        
-        st.markdown("#### Task Organization")
-        st.info("Tasks will be automatically grouped by your wedding events.")
-        
-        st.markdown("#### Custom Tags")
-        st.markdown("Enter custom tags (one per line):")
-        custom_tags = st.text_area("Custom Tags", value=st.session_state.signup_form_data['custom_tags'], placeholder="e.g.,\nUrgent\nHigh Priority\nDeposit Required\nResearch Needed")
-        
-        st.markdown("#### Task Assignees")
-        st.markdown("Enter people who will regularly be assigned tasks (one per line):")
-        task_assignees = st.text_area("Task Assignees", value=st.session_state.signup_form_data['task_assignees'], placeholder="e.g.,\nMom\nDad\nWedding Planner\nBest Friend\nCoordinator")
-        
-        form_submitted = st.form_submit_button("Update Wedding Information")
-        
-        if form_submitted:
-            # Update session state with form data
-            st.session_state.signup_form_data = {
-                'partner1_name': partner1_name,
-                'partner2_name': partner2_name,
-                'venue_city': venue_city,
-                'wedding_start_date': wedding_start_date,
-                'wedding_end_date': wedding_end_date,
-                'custom_tags': custom_tags,
-                'task_assignees': task_assignees
-            }
-            st.success("Wedding information updated!")
-            st.rerun()
+            if st.button(button_text, help=button_help, disabled=not modified_files):
+                with st.spinner("Syncing to Google Drive..."):
+                    if config_manager.manual_sync_to_drive():
+                        st.success("Successfully synced to Google Drive!")
+                        st.rerun()
+                    else:
+                        st.error("Failed to sync to Google Drive")
     
-    # Event management section (outside form)
-    st.markdown("#### Wedding Events")
-    st.markdown("Define all your wedding events with their details:")
+    # Configuration info
+    st.markdown("#### Configuration")
+    st.markdown("To enable Google Drive integration, set the following environment variables:")
+    st.code("""
+GOOGLE_DRIVE_FOLDER_ID=your_folder_id
+GOOGLE_PROJECT_ID=your_project_id
+GOOGLE_PRIVATE_KEY_ID=your_private_key_id
+GOOGLE_PRIVATE_KEY=your_private_key
+GOOGLE_CLIENT_EMAIL=your_client_email
+GOOGLE_CLIENT_ID=your_client_id
+    """)
     
-    # Add/Remove event buttons
-    col1, col2 = st.columns(2)
-    with col1:
-        if st.button("➕ Add Event"):
-            # Set default date to wedding start date
-            wedding_start = st.session_state.signup_form_data['wedding_start_date']
-            st.session_state.signup_events.append({
-                "name": "New Event",
-                "description": "",
-                "date_offset": 0,
-                "requires_meal_choice": False,
-                "meal_options": [],
-                "location": "",
-                "address": ""
-            })
-            st.rerun()
+    st.markdown("**Note:** Google Drive integration is automatically enabled when running on Hugging Face Spaces with proper credentials configured.")
+
+def show_event_management_section(config):
+    st.markdown("#### Manage Wedding Events")
     
-    with col2:
-        if len(st.session_state.signup_events) > 0 and st.button("➖ Remove Last Event"):
-            st.session_state.signup_events.pop()
-            st.rerun()
+    # Initialize session state for event editing if not exists
+    if 'edit_events' not in st.session_state:
+        st.session_state.edit_events = config.get('wedding_events', []).copy()
     
-    # Display events
-    if st.session_state.signup_events:
-        for i, event in enumerate(st.session_state.signup_events):
+    wedding_events = st.session_state.edit_events
+    wedding_info = config.get('wedding_info', {})
+    
+    # Get wedding dates for date calculations
+    wedding_start_str = wedding_info.get('wedding_start_date', '')
+    wedding_end_str = wedding_info.get('wedding_end_date', '')
+    
+    if not wedding_start_str or not wedding_end_str:
+        st.warning("Please set your wedding date range in the 'Edit Configuration' tab first.")
+        return
+    
+    try:
+        wedding_start = datetime.fromisoformat(wedding_start_str).date()
+        wedding_end = datetime.fromisoformat(wedding_end_str).date()
+    except:
+        st.error("Invalid wedding date format. Please check your configuration.")
+        return
+    
+    # Add event button
+    if st.button("➕ Add New Event"):
+        st.session_state.edit_events.append({
+            "name": "New Event",
+            "description": "",
+            "date_offset": 0,
+            "requires_meal_choice": False,
+            "meal_options": [],
+            "location": "",
+            "address": ""
+        })
+        st.rerun()
+    
+    # Display events for editing
+    if st.session_state.edit_events:
+        st.markdown("##### Edit Events")
+        
+        for i, event in enumerate(st.session_state.edit_events):
             with st.expander(f"Event {i+1}: {event['name']}", expanded=True):
+                # Add delete button at the top right of each event
+                col_header1, col_header2 = st.columns([4, 1])
+                with col_header2:
+                    if st.button("🗑️ Delete", key=f"delete_event_{i}", help="Delete this event"):
+                        st.session_state.edit_events.pop(i)
+                        st.rerun()
+                
                 col1, col2 = st.columns(2)
                 
                 with col1:
-                    event_name = st.text_input("Event Name", value=event['name'], key=f"signup_event_name_{i}")
-                    event_description = st.text_input("Time", value=event['description'], placeholder="e.g., 2:00 PM, 6:30 PM", key=f"signup_event_desc_{i}")
-                    event_location = st.text_input("Location Name", value=event.get('location', ''), placeholder="e.g., Central Park, Grand Ballroom", key=f"signup_event_location_{i}")
+                    event_name = st.text_input("Event Name", value=event['name'], key=f"settings_event_name_{i}")
+                    event_description = st.text_input("Time", value=event['description'], placeholder="e.g., 2:00 PM, 6:30 PM", key=f"settings_event_desc_{i}")
+                    event_location = st.text_input("Location Name", value=event.get('location', ''), placeholder="e.g., Central Park, Grand Ballroom", key=f"settings_event_location_{i}")
                 
                 with col2:
-                    # Get wedding date range
-                    wedding_start = st.session_state.signup_form_data['wedding_start_date']
-                    wedding_end = st.session_state.signup_form_data['wedding_end_date']
-                    
                     # Calculate current event date from date_offset
                     current_event_date = wedding_start + timedelta(days=event['date_offset'])
                     
@@ -709,7 +679,7 @@ def show_wedding_setup_for_signup():
                     event_date = st.date_input(
                         "Event Date", 
                         value=current_event_date, 
-                        key=f"signup_event_date_{i}",
+                        key=f"settings_event_date_{i}",
                         help="Select any date for this event"
                     )
                     
@@ -717,7 +687,7 @@ def show_wedding_setup_for_signup():
                     if event_date < wedding_start or event_date > wedding_end:
                         st.warning(f"⚠️ Selected date is outside your wedding date range ({wedding_start.strftime('%B %d, %Y')} - {wedding_end.strftime('%B %d, %Y')})")
                     
-                    requires_meal_choice = st.checkbox("Requires Meal Choice", value=event['requires_meal_choice'], key=f"signup_event_meal_{i}")
+                    requires_meal_choice = st.checkbox("Requires Meal Choice", value=event['requires_meal_choice'], key=f"settings_event_meal_{i}")
                     
                     # Meal options section (only show if meal choice is required)
                     if requires_meal_choice:
@@ -725,11 +695,11 @@ def show_wedding_setup_for_signup():
                         st.markdown("Enter meal options (one per line):")
                         current_meal_options = event.get('meal_options', [])
                         meal_options_text = '\n'.join(current_meal_options) if current_meal_options else ''
-                        meal_options = st.text_area("Meal Options", value=meal_options_text, placeholder="e.g.,\nDuck\nSurf & Turf\nRisotto (vegetarian)\nStuffed Squash (vegetarian)", key=f"signup_event_meal_options_{i}", height=100)
+                        meal_options = st.text_area("Meal Options", value=meal_options_text, placeholder="e.g.,\nDuck\nSurf & Turf\nRisotto (vegetarian)\nStuffed Squash (vegetarian)", key=f"settings_event_meal_options_{i}", height=100)
                     else:
                         meal_options = ""
                     
-                    event_address = st.text_area("Address", value=event.get('address', ''), placeholder="Enter full address (street, city, state, zip code)", key=f"signup_event_address_{i}", height=80)
+                    event_address = st.text_area("Address", value=event.get('address', ''), placeholder="Enter full address (street, city, state, zip code)", key=f"settings_event_address_{i}", height=80)
                 
                 # Calculate date_offset from the selected date
                 date_offset = (event_date - wedding_start).days
@@ -740,7 +710,7 @@ def show_wedding_setup_for_signup():
                     meal_options_list = [option.strip() for option in meal_options.split('\n') if option.strip()]
                 
                 # Update session state
-                st.session_state.signup_events[i] = {
+                st.session_state.edit_events[i] = {
                     "name": event_name,
                     "description": event_description,
                     "date_offset": date_offset,
@@ -749,172 +719,55 @@ def show_wedding_setup_for_signup():
                     "location": event_location,
                     "address": event_address
                 }
+        
+        # Save events button
+        st.markdown("---")
+        col1, col2, col3 = st.columns([1, 1, 1])
+        with col2:
+            if st.button("💾 Save Event Changes", type="primary"):
+                # Update the configuration with edited events
+                updated_config = config.copy()
+                updated_config['wedding_events'] = st.session_state.edit_events
+                
+                # Save the updated configuration
+                st.session_state.config_manager.save_config(updated_config)
+                st.success("Event changes saved successfully!")
+                st.rerun()
     else:
-        st.info("No events added yet. Click 'Add Event' to get started!")
+        st.info("No events added yet. Click 'Add New Event' to get started!")
     
-    # Complete signup button
-    st.markdown("---")
-    col1, col2, col3 = st.columns([1, 2, 1])
-    with col2:
-        if st.button("Complete Signup & Create Wedding", type="primary", use_container_width=True):
-            # Validate wedding setup
-            form_data = st.session_state.signup_form_data
-            
-            if not form_data['partner1_name'] or not form_data['partner2_name']:
-                st.error("Please fill in both partner names")
-            elif not form_data['wedding_start_date'] or not form_data['wedding_end_date']:
-                st.error("Please set your wedding date range")
-            else:
-                # Create the new user and wedding
-                if create_new_user_and_wedding():
-                    st.success("🎉 Welcome to your Wedding Planner! Your account and wedding have been created successfully.")
-                    st.info("You can now log in with your new account.")
-                    
-                    # Reset signup state
-                    for key in ['signup_step', 'signup_account_info', 'signup_events', 'signup_form_data', 'show_signup']:
-                        if key in st.session_state:
-                            del st.session_state[key]
-                    
-                    st.rerun()
-                else:
-                    st.error("Failed to create your account. Please try again.")
-
-def create_new_user_and_wedding():
-    """Create a new user account and wedding setup"""
-    try:
-        # Get account info
-        account_info = st.session_state.signup_account_info
-        form_data = st.session_state.signup_form_data
-        events = st.session_state.signup_events
-        
-        # Generate a unique folder name for the wedding
-        partner1_clean = ''.join(c.lower() for c in account_info['first_name'] if c.isalnum())
-        partner2_clean = ''.join(c.lower() for c in form_data['partner2_name'] if c.isalnum())
-        wedding_folder = f"{partner1_clean}_{partner2_clean}_wedding"
-        
-        # Create wedding name
-        wedding_name = f"{form_data['partner1_name']} & {form_data['partner2_name']}'s Wedding"
-        
-        # Hash the password
-        hasher = stauth.Hasher()
-        hashed_password = hasher.hash(account_info['password'])
-        
-        # Create new user entry
-        new_user = {
-            'email': account_info['email'],
-            'failed_login_attempts': 0,
-            'first_name': account_info['first_name'],
-            'last_name': account_info['last_name'],
-            'name': f"{account_info['first_name']} {account_info['last_name']}",
-            'logged_in': False,
-            'password': hashed_password,
-            'roles': ['admin', 'editor', 'viewer']
-        }
-        
-        # Update auth config
-        auth_config = st.session_state.auth_config.copy()
-        auth_config['credentials']['usernames'][account_info['username']] = new_user
-        
-        # Add email to pre-authorized list
-        if 'pre-authorized' not in auth_config:
-            auth_config['pre-authorized'] = {'emails': []}
-        if account_info['email'] not in auth_config['pre-authorized']['emails']:
-            auth_config['pre-authorized']['emails'].append(account_info['email'])
-        
-        # Add wedding mapping
-        if 'wedding_mappings' not in auth_config:
-            auth_config['wedding_mappings'] = {}
-        
-        wedding_key = f"{partner1_clean}_{partner2_clean}"
-        auth_config['wedding_mappings'][wedding_key] = {
-            'folder': wedding_folder,
-            'users': [account_info['username']],
-            'wedding_name': wedding_name
-        }
-        
-        # Save updated config to Google Drive
-        config_manager = st.session_state.config_manager
-        if config_manager.google_drive_enabled:
-            # Upload updated config to Google Drive
-            config_manager.drive_manager.upload_file('config.yaml', auth_config)
-        
-        # Create wedding configuration
-        custom_tags_list = [tag.strip() for tag in form_data['custom_tags'].split('\n') if tag.strip()]
-        task_assignees_list = [assignee.strip() for assignee in form_data['task_assignees'].split('\n') if assignee.strip()]
-        
-        wedding_config = {
-            'wedding_info': {
-                'partner1_name': form_data['partner1_name'],
-                'partner2_name': form_data['partner2_name'],
-                'wedding_start_date': form_data['wedding_start_date'].isoformat(),
-                'wedding_end_date': form_data['wedding_end_date'].isoformat(),
-                'venue_city': form_data['venue_city']
-            },
-            'custom_settings': {
-                'custom_tags': custom_tags_list,
-                'task_assignees': task_assignees_list
-            },
-            'wedding_events': events
-        }
-        
-        # Store wedding config in session state for immediate use
-        # The files will be created on-demand when the user first accesses the app
-        st.session_state[f'wedding_config_{account_info["username"]}'] = wedding_config
-        
-        # Create initial data files structure (will be created on first use)
-        initial_data_files = {
-            'guest_list_data.json': {},
-            'rsvp_data.json': {},
-            'tasks.json': [],
-            'vendors.json': [],
-            'wedding_party.json': []
-        }
-        
-        # Store initial data in session state
-        for filename, data in initial_data_files.items():
-            st.session_state[f'{filename}_{account_info["username"]}'] = data
-        
-        # Try to upload wedding config to Google Drive (this is the most important file)
-        if config_manager.google_drive_enabled:
-            if config_manager.drive_manager.upload_file(f'{wedding_folder}/wedding_config.json', wedding_config):
-                st.success("✅ Wedding configuration saved to Google Drive!")
-            else:
-                st.warning("⚠️ Could not upload wedding config to Google Drive due to storage quota limitations. Your data is saved locally and will sync when you first use the app.")
+    # Event summary
+    if st.session_state.edit_events:
+        st.markdown("##### Event Summary")
         
-        st.info("💡 **Note**: Your wedding data files will be created automatically when you first add guests, tasks, or vendors. This approach works better with Google Drive storage limitations.")
+        col1, col2, col3 = st.columns(3)
         
-        # Update session state auth config
-        st.session_state.auth_config = auth_config
+        with col1:
+            total_events = len(st.session_state.edit_events)
+            st.metric("Total Events", total_events)
         
-        return True
+        with col2:
+            meal_events = len([e for e in st.session_state.edit_events if e.get('requires_meal_choice', False)])
+            st.metric("Events with Meals", meal_events)
         
-    except Exception as e:
-        st.error(f"Error creating user and wedding: {e}")
-        return False
+        with col3:
+            days_span = (wedding_end - wedding_start).days + 1
+            st.metric("Celebration Days", days_span)
 
-def show_wedding_setup_form():
-    """Show the wedding setup form for creating a new wedding"""
-    st.markdown("### 📝 Create Your Wedding Configuration")
-    
-    # Initialize session state for events and form data if not exists
-    if 'setup_events' not in st.session_state:
-        st.session_state.setup_events = []
-    if 'setup_form_data' not in st.session_state:
-        st.session_state.setup_form_data = {
-            'partner1_name': '',
-            'partner2_name': '',
-            'venue_city': '',
-            'wedding_start_date': date.today(),
-            'wedding_end_date': date.today(),
-            'custom_tags': '',
-            'task_assignees': ''
-        }
-    
-    # Basic wedding information form
-    with st.form("wedding_setup"):
-        st.markdown("#### Basic Wedding Information")
-        
-        col1, col2 = st.columns(2)
+def get_friendly_file_name(filename):
+    """Convert technical file names to user-friendly names"""
+    friendly_names = {
+        'wedding_config.json': 'Wedding Configuration',
+        'guest_list_data.json': 'Guest List',
+        'rsvp_data.json': 'RSVP Responses',
+        'tasks.json': 'Tasks',
+        'vendors.json': 'Vendors',
+        'wedding_party.json': 'Wedding Party'
+    }
+    return friendly_names.get(filename, filename)
+
+if __name__ == "__main__":
+    main() = st.columns(2)
         with col1:
             partner1_name = st.text_input("Partner 1 Name", value=st.session_state.setup_form_data['partner1_name'], placeholder="Enter first partner's name")
             partner2_name = st.text_input("Partner 2 Name", value=st.session_state.setup_form_data['partner2_name'], placeholder="Enter second partner's name")
@@ -1050,7 +903,7 @@ def show_wedding_setup_form():
     
     # Save configuration button (after event management)
     st.markdown("---")
-    if st.button("Save Configuration", type="primary"):
+    if st.button("Save Configuration & Start Planning", type="primary"):
         # Get form values from session state
         form_data = st.session_state.setup_form_data
         
@@ -1075,20 +928,64 @@ def show_wedding_setup_form():
                 'wedding_events': st.session_state.setup_events
             }
             
-            # Save configuration
-            st.session_state.config_manager.save_config(config)
-            # Clear setup session state
-            if 'setup_events' in st.session_state:
-                del st.session_state.setup_events
-            if 'setup_form_data' in st.session_state:
-                del st.session_state.setup_form_data
-            if 'show_setup_form' in st.session_state:
-                del st.session_state.show_setup_form
-            st.success("Configuration saved successfully!")
-            st.rerun()
+            # Save configuration to the new wedding folder
+            config_manager = st.session_state.config_manager
+            if config_manager.google_drive_enabled:
+                full_config_path = f"{new_user_folder}/wedding_config.json"
+                if config_manager.drive_manager.upload_file(full_config_path, config):
+                    # Update user folder in config manager
+                    config_manager.set_user_folder(new_user_folder)
+                    
+                    # Clear setup session state
+                    for key in ['setup_events', 'setup_form_data', 'show_wedding_setup', 'new_user_folder']:
+                        if key in st.session_state:
+                            del st.session_state[key]
+                    
+                    st.success("✅ Wedding configuration saved successfully!")
+                    st.success("🎉 Welcome to your personalized wedding planner!")
+                    st.rerun()
+                else:
+                    st.error("Failed to save wedding configuration. Please try again.")
+            else:
+                st.error("Google Drive not available. Cannot save configuration.")
         else:
             st.error("Please fill in at least the partner names and wedding date range in the form above.")
 
+def main():
+    # Initialize session state
+    if 'config_manager' not in st.session_state:
+        st.session_state.config_manager = ConfigManager()
+    
+    # Load authentication configuration
+    if 'auth_config' not in st.session_state:
+        st.session_state.auth_config = load_auth_config()
+    
+    if st.session_state.auth_config is None:
+        st.error("Failed to load authentication configuration. Please check your Google Drive setup.")
+        st.stop()
+    
+    # Create authenticator using the new v0.4.2 syntax
+    authenticator = stauth.Authenticate(
+        st.session_state.auth_config['credentials'],
+        st.session_state.auth_config['cookie']['name'],
+        st.session_state.auth_config['cookie']['key'],
+        st.session_state.auth_config['cookie']['expiry_days']
+    )
+    
+    # Check if user wants to see wedding setup
+    if st.session_state.get('show_wedding_setup', False):
+        show_wedding_setup_form()
+        return
+    
+    # Check authentication status from session state (v0.4.2 uses session state)
+    authentication_status = st.session_state.get('authentication_status')
+    
+    if authentication_status:
+        # User is authenticated, show main app
+        show_main_app(authenticator)
+    else:
+        # Show signup/login page
+        show_signup_page(authenticator)
 
 def show_main_app(authenticator):
     # Get current user from session state (set by authenticator.login)
@@ -1128,14 +1025,8 @@ def show_main_app(authenticator):
                     st.session_state.app_initialized = True
                     st.session_state.last_user_folder = user_folder
                 else:
-                    # Check if this is a new user who just signed up
-                    if 'wedding_config_' + username in st.session_state:
-                        st.info("🎉 Welcome! Your wedding planner is ready. Your data will be saved to Google Drive when you first add content or manually sync.")
-                        st.session_state.app_initialized = True
-                        st.session_state.last_user_folder = user_folder
-                    else:
-                        st.error("Failed to load wedding data. Please try logging in again or contact support.")
-                        return
+                    st.error("Failed to load wedding data.")
+                    return
     
     # Load config
     config = st.session_state.config_manager.load_config()
@@ -1247,7 +1138,7 @@ def show_main_app(authenticator):
                             st.error("❌ Failed to save")
             
             # Always show pull button
-            if st.button("🔄 Pull Latest", help="Get latest from Google Drive", key="sidebar_pull"):
+            if st.button("📥 Pull Latest", help="Get latest from Google Drive", key="sidebar_pull"):
                 with st.spinner("Pulling latest..."):
                     if config_manager.manual_sync_from_drive():
                         st.success("✅ Latest loaded!")
@@ -1641,150 +1532,6 @@ def show_cache_management_section():
         if st.button("ℹ️ Cache Info", help="Show detailed cache information"):
             st.info("Cache helps improve performance by storing data in memory. Data is automatically cached when first loaded and updated when modified.")
 
-def show_google_drive_status_setup():
-    """Show Google Drive status on the setup page"""
-    config_manager = st.session_state.config_manager
-    drive_status = config_manager.get_google_drive_status()
-    
-    # Create an expander for Google Drive status
-    with st.expander("🔗 Google Drive Connection Status", expanded=False):
-        # Status display
-        if drive_status['enabled']:
-            if drive_status['status'] == 'Online':
-                st.success(f"✅ {drive_status['message']}")
-            elif drive_status['status'] == 'Offline':
-                st.warning(f"⚠️ {drive_status['message']}")
-            else:
-                st.error(f"❌ {drive_status['message']}")
-        else:
-            st.info(f"ℹ️ {drive_status['message']}")
-        
-        # Show files if available
-        if drive_status['enabled'] and 'files' in drive_status:
-            st.markdown("**Files found in Google Drive:**")
-            for file_name in drive_status['files']:
-                friendly_name = get_friendly_file_name(file_name)
-                st.markdown(f"• {friendly_name}")
-        
-        # Manual sync buttons (if enabled) - only show pull and load options
-        if drive_status['enabled']:
-            st.markdown("**Manual Sync:**")
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                if st.button("📥 Sync from Google Drive", help="Download latest data from Google Drive", key="setup_sync_from"):
-                    with st.spinner("Syncing from Google Drive..."):
-                        if config_manager.manual_sync_from_drive():
-                            st.success("Successfully synced from Google Drive!")
-                            st.rerun()
-                        else:
-                            st.error("Failed to sync from Google Drive")
-            
-            with col2:
-                if st.button("🔄 Load Existing Data", help="Load existing wedding data from Google Drive", key="setup_load_existing"):
-                    with st.spinner("Loading existing data from Google Drive..."):
-                        if config_manager.load_existing_data_from_drive():
-                            st.success("Successfully loaded existing data from Google Drive!")
-                            st.info("Your wedding data has been loaded. The page will refresh to show your wedding planner.")
-                            st.rerun()
-                        else:
-                            st.error("Failed to load existing data from Google Drive")
-        
-        # Configuration help
-        if not drive_status['enabled']:
-            st.markdown("**To enable Google Drive integration:**")
-            st.markdown("Set the following **secrets** in your Hugging Face Space settings:")
-            st.code("""
-GOOGLE_DRIVE_FOLDER_ID=your_folder_id
-GOOGLE_PROJECT_ID=your_project_id
-GOOGLE_PRIVATE_KEY_ID=your_private_key_id
-GOOGLE_PRIVATE_KEY=your_private_key
-GOOGLE_CLIENT_EMAIL=your_client_email
-GOOGLE_CLIENT_ID=your_client_id
-            """)
-            
-            # Debug information
-            st.markdown("**Debug Information:**")
-            folder_id = os.getenv('GOOGLE_DRIVE_FOLDER_ID')
-            if folder_id:
-                st.success(f"✅ GOOGLE_DRIVE_FOLDER_ID found: {folder_id[:10]}...")
-            else:
-                st.error("❌ GOOGLE_DRIVE_FOLDER_ID not found")
-            
-            # Check other variables
-            project_id = os.getenv('GOOGLE_PROJECT_ID')
-            client_email = os.getenv('GOOGLE_CLIENT_EMAIL')
-            private_key_id = os.getenv('GOOGLE_PRIVATE_KEY_ID')
-            private_key = os.getenv('GOOGLE_PRIVATE_KEY')
-            client_id = os.getenv('GOOGLE_CLIENT_ID')
-            
-            if project_id:
-                st.success(f"✅ GOOGLE_PROJECT_ID found: {project_id[:10]}...")
-            else:
-                st.error("❌ GOOGLE_PROJECT_ID not found")
-                
-            if client_email:
-                st.success(f"✅ GOOGLE_CLIENT_EMAIL found: {client_email}")
-            else:
-                st.error("❌ GOOGLE_CLIENT_EMAIL not found")
-                
-            if private_key_id:
-                st.success(f"✅ GOOGLE_PRIVATE_KEY_ID found: {private_key_id[:10]}...")
-            else:
-                st.error("❌ GOOGLE_PRIVATE_KEY_ID not found")
-                
-            if private_key:
-                st.success(f"✅ GOOGLE_PRIVATE_KEY found: {len(private_key)} characters")
-            else:
-                st.error("❌ GOOGLE_PRIVATE_KEY not found")
-                
-            if client_id:
-                st.success(f"✅ GOOGLE_CLIENT_ID found: {client_id[:10]}...")
-            else:
-                st.error("❌ GOOGLE_CLIENT_ID not found")
-            
-            # Check if all required variables are present
-            all_required = all([folder_id, project_id, private_key_id, private_key, client_email, client_id])
-            if all_required:
-                st.success("🎉 All required secrets are present!")
-                st.info("If Google Drive is still not working, there might be an authentication issue. Try restarting your Space.")
-                
-                # Test file writing permissions
-                st.markdown("**Testing file permissions:**")
-                try:
-                    test_file = "/tmp/test_write.txt"
-                    with open(test_file, 'w') as f:
-                        f.write("test")
-                    st.success("✅ Can write to /tmp directory")
-                    os.remove(test_file)
-                except Exception as e:
-                    st.error(f"❌ Cannot write to /tmp directory: {e}")
-                    
-                try:
-                    test_dir = "wedding_data"
-                    os.makedirs(test_dir, exist_ok=True)
-                    test_file = os.path.join(test_dir, "test.txt")
-                    with open(test_file, 'w') as f:
-                        f.write("test")
-                    st.success("✅ Can write to wedding_data directory")
-                    os.remove(test_file)
-                except Exception as e:
-                    st.error(f"❌ Cannot write to wedding_data directory: {e}")
-            else:
-                st.warning("⚠️ Some required secrets are missing. Please add all secrets and restart your Space.")
-
-def get_friendly_file_name(filename):
-    """Convert technical file names to user-friendly names"""
-    friendly_names = {
-        'wedding_config.json': 'Wedding Configuration',
-        'guest_list_data.json': 'Guest List',
-        'rsvp_data.json': 'RSVP Responses',
-        'tasks.json': 'Tasks',
-        'vendors.json': 'Vendors',
-        'wedding_party.json': 'Wedding Party'
-    }
-    return friendly_names.get(filename, filename)
-
 def show_google_drive_sync_status():
     """Show Google Drive sync status and push button prominently in main app"""
     config_manager = st.session_state.config_manager
@@ -1825,7 +1572,7 @@ def show_google_drive_sync_status():
                     st.error("❌ Failed to save changes to Google Drive")
     
     with col3:
-        if st.button("🔄 Pull Latest", help="Get latest changes from Google Drive"):
+        if st.button("📥 Pull Latest", help="Get latest changes from Google Drive"):
             with st.spinner("Pulling latest changes from Google Drive..."):
                 if config_manager.manual_sync_from_drive():
                     st.success("✅ Latest changes loaded from Google Drive!")
@@ -1876,189 +1623,4 @@ def show_google_drive_section():
     # Manual sync buttons
     if drive_status['enabled']:
         st.markdown("#### Manual Sync")
-        col1, col2 = st.columns(2)
-        
-        with col1:
-            if st.button("📥 Sync from Google Drive", help="Download latest data from Google Drive"):
-                with st.spinner("Syncing from Google Drive..."):
-                    if config_manager.manual_sync_from_drive():
-                        st.success("Successfully synced from Google Drive!")
-                        st.rerun()
-                    else:
-                        st.error("Failed to sync from Google Drive")
-        
-        with col2:
-            # Show different button text based on whether there are modified files
-            modified_files = config_manager.get_modified_files()
-            if modified_files:
-                button_text = f"📤 Sync {len(modified_files)} Modified Files to Drive"
-                button_help = f"Upload {len(modified_files)} modified files to Google Drive"
-            else:
-                button_text = "📤 Sync to Google Drive"
-                button_help = "Upload current data to Google Drive (no changes to sync)"
-            
-            if st.button(button_text, help=button_help, disabled=not modified_files):
-                with st.spinner("Syncing to Google Drive..."):
-                    if config_manager.manual_sync_to_drive():
-                        st.success("Successfully synced to Google Drive!")
-                        st.rerun()
-                    else:
-                        st.error("Failed to sync to Google Drive")
-    
-    # Configuration info
-    st.markdown("#### Configuration")
-    st.markdown("To enable Google Drive integration, set the following environment variables:")
-    st.code("""
-GOOGLE_DRIVE_FOLDER_ID=your_folder_id
-GOOGLE_PROJECT_ID=your_project_id
-GOOGLE_PRIVATE_KEY_ID=your_private_key_id
-GOOGLE_PRIVATE_KEY=your_private_key
-GOOGLE_CLIENT_EMAIL=your_client_email
-GOOGLE_CLIENT_ID=your_client_id
-    """)
-    
-    st.markdown("**Note:** Google Drive integration is automatically enabled when running on Hugging Face Spaces with proper credentials configured.")
-
-def show_event_management_section(config):
-    st.markdown("#### Manage Wedding Events")
-    
-    # Initialize session state for event editing if not exists
-    if 'edit_events' not in st.session_state:
-        st.session_state.edit_events = config.get('wedding_events', []).copy()
-    
-    wedding_events = st.session_state.edit_events
-    wedding_info = config.get('wedding_info', {})
-    
-    # Get wedding dates for date calculations
-    wedding_start_str = wedding_info.get('wedding_start_date', '')
-    wedding_end_str = wedding_info.get('wedding_end_date', '')
-    
-    if not wedding_start_str or not wedding_end_str:
-        st.warning("Please set your wedding date range in the 'Edit Configuration' tab first.")
-        return
-    
-    try:
-        wedding_start = datetime.fromisoformat(wedding_start_str).date()
-        wedding_end = datetime.fromisoformat(wedding_end_str).date()
-    except:
-        st.error("Invalid wedding date format. Please check your configuration.")
-        return
-    
-    # Add event button
-    if st.button("➕ Add New Event"):
-        st.session_state.edit_events.append({
-            "name": "New Event",
-            "description": "",
-            "date_offset": 0,
-            "requires_meal_choice": False,
-            "meal_options": [],
-            "location": "",
-            "address": ""
-        })
-        st.rerun()
-    
-    # Display events for editing
-    if st.session_state.edit_events:
-        st.markdown("##### Edit Events")
-        
-        for i, event in enumerate(st.session_state.edit_events):
-            with st.expander(f"Event {i+1}: {event['name']}", expanded=True):
-                # Add delete button at the top right of each event
-                col_header1, col_header2 = st.columns([4, 1])
-                with col_header2:
-                    if st.button("🗑️ Delete", key=f"delete_event_{i}", help="Delete this event"):
-                        st.session_state.edit_events.pop(i)
-                        st.rerun()
-                
-                col1, col2 = st.columns(2)
-                
-                with col1:
-                    event_name = st.text_input("Event Name", value=event['name'], key=f"settings_event_name_{i}")
-                    event_description = st.text_input("Time", value=event['description'], placeholder="e.g., 2:00 PM, 6:30 PM", key=f"settings_event_desc_{i}")
-                    event_location = st.text_input("Location Name", value=event.get('location', ''), placeholder="e.g., Central Park, Grand Ballroom", key=f"settings_event_location_{i}")
-                
-                with col2:
-                    # Calculate current event date from date_offset
-                    current_event_date = wedding_start + timedelta(days=event['date_offset'])
-                    
-                    # Use date input without constraints - allow any date
-                    event_date = st.date_input(
-                        "Event Date", 
-                        value=current_event_date, 
-                        key=f"settings_event_date_{i}",
-                        help="Select any date for this event"
-                    )
-                    
-                    # Show warning if date is outside wedding range
-                    if event_date < wedding_start or event_date > wedding_end:
-                        st.warning(f"⚠️ Selected date is outside your wedding date range ({wedding_start.strftime('%B %d, %Y')} - {wedding_end.strftime('%B %d, %Y')})")
-                    
-                    requires_meal_choice = st.checkbox("Requires Meal Choice", value=event['requires_meal_choice'], key=f"settings_event_meal_{i}")
-                    
-                    # Meal options section (only show if meal choice is required)
-                    if requires_meal_choice:
-                        st.markdown("**Meal Options**")
-                        st.markdown("Enter meal options (one per line):")
-                        current_meal_options = event.get('meal_options', [])
-                        meal_options_text = '\n'.join(current_meal_options) if current_meal_options else ''
-                        meal_options = st.text_area("Meal Options", value=meal_options_text, placeholder="e.g.,\nDuck\nSurf & Turf\nRisotto (vegetarian)\nStuffed Squash (vegetarian)", key=f"settings_event_meal_options_{i}", height=100)
-                    else:
-                        meal_options = ""
-                    
-                    event_address = st.text_area("Address", value=event.get('address', ''), placeholder="Enter full address (street, city, state, zip code)", key=f"settings_event_address_{i}", height=80)
-                
-                # Calculate date_offset from the selected date
-                date_offset = (event_date - wedding_start).days
-                
-                # Parse meal options
-                meal_options_list = []
-                if requires_meal_choice and meal_options:
-                    meal_options_list = [option.strip() for option in meal_options.split('\n') if option.strip()]
-                
-                # Update session state
-                st.session_state.edit_events[i] = {
-                    "name": event_name,
-                    "description": event_description,
-                    "date_offset": date_offset,
-                    "requires_meal_choice": requires_meal_choice,
-                    "meal_options": meal_options_list,
-                    "location": event_location,
-                    "address": event_address
-                }
-        
-        # Save events button
-        st.markdown("---")
-        col1, col2, col3 = st.columns([1, 1, 1])
-        with col2:
-            if st.button("💾 Save Event Changes", type="primary"):
-                # Update the configuration with edited events
-                updated_config = config.copy()
-                updated_config['wedding_events'] = st.session_state.edit_events
-                
-                # Save the updated configuration
-                st.session_state.config_manager.save_config(updated_config)
-                st.success("Event changes saved successfully!")
-                st.rerun()
-    else:
-        st.info("No events added yet. Click 'Add New Event' to get started!")
-    
-    # Event summary
-    if st.session_state.edit_events:
-        st.markdown("##### Event Summary")
-        
-        col1, col2, col3 = st.columns(3)
-        
-        with col1:
-            total_events = len(st.session_state.edit_events)
-            st.metric("Total Events", total_events)
-        
-        with col2:
-            meal_events = len([e for e in st.session_state.edit_events if e.get('requires_meal_choice', False)])
-            st.metric("Events with Meals", meal_events)
-        
-        with col3:
-            days_span = (wedding_end - wedding_start).days + 1
-            st.metric("Celebration Days", days_span)
-
-if __name__ == "__main__":
-    main()
+        col1, col2

config_manager.py

@@ -1,5 +1,6 @@
 import json
 import os
+import yaml
 from datetime import datetime
 from google_drive_manager import GoogleDriveManager
 import streamlit as st
@@ -573,85 +574,13 @@ class ConfigManager:
                 
                 self.data_loaded_from_drive = True
                 return True
-            
-            # If no config found in Google Drive, check if this is a new user with data in session state
-            return self.load_new_user_data_from_session()
-            
+            return False
         except Exception as e:
             print(f"Error loading existing data from Google Drive: {e}")
             # This is a common issue on Hugging Face Spaces due to network/SSL issues
             # The error is expected and the user can retry manually
             return False
     
-    def load_new_user_data_from_session(self):
-        """Load new user data from session state (for users who just signed up)"""
-        try:
-            # Get current username from session state
-            username = st.session_state.get('username')
-            if not username:
-                return False
-            
-            # Check if we have wedding config for this user in session state
-            config_key = f'wedding_config_{username}'
-            if config_key in st.session_state:
-                config_content = st.session_state[config_key]
-                
-                # Save config locally (in memory or file)
-                if self.use_memory_storage:
-                    self.memory_data['wedding_config.json'] = config_content
-                    # Update cache in session state
-                    st.session_state['cached_wedding_config'] = config_content
-                    print("Stored new user wedding_config.json in memory")
-                else:
-                    config_path = self.get_config_file_path()
-                    config_dir = os.path.dirname(config_path)
-                    if config_dir:
-                        os.makedirs(config_dir, exist_ok=True)
-                    with open(config_path, 'w') as f:
-                        json.dump(config_content, f, indent=2)
-                    # Update cache in session state
-                    st.session_state['cached_wedding_config'] = config_content
-                    print(f"Stored new user wedding_config.json in file: {config_path}")
-                
-                # Load data files from session state
-                data_files = [
-                    'guest_list_data.json',
-                    'rsvp_data.json', 
-                    'tasks.json',
-                    'vendors.json',
-                    'wedding_party.json'
-                ]
-                
-                for file_name in data_files:
-                    data_key = f'{file_name}_{username}'
-                    if data_key in st.session_state:
-                        content = st.session_state[data_key]
-                        if self.use_memory_storage:
-                            self.memory_data[file_name] = content
-                            # Update cache in session state
-                            cache_key = f"cached_{file_name}"
-                            st.session_state[cache_key] = content
-                            print(f"Stored new user {file_name} in memory")
-                        else:
-                            file_path = self.get_data_file_path(file_name)
-                            file_dir = os.path.dirname(file_path)
-                            if file_dir:
-                                os.makedirs(file_dir, exist_ok=True)
-                            with open(file_path, 'w') as f:
-                                json.dump(content, f, indent=2)
-                            # Update cache in session state
-                            cache_key = f"cached_{file_name}"
-                            st.session_state[cache_key] = content
-                            print(f"Stored new user {file_name} in file: {file_path}")
-                
-                self.data_loaded_from_drive = True
-                return True
-            
-            return False
-        except Exception as e:
-            print(f"Error loading new user data from session: {e}")
-            return False
-    
     def load_demo_data_from_drive(self):
         """Load demo wedding data from Google Drive and enable demo mode"""
         if not self.google_drive_enabled:
@@ -859,3 +788,66 @@ class ConfigManager:
         except Exception as e:
             print(f"Error resetting app state: {e}")
             return False
+    
+    def create_wedding_folder_structure(self, folder_name: str, wedding_config: dict) -> bool:
+        """Create a complete wedding folder structure in Google Drive with initial files"""
+        if not self.google_drive_enabled:
+            return False
+        
+        try:
+            # Check if folder already exists
+            if self.drive_manager.check_folder_exists(folder_name):
+                print(f"Folder {folder_name} already exists")
+                return True
+            
+            # Create the folder
+            folder_id = self.drive_manager.create_folder(folder_name)
+            if not folder_id:
+                return False
+            
+            # Create initial data files for the new wedding
+            initial_files = {
+                'wedding_config.json': wedding_config,
+                'guest_list_data.json': [],
+                'rsvp_data.json': {},
+                'tasks.json': [],
+                'vendors.json': [],
+                'wedding_party.json': []
+            }
+            
+            # Upload each file to the new folder
+            for filename, content in initial_files.items():
+                full_path = f"{folder_name}/{filename}"
+                if not self.drive_manager.upload_file(full_path, content):
+                    print(f"Failed to create {filename} in {folder_name}")
+                    return False
+            
+            print(f"Successfully created wedding folder structure: {folder_name}")
+            return True
+            
+        except Exception as e:
+            print(f"Error creating wedding folder structure: {e}")
+            return False
+    
+    def load_auth_config(self):
+        """Load authentication configuration from Google Drive"""
+        if not self.google_drive_enabled:
+            return None
+        
+        try:
+            auth_config = self.drive_manager.download_file('config.yaml')
+            return auth_config
+        except Exception as e:
+            print(f"Error loading auth config: {e}")
+            return None
+    
+    def save_auth_config(self, config):
+        """Save authentication configuration to Google Drive"""
+        if not self.google_drive_enabled:
+            return False
+        
+        try:
+            return self.drive_manager.upload_file('config.yaml', config)
+        except Exception as e:
+            print(f"Error saving auth config: {e}")
+            return False

google_drive_manager.py

@@ -2,7 +2,8 @@ import os
 import json
 import tempfile
 import time
-from typing import Dict, List, Optional, Any
+import yaml
+from typing import Dict, List, Optional, Any, Union
 from google.oauth2 import service_account
 from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
@@ -129,7 +130,7 @@ class GoogleDriveManager:
             return []
     
     @retry_on_ssl_error(max_retries=3, delay=1)
-    def download_file(self, file_name: str) -> Optional[Dict[str, Any]]:
+    def download_file(self, file_name: str) -> Optional[Union[Dict[str, Any], str]]:
         """Download a file from Google Drive and return its content"""
         if not self.service or not self.folder_id:
             return None
@@ -145,7 +146,7 @@ class GoogleDriveManager:
                 folders = folder_results.get('files', [])
                 
                 if not folders:
-                    st.warning(f"File '{file_name}' not found in Google Drive")
+                    print(f"Folder '{folder_name}' not found in Google Drive")
                     return None
                 
                 folder_id = folders[0]['id']
@@ -156,7 +157,7 @@ class GoogleDriveManager:
                 files = results.get('files', [])
                 
                 if not files:
-                    st.warning(f"File '{file_name}' not found in Google Drive")
+                    print(f"File '{file_name}' not found in Google Drive")
                     return None
             else:
                 # Direct file search in root folder
@@ -165,7 +166,7 @@ class GoogleDriveManager:
                 files = results.get('files', [])
                 
                 if not files:
-                    st.warning(f"File '{file_name}' not found in Google Drive")
+                    print(f"File '{file_name}' not found in Google Drive")
                     return None
             
             file_id = files[0]['id']
@@ -174,15 +175,27 @@ class GoogleDriveManager:
             request = self.service.files().get_media(fileId=file_id)
             content = request.execute()
             
-            # Try to parse as JSON
-            try:
-                return json.loads(content.decode('utf-8'))
-            except json.JSONDecodeError:
-                # If not JSON, return as string
-                return content.decode('utf-8')
+            # Determine file type and parse accordingly
+            content_str = content.decode('utf-8')
+            
+            if file_name.endswith('.yaml') or file_name.endswith('.yml'):
+                # Parse as YAML
+                try:
+                    return yaml.safe_load(content_str)
+                except yaml.YAMLError:
+                    return content_str
+            elif file_name.endswith('.json'):
+                # Parse as JSON
+                try:
+                    return json.loads(content_str)
+                except json.JSONDecodeError:
+                    return content_str
+            else:
+                # Return as string
+                return content_str
                 
         except HttpError as e:
-            st.error(f"Error downloading file '{file_name}': {str(e)}")
+            print(f"Error downloading file '{file_name}': {str(e)}")
             return None
     
     @retry_on_ssl_error(max_retries=3, delay=1)
@@ -196,13 +209,20 @@ class GoogleDriveManager:
             if isinstance(content, (dict, list)):
                 if file_name.endswith('.yaml') or file_name.endswith('.yml'):
                     # For YAML files, convert to YAML string
-                    import yaml
                     content_str = yaml.dump(content, default_flow_style=False, sort_keys=False)
+                    mimetype = 'text/yaml'
                 else:
                     # For JSON files, convert to JSON string
                     content_str = json.dumps(content, indent=2)
+                    mimetype = 'application/json'
             else:
                 content_str = str(content)
+                if file_name.endswith('.yaml') or file_name.endswith('.yml'):
+                    mimetype = 'text/yaml'
+                elif file_name.endswith('.json'):
+                    mimetype = 'application/json'
+                else:
+                    mimetype = 'text/plain'
             
             # Convert string to bytes
             content_bytes = content_str.encode('utf-8')
@@ -211,12 +231,6 @@ class GoogleDriveManager:
             from io import BytesIO
             media_body = BytesIO(content_bytes)
             
-            # Determine MIME type based on file extension
-            if file_name.endswith('.yaml') or file_name.endswith('.yml'):
-                mimetype = 'text/yaml'
-            else:
-                mimetype = 'application/json'
-            
             # Handle subfolder paths like 'laraandumang/wedding_config.json'
             target_folder_id = self.folder_id
             actual_file_name = file_name
@@ -241,6 +255,7 @@ class GoogleDriveManager:
                         fields='id'
                     ).execute()
                     target_folder_id = created_folder.get('id')
+                    print(f"Created new folder: {folder_name}")
                 else:
                     target_folder_id = folders[0]['id']
             
@@ -258,6 +273,7 @@ class GoogleDriveManager:
                     fileId=file_id,
                     media_body=media
                 ).execute()
+                print(f"Updated existing file: {file_name}")
             else:
                 # Create new file
                 file_metadata = {
@@ -270,14 +286,15 @@ class GoogleDriveManager:
                     body=file_metadata,
                     media_body=media
                 ).execute()
+                print(f"Created new file: {file_name}")
             
             return True
             
         except HttpError as e:
-            st.error(f"Error uploading file '{file_name}': {str(e)}")
+            print(f"Error uploading file '{file_name}': {str(e)}")
             return False
         except Exception as e:
-            st.error(f"Unexpected error uploading file '{file_name}': {str(e)}")
+            print(f"Unexpected error uploading file '{file_name}': {str(e)}")
             return False
     
     def sync_from_drive(self, file_names: List[str]) -> Dict[str, Any]:
@@ -290,9 +307,14 @@ class GoogleDriveManager:
                 synced_files[file_name] = content
                 # Save to local temp directory
                 local_path = os.path.join(self.temp_dir, file_name)
+                os.makedirs(os.path.dirname(local_path), exist_ok=True)
+                
                 with open(local_path, 'w') as f:
                     if isinstance(content, (dict, list)):
-                        json.dump(content, f, indent=2)
+                        if file_name.endswith('.yaml') or file_name.endswith('.yml'):
+                            yaml.dump(content, f, default_flow_style=False, sort_keys=False)
+                        else:
+                            json.dump(content, f, indent=2)
                     else:
                         f.write(str(content))
         
@@ -315,7 +337,23 @@ class GoogleDriveManager:
             return None
         
         try:
-            query = f"name='{file_name}' and '{self.folder_id}' in parents and trashed=false"
+            # Handle subfolder paths
+            if '/' in file_name:
+                folder_name, actual_file_name = file_name.split('/', 1)
+                
+                # Find the subfolder first
+                folder_query = f"name='{folder_name}' and '{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
+                folder_results = self.service.files().list(q=folder_query).execute()
+                folders = folder_results.get('files', [])
+                
+                if not folders:
+                    return None
+                
+                folder_id = folders[0]['id']
+                query = f"name='{actual_file_name}' and '{folder_id}' in parents and trashed=false"
+            else:
+                query = f"name='{file_name}' and '{self.folder_id}' in parents and trashed=false"
+            
             results = self.service.files().list(q=query).execute()
             files = results.get('files', [])
             
@@ -324,9 +362,65 @@ class GoogleDriveManager:
             return None
             
         except HttpError as e:
-            st.error(f"Error getting file info for '{file_name}': {str(e)}")
+            print(f"Error getting file info for '{file_name}': {str(e)}")
             return None
     
     def is_online(self) -> bool:
         """Check if Google Drive service is available"""
         return self.service is not None and self.folder_id is not None
+    
+    def create_folder(self, folder_name: str) -> Optional[str]:
+        """Create a new folder in Google Drive and return its ID"""
+        if not self.service or not self.folder_id:
+            return None
+        
+        try:
+            folder_metadata = {
+                'name': folder_name,
+                'mimeType': 'application/vnd.google-apps.folder',
+                'parents': [self.folder_id]
+            }
+            
+            created_folder = self.service.files().create(
+                body=folder_metadata,
+                fields='id'
+            ).execute()
+            
+            folder_id = created_folder.get('id')
+            print(f"Created folder '{folder_name}' with ID: {folder_id}")
+            return folder_id
+            
+        except HttpError as e:
+            print(f"Error creating folder '{folder_name}': {str(e)}")
+            return None
+    
+    def list_folders(self) -> List[Dict[str, Any]]:
+        """List all folders in the Google Drive directory"""
+        if not self.service or not self.folder_id:
+            return []
+        
+        try:
+            query = f"'{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
+            results = self.service.files().list(
+                q=query,
+                fields="files(id, name, modifiedTime)"
+            ).execute()
+            
+            return results.get('files', [])
+        except HttpError as e:
+            print(f"Error listing folders: {str(e)}")
+            return []
+    
+    def check_folder_exists(self, folder_name: str) -> bool:
+        """Check if a folder exists in Google Drive"""
+        if not self.service or not self.folder_id:
+            return False
+        
+        try:
+            query = f"name='{folder_name}' and '{self.folder_id}' in parents and trashed=false and mimeType='application/vnd.google-apps.folder'"
+            results = self.service.files().list(q=query).execute()
+            files = results.get('files', [])
+            return len(files) > 0
+        except HttpError as e:
+            print(f"Error checking folder existence: {str(e)}")
+            return False