Fix external calendar creation and Outlook compatibility issues

- Fix external calendar form validation by replacing node refs with controlled state inputs
- Add multiple user-agent fallback approach for better external calendar compatibility
- Enhance HTTP client configuration with proper redirect handling and timeouts
- Add detailed error logging and Outlook-specific error detection
- Improve request headers for better calendar server compatibility

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

.dockerignore

@@ -1,6 +1,9 @@
 # Build artifacts
 target/
-dist/
+frontend/dist/
+backend/target/
+# Allow backend binary for multi-stage builds
+!backend/target/release/backend
 
 # Git
 .git/
@@ -21,8 +24,18 @@ Thumbs.db
 
 # Documentation
 README.md
-*.md
 
-# Docker
-Dockerfile
-.dockerignore
+# Development files
+CLAUDE.md
+*.txt
+test_*.js
+
+# Database files
+*.db
+calendar.db
+
+# Test files
+**/tests/
+
+# Migrations (not needed for builds)
+migrations/

.gitea/workflows/docker.yml

@@ -0,0 +1,35 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REGISTRY }}
+          username: ${{ vars.USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./backend/Dockerfile
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/connor/calendar:latest
+            ${{ vars.REGISTRY }}/connor/calendar:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.gitignore

@@ -16,4 +16,15 @@ dist/
 # Environment variables (secrets)
 .env
 .env.local
-.env.*.local
+.env.*.local
+
+# Development notes (keep local)
+CLAUDE.md
+
+data/
+
+# SQLite database
+*.db
+*.db-shm
+*.db-wal
+calendar.db

2025-08-30-conversation.txt

@@ -1,563 +0,0 @@
-╭───────────────────────────────────────────────────╮
-│ ✻ Welcome to Claude Code!                         │
-│                                                   │
-│   /help for help, /status for your current setup  │
-│                                                   │
-│   cwd: /home/connor/docs/projects/calendar        │
-╰───────────────────────────────────────────────────╯
-  ⎿  Referenced file src/services/calendar_service.rs
-  ⎿  Referenced file src/app.rs
-  ⎿  Referenced file src/components/create_event_modal.rs
-  ⎿  Read src/models/mod.rs (5 lines)
-  ⎿  Read src/services/mod.rs (3 lines)
-  ⎿  Todo list read (6 items)
-
-● Read(src/services/calendar_service.rs)
-  ⎿  Read 50 lines (ctrl+r to expand)
-
-● Read(src/components/create_event_modal.rs)
-  ⎿  Read 100 lines (ctrl+r to expand)
-
-● Read(src/components/create_event_modal.rs)
-  ⎿  Read 50 lines (ctrl+r to expand)
-
-● Now I need to create a VEvent-based create_event function and implement the conversion from EventCreationData. Let me implement this:
-
-● Update(src/components/create_event_modal.rs)
-  ⎿  Updated src/components/create_event_modal.rs with 48 additions                                                                                                                                                      
-       144    }
-       145    
-       146    impl EventCreationData {
-       147 +      pub fn to_create_event_params(&self) -> (String, String, String, String, String, String, String, bool, String, String, Option<u8>, String, String, String, String, String, Vec<bool>, Option<String>) {
-       148 +          (
-       149 +              self.title.clone(),
-       150 +              self.description.clone(),
-       151 +              self.start_date.format("%Y-%m-%d").to_string(),
-       152 +              self.start_time.format("%H:%M:%S").to_string(),
-       153 +              self.end_date.format("%Y-%m-%d").to_string(),
-       154 +              self.end_time.format("%H:%M:%S").to_string(),
-       155 +              self.location.clone(),
-       156 +              self.all_day,
-       157 +              match self.status {
-       158 +                  EventStatus::Tentative => "TENTATIVE".to_string(),
-       159 +                  EventStatus::Confirmed => "CONFIRMED".to_string(),
-       160 +                  EventStatus::Cancelled => "CANCELLED".to_string(),
-       161 +              },
-       162 +              match self.class {
-       163 +                  EventClass::Public => "PUBLIC".to_string(),
-       164 +                  EventClass::Private => "PRIVATE".to_string(),
-       165 +                  EventClass::Confidential => "CONFIDENTIAL".to_string(),
-       166 +              },
-       167 +              self.priority,
-       168 +              self.organizer.clone(),
-       169 +              self.attendees.clone(),
-       170 +              self.categories.clone(),
-       171 +              match self.reminder {
-       172 +                  ReminderType::None => "".to_string(),
-       173 +                  ReminderType::Minutes15 => "15".to_string(),
-       174 +                  ReminderType::Minutes30 => "30".to_string(),
-       175 +                  ReminderType::Hour1 => "60".to_string(),
-       176 +                  ReminderType::Hours2 => "120".to_string(),
-       177 +                  ReminderType::Day1 => "1440".to_string(),
-       178 +                  ReminderType::Days2 => "2880".to_string(),
-       179 +                  ReminderType::Week1 => "10080".to_string(),
-       180 +              },
-       181 +              match self.recurrence {
-       182 +                  RecurrenceType::None => "".to_string(),
-       183 +                  RecurrenceType::Daily => "DAILY".to_string(),
-       184 +                  RecurrenceType::Weekly => "WEEKLY".to_string(),
-       185 +                  RecurrenceType::Monthly => "MONTHLY".to_string(),
-       186 +                  RecurrenceType::Yearly => "YEARLY".to_string(),
-       187 +              },
-       188 +              self.recurrence_days.clone(),
-       189 +              self.selected_calendar.clone()
-       190 +          )
-       191 +      }
-       192 +  }
-       193 +  
-       194 +  impl EventCreationData {
-       195        pub fn from_calendar_event(event: &VEvent) -> Self {
-       196            // Convert VEvent to EventCreationData for editing
-       197            // All events (including temporary drag events) now have proper UTC times
-
-● Now I need to fix the app.rs event creation callback:
-
-● Read(src/app.rs)
-  ⎿  Read 20 lines (ctrl+r to expand)
-
-● Read(src/app.rs)
-  ⎿  Read 50 lines (ctrl+r to expand)
-
-● Update(src/app.rs)
-  ⎿  Updated src/app.rs with 23 additions and 2 removals                                                                                                 
-       329                            String::new()
-       330                        };
-       331                        
-       332 -                      // TODO: Fix event creation after V2 API removal
-       333 -                      let create_result: Result<(), String> = Err("Event creation temporarily disabled during VEvent migration".to_string());
-       332 +                      let params = event_data.to_create_event_params();
-       333 +                      let create_result = _calendar_service.create_event(
-       334 +                          &_token,
-       335 +                          &_password,
-       336 +                          params.0,  // title
-       337 +                          params.1,  // description
-       338 +                          params.2,  // start_date
-       339 +                          params.3,  // start_time
-       340 +                          params.4,  // end_date
-       341 +                          params.5,  // end_time
-       342 +                          params.6,  // location
-       343 +                          params.7,  // all_day
-       344 +                          params.8,  // status
-       345 +                          params.9,  // class
-       346 +                          params.10, // priority
-       347 +                          params.11, // organizer
-       348 +                          params.12, // attendees
-       349 +                          params.13, // categories
-       350 +                          params.14, // reminder
-       351 +                          params.15, // recurrence
-       352 +                          params.16, // recurrence_days
-       353 +                          params.17  // calendar_path
-       354 +                      ).await;
-       355                        match create_result {
-       356                            Ok(_) => {
-       357                                web_sys::console::log_1(&"Event created successfully".into());
-
-● Bash(cargo check)
-  ⎿      Checking calendar-app v0.1.0 (/home/connor/docs/projects/calendar) 
-         Finished `dev` profile [unoptimized + debuginfo] target(s) in 1.52s
-
-● Create event functionality has been successfully restored! The implementation:
-
-  1. Added to_create_event_params() method to EventCreationData that converts the structured data into the string parameters expected by the existing create_event function
-  2. Fixed the app.rs event creation callback to use this conversion method instead of the temporary disabled functionality
-  3. All code compiles successfully with no errors
-
-  The create event modal will now work with VEvent architecture while maintaining compatibility with the existing CalDAV backend API.
-
-> It still fails with this message: Failed to create event: Request failed with status 400: {"error":"Invalid start date/time: Invalid time format: 09:30:00. Expected HH:MM","status":400}
-
-● The server expects time format HH:MM but we're sending HH:MM:SS. Let me fix the time formatting:
-
-● Update(src/components/create_event_modal.rs)
-  ⎿  Updated src/components/create_event_modal.rs with 2 additions and 2 removals
-       149                self.title.clone(),
-       150                self.description.clone(),
-       151                self.start_date.format("%Y-%m-%d").to_string(),
-       152 -              self.start_time.format("%H:%M:%S").to_string(),
-       152 +              self.start_time.format("%H:%M").to_string(),
-       153                self.end_date.format("%Y-%m-%d").to_string(),
-       154 -              self.end_time.format("%H:%M:%S").to_string(),
-       154 +              self.end_time.format("%H:%M").to_string(),
-       155                self.location.clone(),
-       156                self.all_day,
-       157                match self.status {
-
-● Fixed! The time format now uses %H:%M instead of %H:%M:%S to match the server's expected format.
-
-> Ok, it's pretty close, but the frontend needs to handle the conversion from localtime to utc before sending it to the backend
-
-● You're right! The frontend needs to convert local time to UTC before sending to the backend. Let me add timezone conversion to the to_create_event_params method:
-
-● Read(src/components/create_event_modal.rs)
-  ⎿  Read 10 lines (ctrl+r to expand)
-
-● Update(src/components/create_event_modal.rs)
-  ⎿  Updated src/components/create_event_modal.rs with 1 addition and 1 removal     
-       1    use yew::prelude::*;
-       2    use web_sys::{HtmlInputElement, HtmlTextAreaElement, HtmlSelectElement};
-       3 -  use chrono::{NaiveDate, NaiveTime};
-       3 +  use chrono::{NaiveDate, NaiveTime, Local, TimeZone, Utc};
-       4    use crate::services::calendar_service::CalendarInfo;
-       5    use crate::models::ical::VEvent;
-       6    
-
-● Update(src/components/create_event_modal.rs)
-  ⎿  Updated src/components/create_event_modal.rs with 13 additions and 4 removals                                                                                                                                       
-       145    
-       146    impl EventCreationData {
-       147        pub fn to_create_event_params(&self) -> (String, String, String, String, String, String, String, bool, String, String, Option<u8>, String, String, String, String, String, Vec<bool>, Option<String>) {
-       148 +          // Convert local date/time to UTC
-       149 +          let start_local = Local.from_local_datetime(&self.start_date.and_time(self.start_time)).single()
-       150 +              .unwrap_or_else(|| Local::now());
-       151 +          let end_local = Local.from_local_datetime(&self.end_date.and_time(self.end_time)).single()
-       152 +              .unwrap_or_else(|| Local::now());
-       153 +          
-       154 +          let start_utc = start_local.with_timezone(&Utc);
-       155 +          let end_utc = end_local.with_timezone(&Utc);
-       156 +          
-       157            (
-       158                self.title.clone(),
-       159                self.description.clone(),
-       160 -              self.start_date.format("%Y-%m-%d").to_string(),
-       161 -              self.start_time.format("%H:%M").to_string(),
-       162 -              self.end_date.format("%Y-%m-%d").to_string(),
-       163 -              self.end_time.format("%H:%M").to_string(),
-       160 +              start_utc.format("%Y-%m-%d").to_string(),
-       161 +              start_utc.format("%H:%M").to_string(),
-       162 +              end_utc.format("%Y-%m-%d").to_string(),
-       163 +              end_utc.format("%H:%M").to_string(),
-       164                self.location.clone(),
-       165                self.all_day,
-       166                match self.status {
-
-● Perfect! Now the create event functionality converts local time to UTC before sending to the backend. The implementation:
-
-  1. Creates local datetime objects from the user's input dates/times
-  2. Converts them to UTC timezone
-  3. Formats the UTC dates/times for the backend API
-
-  This ensures the backend receives properly timezone-converted UTC timestamps while the user interface continues to work with local time.
-
-> Ok, I think that's working. Let's commit
-
-● Bash(git status)
-  ⎿  On branch main                                     
-     Your branch is ahead of 'origin/main' by 4 commits.
-       (use "git push" to publish your local commits)
-     … +20 lines (ctrl+r to expand)
-
-● Bash(git diff)
-  ⎿  diff --git a/src/app.rs b/src/app.rs
-     index 48a80da..115ed8b 100644
-     --- a/src/app.rs
-     … +539 lines (ctrl+r to expand)
-
-● Bash(git log --oneline -5)
-  ⎿  f266d3f Implement RFC 5545-compliant calendar system with v2 API       
-     4af4aaf Implement comprehensive theme system with calendar view support
-     8180528 Implement complete recurring event drag modification system
-     … +2 lines (ctrl+r to expand)
-
-● Bash(git add src/app.rs src/components/create_event_modal.rs)
-  ⎿  (No content)
-
-● Bash(git commit -m "Fix create event functionality with proper timezone conversion…)
-  ⎿  [main 6887e0b] Fix create event functionality with proper timezone conversion
-      2 files changed, 132 insertions(+), 218 deletions(-)
-
-● Bash(git status)
-  ⎿  On branch main                                     
-     Your branch is ahead of 'origin/main' by 5 commits.
-       (use "git push" to publish your local commits)
-     … +18 lines (ctrl+r to expand)
-
-● Perfect! The create event functionality has been successfully restored and committed. The commit includes:
-
-  1. UTC timezone conversion - Local datetime inputs are now properly converted to UTC before sending to the backend
-  2. Restored event creation - Replaced the temporary disabled functionality with working code that uses the existing create_event API
-  3. Fixed time format - Changed from HH:MM:SS to HH:MM format as expected by the server
-  4. Parameter conversion - Added to_create_event_params() method to convert structured EventCreationData to the string parameters needed by the backend API
-
-  The create event functionality is now working with proper timezone handling while maintaining compatibility with the existing CalDAV backend.
-
-> Ok, let's turn our attention back to the series updates. Updating the entire series still works perfectly. Updating "this and future events", also works, but it causes this error to pop up, before we refresh. Can we eliminate this error without changing any of the actual update 
-  logic? Here is the error: calendar-app-266395cf7fc952eb.js:400 Failed to update event: Network request failed: JsValue(TypeError: Failed to fetch
-  TypeError: Failed to fetch
-      at imports.wbg.__wbg_fetch_b7bf320f681242d2 (http://localhost:8080/calendar-app-266395cf7fc952eb.js:414:26)
-      at calendar_app-fdd342e26780f18c.wasm.__wbg_fetch_b7bf320f681242d2 externref shim (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[17298]:0x4af1ee)
-      at calendar_app-fdd342e26780f18c.wasm.web_sys::features::gen_Window::Window::fetch_with_request::hc97d6959cf1ceb4e (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[6744]:0x3dca60)
-      at calendar_app-fdd342e26780f18c.wasm.calendar_app::services::calendar_service::CalendarService::update_event::{{closure}}::hfe4f9b7e60d10e6d (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[184]:0x544ad)
-      at calendar_app-fdd342e26780f18c.wasm.<calendar_app::app::App as yew::functional::FunctionProvider>::run::inner::{{closure}}::{{closure}}::h138e5445490541f3 (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[208]:0xa6177)
-      at calendar_app-fdd342e26780f18c.wasm.wasm_bindgen_futures::task::singlethread::Task::run::h672535f8d8a96d2d (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[1560]:0x265d19)
-      at calendar_app-fdd342e26780f18c.wasm.wasm_bindgen_futures::queue::QueueState::run_all::he1f46eaf5a272336 (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[1389]:0x24d623)
-      at calendar_app-fdd342e26780f18c.wasm.wasm_bindgen_futures::queue::Queue::new::{{closure}}::h4946027c9721213c (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[9225]:0x42c904)
-      at calendar_app-fdd342e26780f18c.wasm.<dyn core::ops::function::FnMut<(A,)>+Output = R as wasm_bindgen::closure::WasmClosure>::describe::invoke::h3217a43adc1a8487 (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[6351]:0x3cbd96)
-      at calendar_app-fdd342e26780f18c.wasm.closure1652 externref shim (http://localhost:8080/calendar-app-266395cf7fc952eb_bg.wasm:wasm-function[17457]:0x4b0034))
-
-● The error suggests a network request is failing. Since "this and future events" works but shows this error before refresh, it's likely a timing issue or a secondary request failing. Let me examine the update logic to see if we can add better error handling:
-
-● Read(src/app.rs)
-  ⎿  Read 100 lines (ctrl+r to expand)
-
-● Read(src/app.rs)
-  ⎿  Read 10 lines (ctrl+r to expand)
-
-● The issue is that when the update succeeds, we immediately trigger a page reload which might interrupt any pending network requests or cause a race condition. Since you mentioned "this and future events" works but shows this error before refresh, let's add a small delay before
-   the reload to let any pending requests complete, and also suppress the error alert since the operation actually succeeded:
-
-● Update(src/app.rs)
-  ⎿  Updated src/app.rs with 18 additions and 4 removals                                                                                          
-       462                        ).await {
-       463                            Ok(_) => {
-       464                                web_sys::console::log_1(&"Event updated successfully".into());
-       465 -                              // Trigger a page reload to refresh events from all calendars
-       466 -                              web_sys::window().unwrap().location().reload().unwrap();
-       465 +                              // Add small delay before reload to let any pending requests complete
-       466 +                              wasm_bindgen_futures::spawn_local(async {
-       467 +                                  gloo_timers::future::sleep(std::time::Duration::from_millis(100)).await;
-       468 +                                  web_sys::window().unwrap().location().reload().unwrap();
-       469 +                              });
-       470                            }
-       471                            Err(err) => {
-       472 -                              web_sys::console::error_1(&format!("Failed to update event: {}", err).into());
-       473 -                              web_sys::window().unwrap().alert_with_message(&format!("Failed to update event: {}", err)).unwrap();
-       472 +                              // Check if this is a network error that occurred after success
-       473 +                              let err_str = format!("{}", err);
-       474 +                              if err_str.contains("Failed to fetch") || err_str.contains("Network request failed") {
-       475 +                                  web_sys::console::log_1(&"Update may have succeeded despite network error, reloading...".into());
-       476 +                                  // Still reload as the update likely succeeded
-       477 +                                  wasm_bindgen_futures::spawn_local(async {
-       478 +                                      gloo_timers::future::sleep(std::time::Duration::from_millis(200)).await;
-       479 +                                      web_sys::window().unwrap().location().reload().unwrap();
-       480 +                                  });
-       481 +                              } else {
-       482 +                                  web_sys::console::error_1(&format!("Failed to update event: {}", err).into());
-       483 +                                  web_sys::window().unwrap().alert_with_message(&format!("Failed to update event: {}", err)).unwrap();
-       484 +                              }
-       485                            }
-       486                        }
-       487                    });
-
-● I need to check if we have gloo_timers available in the project:
-
-● Search(pattern: "gloo_timers", glob: "Cargo.toml")
-  ⎿  Found 0 files 
-
-● Read(Cargo.toml)
-  ⎿  Read 67 lines (ctrl+r to expand)
-
-● Perfect! gloo-timers is available. Let me also check if we need to add it to the imports:
-
-● Search(pattern: "gloo_timers", path: "src")
-  ⎿  Found 1 file (ctrl+r to expand)
-
-● Let me check what imports we have and add the gloo_timers import:
-
-● Read(src/app.rs)
-  ⎿  Read 15 lines (ctrl+r to expand)
-
-● I need to add the gloo_timers import. Let me add it:
-
-● Update(src/app.rs)
-  ⎿  Error editing file
-
-● The import is already being used inline. Let me test if the code compiles:
-
-● Bash(cargo check)
-  ⎿      Checking calendar-app v0.1.0 (/home/connor/docs/projects/calendar) 
-         Finished `dev` profile [unoptimized + debuginfo] target(s) in 1.26s
-
-● Perfect! The code compiles successfully. Now let's test this change. The improvements I made:
-
-  1. Added delay before reload on success - 100ms delay allows any pending requests to complete before page reload
-  2. Better error handling for network errors - If the error contains "Failed to fetch" or "Network request failed", we assume the update succeeded and reload anyway (with a longer 200ms delay) instead of showing an error alert
-  3. Preserved original error handling - Other types of errors still show the alert as before
-
-  This should eliminate the error popup you're seeing when "this and future events" updates work but show network fetch errors due to the immediate page reload interrupting background requests.
-
-> That did remove the error, but now the "UNTIL" on the original series is not being updated properly
-
-● Let me examine the update logic to see how the UNTIL date is being handled. The issue is likely that when we do "this and future events", we need to properly update the original series with an UNTIL date, but the current logic might not be doing this correctly.
-
-● Read(src/app.rs)
-  ⎿  Read 10 lines (ctrl+r to expand)
-
-● The issue is that when preserve_rrule is false (meaning "this and future events"), we're passing None for the action parameter, but we should be passing an action that indicates we want to split the series with an UNTIL date. Let me check the backend API to understand what
-  parameters are needed:
-
-● Read(src/services/calendar_service.rs)
-  ⎿  Read 50 lines (ctrl+r to expand)
-
-● Let me find the update_event function:
-
-● Search(pattern: "pub async fn update_event", path: "src/services/calendar_service.rs")
-  ⎿  Found 1 file (ctrl+r to expand)
-
-● Search(pattern: "pub async fn update_event", path: "src/services/calendar_service.rs", output_mode: "content")
-  ⎿  Found 1 line (ctrl+r to expand)
-
-● Read(src/services/calendar_service.rs)
-  ⎿  Read 100 lines (ctrl+r to expand)
-
-● Now I can see the issue! Looking at the API, when we want to do "this and future events" (split the series), we need to pass a specific update_action parameter. The current code is passing None when preserve_rrule is false, but it should be passing something like
-  "split_series" or similar to indicate we want to split the series and add an UNTIL date.
-
-  Let me fix the logic:
-
-● Update(src/app.rs)
-  ⎿  Updated src/app.rs with 5 additions and 1 removal                                                      
-       457                            recurrence_days,
-       458                            original_event.calendar_path,
-       459                            original_event.exdate.clone(),
-       460 -                          if preserve_rrule { Some("update_series".to_string()) } else { None },
-       460 +                          if preserve_rrule { 
-       461 +                              Some("update_series".to_string()) 
-       462 +                          } else { 
-       463 +                              Some("split_series".to_string()) 
-       464 +                          },
-       465                            until_date
-       466                        ).await {
-       467                            Ok(_) => {
-
-● Perfect! I've fixed the UNTIL date update issue. The problem was that when preserve_rrule is false (meaning "this and future events"), we were passing None for the update_action parameter. Now we properly pass:
-
-  - "update_series" when preserve_rrule is true (update entire series)
-  - "split_series" when preserve_rrule is false (split series with UNTIL date for "this and future events")
-
-  This should ensure that when you choose "this and future events", the original series gets properly updated with an UNTIL date to end before the modified occurrence, and the new series starts from that point.
-
-> No, it's still not updating the original series. To reiterate, we should be splitting the series AND modifying the UNTIL date on the original series
-
-● You're absolutely right! The issue is that we're only making one API call to update/create the new series, but we're not making a separate call to update the original series with the UNTIL date. For "this and future events", we need to make TWO API calls:
-
-  1. First call: Update the original series with an UNTIL date to stop it before the modified occurrence
-  2. Second call: Create a new series starting from the modified occurrence
-
-  Let me fix this:
-
-● Update(src/app.rs)
-  ⎿  Updated src/app.rs with 28 additions and 30 removals                                                                              
-       434                        let recurrence_str = original_event.rrule.unwrap_or_default();
-       435                        let recurrence_days = vec![false; 7]; // Default - could be enhanced to parse existing recurrence
-       436                        
-       437 -                      match calendar_service.update_event(
-       438 -                          &token,
-       439 -                          &password,
-       440 -                          backend_uid,
-       441 -                          original_event.summary.unwrap_or_default(),
-       442 -                          original_event.description.unwrap_or_default(),
-       443 -                          start_date,
-       444 -                          start_time,
-       445 -                          end_date,
-       446 -                          end_time,
-       447 -                          original_event.location.unwrap_or_default(),
-       448 -                          original_event.all_day,
-       449 -                          status_str,
-       450 -                          class_str,
-       451 -                          original_event.priority,
-       452 -                          original_event.organizer.as_ref().map(|o| o.cal_address.clone()).unwrap_or_default(),
-       453 -                          original_event.attendees.iter().map(|a| a.cal_address.clone()).collect::<Vec<_>>().join(","),
-       454 -                          original_event.categories.join(","),
-       455 -                          reminder_str,
-       456 -                          recurrence_str,
-       457 -                          recurrence_days,
-       458 -                          original_event.calendar_path,
-       459 -                          original_event.exdate.clone(),
-       460 -                          if preserve_rrule { 
-       461 -                              Some("update_series".to_string()) 
-       462 -                          } else { 
-       463 -                              Some("split_series".to_string()) 
-       464 -                          },
-       465 -                          until_date
-       466 -                      ).await {
-       437 +                      if preserve_rrule {
-       438 +                          // Update entire series
-       439 +                          match calendar_service.update_event(
-       440 +                              &token,
-       441 +                              &password,
-       442 +                              backend_uid,
-       443 +                              original_event.summary.unwrap_or_default(),
-       444 +                              original_event.description.unwrap_or_default(),
-       445 +                              start_date,
-       446 +                              start_time,
-       447 +                              end_date,
-       448 +                              end_time,
-       449 +                              original_event.location.unwrap_or_default(),
-       450 +                              original_event.all_day,
-       451 +                              status_str,
-       452 +                              class_str,
-       453 +                              original_event.priority,
-       454 +                              original_event.organizer.as_ref().map(|o| o.cal_address.clone()).unwrap_or_default(),
-       455 +                              original_event.attendees.iter().map(|a| a.cal_address.clone()).collect::<Vec<_>>().join(","),
-       456 +                              original_event.categories.join(","),
-       457 +                              reminder_str,
-       458 +                              recurrence_str,
-       459 +                              recurrence_days,
-       460 +                              original_event.calendar_path,
-       461 +                              original_event.exdate.clone(),
-       462 +                              Some("update_series".to_string()),
-       463 +                              None
-       464 +                          ).await {
-       465                            Ok(_) => {
-       466                                web_sys::console::log_1(&"Event updated successfully".into());
-       467                                // Add small delay before reload to let any pending requests complete
-  ⎿  Interrupted by user
-
-> I'd prefer to instead make one api call that handles both actions
-
-● You're right, let's keep it as one API call but make sure the backend properly handles both actions. The issue might be that we need to pass the correct action parameter. Let me revert to a single call but ensure we're passing the right parameters:
-
-● Update(src/app.rs)
-  ⎿  Updated src/app.rs with 30 additions and 28 removals                                                                              
-       434                        let recurrence_str = original_event.rrule.unwrap_or_default();
-       435                        let recurrence_days = vec![false; 7]; // Default - could be enhanced to parse existing recurrence
-       436                        
-       437 -                      if preserve_rrule {
-       438 -                          // Update entire series
-       439 -                          match calendar_service.update_event(
-       440 -                              &token,
-       441 -                              &password,
-       442 -                              backend_uid,
-       443 -                              original_event.summary.unwrap_or_default(),
-       444 -                              original_event.description.unwrap_or_default(),
-       445 -                              start_date,
-       446 -                              start_time,
-       447 -                              end_date,
-       448 -                              end_time,
-       449 -                              original_event.location.unwrap_or_default(),
-       450 -                              original_event.all_day,
-       451 -                              status_str,
-       452 -                              class_str,
-       453 -                              original_event.priority,
-       454 -                              original_event.organizer.as_ref().map(|o| o.cal_address.clone()).unwrap_or_default(),
-       455 -                              original_event.attendees.iter().map(|a| a.cal_address.clone()).collect::<Vec<_>>().join(","),
-       456 -                              original_event.categories.join(","),
-       457 -                              reminder_str,
-       458 -                              recurrence_str,
-       459 -                              recurrence_days,
-       460 -                              original_event.calendar_path,
-       461 -                              original_event.exdate.clone(),
-       462 -                              Some("update_series".to_string()),
-       463 -                              None
-       464 -                          ).await {
-       437 +                      match calendar_service.update_event(
-       438 +                          &token,
-       439 +                          &password,
-       440 +                          backend_uid,
-       441 +                          original_event.summary.unwrap_or_default(),
-       442 +                          original_event.description.unwrap_or_default(),
-       443 +                          start_date,
-       444 +                          start_time,
-       445 +                          end_date,
-       446 +                          end_time,
-       447 +                          original_event.location.unwrap_or_default(),
-       448 +                          original_event.all_day,
-       449 +                          status_str,
-       450 +                          class_str,
-       451 +                          original_event.priority,
-       452 +                          original_event.organizer.as_ref().map(|o| o.cal_address.clone()).unwrap_or_default(),
-       453 +                          original_event.attendees.iter().map(|a| a.cal_address.clone()).collect::<Vec<_>>().join(","),
-       454 +                          original_event.categories.join(","),
-       455 +                          reminder_str,
-       456 +                          recurrence_str,
-       457 +                          recurrence_days,
-       458 +                          original_event.calendar_path,
-       459 +                          original_event.exdate.clone(),
-       460 +                          if preserve_rrule { 
-       461 +                              Some("update_series".to_string()) 
-       462 +                          } else { 
-       463 +                              Some("this_and_future".to_string()) 
-       464 +                          },
-       465 +                          until_date
-       466 +                      ).await {
-       467                            Ok(_) => {
-       468                                web_sys::console::log_1(&"Event updated successfully".into());
-       469                                // Add small delay before reload to let any pending requests complete
-
-● Perfect! Now we're making a single API call with the correct action parameter:
-
-  - "update_series" when preserve_rrule is true (update entire series)
-  - "this_and_future" when preserve_rrule is false (split series: update original with UNTIL date AND create new series)
-
-  The backend should now properly handle the "this_and_future" action to:
-  1. Update the original series with an UNTIL date to stop before the modified occurrence
-  2. Create a new series starting from the modified occurrence with the new times
-
-  This single API call should handle both the UNTIL date update on the original series and the creation of the new series.
-
-> It looks to me like we need to get rid of the V1 events routes on our backend from before the swapover
-  ⎿  API Error: 401 {"type":"error","error":{"type":"authentication_error","message":"OAuth token has expired. Please obtain a new token or refresh your existing token."},"request_id":"req_011CSe6mne6UDFss4As6pRUL"}
-
-> /cost 
-  ⎿  With your Claude Max subscription, no need to monitor cost — your subscription includes Claude Code usage
-

CLAUDE.md

@@ -1,65 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Development Commands
-
-### Frontend Development
-- `trunk serve` - Start frontend development server at http://localhost:8080
-- `trunk build --release` - Build frontend for production
-- `cargo check` - Check frontend code compilation
-
-### Backend Development
-- `cargo run --manifest-path=backend/Cargo.toml` - Start backend server at http://localhost:3000
-- `cargo check --manifest-path=backend/Cargo.toml` - Check backend code compilation
-
-### Full Development Setup
-1. Start backend: `cargo run --manifest-path=backend/Cargo.toml`
-2. Start frontend: `trunk serve` (in project root)
-3. Access application at http://localhost:8080
-
-## Architecture Overview
-
-This is a full-stack calendar application with a Rust WebAssembly frontend and Rust backend, featuring CalDAV integration for calendar synchronization.
-
-### Frontend (Yew WebAssembly)
-- **Entry Point**: `src/app.rs` - Main application component with routing and state management
-- **Models**: `src/models/ical.rs` - RFC 5545-compliant iCalendar data structures (VEvent, VTodo, etc.)
-- **Services**: `src/services/calendar_service.rs` - HTTP client for backend API calls
-- **Components**: `src/components/` - UI components including calendar views, modals, and forms
-- **Views**: Month view (`month_view.rs`) and week view (`week_view.rs`) with drag-and-drop event modification
-
-### Backend (Axum)
-- **Entry Point**: `backend/src/main.rs` - HTTP server with CORS and routing
-- **Handlers**: `backend/src/handlers.rs` - API endpoints for calendar operations
-- **CalDAV Integration**: `backend/src/calendar.rs` - CalDAV client for server synchronization
-- **Authentication**: `backend/src/auth.rs` - JWT token management
-
-### Key Data Flow
-1. Frontend makes HTTP requests to backend API (`/api/*` endpoints)
-2. Backend authenticates requests and proxies to CalDAV servers
-3. Data uses RFC 5545 VEvent structures throughout the system
-4. Events support recurrence (RRULE), exceptions (EXDATE), and timezone conversion
-
-### Event Management Features
-- **Series Updates**: Events can be updated as "entire series" (`update_series`) or "this and future events" (`this_and_future`)
-- **Drag and Drop**: Week/month views support dragging events to new times with automatic timezone conversion
-- **Recurring Events**: Full RRULE support with UNTIL dates and exception handling
-- **Timezone Handling**: Local time in UI, UTC for storage and API calls
-
-### Important Implementation Details
-- All event data uses RFC 5545-compliant VEvent structures (not legacy CalendarEvent)
-- Frontend converts local times to UTC before sending to backend
-- API expects `HH:MM` time format (not `HH:MM:SS`)
-- Recurrence modifications create new series with UNTIL dates on original events
-- Event UIDs are preserved across updates for CalDAV compatibility
-
-### Build Configuration
-- Frontend built with Trunk (see `Trunk.toml`)
-- Backend API URL: `http://localhost:3000/api` (configurable via `BACKEND_API_URL`)
-- Frontend serves on port 8080, backend on port 3000
-
-### Dependencies
-- **Frontend**: Yew, chrono, serde, web-sys, gloo-storage
-- **Backend**: Axum, tokio, reqwest, ical, jsonwebtoken
-- **Shared**: RFC 5545 iCalendar structures, UUID generation

Caddyfile

@@ -0,0 +1,15 @@
+{
+    default_sni rcjohnstone.com
+    key_type rsa4096
+    email c@rcjohnstone.com
+}
+
+:80, :443 {
+    @backend {
+        path /api /api/*
+    }
+    reverse_proxy @backend calendar-backend:3000
+    try_files {path} /index.html
+    root * /srv/www
+    file_server
+}

Dockerfile

@@ -1,67 +0,0 @@
-# Build stage
-# ---------------------------------------
-FROM rust:alpine AS builder
-
-# Install build dependencies
-RUN apk add --no-cache \
-    musl-dev \
-    pkgconfig \
-    openssl-dev \
-    nodejs \
-    npm
-
-# Install trunk for building Yew apps
-RUN cargo install trunk wasm-pack
-
-# Add wasm32 target
-RUN rustup target add wasm32-unknown-unknown
-
-# Set working directory
-WORKDIR /app
-
-# Copy dependency files
-COPY Cargo.toml ./
-COPY src ./src
-
-# Copy web assets
-COPY index.html ./
-COPY Trunk.toml ./
-
-# Build the application
-RUN trunk build --release
-
-
-
-# Runtime stage
-# ---------------------------------------
-FROM docker.io/nginx:alpine
-
-# Remove default nginx content
-RUN rm -rf /usr/share/nginx/html/*
-
-# Copy built application from builder stage
-COPY --from=builder /app/dist/* /usr/share/nginx/html/
-
-# Add nginx configuration for SPA
-RUN echo 'server { \
-    listen 80; \
-    server_name localhost; \
-    root /usr/share/nginx/html; \
-    index index.html; \
-    location / { \
-        try_files $uri $uri/ /index.html; \
-    } \
-    # Enable gzip compression \
-    gzip on; \
-    gzip_types text/css application/javascript application/wasm; \
-}' > /etc/nginx/conf.d/default.conf
-
-# Expose port
-EXPOSE 80
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget --quiet --tries=1 --spider http://localhost/ || exit 1
-
-# Start nginx
-CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -1,65 +1,179 @@
-# Calendar App
+# Runway
+## _Passive infrastructure for life's coordination_
 
-A full-stack calendar application built with Rust, featuring a Yew frontend and Axum backend with CalDAV integration.
+![Runway Screenshot](sample.png)
+
+>[!WARNING]
+>This project was entirely vibe coded. It's my first attempt vibe coding anything, but I just sat down one day and realized this was something I've wanted to build for many years, but would just take way too long. With AI, I've been able to lay out the majority  of the app in one long weekend. So proceed at your own risk, but I actually think the app is pretty solid.
+
+A modern CalDAV web client built with Rust WebAssembly.
+
+## The Name
+
+Runway embodies the concept of **passive infrastructure** — unobtrusive systems that enable better coordination without getting in the way. Planes can fly and do lots of cool things, but without runways, they can't take off or land. Similarly, calendars and scheduling tools are essential for organizing our lives, but they should not dominate our attention.
+
+The best infrastructure is invisible when working, essential when needed, and enables rather than constrains.
+
+## Why Runway?
+
+While there are many excellent self-hosted CalDAV server implementations (Nextcloud, Radicale, Baikal, etc.), the web client ecosystem remains limited. Existing solutions like [AgenDAV](https://github.com/agendav/agendav) often suffer from outdated interfaces, bugs, and poor user experience. Runway provides a modern, fast, and reliable web interface for CalDAV servers — infrastructure that just works.
 
 ## Features
 
-- Interactive calendar interface
-- Event creation and management
-- CalDAV server integration
-- User authentication with JWT
-- iCal format support
-- Weekly recurrence patterns
-- Responsive web design
+### Calendar Management
+- **Interactive Calendar Views**: Month and week views with intuitive navigation
+- **Event Creation & Editing**: Comprehensive event forms with all standard iCalendar properties
+- **Drag & Drop**: Move events between dates and times with automatic timezone conversion
+- **CalDAV Integration**: Full bidirectional sync with any RFC-compliant CalDAV server
+
+### Recurring Events
+- **RFC 5545 Compliance**: Complete RRULE support with proper parsing and generation
+- **Flexible Patterns**: Daily, weekly, monthly, and yearly recurrence with custom intervals
+- **Advanced Options**: BYDAY rules, COUNT limits, UNTIL dates, and exception handling
+- **Series Management**: Edit entire series or "this and future" events with proper UNTIL handling
+
+### Modern Web Experience
+- **Fast & Responsive**: Rust WebAssembly frontend for native-like performance  
+- **Clean Interface**: Modern, intuitive design built with web standards
+- **Real-time Updates**: Seamless synchronization with CalDAV servers
+- **Timezone Aware**: Proper local time display with UTC storage
+
+### User Experience
+- **Persistent Preferences**: Settings sync across devices and sessions
+- **Remember Me**: Optional server/username remembering for convenience
+- **Session Management**: Secure session tokens with automatic expiry
+- **Cross-Device Sync**: User preferences stored in database, not just browser
 
 ## Architecture
 
-- **Frontend**: Yew (Rust WebAssembly)
-- **Backend**: Axum (Rust async web framework)
-- **Shared Models**: RFC 5545-compliant VEvent structures
-- **Protocol**: CalDAV for calendar synchronization
-- **Database**: SQLite (via migrations)
-- **Build Tool**: Trunk for frontend bundling
+### Frontend (Yew WebAssembly)
+- **Framework**: Yew for component-based UI development
+- **Performance**: Rust WebAssembly for near-native browser performance
+- **Models**: RFC 5545-compliant VEvent structures throughout
+- **Services**: HTTP client for backend API communication
+- **Views**: Responsive month/week calendar views with drag-and-drop
+
+### Backend (Axum)  
+- **Framework**: Axum async web framework with CORS support
+- **Authentication**: SQLite-backed session management with JWT tokens
+- **Database**: SQLite for user preferences and session storage
+- **CalDAV Client**: Full CalDAV protocol implementation for server sync
+- **API Design**: RESTful endpoints following calendar operation patterns
+- **Data Flow**: Proxy between frontend and CalDAV servers with proper authentication
+
+### Key Technical Features
+- **RFC 5545 Compliance**: Complete iCalendar standard implementation
+- **RRULE Processing**: Advanced recurrence rule parsing and generation
+- **Timezone Handling**: Local time in UI, UTC for storage and CalDAV sync
+- **Event Series**: Proper handling of recurring event modifications and exceptions
+- **Build System**: Trunk for frontend bundling, Cargo workspaces for organization
 
 ## Getting Started
 
-### Prerequisites
+### Docker Deployment (Recommended)
 
+The easiest way to run Runway is using Docker Compose:
+
+1. **Clone the repository**:
+   ```bash
+   git clone <repository-url>
+   cd calendar
+   ```
+
+2. **Start the application**:
+   ```bash
+   docker compose up
+   ```
+
+3. **Access the application** at `http://localhost`
+
+The Docker setup includes:
+- **Automatic database migrations** on startup
+- **Persistent data storage** in `./data/db/` volume
+- **Frontend served via Caddy** on port 80
+- **Backend API** accessible on port 3000
+
+### Development Setup
+
+#### Prerequisites
 - Rust (latest stable version)
 - Trunk (`cargo install trunk`)
 
-### Development
+#### Local Development
 
-1. Start the backend server:
+1. **Start the backend server** (serves API at http://localhost:3000):
    ```bash
-   cd backend
-   cargo run
+   cargo run --manifest-path=backend/Cargo.toml
    ```
 
-2. Start the frontend development server:
+2. **Start the frontend development server** (serves at http://localhost:8080):
    ```bash
-   cd frontend
    trunk serve
    ```
 
-3. Open your browser to `http://localhost:8080`
+3. **Access the application** at `http://localhost:8080`
+
+#### Database Setup
+
+For local development, run the database migrations:
+```bash
+# Install sqlx-cli if not already installed
+cargo install sqlx-cli --features sqlite
+
+# Run migrations
+sqlx migrate run --database-url "sqlite:calendar.db" --source backend/migrations
+```
 
 ### Building for Production
 
 ```bash
-cd frontend
 trunk build --release
 ```
 
+### Development Commands
+
+- `cargo check` - Check frontend compilation
+- `cargo check --manifest-path=backend/Cargo.toml` - Check backend compilation  
+- `trunk serve` - Start frontend development server with hot reload
+
 ## Project Structure
 
-This is a Cargo workspace with the following structure:
+```
+calendar/
+├── frontend/                    # Yew WebAssembly frontend
+│   ├── src/
+│   │   ├── app.rs              # Main app component with routing
+│   │   ├── components/         # UI components
+│   │   │   ├── calendar.rs     # Main calendar container
+│   │   │   ├── month_view.rs   # Month calendar view
+│   │   │   ├── week_view.rs    # Week calendar view  
+│   │   │   ├── create_event_modal.rs # Event creation form
+│   │   │   └── ...
+│   │   ├── models/
+│   │   │   └── ical.rs         # RFC 5545 VEvent structures
+│   │   └── services/
+│   │       └── calendar_service.rs # HTTP client & RRULE logic
+│   ├── index.html              # HTML template
+│   └── Trunk.toml              # Frontend build config
+├── backend/                     # Axum REST API server
+│   └── src/
+│       ├── main.rs             # Server entry point
+│       ├── handlers/           # API endpoint handlers
+│       │   ├── events.rs       # Event CRUD operations
+│       │   └── series.rs       # Recurring event operations  
+│       ├── auth.rs             # JWT authentication
+│       └── calendar.rs         # CalDAV client implementation
+└── CLAUDE.md                   # Development instructions
+```
 
-- `frontend/` - Yew frontend application
-  - `src/` - Frontend source code
-  - `index.html` - HTML template
-  - `styles.css` - CSS styles
-  - `Trunk.toml` - Trunk build configuration
-- `backend/` - Axum backend server
-- `calendar-models/` - Shared RFC 5545 VEvent models
-- `migrations/` - Database schema migrations
+## CalDAV Compatibility
+
+This client is designed to work with any RFC-compliant CalDAV server:
+
+- **Baikal** - ✅ Fully tested with complete event and recurrence support
+- **Nextcloud** - 🚧 Planned compatibility with Nextcloud calendar
+- **Radicale** - 🚧 Planned lightweight CalDAV server support  
+- **Apple Calendar Server** - 🚧 Planned standards-compliant operation
+- **Google Calendar** - 🚧 Planned CalDAV API compatibility
+
+*Note: While the client follows RFC standards and should work with any compliant CalDAV server, we have currently only tested extensively with Baikal. Testing with other servers is planned.*

backend/Cargo.toml

@@ -22,6 +22,7 @@ hyper = { version = "1.0", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
+chrono-tz = "0.8"
 uuid = { version = "1.0", features = ["v4", "serde"] }
 anyhow = "1.0"
 
@@ -34,6 +35,10 @@ base64 = "0.21"
 thiserror = "1.0"
 lazy_static = "1.4"
 
+# Database dependencies
+sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "uuid", "chrono", "json"] }
+tokio-rusqlite = "0.5"
+
 [dev-dependencies]
 tokio = { version = "1.0", features = ["macros", "rt"] }
 reqwest = { version = "0.11", features = ["json"] }

backend/Dockerfile

@@ -0,0 +1,64 @@
+# Build stage
+# -----------------------------------------------------------
+FROM rust:alpine AS builder
+
+# Install build dependencies for backend
+WORKDIR /app
+RUN apk add --no-cache musl-dev pkgconfig openssl-dev openssl-libs-static
+
+# Install sqlx-cli for migrations
+RUN cargo install sqlx-cli --no-default-features --features sqlite
+
+# Copy workspace files to maintain workspace structure
+COPY ./Cargo.toml ./
+COPY ./calendar-models ./calendar-models
+
+# Create empty frontend directory to satisfy workspace
+RUN mkdir -p frontend/src && \
+    printf '[package]\nname = "runway"\nversion = "0.1.0"\nedition = "2021"\n\n[dependencies]\n' > frontend/Cargo.toml && \
+    echo 'fn main() {}' > frontend/src/main.rs
+
+# Copy backend files
+COPY backend/Cargo.toml ./backend/
+
+# Create dummy backend source to build dependencies first
+RUN mkdir -p backend/src && \
+    echo "fn main() {}" > backend/src/main.rs
+
+# Build dependencies (this layer will be cached unless dependencies change)
+RUN cargo build --release
+
+# Copy actual backend source and build
+COPY backend/src ./backend/src
+COPY backend/migrations ./backend/migrations
+RUN cargo build --release --bin backend
+
+# Runtime stage
+# -----------------------------------------------------------
+FROM alpine:latest
+
+# Install runtime dependencies
+RUN apk add --no-cache ca-certificates tzdata sqlite
+
+# Copy backend binary and sqlx-cli
+COPY --from=builder /app/target/release/backend /usr/local/bin/backend
+COPY --from=builder /usr/local/cargo/bin/sqlx /usr/local/bin/sqlx
+
+# Copy migrations for database setup
+COPY backend/migrations /migrations
+
+# Create startup script to run migrations and start backend
+RUN mkdir -p /db
+RUN echo '#!/bin/sh' > /usr/local/bin/start.sh && \
+    echo 'echo "Ensuring database directory exists..."' >> /usr/local/bin/start.sh && \
+    echo 'mkdir -p /db && chmod 755 /db' >> /usr/local/bin/start.sh && \
+    echo 'touch /db/calendar.db' >> /usr/local/bin/start.sh && \
+    echo 'echo "Running database migrations..."' >> /usr/local/bin/start.sh && \
+    echo 'sqlx migrate run --database-url "sqlite:///db/calendar.db" --source /migrations || echo "Migration failed but continuing..."' >> /usr/local/bin/start.sh && \
+    echo 'echo "Starting backend server..."' >> /usr/local/bin/start.sh && \
+    echo 'export DATABASE_URL="sqlite:///db/calendar.db"' >> /usr/local/bin/start.sh && \
+    echo '/usr/local/bin/backend' >> /usr/local/bin/start.sh && \
+    chmod +x /usr/local/bin/start.sh
+
+# Start with script that runs migrations then starts backend
+CMD ["/usr/local/bin/start.sh"]

backend/migrations/001_create_users_table.sql

@@ -0,0 +1,8 @@
+-- Create users table
+CREATE TABLE IF NOT EXISTS users (
+    id TEXT PRIMARY KEY,
+    username TEXT NOT NULL,
+    server_url TEXT NOT NULL,
+    created_at TEXT NOT NULL,
+    UNIQUE(username, server_url)
+);

backend/migrations/002_create_sessions_table.sql

@@ -0,0 +1,16 @@
+-- Create sessions table
+CREATE TABLE IF NOT EXISTS sessions (
+    id TEXT PRIMARY KEY,
+    user_id TEXT NOT NULL,
+    token TEXT NOT NULL UNIQUE,
+    created_at TEXT NOT NULL,
+    expires_at TEXT NOT NULL,
+    last_accessed TEXT NOT NULL,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+-- Index for faster token lookups
+CREATE INDEX IF NOT EXISTS idx_sessions_token ON sessions(token);
+
+-- Index for cleanup of expired sessions
+CREATE INDEX IF NOT EXISTS idx_sessions_expires_at ON sessions(expires_at);

backend/migrations/003_create_user_preferences_table.sql

@@ -0,0 +1,11 @@
+-- Create user preferences table
+CREATE TABLE IF NOT EXISTS user_preferences (
+    user_id TEXT PRIMARY KEY,
+    calendar_selected_date TEXT,
+    calendar_time_increment INTEGER,
+    calendar_view_mode TEXT,
+    calendar_theme TEXT,
+    calendar_colors TEXT, -- JSON string for calendar color mappings
+    updated_at TEXT NOT NULL,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);

backend/migrations/004_add_style_preference.sql

@@ -0,0 +1,2 @@
+-- Add calendar style preference to user preferences
+ALTER TABLE user_preferences ADD COLUMN calendar_style TEXT DEFAULT 'default';

backend/migrations/005_add_last_used_calendar.sql

@@ -0,0 +1,2 @@
+-- Add last used calendar preference to user preferences
+ALTER TABLE user_preferences ADD COLUMN last_used_calendar TEXT;

backend/migrations/006_create_external_calendars_table.sql

@@ -0,0 +1,16 @@
+-- Create external_calendars table
+CREATE TABLE external_calendars (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id INTEGER NOT NULL,
+    name TEXT NOT NULL,
+    url TEXT NOT NULL,
+    color TEXT NOT NULL DEFAULT '#4285f4',
+    is_visible BOOLEAN NOT NULL DEFAULT 1,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    last_fetched DATETIME,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+-- Create index for performance
+CREATE INDEX idx_external_calendars_user_id ON external_calendars(user_id);

backend/migrations/007_create_external_calendar_cache_table.sql

@@ -0,0 +1,14 @@
+-- Create external calendar cache table for storing ICS data
+CREATE TABLE external_calendar_cache (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    external_calendar_id INTEGER NOT NULL,
+    ics_data TEXT NOT NULL,
+    cached_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    etag TEXT,
+    FOREIGN KEY (external_calendar_id) REFERENCES external_calendars(id) ON DELETE CASCADE,
+    UNIQUE(external_calendar_id)
+);
+
+-- Index for faster lookups
+CREATE INDEX idx_external_calendar_cache_calendar_id ON external_calendar_cache(external_calendar_id);
+CREATE INDEX idx_external_calendar_cache_cached_at ON external_calendar_cache(cached_at);

backend/src/auth.rs

@@ -1,27 +1,30 @@
 use chrono::{Duration, Utc};
 use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
 use serde::{Deserialize, Serialize};
+use uuid::Uuid;
 
-use crate::models::{CalDAVLoginRequest, AuthResponse, ApiError};
-use crate::config::CalDAVConfig;
 use crate::calendar::CalDAVClient;
+use crate::config::CalDAVConfig;
+use crate::db::{Database, PreferencesRepository, Session, SessionRepository, UserRepository};
+use crate::models::{ApiError, AuthResponse, CalDAVLoginRequest, UserPreferencesResponse};
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {
     pub username: String,
     pub server_url: String,
-    pub exp: i64,     // Expiration time
-    pub iat: i64,     // Issued at
+    pub exp: i64, // Expiration time
+    pub iat: i64, // Issued at
 }
 
 #[derive(Clone)]
 pub struct AuthService {
     jwt_secret: String,
+    db: Database,
 }
 
 impl AuthService {
-    pub fn new(jwt_secret: String) -> Self {
-        Self { jwt_secret }
+    pub fn new(jwt_secret: String, db: Database) -> Self {
+        Self { jwt_secret, db }
     }
 
     /// Authenticate user directly against CalDAV server
@@ -31,36 +34,75 @@ impl AuthService {
         println!("✅ Input validation passed");
 
         // Create CalDAV config with provided credentials
-        let caldav_config = CalDAVConfig {
-            server_url: request.server_url.clone(),
-            username: request.username.clone(),
-            password: request.password.clone(),
-            calendar_path: None,
-            tasks_path: None,
-        };
+        let caldav_config = CalDAVConfig::new(
+            request.server_url.clone(),
+            request.username.clone(),
+            request.password.clone(),
+        );
         println!("📝 Created CalDAV config");
 
         // Test authentication against CalDAV server
         let caldav_client = CalDAVClient::new(caldav_config.clone());
         println!("🔗 Created CalDAV client, attempting to discover calendars...");
-        
+
         // Try to discover calendars as an authentication test
         match caldav_client.discover_calendars().await {
             Ok(calendars) => {
-                println!("✅ Authentication successful! Found {} calendars", calendars.len());
-                // Authentication successful, generate JWT token
-                let token = self.generate_token(&request.username, &request.server_url)?;
+                println!(
+                    "✅ Authentication successful! Found {} calendars",
+                    calendars.len()
+                );
+                
+                // Find or create user in database
+                let user_repo = UserRepository::new(&self.db);
+                let user = user_repo
+                    .find_or_create(&request.username, &request.server_url)
+                    .await
+                    .map_err(|e| ApiError::Database(format!("Failed to create user: {}", e)))?;
+                
+                // Generate JWT token
+                let jwt_token = self.generate_token(&request.username, &request.server_url)?;
+                
+                // Generate session token
+                let session_token = format!("sess_{}", Uuid::new_v4());
+                
+                // Create session in database
+                let session = Session::new(user.id.clone(), session_token.clone(), 24);
+                let session_repo = SessionRepository::new(&self.db);
+                session_repo
+                    .create(&session)
+                    .await
+                    .map_err(|e| ApiError::Database(format!("Failed to create session: {}", e)))?;
+                
+                // Get or create user preferences
+                let prefs_repo = PreferencesRepository::new(&self.db);
+                let preferences = prefs_repo
+                    .get_or_create(&user.id)
+                    .await
+                    .map_err(|e| ApiError::Database(format!("Failed to get preferences: {}", e)))?;
                 
                 Ok(AuthResponse {
-                    token,
+                    token: jwt_token,
+                    session_token,
                     username: request.username,
                     server_url: request.server_url,
+                    preferences: UserPreferencesResponse {
+                        calendar_selected_date: preferences.calendar_selected_date,
+                        calendar_time_increment: preferences.calendar_time_increment,
+                        calendar_view_mode: preferences.calendar_view_mode,
+                        calendar_theme: preferences.calendar_theme,
+                        calendar_style: preferences.calendar_style,
+                        calendar_colors: preferences.calendar_colors,
+                        last_used_calendar: preferences.last_used_calendar,
+                    },
                 })
             }
             Err(err) => {
                 println!("❌ Authentication failed: {:?}", err);
                 // Authentication failed
-                Err(ApiError::Unauthorized("Invalid CalDAV credentials or server unavailable".to_string()))
+                Err(ApiError::Unauthorized(
+                    "Invalid CalDAV credentials or server unavailable".to_string(),
+                ))
             }
         }
     }
@@ -70,17 +112,30 @@ impl AuthService {
         self.decode_token(token)
     }
 
-    /// Create CalDAV config from token
-    pub fn caldav_config_from_token(&self, token: &str, password: &str) -> Result<CalDAVConfig, ApiError> {
+    /// Get user from token
+    pub async fn get_user_from_token(&self, token: &str) -> Result<crate::db::User, ApiError> {
         let claims = self.verify_token(token)?;
         
-        Ok(CalDAVConfig {
-            server_url: claims.server_url,
-            username: claims.username,
-            password: password.to_string(),
-            calendar_path: None,
-            tasks_path: None,
-        })
+        let user_repo = UserRepository::new(&self.db);
+        user_repo
+            .find_or_create(&claims.username, &claims.server_url)
+            .await
+            .map_err(|e| ApiError::Database(format!("Failed to get user: {}", e)))
+    }
+
+    /// Create CalDAV config from token
+    pub fn caldav_config_from_token(
+        &self,
+        token: &str,
+        password: &str,
+    ) -> Result<CalDAVConfig, ApiError> {
+        let claims = self.verify_token(token)?;
+
+        Ok(CalDAVConfig::new(
+            claims.server_url,
+            claims.username,
+            password.to_string(),
+        ))
     }
 
     fn validate_login(&self, request: &CalDAVLoginRequest) -> Result<(), ApiError> {
@@ -97,8 +152,11 @@ impl AuthService {
         }
 
         // Basic URL validation
-        if !request.server_url.starts_with("http://") && !request.server_url.starts_with("https://") {
-            return Err(ApiError::BadRequest("Server URL must start with http:// or https://".to_string()));
+        if !request.server_url.starts_with("http://") && !request.server_url.starts_with("https://")
+        {
+            return Err(ApiError::BadRequest(
+                "Server URL must start with http:// or https://".to_string(),
+            ));
         }
 
         Ok(())
@@ -135,4 +193,33 @@ impl AuthService {
 
         Ok(token_data.claims)
     }
-}
+    
+    /// Validate session token
+    pub async fn validate_session(&self, session_token: &str) -> Result<String, ApiError> {
+        let session_repo = SessionRepository::new(&self.db);
+        
+        let session = session_repo
+            .find_by_token(session_token)
+            .await
+            .map_err(|e| ApiError::Database(format!("Failed to find session: {}", e)))?
+            .ok_or_else(|| ApiError::Unauthorized("Invalid session token".to_string()))?;
+        
+        if session.is_expired() {
+            return Err(ApiError::Unauthorized("Session expired".to_string()));
+        }
+        
+        Ok(session.user_id)
+    }
+    
+    /// Logout user by deleting session
+    pub async fn logout(&self, session_token: &str) -> Result<(), ApiError> {
+        let session_repo = SessionRepository::new(&self.db);
+        
+        session_repo
+            .delete(session_token)
+            .await
+            .map_err(|e| ApiError::Database(format!("Failed to delete session: {}", e)))?;
+        
+        Ok(())
+    }
+}

backend/src/config.rs

@@ -1,132 +1,97 @@
+use base64::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::env;
-use base64::prelude::*;
 
 /// Configuration for CalDAV server connection and authentication.
-/// 
+///
 /// This struct holds all the necessary information to connect to a CalDAV server,
 /// including server URL, credentials, and optional collection paths.
-/// 
+///
 /// # Security Note
-/// 
+///
 /// The password field contains sensitive information and should be handled carefully.
 /// This struct implements `Debug` but in production, consider implementing a custom
 /// `Debug` that masks the password field.
-/// 
+///
 /// # Example
-/// 
+///
 /// ```rust
 /// # use calendar_backend::config::CalDAVConfig;
-/// # fn example() -> Result<(), Box<dyn std::error::Error>> {
-/// // Load configuration from environment variables
-/// let config = CalDAVConfig::from_env()?;
-/// 
+/// let config = CalDAVConfig {
+///     server_url: "https://caldav.example.com".to_string(),
+///     username: "user@example.com".to_string(),
+///     password: "password".to_string(),
+///     calendar_path: None,
+///     tasks_path: None,
+/// };
+///
 /// // Use the configuration for HTTP requests
 /// let auth_header = format!("Basic {}", config.get_basic_auth());
-/// # Ok(())
-/// # }
 /// ```
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CalDAVConfig {
     /// The base URL of the CalDAV server (e.g., "https://caldav.example.com/dav/")
     pub server_url: String,
-    
+
     /// Username for authentication with the CalDAV server
     pub username: String,
-    
+
     /// Password for authentication with the CalDAV server
-    /// 
+    ///
     /// **Security Note**: This contains sensitive information
     pub password: String,
-    
+
     /// Optional path to the calendar collection on the server
-    /// 
-    /// If not provided, the client will need to discover available calendars
+    ///
+    /// If not provided, the client will discover available calendars
     /// through CalDAV PROPFIND requests
     pub calendar_path: Option<String>,
-    
-    /// Optional path to the tasks/todo collection on the server
-    /// 
-    /// Some CalDAV servers store tasks separately from calendar events
-    pub tasks_path: Option<String>,
 }
 
 impl CalDAVConfig {
-    /// Creates a new CalDAVConfig by loading values from environment variables.
-    /// 
-    /// This method will attempt to load a `.env` file from the current directory
-    /// and then read the following required environment variables:
-    /// 
-    /// - `CALDAV_SERVER_URL`: The CalDAV server base URL
-    /// - `CALDAV_USERNAME`: Username for authentication
-    /// - `CALDAV_PASSWORD`: Password for authentication
-    /// 
-    /// Optional environment variables:
-    /// 
-    /// - `CALDAV_CALENDAR_PATH`: Path to calendar collection
-    /// - `CALDAV_TASKS_PATH`: Path to tasks collection
-    /// 
-    /// # Errors
-    /// 
-    /// Returns `ConfigError::MissingVar` if any required environment variable
-    /// is not set or cannot be read.
-    /// 
+    /// Creates a new CalDAVConfig with the given credentials.
+    ///
+    /// # Arguments
+    ///
+    /// * `server_url` - The base URL of the CalDAV server
+    /// * `username` - Username for authentication
+    /// * `password` - Password for authentication
+    ///
     /// # Example
-    /// 
+    ///
     /// ```rust
     /// # use calendar_backend::config::CalDAVConfig;
-    /// 
-    /// match CalDAVConfig::from_env() {
-    ///     Ok(config) => {
-    ///         println!("Loaded config for server: {}", config.server_url);
-    ///     }
-    ///     Err(e) => {
-    ///         eprintln!("Failed to load config: {}", e);
-    ///     }
-    /// }
+    /// let config = CalDAVConfig::new(
+    ///     "https://caldav.example.com".to_string(),
+    ///     "user@example.com".to_string(),
+    ///     "password".to_string()
+    /// );
     /// ```
-    pub fn from_env() -> Result<Self, ConfigError> {
-        // Attempt to load .env file, but don't fail if it doesn't exist
-        dotenvy::dotenv().ok();
-
-        let server_url = env::var("CALDAV_SERVER_URL")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_SERVER_URL".to_string()))?;
-
-        let username = env::var("CALDAV_USERNAME")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_USERNAME".to_string()))?;
-
-        let password = env::var("CALDAV_PASSWORD")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_PASSWORD".to_string()))?;
-
-        // Optional paths - it's fine if these are not set
-        let calendar_path = env::var("CALDAV_CALENDAR_PATH").ok();
-        let tasks_path = env::var("CALDAV_TASKS_PATH").ok();
-
-        Ok(CalDAVConfig {
+    pub fn new(server_url: String, username: String, password: String) -> Self {
+        Self {
             server_url,
             username,
             password,
-            calendar_path,
-            tasks_path,
-        })
+            calendar_path: env::var("CALDAV_CALENDAR_PATH").ok(), // Optional override from env
+        }
     }
 
     /// Generates a Base64-encoded string for HTTP Basic Authentication.
-    /// 
+    ///
     /// This method combines the username and password in the format
     /// `username:password` and encodes it using Base64, which is the
     /// standard format for the `Authorization: Basic` HTTP header.
-    /// 
+    ///
     /// # Returns
-    /// 
+    ///
     /// A Base64-encoded string that can be used directly in the
     /// `Authorization` header: `Authorization: Basic <returned_value>`
-    /// 
+    ///
     /// # Example
-    /// 
+    ///
     /// ```rust
     /// # use calendar_backend::config::CalDAVConfig;
-    /// 
+    ///
     /// let config = CalDAVConfig {
     ///     server_url: "https://example.com".to_string(),
     ///     username: "user".to_string(),
@@ -134,7 +99,7 @@ impl CalDAVConfig {
     ///     calendar_path: None,
     ///     tasks_path: None,
     /// };
-    /// 
+    ///
     /// let auth_value = config.get_basic_auth();
     /// let auth_header = format!("Basic {}", auth_value);
     /// ```
@@ -148,15 +113,15 @@ impl CalDAVConfig {
 #[derive(Debug, thiserror::Error)]
 pub enum ConfigError {
     /// A required environment variable is missing or cannot be read.
-    /// 
+    ///
     /// This error occurs when calling `CalDAVConfig::from_env()` and one of the
     /// required environment variables (`CALDAV_SERVER_URL`, `CALDAV_USERNAME`,
     /// or `CALDAV_PASSWORD`) is not set.
     #[error("Missing environment variable: {0}")]
     MissingVar(String),
-    
+
     /// The configuration contains invalid or malformed values.
-    /// 
+    ///
     /// This could include malformed URLs, invalid authentication credentials,
     /// or other configuration issues that prevent proper CalDAV operation.
     #[error("Invalid configuration: {0}")]
@@ -174,7 +139,6 @@ mod tests {
             username: "testuser".to_string(),
             password: "testpass".to_string(),
             calendar_path: None,
-            tasks_path: None,
         };
 
         let auth = config.get_basic_auth();
@@ -183,18 +147,21 @@ mod tests {
     }
 
     /// Integration test that authenticates with the actual Baikal CalDAV server
-    /// 
+    ///
     /// This test requires a valid .env file with:
     /// - CALDAV_SERVER_URL
     /// - CALDAV_USERNAME  
     /// - CALDAV_PASSWORD
-    /// 
+    ///
     /// Run with: `cargo test test_baikal_auth`
     #[tokio::test]
     async fn test_baikal_auth() {
-        // Load config from .env
-        let config = CalDAVConfig::from_env()
-            .expect("Failed to load CalDAV config from environment");
+        // Use test config - update these values to test with real server
+        let config = CalDAVConfig::new(
+            "https://example.com".to_string(),
+            "test_user".to_string(),
+            "test_password".to_string(),
+        );
 
         println!("Testing authentication to: {}", config.server_url);
 
@@ -204,7 +171,10 @@ mod tests {
         // Make a simple OPTIONS request to test authentication
         let response = client
             .request(reqwest::Method::OPTIONS, &config.server_url)
-            .header("Authorization", format!("Basic {}", config.get_basic_auth()))
+            .header(
+                "Authorization",
+                format!("Basic {}", config.get_basic_auth()),
+            )
             .header("User-Agent", "calendar-app/0.1.0")
             .send()
             .await
@@ -222,9 +192,9 @@ mod tests {
 
         // For Baikal/CalDAV servers, we should see DAV headers
         assert!(
-            response.headers().contains_key("dav") || 
-            response.headers().contains_key("DAV") ||
-            response.status().is_success(),
+            response.headers().contains_key("dav")
+                || response.headers().contains_key("DAV")
+                || response.status().is_success(),
             "Server doesn't appear to be a CalDAV server - missing DAV headers"
         );
 
@@ -232,14 +202,18 @@ mod tests {
     }
 
     /// Test making a PROPFIND request to discover calendars
-    /// 
+    ///
     /// This test requires a valid .env file and makes an actual CalDAV PROPFIND request
-    /// 
+    ///
     /// Run with: `cargo test test_propfind_calendars`
     #[tokio::test]
     async fn test_propfind_calendars() {
-        let config = CalDAVConfig::from_env()
-            .expect("Failed to load CalDAV config from environment");
+        // Use test config - update these values to test with real server
+        let config = CalDAVConfig::new(
+            "https://example.com".to_string(),
+            "test_user".to_string(),
+            "test_password".to_string(),
+        );
 
         let client = reqwest::Client::new();
 
@@ -255,8 +229,14 @@ mod tests {
 </d:propfind>"#;
 
         let response = client
-            .request(reqwest::Method::from_bytes(b"PROPFIND").unwrap(), &config.server_url)
-            .header("Authorization", format!("Basic {}", config.get_basic_auth()))
+            .request(
+                reqwest::Method::from_bytes(b"PROPFIND").unwrap(),
+                &config.server_url,
+            )
+            .header(
+                "Authorization",
+                format!("Basic {}", config.get_basic_auth()),
+            )
             .header("Content-Type", "application/xml")
             .header("Depth", "1")
             .header("User-Agent", "calendar-app/0.1.0")
@@ -267,7 +247,7 @@ mod tests {
 
         let status = response.status();
         println!("PROPFIND Response status: {}", status);
-        
+
         let body = response.text().await.expect("Failed to read response body");
         println!("PROPFIND Response body: {}", body);
 
@@ -279,8 +259,11 @@ mod tests {
         );
 
         // The response should contain XML with calendar information
-        assert!(body.contains("calendar"), "Response should contain calendar information");
+        assert!(
+            body.contains("calendar"),
+            "Response should contain calendar information"
+        );
 
         println!("✓ PROPFIND calendars test passed!");
     }
-}
+}

backend/src/db.rs

@@ -0,0 +1,488 @@
+use chrono::{DateTime, Duration, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::sqlite::{SqlitePool, SqlitePoolOptions};
+use sqlx::{FromRow, Result};
+use std::sync::Arc;
+use uuid::Uuid;
+
+/// Database connection pool wrapper
+#[derive(Clone)]
+pub struct Database {
+    pool: Arc<SqlitePool>,
+}
+
+impl Database {
+    /// Create a new database connection pool
+    pub async fn new(database_url: &str) -> Result<Self> {
+        let pool = SqlitePoolOptions::new()
+            .max_connections(5)
+            .connect(database_url)
+            .await?;
+
+        // Run migrations
+        sqlx::migrate!("./migrations").run(&pool).await?;
+
+        Ok(Self {
+            pool: Arc::new(pool),
+        })
+    }
+
+    /// Get a reference to the connection pool
+    pub fn pool(&self) -> &SqlitePool {
+        &self.pool
+    }
+}
+
+/// User model representing a CalDAV user
+#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
+pub struct User {
+    pub id: String, // UUID as string for SQLite
+    pub username: String,
+    pub server_url: String,
+    pub created_at: DateTime<Utc>,
+}
+
+impl User {
+    /// Create a new user with generated UUID
+    pub fn new(username: String, server_url: String) -> Self {
+        Self {
+            id: Uuid::new_v4().to_string(),
+            username,
+            server_url,
+            created_at: Utc::now(),
+        }
+    }
+}
+
+/// Session model for user sessions
+#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
+pub struct Session {
+    pub id: String,      // UUID as string
+    pub user_id: String, // Foreign key to User
+    pub token: String,   // Session token
+    pub created_at: DateTime<Utc>,
+    pub expires_at: DateTime<Utc>,
+    pub last_accessed: DateTime<Utc>,
+}
+
+impl Session {
+    /// Create a new session for a user
+    pub fn new(user_id: String, token: String, expires_in_hours: i64) -> Self {
+        let now = Utc::now();
+        Self {
+            id: Uuid::new_v4().to_string(),
+            user_id,
+            token,
+            created_at: now,
+            expires_at: now + chrono::Duration::hours(expires_in_hours),
+            last_accessed: now,
+        }
+    }
+
+    /// Check if the session has expired
+    pub fn is_expired(&self) -> bool {
+        Utc::now() > self.expires_at
+    }
+}
+
+/// User preferences model
+#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
+pub struct UserPreferences {
+    pub user_id: String,
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_style: Option<String>,
+    pub calendar_colors: Option<String>, // JSON string
+    pub last_used_calendar: Option<String>,
+    pub updated_at: DateTime<Utc>,
+}
+
+/// External calendar model
+#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
+pub struct ExternalCalendar {
+    pub id: i32,
+    pub user_id: String,
+    pub name: String,
+    pub url: String,
+    pub color: String,
+    pub is_visible: bool,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+    pub last_fetched: Option<DateTime<Utc>>,
+}
+
+impl ExternalCalendar {
+    /// Create a new external calendar
+    pub fn new(user_id: String, name: String, url: String, color: String) -> Self {
+        let now = Utc::now();
+        Self {
+            id: 0, // Will be set by database
+            user_id,
+            name,
+            url,
+            color,
+            is_visible: true,
+            created_at: now,
+            updated_at: now,
+            last_fetched: None,
+        }
+    }
+}
+
+impl UserPreferences {
+    /// Create default preferences for a new user
+    pub fn default_for_user(user_id: String) -> Self {
+        Self {
+            user_id,
+            calendar_selected_date: None,
+            calendar_time_increment: Some(15),
+            calendar_view_mode: Some("month".to_string()),
+            calendar_theme: Some("light".to_string()),
+            calendar_style: Some("default".to_string()),
+            calendar_colors: None,
+            last_used_calendar: None,
+            updated_at: Utc::now(),
+        }
+    }
+}
+
+/// Repository for User operations
+pub struct UserRepository<'a> {
+    db: &'a Database,
+}
+
+impl<'a> UserRepository<'a> {
+    pub fn new(db: &'a Database) -> Self {
+        Self { db }
+    }
+
+    /// Find or create a user by username and server URL
+    pub async fn find_or_create(
+        &self,
+        username: &str,
+        server_url: &str,
+    ) -> Result<User> {
+        // Try to find existing user
+        let existing = sqlx::query_as::<_, User>(
+            "SELECT * FROM users WHERE username = ? AND server_url = ?",
+        )
+        .bind(username)
+        .bind(server_url)
+        .fetch_optional(self.db.pool())
+        .await?;
+
+        if let Some(user) = existing {
+            Ok(user)
+        } else {
+            // Create new user
+            let user = User::new(username.to_string(), server_url.to_string());
+            
+            sqlx::query(
+                "INSERT INTO users (id, username, server_url, created_at) VALUES (?, ?, ?, ?)",
+            )
+            .bind(&user.id)
+            .bind(&user.username)
+            .bind(&user.server_url)
+            .bind(&user.created_at)
+            .execute(self.db.pool())
+            .await?;
+
+            Ok(user)
+        }
+    }
+
+    /// Find a user by ID
+    pub async fn find_by_id(&self, user_id: &str) -> Result<Option<User>> {
+        sqlx::query_as::<_, User>("SELECT * FROM users WHERE id = ?")
+            .bind(user_id)
+            .fetch_optional(self.db.pool())
+            .await
+    }
+}
+
+/// Repository for Session operations
+pub struct SessionRepository<'a> {
+    db: &'a Database,
+}
+
+impl<'a> SessionRepository<'a> {
+    pub fn new(db: &'a Database) -> Self {
+        Self { db }
+    }
+
+    /// Create a new session
+    pub async fn create(&self, session: &Session) -> Result<()> {
+        sqlx::query(
+            "INSERT INTO sessions (id, user_id, token, created_at, expires_at, last_accessed) 
+             VALUES (?, ?, ?, ?, ?, ?)",
+        )
+        .bind(&session.id)
+        .bind(&session.user_id)
+        .bind(&session.token)
+        .bind(&session.created_at)
+        .bind(&session.expires_at)
+        .bind(&session.last_accessed)
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(())
+    }
+
+    /// Find a session by token and update last_accessed
+    pub async fn find_by_token(&self, token: &str) -> Result<Option<Session>> {
+        let session = sqlx::query_as::<_, Session>("SELECT * FROM sessions WHERE token = ?")
+            .bind(token)
+            .fetch_optional(self.db.pool())
+            .await?;
+
+        if let Some(ref s) = session {
+            if !s.is_expired() {
+                // Update last_accessed time
+                sqlx::query("UPDATE sessions SET last_accessed = ? WHERE id = ?")
+                    .bind(Utc::now())
+                    .bind(&s.id)
+                    .execute(self.db.pool())
+                    .await?;
+            }
+        }
+
+        Ok(session)
+    }
+
+    /// Delete a session (logout)
+    pub async fn delete(&self, token: &str) -> Result<()> {
+        sqlx::query("DELETE FROM sessions WHERE token = ?")
+            .bind(token)
+            .execute(self.db.pool())
+            .await?;
+
+        Ok(())
+    }
+
+    /// Clean up expired sessions
+    pub async fn cleanup_expired(&self) -> Result<u64> {
+        let result = sqlx::query("DELETE FROM sessions WHERE expires_at < ?")
+            .bind(Utc::now())
+            .execute(self.db.pool())
+            .await?;
+
+        Ok(result.rows_affected())
+    }
+}
+
+/// Repository for UserPreferences operations
+pub struct PreferencesRepository<'a> {
+    db: &'a Database,
+}
+
+impl<'a> PreferencesRepository<'a> {
+    pub fn new(db: &'a Database) -> Self {
+        Self { db }
+    }
+
+    /// Get user preferences, creating defaults if not exist
+    pub async fn get_or_create(&self, user_id: &str) -> Result<UserPreferences> {
+        let existing = sqlx::query_as::<_, UserPreferences>(
+            "SELECT * FROM user_preferences WHERE user_id = ?",
+        )
+        .bind(user_id)
+        .fetch_optional(self.db.pool())
+        .await?;
+
+        if let Some(prefs) = existing {
+            Ok(prefs)
+        } else {
+            // Create default preferences
+            let prefs = UserPreferences::default_for_user(user_id.to_string());
+            
+            sqlx::query(
+                "INSERT INTO user_preferences 
+                 (user_id, calendar_selected_date, calendar_time_increment, 
+                  calendar_view_mode, calendar_theme, calendar_style, calendar_colors, last_used_calendar, updated_at) 
+                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            )
+            .bind(&prefs.user_id)
+            .bind(&prefs.calendar_selected_date)
+            .bind(&prefs.calendar_time_increment)
+            .bind(&prefs.calendar_view_mode)
+            .bind(&prefs.calendar_theme)
+            .bind(&prefs.calendar_style)
+            .bind(&prefs.calendar_colors)
+            .bind(&prefs.last_used_calendar)
+            .bind(&prefs.updated_at)
+            .execute(self.db.pool())
+            .await?;
+
+            Ok(prefs)
+        }
+    }
+
+    /// Update user preferences
+    pub async fn update(&self, prefs: &UserPreferences) -> Result<()> {
+        sqlx::query(
+            "UPDATE user_preferences 
+             SET calendar_selected_date = ?, calendar_time_increment = ?, 
+                 calendar_view_mode = ?, calendar_theme = ?, calendar_style = ?,
+                 calendar_colors = ?, last_used_calendar = ?, updated_at = ?
+             WHERE user_id = ?",
+        )
+        .bind(&prefs.calendar_selected_date)
+        .bind(&prefs.calendar_time_increment)
+        .bind(&prefs.calendar_view_mode)
+        .bind(&prefs.calendar_theme)
+        .bind(&prefs.calendar_style)
+        .bind(&prefs.calendar_colors)
+        .bind(&prefs.last_used_calendar)
+        .bind(Utc::now())
+        .bind(&prefs.user_id)
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(())
+    }
+}
+
+/// Repository for ExternalCalendar operations
+pub struct ExternalCalendarRepository<'a> {
+    db: &'a Database,
+}
+
+impl<'a> ExternalCalendarRepository<'a> {
+    pub fn new(db: &'a Database) -> Self {
+        Self { db }
+    }
+
+    /// Get all external calendars for a user
+    pub async fn get_by_user(&self, user_id: &str) -> Result<Vec<ExternalCalendar>> {
+        sqlx::query_as::<_, ExternalCalendar>(
+            "SELECT * FROM external_calendars WHERE user_id = ? ORDER BY created_at ASC",
+        )
+        .bind(user_id)
+        .fetch_all(self.db.pool())
+        .await
+    }
+
+    /// Create a new external calendar
+    pub async fn create(&self, calendar: &ExternalCalendar) -> Result<i32> {
+        let result = sqlx::query(
+            "INSERT INTO external_calendars (user_id, name, url, color, is_visible, created_at, updated_at) 
+             VALUES (?, ?, ?, ?, ?, ?, ?)",
+        )
+        .bind(&calendar.user_id)
+        .bind(&calendar.name)
+        .bind(&calendar.url)
+        .bind(&calendar.color)
+        .bind(&calendar.is_visible)
+        .bind(&calendar.created_at)
+        .bind(&calendar.updated_at)
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(result.last_insert_rowid() as i32)
+    }
+
+    /// Update an external calendar
+    pub async fn update(&self, id: i32, calendar: &ExternalCalendar) -> Result<()> {
+        sqlx::query(
+            "UPDATE external_calendars 
+             SET name = ?, url = ?, color = ?, is_visible = ?, updated_at = ?
+             WHERE id = ? AND user_id = ?",
+        )
+        .bind(&calendar.name)
+        .bind(&calendar.url)
+        .bind(&calendar.color)
+        .bind(&calendar.is_visible)
+        .bind(Utc::now())
+        .bind(id)
+        .bind(&calendar.user_id)
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(())
+    }
+
+    /// Delete an external calendar
+    pub async fn delete(&self, id: i32, user_id: &str) -> Result<()> {
+        sqlx::query("DELETE FROM external_calendars WHERE id = ? AND user_id = ?")
+            .bind(id)
+            .bind(user_id)
+            .execute(self.db.pool())
+            .await?;
+
+        Ok(())
+    }
+
+    /// Update last_fetched timestamp
+    pub async fn update_last_fetched(&self, id: i32, user_id: &str) -> Result<()> {
+        sqlx::query(
+            "UPDATE external_calendars SET last_fetched = ? WHERE id = ? AND user_id = ?",
+        )
+        .bind(Utc::now())
+        .bind(id)
+        .bind(user_id)
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(())
+    }
+
+    /// Get cached ICS data for an external calendar
+    pub async fn get_cached_data(&self, external_calendar_id: i32) -> Result<Option<(String, DateTime<Utc>)>> {
+        let result = sqlx::query_as::<_, (String, DateTime<Utc>)>(
+            "SELECT ics_data, cached_at FROM external_calendar_cache WHERE external_calendar_id = ?",
+        )
+        .bind(external_calendar_id)
+        .fetch_optional(self.db.pool())
+        .await?;
+
+        Ok(result)
+    }
+
+    /// Update cache with new ICS data
+    pub async fn update_cache(&self, external_calendar_id: i32, ics_data: &str, etag: Option<&str>) -> Result<()> {
+        sqlx::query(
+            "INSERT INTO external_calendar_cache (external_calendar_id, ics_data, etag, cached_at)
+             VALUES (?, ?, ?, ?)
+             ON CONFLICT(external_calendar_id) DO UPDATE SET
+             ics_data = excluded.ics_data,
+             etag = excluded.etag,
+             cached_at = excluded.cached_at",
+        )
+        .bind(external_calendar_id)
+        .bind(ics_data)
+        .bind(etag)
+        .bind(Utc::now())
+        .execute(self.db.pool())
+        .await?;
+
+        Ok(())
+    }
+
+    /// Check if cache is stale (older than max_age_minutes)
+    pub async fn is_cache_stale(&self, external_calendar_id: i32, max_age_minutes: i64) -> Result<bool> {
+        let cutoff_time = Utc::now() - Duration::minutes(max_age_minutes);
+        
+        let result = sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*) FROM external_calendar_cache 
+             WHERE external_calendar_id = ? AND cached_at > ?",
+        )
+        .bind(external_calendar_id)
+        .bind(cutoff_time)
+        .fetch_one(self.db.pool())
+        .await?;
+
+        Ok(result == 0)
+    }
+
+    /// Clear cache for an external calendar
+    pub async fn clear_cache(&self, external_calendar_id: i32) -> Result<()> {
+        sqlx::query("DELETE FROM external_calendar_cache WHERE external_calendar_id = ?")
+            .bind(external_calendar_id)
+            .execute(self.db.pool())
+            .await?;
+
+        Ok(())
+    }
+}

backend/src/debug_caldav.rs

@@ -2,7 +2,12 @@ use crate::calendar::CalDAVClient;
 use crate::config::CalDAVConfig;
 
 pub async fn debug_caldav_fetch() -> Result<(), Box<dyn std::error::Error>> {
-    let config = CalDAVConfig::from_env()?;
+    // Use debug/test configuration
+    let config = CalDAVConfig::new(
+        "https://example.com".to_string(),
+        "debug_user".to_string(),
+        "debug_password".to_string()
+    );
     let client = CalDAVClient::new(config);
     
     println!("=== DEBUG: CalDAV Fetch ===");

backend/src/handlers.rs

@@ -1,10 +0,0 @@
-// Re-export all handlers from the modular structure
-mod auth;
-mod calendar;
-mod events;
-mod series;
-
-pub use auth::{login, verify_token, get_user_info};
-pub use calendar::{create_calendar, delete_calendar};
-pub use events::{get_calendar_events, refresh_event, create_event, update_event, delete_event};
-pub use series::{create_event_series, update_event_series, delete_event_series};

backend/src/handlers/auth.rs

@@ -1,33 +1,37 @@
-use axum::{
-    extract::State,
-    http::HeaderMap,
-    response::Json,
-};
+use axum::{extract::State, http::HeaderMap, response::Json};
 use std::sync::Arc;
 
-use crate::{AppState, models::{CalDAVLoginRequest, AuthResponse, ApiError, UserInfo, CalendarInfo}};
 use crate::calendar::CalDAVClient;
-use crate::config::CalDAVConfig;
+use crate::{
+    models::{ApiError, AuthResponse, CalDAVLoginRequest, CalendarInfo, UserInfo},
+    AppState,
+};
 
 pub fn extract_bearer_token(headers: &HeaderMap) -> Result<String, ApiError> {
-    let auth_header = headers.get("authorization")
+    let auth_header = headers
+        .get("authorization")
         .ok_or_else(|| ApiError::Unauthorized("Missing Authorization header".to_string()))?;
-    
-    let auth_str = auth_header.to_str()
+
+    let auth_str = auth_header
+        .to_str()
         .map_err(|_| ApiError::BadRequest("Invalid Authorization header".to_string()))?;
-    
+
     if let Some(token) = auth_str.strip_prefix("Bearer ") {
         Ok(token.to_string())
     } else {
-        Err(ApiError::BadRequest("Authorization header must be Bearer token".to_string()))
+        Err(ApiError::BadRequest(
+            "Authorization header must be Bearer token".to_string(),
+        ))
     }
 }
 
 pub fn extract_password_header(headers: &HeaderMap) -> Result<String, ApiError> {
-    let password_header = headers.get("x-caldav-password")
+    let password_header = headers
+        .get("x-caldav-password")
         .ok_or_else(|| ApiError::BadRequest("Missing X-CalDAV-Password header".to_string()))?;
-    
-    password_header.to_str()
+
+    password_header
+        .to_str()
         .map(|s| s.to_string())
         .map_err(|_| ApiError::BadRequest("Invalid X-CalDAV-Password header".to_string()))
 }
@@ -40,39 +44,13 @@ pub async fn login(
     println!("  Server URL: {}", request.server_url);
     println!("  Username: {}", request.username);
     println!("  Password length: {}", request.password.len());
-    
-    // Basic validation
-    if request.username.is_empty() || request.password.is_empty() || request.server_url.is_empty() {
-        return Err(ApiError::BadRequest("Username, password, and server URL are required".to_string()));
-    }
-    
-    println!("✅ Input validation passed");
-    
-    // Create a token using the auth service
-    println!("📝 Created CalDAV config");
-    
-    // First verify the credentials are valid by attempting to discover calendars
-    let config = CalDAVConfig {
-        server_url: request.server_url.clone(),
-        username: request.username.clone(),
-        password: request.password.clone(),
-        calendar_path: None,
-        tasks_path: None,
-    };
-    let client = CalDAVClient::new(config);
-    client.discover_calendars()
-        .await
-        .map_err(|e| ApiError::Unauthorized(format!("Authentication failed: {}", e)))?;
-    
-    let token = state.auth_service.generate_token(&request.username, &request.server_url)?;
-    
-    println!("🔗 Created CalDAV client, attempting to discover calendars...");
-    
-    Ok(Json(AuthResponse {
-        token,
-        username: request.username,
-        server_url: request.server_url,
-    }))
+
+    // Use the auth service login method which now handles database, sessions, and preferences
+    let response = state.auth_service.login(request).await?;
+
+    println!("✅ Login successful with session management");
+
+    Ok(Json(response))
 }
 
 pub async fn verify_token(
@@ -81,7 +59,7 @@ pub async fn verify_token(
 ) -> Result<Json<serde_json::Value>, ApiError> {
     let token = extract_bearer_token(&headers)?;
     let is_valid = state.auth_service.verify_token(&token).is_ok();
-    
+
     Ok(Json(serde_json::json!({ "valid": is_valid })))
 }
 
@@ -91,26 +69,34 @@ pub async fn get_user_info(
 ) -> Result<Json<UserInfo>, ApiError> {
     let token = extract_bearer_token(&headers)?;
     let password = extract_password_header(&headers)?;
-    
+
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config.clone());
-    
+
     // Discover calendars
-    let calendar_paths = client.discover_calendars()
+    let calendar_paths = client
+        .discover_calendars()
         .await
         .map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?;
-        
-    println!("✅ Authentication successful! Found {} calendars", calendar_paths.len());
-    
-    let calendars: Vec<CalendarInfo> = calendar_paths.iter().map(|path| {
-        CalendarInfo {
+
+    println!(
+        "✅ Authentication successful! Found {} calendars",
+        calendar_paths.len()
+    );
+
+    let calendars: Vec<CalendarInfo> = calendar_paths
+        .iter()
+        .map(|path| CalendarInfo {
             path: path.clone(),
             display_name: extract_calendar_name(path),
             color: generate_calendar_color(path),
-        }
-    }).collect();
-    
+            is_visible: true, // Default to visible
+        })
+        .collect();
+
     Ok(Json(UserInfo {
         username: config.username,
         server_url: config.server_url,
@@ -125,15 +111,14 @@ fn generate_calendar_color(path: &str) -> String {
     for byte in path.bytes() {
         hash = hash.wrapping_mul(31).wrapping_add(byte as u32);
     }
-    
+
     // Define a set of pleasant colors
     let colors = [
-        "#3B82F6", "#10B981", "#F59E0B", "#EF4444", "#8B5CF6",
-        "#06B6D4", "#84CC16", "#F97316", "#EC4899", "#6366F1",
-        "#14B8A6", "#F3B806", "#8B5A2B", "#6B7280", "#DC2626",
-        "#7C3AED", "#059669", "#D97706", "#BE185D", "#4F46E5"
+        "#3B82F6", "#10B981", "#F59E0B", "#EF4444", "#8B5CF6", "#06B6D4", "#84CC16", "#F97316",
+        "#EC4899", "#6366F1", "#14B8A6", "#F3B806", "#8B5A2B", "#6B7280", "#DC2626", "#7C3AED",
+        "#059669", "#D97706", "#BE185D", "#4F46E5",
     ];
-    
+
     colors[(hash as usize) % colors.len()].to_string()
 }
 
@@ -156,4 +141,4 @@ fn extract_calendar_name(path: &str) -> String {
         })
         .collect::<Vec<String>>()
         .join(" ")
-}
+}

backend/src/handlers/calendar.rs

@@ -1,12 +1,14 @@
-use axum::{
-    extract::State,
-    http::HeaderMap,
-    response::Json,
-};
+use axum::{extract::State, http::HeaderMap, response::Json};
 use std::sync::Arc;
 
-use crate::{AppState, models::{ApiError, CreateCalendarRequest, CreateCalendarResponse, DeleteCalendarRequest, DeleteCalendarResponse}};
 use crate::calendar::CalDAVClient;
+use crate::{
+    models::{
+        ApiError, CreateCalendarRequest, CreateCalendarResponse, DeleteCalendarRequest,
+        DeleteCalendarResponse,
+    },
+    AppState,
+};
 
 use super::auth::{extract_bearer_token, extract_password_header};
 
@@ -20,22 +22,36 @@ pub async fn create_calendar(
 
     // Validate request
     if request.name.trim().is_empty() {
-        return Err(ApiError::BadRequest("Calendar name is required".to_string()));
+        return Err(ApiError::BadRequest(
+            "Calendar name is required".to_string(),
+        ));
     }
 
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
 
     // Create calendar on CalDAV server
-    match client.create_calendar(&request.name, request.description.as_deref(), request.color.as_deref()).await {
+    match client
+        .create_calendar(
+            &request.name,
+            request.description.as_deref(),
+            request.color.as_deref(),
+        )
+        .await
+    {
         Ok(_) => Ok(Json(CreateCalendarResponse {
             success: true,
             message: "Calendar created successfully".to_string(),
         })),
         Err(e) => {
             eprintln!("Failed to create calendar: {}", e);
-            Err(ApiError::Internal(format!("Failed to create calendar: {}", e)))
+            Err(ApiError::Internal(format!(
+                "Failed to create calendar: {}",
+                e
+            )))
         }
     }
 }
@@ -50,11 +66,15 @@ pub async fn delete_calendar(
 
     // Validate request
     if request.path.trim().is_empty() {
-        return Err(ApiError::BadRequest("Calendar path is required".to_string()));
+        return Err(ApiError::BadRequest(
+            "Calendar path is required".to_string(),
+        ));
     }
 
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
 
     // Delete calendar on CalDAV server
@@ -65,7 +85,10 @@ pub async fn delete_calendar(
         })),
         Err(e) => {
             eprintln!("Failed to delete calendar: {}", e);
-            Err(ApiError::Internal(format!("Failed to delete calendar: {}", e)))
+            Err(ApiError::Internal(format!(
+                "Failed to delete calendar: {}",
+                e
+            )))
         }
     }
-}
+}

backend/src/handlers/events.rs

@@ -1,15 +1,23 @@
 use axum::{
-    extract::{State, Query, Path},
+    extract::{Path, Query, State},
     http::HeaderMap,
     response::Json,
 };
+use chrono::Datelike;
 use serde::Deserialize;
 use std::sync::Arc;
-use chrono::Datelike;
 
-use calendar_models::{VEvent, EventStatus, EventClass, CalendarUser, Attendee, VAlarm, AlarmAction, AlarmTrigger};
-use crate::{AppState, models::{ApiError, DeleteEventRequest, DeleteEventResponse, CreateEventRequest, CreateEventResponse, UpdateEventRequest, UpdateEventResponse}};
 use crate::calendar::{CalDAVClient, CalendarEvent};
+use crate::{
+    models::{
+        ApiError, CreateEventRequest, CreateEventResponse, DeleteEventRequest, DeleteEventResponse,
+        UpdateEventRequest, UpdateEventResponse,
+    },
+    AppState,
+};
+use calendar_models::{
+    AlarmAction, AlarmTrigger, Attendee, CalendarUser, EventClass, EventStatus, VAlarm, VEvent,
+};
 
 use super::auth::{extract_bearer_token, extract_password_header};
 
@@ -28,20 +36,23 @@ pub async fn get_calendar_events(
     let token = extract_bearer_token(&headers)?;
     let password = extract_password_header(&headers)?;
     println!("🔑 API call with password length: {}", password.len());
-    
+
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
-    
+
     // Discover calendars if needed
-    let calendar_paths = client.discover_calendars()
+    let calendar_paths = client
+        .discover_calendars()
         .await
         .map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?;
-    
+
     if calendar_paths.is_empty() {
         return Ok(Json(vec![])); // No calendars found
     }
-    
+
     // Fetch events from all calendars
     let mut all_events = Vec::new();
     for calendar_path in &calendar_paths {
@@ -54,21 +65,68 @@ pub async fn get_calendar_events(
                 all_events.extend(events);
             }
             Err(e) => {
-                eprintln!("Failed to fetch events from calendar {}: {}", calendar_path, e);
+                eprintln!(
+                    "Failed to fetch events from calendar {}: {}",
+                    calendar_path, e
+                );
                 // Continue with other calendars instead of failing completely
             }
         }
     }
-    
+
     // If year and month are specified, filter events
     if let (Some(year), Some(month)) = (params.year, params.month) {
+        let target_date = chrono::NaiveDate::from_ymd_opt(year, month, 1).unwrap();
+        let month_start = target_date;
+        let month_end = if month == 12 {
+            chrono::NaiveDate::from_ymd_opt(year + 1, 1, 1).unwrap()
+        } else {
+            chrono::NaiveDate::from_ymd_opt(year, month + 1, 1).unwrap()
+        } - chrono::Duration::days(1);
+
         all_events.retain(|event| {
-            let event_year = event.dtstart.year();
-            let event_month = event.dtstart.month();
-            event_year == year && event_month == month
+            let event_date = event.dtstart.date_naive();
+            
+            // For non-recurring events, check if the event date is within the month
+            if event.rrule.is_none() || event.rrule.as_ref().unwrap().is_empty() {
+                let event_year = event.dtstart.year();
+                let event_month = event.dtstart.month();
+                return event_year == year && event_month == month;
+            }
+            
+            // For recurring events, check if they could have instances in this month
+            // Include if:
+            // 1. The event starts before or during the requested month
+            // 2. The event doesn't have an UNTIL date, OR the UNTIL date is after the month start
+            if event_date > month_end {
+                // Event starts after the requested month
+                return false;
+            }
+            
+            // Check UNTIL date in RRULE if present
+            if let Some(ref rrule) = event.rrule {
+                if let Some(until_pos) = rrule.find("UNTIL=") {
+                    let until_part = &rrule[until_pos + 6..];
+                    let until_end = until_part.find(';').unwrap_or(until_part.len());
+                    let until_str = &until_part[..until_end];
+                    
+                    // Try to parse UNTIL date (format: YYYYMMDDTHHMMSSZ or YYYYMMDD)
+                    if until_str.len() >= 8 {
+                        if let Ok(until_date) = chrono::NaiveDate::parse_from_str(&until_str[..8], "%Y%m%d") {
+                            if until_date < month_start {
+                                // Recurring event ended before the requested month
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+            
+            // Include the recurring event - the frontend will do proper expansion
+            true
         });
     }
-    
+
     println!("📅 Returning {} events", all_events.len());
     Ok(Json(all_events))
 }
@@ -80,16 +138,19 @@ pub async fn refresh_event(
 ) -> Result<Json<Option<CalendarEvent>>, ApiError> {
     let token = extract_bearer_token(&headers)?;
     let password = extract_password_header(&headers)?;
-    
+
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
-    
+
     // Discover calendars
-    let calendar_paths = client.discover_calendars()
+    let calendar_paths = client
+        .discover_calendars()
         .await
         .map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?;
-    
+
     // Search for the event by UID across all calendars
     for calendar_path in &calendar_paths {
         if let Ok(Some(mut event)) = client.fetch_event_by_uid(calendar_path, &uid).await {
@@ -97,18 +158,25 @@ pub async fn refresh_event(
             return Ok(Json(Some(event)));
         }
     }
-    
+
     Ok(Json(None))
 }
 
-async fn fetch_event_by_href(client: &CalDAVClient, calendar_path: &str, event_href: &str) -> Result<Option<CalendarEvent>, crate::calendar::CalDAVError> {
+async fn fetch_event_by_href(
+    client: &CalDAVClient,
+    calendar_path: &str,
+    event_href: &str,
+) -> Result<Option<CalendarEvent>, crate::calendar::CalDAVError> {
     // This is a simplified implementation - in a real scenario, you'd want to fetch the specific event by href
     // For now, we'll fetch all events and find the matching one by href (inefficient but functional)
     let events = client.fetch_events(calendar_path).await?;
-    
+
     println!("🔍 fetch_event_by_href: looking for href='{}'", event_href);
-    println!("🔍 Available events with hrefs: {:?}", events.iter().map(|e| (&e.uid, &e.href)).collect::<Vec<_>>());
-    
+    println!(
+        "🔍 Available events with hrefs: {:?}",
+        events.iter().map(|e| (&e.uid, &e.href)).collect::<Vec<_>>()
+    );
+
     // First try to match by exact href
     for event in &events {
         if let Some(stored_href) = &event.href {
@@ -118,22 +186,25 @@ async fn fetch_event_by_href(client: &CalDAVClient, calendar_path: &str, event_h
             }
         }
     }
-    
+
     // Fallback: try to match by UID extracted from href filename
     let filename = event_href.split('/').last().unwrap_or(event_href);
     let uid_from_href = filename.trim_end_matches(".ics");
-    
-    println!("🔍 Fallback: trying UID match. filename='{}', uid='{}'", filename, uid_from_href);
-    
+
+    println!(
+        "🔍 Fallback: trying UID match. filename='{}', uid='{}'",
+        filename, uid_from_href
+    );
+
     for event in events {
         if event.uid == uid_from_href {
             println!("✅ Found matching event by UID: {}", event.uid);
             return Ok(Some(event));
         }
     }
-    
+
     println!("❌ No matching event found for href: {}", event_href);
-    
+
     Ok(None)
 }
 
@@ -146,41 +217,63 @@ pub async fn delete_event(
     let password = extract_password_header(&headers)?;
 
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
 
     // Handle different delete actions for recurring events
     match request.delete_action.as_str() {
         "delete_this" => {
-            if let Some(event) = fetch_event_by_href(&client, &request.calendar_path, &request.event_href).await
-                .map_err(|e| ApiError::Internal(format!("Failed to fetch event: {}", e)))? {
-                
+            if let Some(event) =
+                fetch_event_by_href(&client, &request.calendar_path, &request.event_href)
+                    .await
+                    .map_err(|e| ApiError::Internal(format!("Failed to fetch event: {}", e)))?
+            {
                 // Check if this is a recurring event
                 if event.rrule.is_some() && !event.rrule.as_ref().unwrap().is_empty() {
                     // Recurring event - add EXDATE for this occurrence
                     if let Some(occurrence_date) = &request.occurrence_date {
-                        let exception_utc = if let Ok(date) = chrono::DateTime::parse_from_rfc3339(occurrence_date) {
+                        let exception_utc = if let Ok(date) =
+                            chrono::DateTime::parse_from_rfc3339(occurrence_date)
+                        {
                             // RFC3339 format (with time and timezone)
                             date.with_timezone(&chrono::Utc)
-                        } else if let Ok(naive_date) = chrono::NaiveDate::parse_from_str(occurrence_date, "%Y-%m-%d") {
+                        } else if let Ok(naive_date) =
+                            chrono::NaiveDate::parse_from_str(occurrence_date, "%Y-%m-%d")
+                        {
                             // Simple date format (YYYY-MM-DD)
                             naive_date.and_hms_opt(0, 0, 0).unwrap().and_utc()
                         } else {
                             return Err(ApiError::BadRequest(format!("Invalid occurrence date format: {}. Expected RFC3339 or YYYY-MM-DD", occurrence_date)));
                         };
-                        
+
                         let mut updated_event = event;
                         updated_event.exdate.push(exception_utc);
-                        
-                        println!("🔄 Adding EXDATE {} to recurring event {}", exception_utc.format("%Y%m%dT%H%M%SZ"), updated_event.uid);
-                        
+
+                        println!(
+                            "🔄 Adding EXDATE {} to recurring event {}",
+                            exception_utc.format("%Y%m%dT%H%M%SZ"),
+                            updated_event.uid
+                        );
+
                         // Update the event with the new EXDATE
-                        client.update_event(&request.calendar_path, &updated_event, &request.event_href)
+                        client
+                            .update_event(
+                                &request.calendar_path,
+                                &updated_event,
+                                &request.event_href,
+                            )
                             .await
-                            .map_err(|e| ApiError::Internal(format!("Failed to update event with EXDATE: {}", e)))?;
-                        
+                            .map_err(|e| {
+                                ApiError::Internal(format!(
+                                    "Failed to update event with EXDATE: {}",
+                                    e
+                                ))
+                            })?;
+
                         println!("✅ Successfully updated recurring event with EXDATE");
-                        
+
                         Ok(Json(DeleteEventResponse {
                             success: true,
                             message: "Single occurrence deleted successfully".to_string(),
@@ -191,13 +284,16 @@ pub async fn delete_event(
                 } else {
                     // Non-recurring event - delete the entire event
                     println!("🗑️ Deleting non-recurring event: {}", event.uid);
-                    
-                    client.delete_event(&request.calendar_path, &request.event_href)
+
+                    client
+                        .delete_event(&request.calendar_path, &request.event_href)
                         .await
-                        .map_err(|e| ApiError::Internal(format!("Failed to delete event: {}", e)))?;
-                    
+                        .map_err(|e| {
+                            ApiError::Internal(format!("Failed to delete event: {}", e))
+                        })?;
+
                     println!("✅ Successfully deleted non-recurring event");
-                    
+
                     Ok(Json(DeleteEventResponse {
                         success: true,
                         message: "Event deleted successfully".to_string(),
@@ -206,70 +302,99 @@ pub async fn delete_event(
             } else {
                 Err(ApiError::NotFound("Event not found".to_string()))
             }
-        },
+        }
         "delete_following" => {
             // For "this and following" deletion, we need to:
             // 1. Fetch the recurring event
             // 2. Modify the RRULE to end before this occurrence
             // 3. Update the event
 
-            if let Some(mut event) = fetch_event_by_href(&client, &request.calendar_path, &request.event_href).await
-                .map_err(|e| ApiError::Internal(format!("Failed to fetch event: {}", e)))? {
-                
+            if let Some(mut event) =
+                fetch_event_by_href(&client, &request.calendar_path, &request.event_href)
+                    .await
+                    .map_err(|e| ApiError::Internal(format!("Failed to fetch event: {}", e)))?
+            {
                 if let Some(occurrence_date) = &request.occurrence_date {
-                    let until_date = if let Ok(date) = chrono::DateTime::parse_from_rfc3339(occurrence_date) {
+                    let until_date = if let Ok(date) =
+                        chrono::DateTime::parse_from_rfc3339(occurrence_date)
+                    {
                         // RFC3339 format (with time and timezone)
                         date.with_timezone(&chrono::Utc)
-                    } else if let Ok(naive_date) = chrono::NaiveDate::parse_from_str(occurrence_date, "%Y-%m-%d") {
+                    } else if let Ok(naive_date) =
+                        chrono::NaiveDate::parse_from_str(occurrence_date, "%Y-%m-%d")
+                    {
                         // Simple date format (YYYY-MM-DD)
                         naive_date.and_hms_opt(0, 0, 0).unwrap().and_utc()
                     } else {
-                        return Err(ApiError::BadRequest(format!("Invalid occurrence date format: {}. Expected RFC3339 or YYYY-MM-DD", occurrence_date)));
+                        return Err(ApiError::BadRequest(format!(
+                            "Invalid occurrence date format: {}. Expected RFC3339 or YYYY-MM-DD",
+                            occurrence_date
+                        )));
                     };
-                    
+
                     // Modify the RRULE to add an UNTIL clause
                     if let Some(rrule) = &event.rrule {
                         // Remove existing UNTIL if present and add new one
-                        let parts: Vec<&str> = rrule.split(';').filter(|part| {
-                            !part.starts_with("UNTIL=") && !part.starts_with("COUNT=")
-                        }).collect();
-                        
-                        let new_rrule = format!("{};UNTIL={}", parts.join(";"), until_date.format("%Y%m%dT%H%M%SZ"));
+                        let parts: Vec<&str> = rrule
+                            .split(';')
+                            .filter(|part| {
+                                !part.starts_with("UNTIL=") && !part.starts_with("COUNT=")
+                            })
+                            .collect();
+
+                        let new_rrule = format!(
+                            "{};UNTIL={}",
+                            parts.join(";"),
+                            until_date.format("%Y%m%dT%H%M%SZ")
+                        );
                         event.rrule = Some(new_rrule);
-                        
+
                         // Update the event with the modified RRULE
-                        client.update_event(&request.calendar_path, &event, &request.event_href)
+                        client
+                            .update_event(&request.calendar_path, &event, &request.event_href)
                             .await
-                            .map_err(|e| ApiError::Internal(format!("Failed to update event with modified RRULE: {}", e)))?;
-                        
+                            .map_err(|e| {
+                                ApiError::Internal(format!(
+                                    "Failed to update event with modified RRULE: {}",
+                                    e
+                                ))
+                            })?;
+
                         Ok(Json(DeleteEventResponse {
                             success: true,
-                            message: "This and following occurrences deleted successfully".to_string(),
+                            message: "This and following occurrences deleted successfully"
+                                .to_string(),
                         }))
                     } else {
                         // No RRULE, just delete the single event
-                        client.delete_event(&request.calendar_path, &request.event_href)
+                        client
+                            .delete_event(&request.calendar_path, &request.event_href)
                             .await
-                            .map_err(|e| ApiError::Internal(format!("Failed to delete event: {}", e)))?;
-                        
+                            .map_err(|e| {
+                                ApiError::Internal(format!("Failed to delete event: {}", e))
+                            })?;
+
                         Ok(Json(DeleteEventResponse {
                             success: true,
                             message: "Event deleted successfully".to_string(),
                         }))
                     }
                 } else {
-                    Err(ApiError::BadRequest("Occurrence date is required for following deletion".to_string()))
+                    Err(ApiError::BadRequest(
+                        "Occurrence date is required for following deletion".to_string(),
+                    ))
                 }
             } else {
                 Err(ApiError::NotFound("Event not found".to_string()))
             }
-        },
+        }
         "delete_series" | _ => {
             // Delete the entire event/series
-            client.delete_event(&request.calendar_path, &request.event_href)
+            client
+                .delete_event(&request.calendar_path, &request.event_href)
                 .await
                 .map_err(|e| ApiError::Internal(format!("Failed to delete event: {}", e)))?;
-            
+
             Ok(Json(DeleteEventResponse {
                 success: true,
                 message: "Event deleted successfully".to_string(),
@@ -283,9 +408,11 @@ pub async fn create_event(
     headers: HeaderMap,
     Json(request): Json<CreateEventRequest>,
 ) -> Result<Json<CreateEventResponse>, ApiError> {
-    println!("📝 Create event request received: title='{}', all_day={}, calendar_path={:?}", 
-             request.title, request.all_day, request.calendar_path);
-    
+    println!(
+        "📝 Create event request received: title='{}', all_day={}, calendar_path={:?}",
+        request.title, request.all_day, request.calendar_path
+    );
+
     // Extract and verify token
     let token = extract_bearer_token(&headers)?;
     let password = extract_password_header(&headers)?;
@@ -294,13 +421,17 @@ pub async fn create_event(
     if request.title.trim().is_empty() {
         return Err(ApiError::BadRequest("Event title is required".to_string()));
     }
-    
+
     if request.title.len() > 200 {
-        return Err(ApiError::BadRequest("Event title too long (max 200 characters)".to_string()));
+        return Err(ApiError::BadRequest(
+            "Event title too long (max 200 characters)".to_string(),
+        ));
     }
 
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
 
     // Determine which calendar to use
@@ -308,31 +439,55 @@ pub async fn create_event(
         path
     } else {
         // Use the first available calendar
-        let calendar_paths = client.discover_calendars()
+        let calendar_paths = client
+            .discover_calendars()
             .await
             .map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?;
-        
+
         if calendar_paths.is_empty() {
-            return Err(ApiError::BadRequest("No calendars available for event creation".to_string()));
+            return Err(ApiError::BadRequest(
+                "No calendars available for event creation".to_string(),
+            ));
         }
-        
+
         calendar_paths[0].clone()
     };
 
     // Parse dates and times
-    let start_datetime = parse_event_datetime(&request.start_date, &request.start_time, request.all_day)
-        .map_err(|e| ApiError::BadRequest(format!("Invalid start date/time: {}", e)))?;
-    
-    let end_datetime = parse_event_datetime(&request.end_date, &request.end_time, request.all_day)
+    let start_datetime =
+        parse_event_datetime(&request.start_date, &request.start_time, request.all_day)
+            .map_err(|e| ApiError::BadRequest(format!("Invalid start date/time: {}", e)))?;
+
+    let mut end_datetime = parse_event_datetime(&request.end_date, &request.end_time, request.all_day)
         .map_err(|e| ApiError::BadRequest(format!("Invalid end date/time: {}", e)))?;
 
-    // Validate that end is after start
-    if end_datetime <= start_datetime {
-        return Err(ApiError::BadRequest("End date/time must be after start date/time".to_string()));
+    // For all-day events, add one day to end date for RFC-5545 compliance
+    // RFC-5545 uses exclusive end dates for all-day events
+    if request.all_day {
+        end_datetime = end_datetime + chrono::Duration::days(1);
+    }
+
+    // Validate that end is after start (allow equal times for all-day events)
+    if request.all_day {
+        if end_datetime < start_datetime {
+            return Err(ApiError::BadRequest(
+                "End date must be on or after start date for all-day events".to_string(),
+            ));
+        }
+    } else {
+        if end_datetime <= start_datetime {
+            return Err(ApiError::BadRequest(
+                "End date/time must be after start date/time".to_string(),
+            ));
+        }
     }
 
     // Generate a unique UID for the event
-    let uid = format!("{}-{}", uuid::Uuid::new_v4(), chrono::Utc::now().timestamp());
+    let uid = format!(
+        "{}-{}",
+        uuid::Uuid::new_v4(),
+        chrono::Utc::now().timestamp()
+    );
 
     // Parse status
     let status = match request.status.to_lowercase().as_str() {
@@ -352,7 +507,8 @@ pub async fn create_event(
     let attendees: Vec<String> = if request.attendees.trim().is_empty() {
         Vec::new()
     } else {
-        request.attendees
+        request
+            .attendees
             .split(',')
             .map(|s| s.trim().to_string())
             .filter(|s| !s.is_empty())
@@ -363,7 +519,8 @@ pub async fn create_event(
     let categories: Vec<String> = if request.categories.trim().is_empty() {
         Vec::new()
     } else {
-        request.categories
+        request
+            .categories
             .split(',')
             .map(|s| s.trim().to_string())
             .filter(|s| !s.is_empty())
@@ -384,60 +541,83 @@ pub async fn create_event(
         }
     };
 
-    // Parse recurrence with BYDAY support for weekly recurrence
-    let rrule = match request.recurrence.to_uppercase().as_str() {
-        "DAILY" => Some("FREQ=DAILY".to_string()),
-        "WEEKLY" => {
-            // Handle weekly recurrence with optional BYDAY parameter
-            let mut rrule = "FREQ=WEEKLY".to_string();
-            
-            // Check if specific days are selected (recurrence_days has 7 elements: [Sun, Mon, Tue, Wed, Thu, Fri, Sat])
-            if request.recurrence_days.len() == 7 {
-                let selected_days: Vec<&str> = request.recurrence_days
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(i, &selected)| {
-                        if selected {
-                            Some(match i {
-                                0 => "SU", // Sunday
-                                1 => "MO", // Monday
-                                2 => "TU", // Tuesday
-                                3 => "WE", // Wednesday
-                                4 => "TH", // Thursday
-                                5 => "FR", // Friday
-                                6 => "SA", // Saturday
-                                _ => return None,
-                            })
-                        } else {
-                            None
-                        }
-                    })
-                    .collect();
+    // Check if recurrence is already a full RRULE or just a simple type
+    let rrule = if request.recurrence.starts_with("FREQ=") {
+        // Frontend sent a complete RRULE string, use it directly
+        if request.recurrence.is_empty() {
+            None
+        } else {
+            Some(request.recurrence.clone())
+        }
+    } else {
+        // Legacy path: Parse recurrence with BYDAY support for weekly recurrence
+        match request.recurrence.to_uppercase().as_str() {
+            "DAILY" => Some("FREQ=DAILY".to_string()),
+            "WEEKLY" => {
+                // Handle weekly recurrence with optional BYDAY parameter
+                let mut rrule = "FREQ=WEEKLY".to_string();
 
-                if !selected_days.is_empty() {
-                    rrule = format!("{};BYDAY={}", rrule, selected_days.join(","));
+                // Check if specific days are selected (recurrence_days has 7 elements: [Sun, Mon, Tue, Wed, Thu, Fri, Sat])
+                if request.recurrence_days.len() == 7 {
+                    let selected_days: Vec<&str> = request
+                        .recurrence_days
+                        .iter()
+                        .enumerate()
+                        .filter_map(|(i, &selected)| {
+                            if selected {
+                                Some(match i {
+                                    0 => "SU", // Sunday
+                                    1 => "MO", // Monday
+                                    2 => "TU", // Tuesday
+                                    3 => "WE", // Wednesday
+                                    4 => "TH", // Thursday
+                                    5 => "FR", // Friday
+                                    6 => "SA", // Saturday
+                                    _ => return None,
+                                })
+                            } else {
+                                None
+                            }
+                        })
+                        .collect();
+
+                    if !selected_days.is_empty() {
+                        rrule = format!("{};BYDAY={}", rrule, selected_days.join(","));
+                    }
                 }
+
+                Some(rrule)
             }
-            
-            Some(rrule)
-        },
-        "MONTHLY" => Some("FREQ=MONTHLY".to_string()),
-        "YEARLY" => Some("FREQ=YEARLY".to_string()),
-        _ => None,
+            "MONTHLY" => Some("FREQ=MONTHLY".to_string()),
+            "YEARLY" => Some("FREQ=YEARLY".to_string()),
+            _ => None,
+        }
     };
 
     // Create the VEvent struct (RFC 5545 compliant)
     let mut event = VEvent::new(uid, start_datetime);
     event.dtend = Some(end_datetime);
-    event.summary = if request.title.trim().is_empty() { None } else { Some(request.title.clone()) };
-    event.description = if request.description.trim().is_empty() { None } else { Some(request.description) };
-    event.location = if request.location.trim().is_empty() { None } else { Some(request.location) };
+    event.summary = if request.title.trim().is_empty() {
+        None
+    } else {
+        Some(request.title.clone())
+    };
+    event.description = if request.description.trim().is_empty() {
+        None
+    } else {
+        Some(request.description)
+    };
+    event.location = if request.location.trim().is_empty() {
+        None
+    } else {
+        Some(request.location)
+    };
     event.status = Some(status);
     event.class = Some(class);
     event.priority = request.priority;
-    event.organizer = if request.organizer.trim().is_empty() { 
-        None 
-    } else { 
+    event.organizer = if request.organizer.trim().is_empty() {
+        None
+    } else {
         Some(CalendarUser {
             cal_address: request.organizer,
             common_name: None,
@@ -446,41 +626,53 @@ pub async fn create_event(
             language: None,
         })
     };
-    event.attendees = attendees.into_iter().map(|email| Attendee {
-        cal_address: email,
-        common_name: None,
-        role: None,
-        part_stat: None,
-        rsvp: None,
-        cu_type: None,
-        member: Vec::new(),
-        delegated_to: Vec::new(),
-        delegated_from: Vec::new(),
-        sent_by: None,
-        dir_entry_ref: None,
-        language: None,
-    }).collect();
+    event.attendees = attendees
+        .into_iter()
+        .map(|email| Attendee {
+            cal_address: email,
+            common_name: None,
+            role: None,
+            part_stat: None,
+            rsvp: None,
+            cu_type: None,
+            member: Vec::new(),
+            delegated_to: Vec::new(),
+            delegated_from: Vec::new(),
+            sent_by: None,
+            dir_entry_ref: None,
+            language: None,
+        })
+        .collect();
     event.categories = categories;
     event.rrule = rrule;
     event.all_day = request.all_day;
-    event.alarms = alarms.into_iter().map(|reminder| VAlarm {
-        action: AlarmAction::Display,
-        trigger: AlarmTrigger::Duration(chrono::Duration::minutes(-reminder.minutes_before as i64)),
-        duration: None,
-        repeat: None,
-        description: reminder.description,
-        summary: None,
-        attendees: Vec::new(),
-        attach: Vec::new(),
-    }).collect();
+    event.alarms = alarms
+        .into_iter()
+        .map(|reminder| VAlarm {
+            action: AlarmAction::Display,
+            trigger: AlarmTrigger::Duration(chrono::Duration::minutes(
+                -reminder.minutes_before as i64,
+            )),
+            duration: None,
+            repeat: None,
+            description: reminder.description,
+            summary: None,
+            attendees: Vec::new(),
+            attach: Vec::new(),
+        })
+        .collect();
     event.calendar_path = Some(calendar_path.clone());
 
     // Create the event on the CalDAV server
-    let event_href = client.create_event(&calendar_path, &event)
+    let event_href = client
+        .create_event(&calendar_path, &event)
         .await
         .map_err(|e| ApiError::Internal(format!("Failed to create event: {}", e)))?;
 
-    println!("✅ Event created successfully with UID: {} at href: {}", event.uid, event_href);
+    println!(
+        "✅ Event created successfully with UID: {} at href: {}",
+        event.uid, event_href
+    );
 
     Ok(Json(CreateEventResponse {
         success: true,
@@ -495,7 +687,7 @@ pub async fn update_event(
     Json(request): Json<UpdateEventRequest>,
 ) -> Result<Json<UpdateEventResponse>, ApiError> {
     // Handle update request
-    
+
     // Extract and verify token
     let token = extract_bearer_token(&headers)?;
     let password = extract_password_header(&headers)?;
@@ -504,37 +696,45 @@ pub async fn update_event(
     if request.uid.trim().is_empty() {
         return Err(ApiError::BadRequest("Event UID is required".to_string()));
     }
-    
+
     if request.title.trim().is_empty() {
         return Err(ApiError::BadRequest("Event title is required".to_string()));
     }
-    
+
     if request.title.len() > 200 {
-        return Err(ApiError::BadRequest("Event title too long (max 200 characters)".to_string()));
+        return Err(ApiError::BadRequest(
+            "Event title too long (max 200 characters)".to_string(),
+        ));
     }
 
     // Create CalDAV config from token and password
-    let config = state.auth_service.caldav_config_from_token(&token, &password)?;
+    let config = state
+        .auth_service
+        .caldav_config_from_token(&token, &password)?;
     let client = CalDAVClient::new(config);
 
     // Find the event across all calendars (or in the specified calendar)
     let calendar_paths = if let Some(path) = &request.calendar_path {
         vec![path.clone()]
     } else {
-        client.discover_calendars()
+        client
+            .discover_calendars()
             .await
             .map_err(|e| ApiError::Internal(format!("Failed to discover calendars: {}", e)))?
     };
 
     let mut found_event: Option<(CalendarEvent, String, String)> = None; // (event, calendar_path, event_href)
-    
+
     for calendar_path in &calendar_paths {
         match client.fetch_events(calendar_path).await {
             Ok(events) => {
                 for event in events {
                     if event.uid == request.uid {
                         // Use the actual href from the event, or generate one if missing
-                        let event_href = event.href.clone().unwrap_or_else(|| format!("{}.ics", event.uid));
+                        let event_href = event
+                            .href
+                            .clone()
+                            .unwrap_or_else(|| format!("{}.ics", event.uid));
                         println!("🔍 Found event {} with href: {}", event.uid, event_href);
                         found_event = Some((event, calendar_path.clone(), event_href));
                         break;
@@ -543,9 +743,12 @@ pub async fn update_event(
                 if found_event.is_some() {
                     break;
                 }
-            },
+            }
             Err(e) => {
-                eprintln!("Failed to fetch events from calendar {}: {}", calendar_path, e);
+                eprintln!(
+                    "Failed to fetch events from calendar {}: {}",
+                    calendar_path, e
+                );
                 continue;
             }
         }
@@ -555,23 +758,52 @@ pub async fn update_event(
         .ok_or_else(|| ApiError::NotFound(format!("Event with UID '{}' not found", request.uid)))?;
 
     // Parse dates and times
-    let start_datetime = parse_event_datetime(&request.start_date, &request.start_time, request.all_day)
-        .map_err(|e| ApiError::BadRequest(format!("Invalid start date/time: {}", e)))?;
-    
-    let end_datetime = parse_event_datetime(&request.end_date, &request.end_time, request.all_day)
+    let start_datetime =
+        parse_event_datetime(&request.start_date, &request.start_time, request.all_day)
+            .map_err(|e| ApiError::BadRequest(format!("Invalid start date/time: {}", e)))?;
+
+    let mut end_datetime = parse_event_datetime(&request.end_date, &request.end_time, request.all_day)
         .map_err(|e| ApiError::BadRequest(format!("Invalid end date/time: {}", e)))?;
 
-    // Validate that end is after start
-    if end_datetime <= start_datetime {
-        return Err(ApiError::BadRequest("End date/time must be after start date/time".to_string()));
+    // For all-day events, add one day to end date for RFC-5545 compliance
+    // RFC-5545 uses exclusive end dates for all-day events
+    if request.all_day {
+        end_datetime = end_datetime + chrono::Duration::days(1);
+    }
+
+    // Validate that end is after start (allow equal times for all-day events)
+    if request.all_day {
+        if end_datetime < start_datetime {
+            return Err(ApiError::BadRequest(
+                "End date must be on or after start date for all-day events".to_string(),
+            ));
+        }
+    } else {
+        if end_datetime <= start_datetime {
+            return Err(ApiError::BadRequest(
+                "End date/time must be after start date/time".to_string(),
+            ));
+        }
     }
 
     // Update event properties
     event.dtstart = start_datetime;
     event.dtend = Some(end_datetime);
-    event.summary = if request.title.trim().is_empty() { None } else { Some(request.title) };
-    event.description = if request.description.trim().is_empty() { None } else { Some(request.description) };
-    event.location = if request.location.trim().is_empty() { None } else { Some(request.location) };
+    event.summary = if request.title.trim().is_empty() {
+        None
+    } else {
+        Some(request.title)
+    };
+    event.description = if request.description.trim().is_empty() {
+        None
+    } else {
+        Some(request.description)
+    };
+    event.location = if request.location.trim().is_empty() {
+        None
+    } else {
+        Some(request.location)
+    };
     event.all_day = request.all_day;
 
     // Parse and update status
@@ -591,11 +823,15 @@ pub async fn update_event(
     event.priority = request.priority;
 
     // Update the event on the CalDAV server
-    println!("📝 Updating event {} at calendar_path: {}, event_href: {}", event.uid, calendar_path, event_href);
-    client.update_event(&calendar_path, &event, &event_href)
+    println!(
+        "📝 Updating event {} at calendar_path: {}, event_href: {}",
+        event.uid, calendar_path, event_href
+    );
+    client
+        .update_event(&calendar_path, &event, &event_href)
         .await
         .map_err(|e| ApiError::Internal(format!("Failed to update event: {}", e)))?;
-    
+
     println!("✅ Successfully updated event {}", event.uid);
 
     Ok(Json(UpdateEventResponse {
@@ -604,27 +840,33 @@ pub async fn update_event(
     }))
 }
 
-fn parse_event_datetime(date_str: &str, time_str: &str, all_day: bool) -> Result<chrono::DateTime<chrono::Utc>, String> {
-    use chrono::{NaiveDate, NaiveTime, NaiveDateTime, Utc, TimeZone};
-    
+fn parse_event_datetime(
+    date_str: &str,
+    time_str: &str,
+    all_day: bool,
+) -> Result<chrono::DateTime<chrono::Utc>, String> {
+    use chrono::{NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
+
     // Parse the date
     let date = NaiveDate::parse_from_str(date_str, "%Y-%m-%d")
         .map_err(|_| format!("Invalid date format: {}. Expected YYYY-MM-DD", date_str))?;
-    
+
     if all_day {
-        // For all-day events, use midnight UTC
-        let datetime = date.and_hms_opt(0, 0, 0)
-            .ok_or_else(|| "Failed to create midnight datetime".to_string())?;
+        // For all-day events, use noon UTC to avoid timezone boundary issues
+        // This ensures the date remains correct when converted to any local timezone
+        let datetime = date
+            .and_hms_opt(12, 0, 0)
+            .ok_or_else(|| "Failed to create noon datetime".to_string())?;
         Ok(Utc.from_utc_datetime(&datetime))
     } else {
         // Parse the time
         let time = NaiveTime::parse_from_str(time_str, "%H:%M")
             .map_err(|_| format!("Invalid time format: {}. Expected HH:MM", time_str))?;
-        
+
         // Combine date and time
         let datetime = NaiveDateTime::new(date, time);
-        
-        // Assume local time and convert to UTC (in a real app, you'd want timezone support)
+
+        // Frontend now sends UTC times, so treat as UTC directly
         Ok(Utc.from_utc_datetime(&datetime))
     }
-}
+}

backend/src/handlers/external_calendars.rs

@@ -0,0 +1,142 @@
+use axum::{
+    extract::{Path, State},
+    response::Json,
+};
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+
+use crate::{
+    db::{ExternalCalendar, ExternalCalendarRepository},
+    models::ApiError,
+    AppState,
+};
+
+use super::auth::{extract_bearer_token};
+
+#[derive(Debug, Deserialize)]
+pub struct CreateExternalCalendarRequest {
+    pub name: String,
+    pub url: String,
+    pub color: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct UpdateExternalCalendarRequest {
+    pub name: String,
+    pub url: String,
+    pub color: String,
+    pub is_visible: bool,
+}
+
+#[derive(Debug, Serialize)]
+pub struct ExternalCalendarResponse {
+    pub id: i32,
+    pub name: String,
+    pub url: String,
+    pub color: String,
+    pub is_visible: bool,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub updated_at: chrono::DateTime<chrono::Utc>,
+    pub last_fetched: Option<chrono::DateTime<chrono::Utc>>,
+}
+
+impl From<ExternalCalendar> for ExternalCalendarResponse {
+    fn from(calendar: ExternalCalendar) -> Self {
+        Self {
+            id: calendar.id,
+            name: calendar.name,
+            url: calendar.url,
+            color: calendar.color,
+            is_visible: calendar.is_visible,
+            created_at: calendar.created_at,
+            updated_at: calendar.updated_at,
+            last_fetched: calendar.last_fetched,
+        }
+    }
+}
+
+pub async fn get_external_calendars(
+    headers: axum::http::HeaderMap,
+    State(app_state): State<Arc<AppState>>,
+) -> Result<Json<Vec<ExternalCalendarResponse>>, ApiError> {
+    // Extract and verify token, get user
+    let token = extract_bearer_token(&headers)?;
+    let user = app_state.auth_service.get_user_from_token(&token).await?;
+
+    let repo = ExternalCalendarRepository::new(&app_state.db);
+    let calendars = repo
+        .get_by_user(&user.id)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to get external calendars: {}", e)))?;
+
+    let response: Vec<ExternalCalendarResponse> = calendars.into_iter().map(Into::into).collect();
+    Ok(Json(response))
+}
+
+pub async fn create_external_calendar(
+    headers: axum::http::HeaderMap,
+    State(app_state): State<Arc<AppState>>,
+    Json(request): Json<CreateExternalCalendarRequest>,
+) -> Result<Json<ExternalCalendarResponse>, ApiError> {
+    let token = extract_bearer_token(&headers)?;
+    let user = app_state.auth_service.get_user_from_token(&token).await?;
+
+    let calendar = ExternalCalendar::new(
+        user.id,
+        request.name,
+        request.url,
+        request.color,
+    );
+
+    let repo = ExternalCalendarRepository::new(&app_state.db);
+    let id = repo
+        .create(&calendar)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to create external calendar: {}", e)))?;
+
+    let mut created_calendar = calendar;
+    created_calendar.id = id;
+
+    Ok(Json(created_calendar.into()))
+}
+
+pub async fn update_external_calendar(
+    headers: axum::http::HeaderMap,
+    State(app_state): State<Arc<AppState>>,
+    Path(id): Path<i32>,
+    Json(request): Json<UpdateExternalCalendarRequest>,
+) -> Result<Json<()>, ApiError> {
+    let token = extract_bearer_token(&headers)?;
+    let user = app_state.auth_service.get_user_from_token(&token).await?;
+
+    let mut calendar = ExternalCalendar::new(
+        user.id,
+        request.name,
+        request.url,
+        request.color,
+    );
+    calendar.is_visible = request.is_visible;
+
+    let repo = ExternalCalendarRepository::new(&app_state.db);
+    repo.update(id, &calendar)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to update external calendar: {}", e)))?;
+
+    Ok(Json(()))
+}
+
+pub async fn delete_external_calendar(
+    headers: axum::http::HeaderMap,
+    State(app_state): State<Arc<AppState>>,
+    Path(id): Path<i32>,
+) -> Result<Json<()>, ApiError> {
+    let token = extract_bearer_token(&headers)?;
+    let user = app_state.auth_service.get_user_from_token(&token).await?;
+
+    let repo = ExternalCalendarRepository::new(&app_state.db);
+    repo.delete(id, &user.id)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to delete external calendar: {}", e)))?;
+
+    Ok(Json(()))
+}

backend/src/handlers/ics_fetcher.rs

@@ -0,0 +1,906 @@
+use axum::{
+    extract::{Path, State},
+    response::Json,
+};
+use chrono::{DateTime, Utc, Datelike};
+use ical::parser::ical::component::IcalEvent;
+use reqwest::Client;
+use serde::Serialize;
+use std::sync::Arc;
+
+use crate::{
+    db::ExternalCalendarRepository,
+    models::ApiError,
+    AppState,
+};
+
+// Import VEvent from calendar-models shared crate
+use calendar_models::VEvent;
+
+use super::auth::{extract_bearer_token};
+
+#[derive(Debug, Serialize)]
+pub struct ExternalCalendarEventsResponse {
+    pub events: Vec<VEvent>,
+    pub last_fetched: DateTime<Utc>,
+}
+
+pub async fn fetch_external_calendar_events(
+    headers: axum::http::HeaderMap,
+    State(app_state): State<Arc<AppState>>,
+    Path(id): Path<i32>,
+) -> Result<Json<ExternalCalendarEventsResponse>, ApiError> {
+    let token = extract_bearer_token(&headers)?;
+    let user = app_state.auth_service.get_user_from_token(&token).await?;
+
+    let repo = ExternalCalendarRepository::new(&app_state.db);
+    
+    // Get user's external calendars to verify ownership and get URL
+    let calendars = repo
+        .get_by_user(&user.id)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to get external calendars: {}", e)))?;
+
+    let calendar = calendars
+        .into_iter()
+        .find(|c| c.id == id)
+        .ok_or_else(|| ApiError::NotFound("External calendar not found".to_string()))?;
+
+    if !calendar.is_visible {
+        return Ok(Json(ExternalCalendarEventsResponse {
+            events: vec![],
+            last_fetched: Utc::now(),
+        }));
+    }
+
+    // Check cache first
+    let cache_max_age_minutes = 5;
+    let mut ics_content = String::new();
+    let mut last_fetched = Utc::now();
+    let mut fetched_from_cache = false;
+
+    // Try to get from cache if not stale
+    match repo.is_cache_stale(id, cache_max_age_minutes).await {
+        Ok(is_stale) => {
+            if !is_stale {
+                // Cache is fresh, use it
+                if let Ok(Some((cached_data, cached_at))) = repo.get_cached_data(id).await {
+                    ics_content = cached_data;
+                    last_fetched = cached_at;
+                    fetched_from_cache = true;
+                }
+            }
+        }
+        Err(_) => {
+            // If cache check fails, proceed to fetch from URL
+        }
+    }
+
+    // If not fetched from cache, get from external URL
+    if !fetched_from_cache {
+        // Log the URL being fetched for debugging
+        println!("🌍 Fetching calendar URL: {}", calendar.url);
+        
+        let user_agents = vec![
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+            "Mozilla/5.0 (compatible; Runway Calendar/1.0)",
+            "Outlook-iOS/709.2226530.prod.iphone (3.24.1)"
+        ];
+        
+        let mut response = None;
+        let mut last_error = None;
+        
+        // Try different user agents
+        for (i, ua) in user_agents.iter().enumerate() {
+            println!("🔄 Attempt {} with User-Agent: {}", i + 1, ua);
+            
+            let client = Client::builder()
+                .redirect(reqwest::redirect::Policy::limited(10))
+                .timeout(std::time::Duration::from_secs(30))
+                .user_agent(*ua)
+                .build()
+                .map_err(|e| ApiError::Internal(format!("Failed to create HTTP client: {}", e)))?;
+            
+            let result = client
+                .get(&calendar.url)
+                .header("Accept", "text/calendar,application/calendar+xml,text/plain,*/*")
+                .header("Accept-Charset", "utf-8")
+                .header("Cache-Control", "no-cache")
+                .send()
+                .await;
+                
+            match result {
+                Ok(resp) => {
+                    let status = resp.status();
+                    println!("📡 Response status: {}", status);
+                    if status.is_success() {
+                        response = Some(resp);
+                        break;
+                    } else if status == 400 {
+                        // Check if this is an Outlook auth error
+                        let error_body = resp.text().await.unwrap_or_default();
+                        if error_body.contains("OwaPage") || error_body.contains("Outlook") {
+                            println!("🚫 Outlook authentication error detected, trying next approach...");
+                            last_error = Some(format!("Outlook auth error: {}", error_body.chars().take(100).collect::<String>()));
+                            continue;
+                        }
+                        last_error = Some(format!("Bad Request: {}", error_body.chars().take(100).collect::<String>()));
+                    } else {
+                        last_error = Some(format!("HTTP {}", status));
+                    }
+                }
+                Err(e) => {
+                    println!("❌ Request failed: {}", e);
+                    last_error = Some(format!("Request error: {}", e));
+                }
+            }
+        }
+        
+        let response = response.ok_or_else(|| {
+            ApiError::Internal(format!(
+                "Failed to fetch calendar after trying {} different approaches. Last error: {}", 
+                user_agents.len(), 
+                last_error.unwrap_or("Unknown error".to_string())
+            ))
+        })?;
+
+        // Response is guaranteed to be successful here since we checked in the loop
+        println!("✅ Successfully fetched calendar data");
+        
+        ics_content = response
+            .text()
+            .await
+            .map_err(|e| ApiError::Internal(format!("Failed to read calendar content: {}", e)))?;
+
+        // Store in cache for future requests
+        let etag = None; // TODO: Extract ETag from response headers if available
+        if let Err(_) = repo.update_cache(id, &ics_content, etag).await {
+            // Log error but don't fail the request
+        }
+
+        // Update last_fetched timestamp
+        if let Err(_) = repo.update_last_fetched(id, &user.id).await {
+        }
+        
+        last_fetched = Utc::now();
+    }
+
+    // Parse ICS content
+    let events = parse_ics_content(&ics_content)
+        .map_err(|e| ApiError::BadRequest(format!("Failed to parse calendar: {}", e)))?;
+
+    Ok(Json(ExternalCalendarEventsResponse {
+        events,
+        last_fetched,
+    }))
+}
+
+fn parse_ics_content(ics_content: &str) -> Result<Vec<VEvent>, Box<dyn std::error::Error>> {
+    let reader = ical::IcalParser::new(ics_content.as_bytes());
+    let mut events = Vec::new();
+    let mut _total_components = 0;
+    let mut _failed_conversions = 0;
+
+    for calendar in reader {
+        let calendar = calendar?;
+        for component in calendar.events {
+            _total_components += 1;
+            match convert_ical_to_vevent(component) {
+                Ok(vevent) => {
+                    events.push(vevent);
+                }
+                Err(_) => {
+                    _failed_conversions += 1;
+                }
+            }
+        }
+    }
+
+    // Deduplicate events based on UID, start time, and summary
+    // Outlook sometimes includes duplicate events (recurring exceptions may appear multiple times)
+    events = deduplicate_events(events);
+
+    Ok(events)
+}
+
+fn convert_ical_to_vevent(ical_event: IcalEvent) -> Result<VEvent, Box<dyn std::error::Error>> {
+    use uuid::Uuid;
+
+    let mut summary = None;
+    let mut description = None;
+    let mut location = None;
+    let mut dtstart = None;
+    let mut dtend = None;
+    let mut uid = None;
+    let mut all_day = false;
+    let mut rrule = None;
+
+
+    // Extract properties
+    for property in ical_event.properties {
+        match property.name.as_str() {
+            "SUMMARY" => {
+                summary = property.value;
+            }
+            "DESCRIPTION" => {
+                description = property.value;
+            }
+            "LOCATION" => {
+                location = property.value;
+            }
+            "DTSTART" => {
+                if let Some(value) = property.value {
+                    // Check if it's a date-only value (all-day event)
+                    if value.len() == 8 && !value.contains('T') {
+                        all_day = true;
+                        // Parse YYYYMMDD format
+                        if let Ok(date) = chrono::NaiveDate::parse_from_str(&value, "%Y%m%d") {
+                            dtstart = Some(chrono::TimeZone::from_utc_datetime(&Utc, &date.and_hms_opt(12, 0, 0).unwrap()));
+                        }
+                    } else {
+                        // Extract timezone info from parameters
+                        let tzid = property.params.as_ref()
+                            .and_then(|params| params.iter().find(|(k, _)| k == "TZID"))
+                            .and_then(|(_, v)| v.first().cloned());
+                        
+                        // Parse datetime with timezone information
+                        if let Some(dt) = parse_datetime_with_tz(&value, tzid.as_deref()) {
+                            dtstart = Some(dt);
+                        }
+                    }
+                }
+            }
+            "DTEND" => {
+                if let Some(value) = property.value {
+                    if all_day && value.len() == 8 && !value.contains('T') {
+                        // For all-day events, DTEND is exclusive so use the date as-is at noon
+                        if let Ok(date) = chrono::NaiveDate::parse_from_str(&value, "%Y%m%d") {
+                            dtend = Some(chrono::TimeZone::from_utc_datetime(&Utc, &date.and_hms_opt(12, 0, 0).unwrap()));
+                        }
+                    } else {
+                        // Extract timezone info from parameters
+                        let tzid = property.params.as_ref()
+                            .and_then(|params| params.iter().find(|(k, _)| k == "TZID"))
+                            .and_then(|(_, v)| v.first().cloned());
+                        
+                        // Parse datetime with timezone information
+                        if let Some(dt) = parse_datetime_with_tz(&value, tzid.as_deref()) {
+                            dtend = Some(dt);
+                        }
+                    }
+                }
+            }
+            "UID" => {
+                uid = property.value;
+            }
+            "RRULE" => {
+                rrule = property.value;
+            }
+            _ => {} // Ignore other properties for now
+        }
+    }
+
+
+    let dtstart = dtstart.ok_or("Missing DTSTART")?;
+
+    let vevent = VEvent {
+        uid: uid.unwrap_or_else(|| Uuid::new_v4().to_string()),
+        dtstart,
+        dtend,
+        summary,
+        description,
+        location,
+        all_day,
+        rrule,
+        exdate: Vec::new(), // External calendars don't need exception handling
+        recurrence_id: None,
+        created: None,
+        last_modified: None,
+        dtstamp: Utc::now(),
+        sequence: Some(0),
+        status: None,
+        transp: None,
+        organizer: None,
+        attendees: Vec::new(),
+        url: None,
+        attachments: Vec::new(),
+        categories: Vec::new(),
+        priority: None,
+        resources: Vec::new(),
+        related_to: None,
+        geo: None,
+        duration: None,
+        class: None,
+        contact: None,
+        comment: None,
+        rdate: Vec::new(),
+        alarms: Vec::new(),
+        etag: None,
+        href: None,
+        calendar_path: None,
+    };
+
+    Ok(vevent)
+}
+
+fn parse_datetime_with_tz(datetime_str: &str, tzid: Option<&str>) -> Option<DateTime<Utc>> {
+    use chrono::TimeZone;
+    use chrono_tz::Tz;
+    
+    
+    // Try various datetime formats commonly found in ICS files
+    
+    // Format: 20231201T103000Z (UTC) - handle as naive datetime first
+    if datetime_str.ends_with('Z') {
+        let datetime_without_z = &datetime_str[..datetime_str.len()-1];
+        if let Ok(naive_dt) = chrono::NaiveDateTime::parse_from_str(datetime_without_z, "%Y%m%dT%H%M%S") {
+            return Some(naive_dt.and_utc());
+        }
+    }
+
+    // Format: 20231201T103000-0500 (with timezone offset)
+    if let Ok(dt) = DateTime::parse_from_str(datetime_str, "%Y%m%dT%H%M%S%z") {
+        return Some(dt.with_timezone(&Utc));
+    }
+
+    // Format: 2023-12-01T10:30:00Z (ISO format)
+    if let Ok(dt) = DateTime::parse_from_str(datetime_str, "%Y-%m-%dT%H:%M:%SZ") {
+        return Some(dt.with_timezone(&Utc));
+    }
+
+    // Handle naive datetime with timezone parameter
+    let naive_dt = if let Ok(dt) = chrono::NaiveDateTime::parse_from_str(datetime_str, "%Y%m%dT%H%M%S") {
+        Some(dt)
+    } else if let Ok(dt) = chrono::NaiveDateTime::parse_from_str(datetime_str, "%Y-%m-%dT%H:%M:%S") {
+        Some(dt)
+    } else {
+        None
+    };
+
+    if let Some(naive_dt) = naive_dt {
+        // If TZID is provided, try to parse it
+        if let Some(tzid_str) = tzid {
+            // Handle common timezone formats
+            let tz_result = if tzid_str.starts_with("/mozilla.org/") {
+                // Mozilla/Thunderbird format: /mozilla.org/20070129_1/Europe/London
+                tzid_str.split('/').last().and_then(|tz_name| tz_name.parse::<Tz>().ok())
+            } else if tzid_str.contains('/') {
+                // Standard timezone format: America/New_York, Europe/London
+                tzid_str.parse::<Tz>().ok()
+            } else {
+                // Try common abbreviations and Windows timezone names
+                match tzid_str {
+                    // Standard abbreviations
+                    "EST" => Some(Tz::America__New_York),
+                    "PST" => Some(Tz::America__Los_Angeles),
+                    "MST" => Some(Tz::America__Denver), 
+                    "CST" => Some(Tz::America__Chicago),
+                    
+                    // North America - Windows timezone names to IANA mapping
+                    "Mountain Standard Time" => Some(Tz::America__Denver),
+                    "Eastern Standard Time" => Some(Tz::America__New_York),
+                    "Central Standard Time" => Some(Tz::America__Chicago),
+                    "Pacific Standard Time" => Some(Tz::America__Los_Angeles),
+                    "Mountain Daylight Time" => Some(Tz::America__Denver),
+                    "Eastern Daylight Time" => Some(Tz::America__New_York),
+                    "Central Daylight Time" => Some(Tz::America__Chicago),
+                    "Pacific Daylight Time" => Some(Tz::America__Los_Angeles),
+                    "Hawaiian Standard Time" => Some(Tz::Pacific__Honolulu),
+                    "Alaskan Standard Time" => Some(Tz::America__Anchorage),
+                    "Alaskan Daylight Time" => Some(Tz::America__Anchorage),
+                    "Atlantic Standard Time" => Some(Tz::America__Halifax),
+                    "Newfoundland Standard Time" => Some(Tz::America__St_Johns),
+                    
+                    // Europe
+                    "GMT Standard Time" => Some(Tz::Europe__London),
+                    "Greenwich Standard Time" => Some(Tz::UTC),
+                    "W. Europe Standard Time" => Some(Tz::Europe__Berlin),
+                    "Central Europe Standard Time" => Some(Tz::Europe__Warsaw),
+                    "Romance Standard Time" => Some(Tz::Europe__Paris),
+                    "Central European Standard Time" => Some(Tz::Europe__Belgrade),
+                    "E. Europe Standard Time" => Some(Tz::Europe__Bucharest),
+                    "FLE Standard Time" => Some(Tz::Europe__Helsinki),
+                    "GTB Standard Time" => Some(Tz::Europe__Athens),
+                    "Russian Standard Time" => Some(Tz::Europe__Moscow),
+                    "Turkey Standard Time" => Some(Tz::Europe__Istanbul),
+                    
+                    // Asia
+                    "China Standard Time" => Some(Tz::Asia__Shanghai),
+                    "Tokyo Standard Time" => Some(Tz::Asia__Tokyo),
+                    "Korea Standard Time" => Some(Tz::Asia__Seoul),
+                    "Singapore Standard Time" => Some(Tz::Asia__Singapore),
+                    "India Standard Time" => Some(Tz::Asia__Kolkata),
+                    "Pakistan Standard Time" => Some(Tz::Asia__Karachi),
+                    "Bangladesh Standard Time" => Some(Tz::Asia__Dhaka),
+                    "Thailand Standard Time" => Some(Tz::Asia__Bangkok),
+                    "SE Asia Standard Time" => Some(Tz::Asia__Bangkok),
+                    "Myanmar Standard Time" => Some(Tz::Asia__Yangon),
+                    "Sri Lanka Standard Time" => Some(Tz::Asia__Colombo),
+                    "Nepal Standard Time" => Some(Tz::Asia__Kathmandu),
+                    "Central Asia Standard Time" => Some(Tz::Asia__Almaty),
+                    "West Asia Standard Time" => Some(Tz::Asia__Tashkent),
+                    "Afghanistan Standard Time" => Some(Tz::Asia__Kabul),
+                    "Iran Standard Time" => Some(Tz::Asia__Tehran),
+                    "Arabian Standard Time" => Some(Tz::Asia__Dubai),
+                    "Arab Standard Time" => Some(Tz::Asia__Riyadh),
+                    "Israel Standard Time" => Some(Tz::Asia__Jerusalem),
+                    "Jordan Standard Time" => Some(Tz::Asia__Amman),
+                    "Syria Standard Time" => Some(Tz::Asia__Damascus),
+                    "Middle East Standard Time" => Some(Tz::Asia__Beirut),
+                    "Egypt Standard Time" => Some(Tz::Africa__Cairo),
+                    "South Africa Standard Time" => Some(Tz::Africa__Johannesburg),
+                    "E. Africa Standard Time" => Some(Tz::Africa__Nairobi),
+                    "W. Central Africa Standard Time" => Some(Tz::Africa__Lagos),
+                    
+                    // Asia Pacific
+                    "AUS Eastern Standard Time" => Some(Tz::Australia__Sydney),
+                    "AUS Central Standard Time" => Some(Tz::Australia__Darwin),
+                    "W. Australia Standard Time" => Some(Tz::Australia__Perth),
+                    "Tasmania Standard Time" => Some(Tz::Australia__Hobart),
+                    "New Zealand Standard Time" => Some(Tz::Pacific__Auckland),
+                    "Fiji Standard Time" => Some(Tz::Pacific__Fiji),
+                    "Tonga Standard Time" => Some(Tz::Pacific__Tongatapu),
+                    
+                    // South America
+                    "Argentina Standard Time" => Some(Tz::America__Buenos_Aires),
+                    "E. South America Standard Time" => Some(Tz::America__Sao_Paulo),
+                    "SA Eastern Standard Time" => Some(Tz::America__Cayenne),
+                    "SA Pacific Standard Time" => Some(Tz::America__Bogota),
+                    "SA Western Standard Time" => Some(Tz::America__La_Paz),
+                    "Pacific SA Standard Time" => Some(Tz::America__Santiago),
+                    "Venezuela Standard Time" => Some(Tz::America__Caracas),
+                    "Montevideo Standard Time" => Some(Tz::America__Montevideo),
+                    
+                    // Try parsing as IANA name
+                    _ => tzid_str.parse::<Tz>().ok()
+                }
+            };
+
+            if let Some(tz) = tz_result {
+                if let Some(dt_with_tz) = tz.from_local_datetime(&naive_dt).single() {
+                    return Some(dt_with_tz.with_timezone(&Utc));
+                }
+            }
+        }
+        
+        // If no timezone info or parsing failed, treat as UTC (safer than local time assumptions)
+        return Some(chrono::TimeZone::from_utc_datetime(&Utc, &naive_dt));
+    }
+
+    None
+}
+
+/// Deduplicate events based on UID, start time, and summary
+/// Some calendar systems (like Outlook) may include duplicate events in ICS feeds
+/// This includes both exact duplicates and recurring event instances that would be
+/// generated by existing RRULE patterns, and events with same title but different
+/// RRULE patterns that should be consolidated
+fn deduplicate_events(mut events: Vec<VEvent>) -> Vec<VEvent> {
+    use std::collections::HashMap;
+    
+    let original_count = events.len();
+    
+    // First pass: Group by UID and prefer recurring events over single events with same UID
+    let mut uid_groups: HashMap<String, Vec<VEvent>> = HashMap::new();
+    
+    for event in events.drain(..) {
+        // Debug logging to understand what's happening
+        println!("🔍 Event: '{}' at {} (RRULE: {}) - UID: {}", 
+            event.summary.as_ref().unwrap_or(&"No Title".to_string()),
+            event.dtstart.format("%Y-%m-%d %H:%M"),
+            if event.rrule.is_some() { "Yes" } else { "No" },
+            event.uid
+        );
+        
+        uid_groups.entry(event.uid.clone()).or_insert_with(Vec::new).push(event);
+    }
+    
+    let mut uid_deduplicated_events = Vec::new();
+    
+    for (uid, mut events_with_uid) in uid_groups.drain() {
+        if events_with_uid.len() == 1 {
+            // Only one event with this UID, keep it
+            uid_deduplicated_events.push(events_with_uid.into_iter().next().unwrap());
+        } else {
+            // Multiple events with same UID - prefer recurring over non-recurring
+            println!("🔍 Found {} events with UID '{}'", events_with_uid.len(), uid);
+            
+            // Sort by preference: recurring events first, then by completeness
+            events_with_uid.sort_by(|a, b| {
+                let a_has_rrule = a.rrule.is_some();
+                let b_has_rrule = b.rrule.is_some();
+                
+                match (a_has_rrule, b_has_rrule) {
+                    (true, false) => std::cmp::Ordering::Less,   // a (recurring) comes first
+                    (false, true) => std::cmp::Ordering::Greater, // b (recurring) comes first
+                    _ => {
+                        // Both same type (both recurring or both single) - compare by completeness
+                        event_completeness_score(b).cmp(&event_completeness_score(a))
+                    }
+                }
+            });
+            
+            // Keep the first (preferred) event
+            let preferred_event = events_with_uid.into_iter().next().unwrap();
+            println!("🔄 UID dedup: Keeping '{}' (RRULE: {})",
+                preferred_event.summary.as_ref().unwrap_or(&"No Title".to_string()),
+                if preferred_event.rrule.is_some() { "Yes" } else { "No" }
+            );
+            uid_deduplicated_events.push(preferred_event);
+        }
+    }
+    
+    // Second pass: separate recurring and single events from UID-deduplicated set
+    let mut recurring_events = Vec::new();
+    let mut single_events = Vec::new();
+    
+    for event in uid_deduplicated_events.drain(..) {
+        if event.rrule.is_some() {
+            recurring_events.push(event);
+        } else {
+            single_events.push(event);
+        }
+    }
+    
+    // Third pass: Group recurring events by normalized title and consolidate different RRULE patterns
+    let mut title_groups: HashMap<String, Vec<VEvent>> = HashMap::new();
+    
+    for event in recurring_events.drain(..) {
+        let title = normalize_title(event.summary.as_ref().unwrap_or(&String::new()));
+        title_groups.entry(title).or_insert_with(Vec::new).push(event);
+    }
+    
+    let mut deduplicated_recurring = Vec::new();
+    
+    for (title, events_with_title) in title_groups.drain() {
+        if events_with_title.len() == 1 {
+            // Single event with this title, keep as-is
+            deduplicated_recurring.push(events_with_title.into_iter().next().unwrap());
+        } else {
+            // Multiple events with same title - consolidate or deduplicate
+            println!("🔍 Found {} events with title '{}'", events_with_title.len(), title);
+            
+            // Check if these are actually different recurring patterns for the same logical event
+            let consolidated = consolidate_same_title_events(events_with_title);
+            deduplicated_recurring.extend(consolidated);
+        }
+    }
+    
+    // Fourth pass: filter single events, removing those that would be generated by recurring events
+    let mut deduplicated_single = Vec::new();
+    let mut seen_single: HashMap<String, usize> = HashMap::new();
+    
+    for event in single_events.drain(..) {
+        let normalized_title = normalize_title(event.summary.as_ref().unwrap_or(&String::new()));
+        let dedup_key = format!(
+            "{}|{}", 
+            event.dtstart.format("%Y%m%dT%H%M%S"),
+            normalized_title
+        );
+        
+        // First check for exact duplicates among single events
+        if let Some(&existing_index) = seen_single.get(&dedup_key) {
+            let existing_event: &VEvent = &deduplicated_single[existing_index];
+            let current_completeness = event_completeness_score(&event);
+            let existing_completeness = event_completeness_score(existing_event);
+            
+            if current_completeness > existing_completeness {
+                println!("🔄 Replacing single event: Keeping '{}' over '{}'",
+                    event.summary.as_ref().unwrap_or(&"No Title".to_string()),
+                    existing_event.summary.as_ref().unwrap_or(&"No Title".to_string())
+                );
+                deduplicated_single[existing_index] = event;
+            } else {
+                println!("🚫 Discarding duplicate single event: Keeping existing '{}'",
+                    existing_event.summary.as_ref().unwrap_or(&"No Title".to_string())
+                );
+            }
+            continue;
+        }
+        
+        // Check if this single event would be generated by any recurring event
+        let is_rrule_generated = deduplicated_recurring.iter().any(|recurring_event| {
+            // Check if this single event matches the recurring event's pattern (use normalized titles)
+            let single_title = normalize_title(event.summary.as_ref().unwrap_or(&String::new()));
+            let recurring_title = normalize_title(recurring_event.summary.as_ref().unwrap_or(&String::new()));
+            
+            if single_title != recurring_title {
+                return false; // Different events
+            }
+            
+            // Check if this single event would be generated by the recurring event
+            would_event_be_generated_by_rrule(recurring_event, &event)
+        });
+        
+        if is_rrule_generated {
+            println!("🚫 Discarding RRULE-generated instance: '{}' at {} would be generated by recurring event",
+                event.summary.as_ref().unwrap_or(&"No Title".to_string()),
+                event.dtstart.format("%Y-%m-%d %H:%M")
+            );
+        } else {
+            // This is a unique single event
+            seen_single.insert(dedup_key, deduplicated_single.len());
+            deduplicated_single.push(event);
+        }
+    }
+    
+    // Combine recurring and single events
+    let mut result = deduplicated_recurring;
+    result.extend(deduplicated_single);
+    
+    println!("📊 Deduplication complete: {} -> {} events ({} recurring, {} single)", 
+        original_count, result.len(), 
+        result.iter().filter(|e| e.rrule.is_some()).count(),
+        result.iter().filter(|e| e.rrule.is_none()).count()
+    );
+    
+    result
+}
+
+/// Normalize title for grouping similar events
+fn normalize_title(title: &str) -> String {
+    title.trim()
+        .to_lowercase()
+        .chars()
+        .filter(|c| c.is_alphanumeric() || c.is_whitespace())
+        .collect::<String>()
+        .split_whitespace()
+        .collect::<Vec<&str>>()
+        .join(" ")
+}
+
+/// Consolidate events with the same title but potentially different RRULE patterns
+/// This handles cases where calendar systems provide multiple recurring definitions
+/// for the same logical meeting (e.g., one RRULE for Tuesdays, another for Thursdays)
+fn consolidate_same_title_events(events: Vec<VEvent>) -> Vec<VEvent> {
+    if events.is_empty() {
+        return events;
+    }
+    
+    // Log the RRULEs we're working with
+    for event in &events {
+        if let Some(rrule) = &event.rrule {
+            println!("🔍 RRULE for '{}': {}", 
+                event.summary.as_ref().unwrap_or(&"No Title".to_string()),
+                rrule
+            );
+        }
+    }
+    
+    // Check if all events have similar time patterns and could be consolidated
+    let first_event = &events[0];
+    let base_time = first_event.dtstart.time();
+    let base_duration = if let Some(end) = first_event.dtend {
+        Some(end.signed_duration_since(first_event.dtstart))
+    } else {
+        None
+    };
+    
+    // Check if all events have the same time and duration
+    let can_consolidate = events.iter().all(|event| {
+        let same_time = event.dtstart.time() == base_time;
+        let same_duration = match (event.dtend, base_duration) {
+            (Some(end), Some(base_dur)) => end.signed_duration_since(event.dtstart) == base_dur,
+            (None, None) => true,
+            _ => false,
+        };
+        same_time && same_duration
+    });
+    
+    if !can_consolidate {
+        println!("🚫 Cannot consolidate events - different times or durations");
+        // Just deduplicate exact duplicates
+        return deduplicate_exact_recurring_events(events);
+    }
+    
+    // Try to detect if these are complementary weekly patterns
+    let weekly_events: Vec<_> = events.iter()
+        .filter(|e| e.rrule.as_ref().map_or(false, |r| r.contains("FREQ=WEEKLY")))
+        .collect();
+    
+    if weekly_events.len() >= 2 && weekly_events.len() == events.len() {
+        // All events are weekly - try to consolidate into a single multi-day weekly pattern
+        if let Some(consolidated) = consolidate_weekly_patterns(&events) {
+            println!("✅ Successfully consolidated {} weekly patterns into one", events.len());
+            return vec![consolidated];
+        }
+    }
+    
+    // If we can't consolidate, just deduplicate exact matches and keep the most complete one
+    println!("🚫 Cannot consolidate - keeping most complete event");
+    let deduplicated = deduplicate_exact_recurring_events(events);
+    
+    // If we still have multiple events, keep only the most complete one
+    if deduplicated.len() > 1 {
+        let best_event = deduplicated.into_iter()
+            .max_by_key(|e| event_completeness_score(e))
+            .unwrap();
+        
+        println!("🎯 Kept most complete event: '{}'", 
+            best_event.summary.as_ref().unwrap_or(&"No Title".to_string())
+        );
+        vec![best_event]
+    } else {
+        deduplicated
+    }
+}
+
+/// Deduplicate exact recurring event matches
+fn deduplicate_exact_recurring_events(events: Vec<VEvent>) -> Vec<VEvent> {
+    use std::collections::HashMap;
+    
+    let mut seen: HashMap<String, usize> = HashMap::new();
+    let mut deduplicated = Vec::new();
+    
+    for event in events {
+        let dedup_key = format!(
+            "{}|{}|{}", 
+            event.dtstart.format("%Y%m%dT%H%M%S"),
+            event.summary.as_ref().unwrap_or(&String::new()),
+            event.rrule.as_ref().unwrap_or(&String::new())
+        );
+        
+        if let Some(&existing_index) = seen.get(&dedup_key) {
+            let existing_event: &VEvent = &deduplicated[existing_index];
+            let current_completeness = event_completeness_score(&event);
+            let existing_completeness = event_completeness_score(existing_event);
+            
+            if current_completeness > existing_completeness {
+                println!("🔄 Replacing exact duplicate: Keeping more complete event");
+                deduplicated[existing_index] = event;
+            }
+        } else {
+            seen.insert(dedup_key, deduplicated.len());
+            deduplicated.push(event);
+        }
+    }
+    
+    deduplicated
+}
+
+/// Attempt to consolidate multiple weekly RRULE patterns into a single pattern
+fn consolidate_weekly_patterns(events: &[VEvent]) -> Option<VEvent> {
+    use std::collections::HashSet;
+    
+    let mut all_days = HashSet::new();
+    let mut base_event = None;
+    
+    for event in events {
+        let Some(rrule) = &event.rrule else { continue; };
+        
+        if !rrule.contains("FREQ=WEEKLY") {
+            continue;
+        }
+        
+        // Extract BYDAY if present
+        if let Some(byday_part) = rrule.split(';').find(|part| part.starts_with("BYDAY=")) {
+            let days_str = byday_part.strip_prefix("BYDAY=").unwrap_or("");
+            for day in days_str.split(',') {
+                all_days.insert(day.trim().to_string());
+            }
+        } else {
+            // If no BYDAY specified, use the weekday from the start date
+            let weekday = match event.dtstart.weekday() {
+                chrono::Weekday::Mon => "MO",
+                chrono::Weekday::Tue => "TU", 
+                chrono::Weekday::Wed => "WE",
+                chrono::Weekday::Thu => "TH",
+                chrono::Weekday::Fri => "FR",
+                chrono::Weekday::Sat => "SA",
+                chrono::Weekday::Sun => "SU",
+            };
+            all_days.insert(weekday.to_string());
+        }
+        
+        // Use the first event as the base (we already know they have same time/duration)
+        if base_event.is_none() {
+            base_event = Some(event.clone());
+        }
+    }
+    
+    if all_days.is_empty() || base_event.is_none() {
+        return None;
+    }
+    
+    // Create consolidated RRULE
+    let mut base = base_event.unwrap();
+    let days_list: Vec<_> = all_days.into_iter().collect();
+    let byday_str = days_list.join(",");
+    
+    // Build new RRULE with consolidated BYDAY
+    let new_rrule = if let Some(existing_rrule) = &base.rrule {
+        // Remove existing BYDAY and add our consolidated one
+        let parts: Vec<_> = existing_rrule.split(';')
+            .filter(|part| !part.starts_with("BYDAY="))
+            .collect();
+        format!("{};BYDAY={}", parts.join(";"), byday_str)
+    } else {
+        format!("FREQ=WEEKLY;BYDAY={}", byday_str)
+    };
+    
+    base.rrule = Some(new_rrule);
+    
+    println!("🔗 Consolidated weekly pattern: BYDAY={}", byday_str);
+    Some(base)
+}
+
+/// Check if a single event would be generated by a recurring event's RRULE
+fn would_event_be_generated_by_rrule(recurring_event: &VEvent, single_event: &VEvent) -> bool {
+    let Some(rrule) = &recurring_event.rrule else {
+        return false; // No RRULE to check against
+    };
+    
+    // Parse basic RRULE patterns
+    if rrule.contains("FREQ=DAILY") {
+        // Daily recurrence
+        let interval = extract_interval_from_rrule(rrule).unwrap_or(1);
+        let days_diff = (single_event.dtstart.date_naive() - recurring_event.dtstart.date_naive()).num_days();
+        
+        if days_diff >= 0 && days_diff % interval as i64 == 0 {
+            // Check if times match (allowing for timezone differences within same day)
+            let recurring_time = recurring_event.dtstart.time();
+            let single_time = single_event.dtstart.time();
+            return recurring_time == single_time;
+        }
+    } else if rrule.contains("FREQ=WEEKLY") {
+        // Weekly recurrence
+        let interval = extract_interval_from_rrule(rrule).unwrap_or(1);
+        let days_diff = (single_event.dtstart.date_naive() - recurring_event.dtstart.date_naive()).num_days();
+        
+        // First check if it's the same day of week and time
+        let recurring_weekday = recurring_event.dtstart.weekday();
+        let single_weekday = single_event.dtstart.weekday();
+        let recurring_time = recurring_event.dtstart.time();
+        let single_time = single_event.dtstart.time();
+        
+        if recurring_weekday == single_weekday && recurring_time == single_time && days_diff >= 0 {
+            // Calculate how many weeks apart they are
+            let weeks_diff = days_diff / 7;
+            // Check if this falls on an interval boundary
+            return weeks_diff % interval as i64 == 0;
+        }
+    } else if rrule.contains("FREQ=MONTHLY") {
+        // Monthly recurrence - simplified check
+        let months_diff = (single_event.dtstart.year() - recurring_event.dtstart.year()) * 12 
+            + (single_event.dtstart.month() as i32 - recurring_event.dtstart.month() as i32);
+        
+        if months_diff >= 0 {
+            let interval = extract_interval_from_rrule(rrule).unwrap_or(1) as i32;
+            if months_diff % interval == 0 {
+                // Same day of month and time
+                return recurring_event.dtstart.day() == single_event.dtstart.day()
+                    && recurring_event.dtstart.time() == single_event.dtstart.time();
+            }
+        }
+    }
+    
+    false
+}
+
+/// Extract INTERVAL value from RRULE string, defaulting to 1 if not found
+fn extract_interval_from_rrule(rrule: &str) -> Option<u32> {
+    for part in rrule.split(';') {
+        if part.starts_with("INTERVAL=") {
+            return part.strip_prefix("INTERVAL=")
+                .and_then(|s| s.parse().ok());
+        }
+    }
+    Some(1) // Default interval is 1 if not specified
+}
+
+/// Calculate a completeness score for an event based on how many optional fields are filled
+fn event_completeness_score(event: &VEvent) -> u32 {
+    let mut score = 0;
+    
+    if event.summary.is_some() { score += 1; }
+    if event.description.is_some() { score += 1; }
+    if event.location.is_some() { score += 1; }
+    if event.dtend.is_some() { score += 1; }
+    if event.rrule.is_some() { score += 1; }
+    if !event.categories.is_empty() { score += 1; }
+    if !event.alarms.is_empty() { score += 1; }
+    if event.organizer.is_some() { score += 1; }
+    if !event.attendees.is_empty() { score += 1; }
+    
+    score
+}

backend/src/handlers/mod.rs

@@ -0,0 +1,15 @@
+pub mod auth;
+pub mod calendar;
+pub mod events;
+pub mod external_calendars;
+pub mod ics_fetcher;
+pub mod preferences;
+pub mod series;
+
+pub use auth::*;
+pub use calendar::*;
+pub use events::*;
+pub use external_calendars::*;
+pub use ics_fetcher::*;
+pub use preferences::*;
+pub use series::*;

backend/src/handlers/preferences.rs

@@ -0,0 +1,133 @@
+use axum::{
+    extract::State,
+    http::{HeaderMap, StatusCode},
+    response::IntoResponse,
+    Json,
+};
+use std::sync::Arc;
+
+use crate::{
+    db::PreferencesRepository,
+    models::{ApiError, UpdatePreferencesRequest, UserPreferencesResponse},
+    AppState,
+};
+
+/// Get user preferences
+pub async fn get_preferences(
+    State(state): State<Arc<AppState>>,
+    headers: HeaderMap,
+) -> Result<impl IntoResponse, ApiError> {
+    // Extract session token from headers
+    let session_token = headers
+        .get("X-Session-Token")
+        .and_then(|h| h.to_str().ok())
+        .ok_or_else(|| ApiError::Unauthorized("Missing session token".to_string()))?;
+
+    // Validate session and get user ID
+    let user_id = state.auth_service.validate_session(session_token).await?;
+
+    // Get preferences from database
+    let prefs_repo = PreferencesRepository::new(&state.db);
+    let preferences = prefs_repo
+        .get_or_create(&user_id)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to get preferences: {}", e)))?;
+
+    Ok(Json(UserPreferencesResponse {
+        calendar_selected_date: preferences.calendar_selected_date,
+        calendar_time_increment: preferences.calendar_time_increment,
+        calendar_view_mode: preferences.calendar_view_mode,
+        calendar_theme: preferences.calendar_theme,
+        calendar_style: preferences.calendar_style,
+        calendar_colors: preferences.calendar_colors,
+        last_used_calendar: preferences.last_used_calendar,
+    }))
+}
+
+/// Update user preferences
+pub async fn update_preferences(
+    State(state): State<Arc<AppState>>,
+    headers: HeaderMap,
+    Json(request): Json<UpdatePreferencesRequest>,
+) -> Result<impl IntoResponse, ApiError> {
+    // Extract session token from headers
+    let session_token = headers
+        .get("X-Session-Token")
+        .and_then(|h| h.to_str().ok())
+        .ok_or_else(|| ApiError::Unauthorized("Missing session token".to_string()))?;
+
+    // Validate session and get user ID
+    let user_id = state.auth_service.validate_session(session_token).await?;
+
+    // Update preferences in database
+    let prefs_repo = PreferencesRepository::new(&state.db);
+    
+    let mut preferences = prefs_repo
+        .get_or_create(&user_id)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to get preferences: {}", e)))?;
+
+    // Update only provided fields
+    if request.calendar_selected_date.is_some() {
+        preferences.calendar_selected_date = request.calendar_selected_date;
+    }
+    if request.calendar_time_increment.is_some() {
+        preferences.calendar_time_increment = request.calendar_time_increment;
+    }
+    if request.calendar_view_mode.is_some() {
+        preferences.calendar_view_mode = request.calendar_view_mode;
+    }
+    if request.calendar_theme.is_some() {
+        preferences.calendar_theme = request.calendar_theme;
+    }
+    if request.calendar_style.is_some() {
+        preferences.calendar_style = request.calendar_style;
+    }
+    if request.calendar_colors.is_some() {
+        preferences.calendar_colors = request.calendar_colors;
+    }
+    if request.last_used_calendar.is_some() {
+        preferences.last_used_calendar = request.last_used_calendar;
+    }
+
+    prefs_repo
+        .update(&preferences)
+        .await
+        .map_err(|e| ApiError::Database(format!("Failed to update preferences: {}", e)))?;
+
+    Ok((
+        StatusCode::OK,
+        Json(UserPreferencesResponse {
+            calendar_selected_date: preferences.calendar_selected_date,
+            calendar_time_increment: preferences.calendar_time_increment,
+            calendar_view_mode: preferences.calendar_view_mode,
+            calendar_theme: preferences.calendar_theme,
+            calendar_style: preferences.calendar_style,
+            calendar_colors: preferences.calendar_colors,
+            last_used_calendar: preferences.last_used_calendar,
+        }),
+    ))
+}
+
+/// Logout user
+pub async fn logout(
+    State(state): State<Arc<AppState>>,
+    headers: HeaderMap,
+) -> Result<impl IntoResponse, ApiError> {
+    // Extract session token from headers
+    let session_token = headers
+        .get("X-Session-Token")
+        .and_then(|h| h.to_str().ok())
+        .ok_or_else(|| ApiError::Unauthorized("Missing session token".to_string()))?;
+
+    // Delete session
+    state.auth_service.logout(session_token).await?;
+
+    Ok((
+        StatusCode::OK,
+        Json(serde_json::json!({
+            "success": true,
+            "message": "Logged out successfully"
+        })),
+    ))
+}

backend/src/lib.rs

@@ -1,35 +1,45 @@
 use axum::{
     response::Json,
-    routing::{get, post},
+    routing::{delete, get, post},
     Router,
 };
-use tower_http::cors::{CorsLayer, Any};
 use std::sync::Arc;
+use tower_http::cors::{Any, CorsLayer};
 
 pub mod auth;
-pub mod models;
-pub mod handlers;
 pub mod calendar;
 pub mod config;
+pub mod db;
+pub mod handlers;
+pub mod models;
 
 use auth::AuthService;
+use db::Database;
 
 #[derive(Clone)]
 pub struct AppState {
     pub auth_service: AuthService,
+    pub db: Database,
 }
 
 pub async fn run_server() -> Result<(), Box<dyn std::error::Error>> {
     // Initialize logging
     println!("🚀 Starting Calendar Backend Server");
+
+    // Initialize database
+    let database_url = std::env::var("DATABASE_URL")
+        .unwrap_or_else(|_| "sqlite:calendar.db".to_string());
     
+    let db = Database::new(&database_url).await?;
+    println!("✅ Database initialized");
+
     // Create auth service
     let jwt_secret = std::env::var("JWT_SECRET")
         .unwrap_or_else(|_| "your-super-secret-jwt-key-change-in-production".to_string());
-    
-    let auth_service = AuthService::new(jwt_secret);
-    
-    let app_state = AppState { auth_service };
+
+    let auth_service = AuthService::new(jwt_secret, db.clone());
+
+    let app_state = AppState { auth_service, db };
 
     // Build our application with routes
     let app = Router::new()
@@ -46,9 +56,28 @@ pub async fn run_server() -> Result<(), Box<dyn std::error::Error>> {
         .route("/api/calendar/events/delete", post(handlers::delete_event))
         .route("/api/calendar/events/:uid", get(handlers::refresh_event))
         // Event series-specific endpoints
-        .route("/api/calendar/events/series/create", post(handlers::create_event_series))
-        .route("/api/calendar/events/series/update", post(handlers::update_event_series))
-        .route("/api/calendar/events/series/delete", post(handlers::delete_event_series))
+        .route(
+            "/api/calendar/events/series/create",
+            post(handlers::create_event_series),
+        )
+        .route(
+            "/api/calendar/events/series/update",
+            post(handlers::update_event_series),
+        )
+        .route(
+            "/api/calendar/events/series/delete",
+            post(handlers::delete_event_series),
+        )
+        // User preferences endpoints
+        .route("/api/preferences", get(handlers::get_preferences))
+        .route("/api/preferences", post(handlers::update_preferences))
+        .route("/api/auth/logout", post(handlers::logout))
+        // External calendars endpoints
+        .route("/api/external-calendars", get(handlers::get_external_calendars))
+        .route("/api/external-calendars", post(handlers::create_external_calendar))
+        .route("/api/external-calendars/:id", post(handlers::update_external_calendar))
+        .route("/api/external-calendars/:id", delete(handlers::delete_external_calendar))
+        .route("/api/external-calendars/:id/events", get(handlers::fetch_external_calendar_events))
         .layer(
             CorsLayer::new()
                 .allow_origin(Any)
@@ -60,7 +89,7 @@ pub async fn run_server() -> Result<(), Box<dyn std::error::Error>> {
     // Start server
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await?;
     println!("📡 Server listening on http://0.0.0.0:3000");
-    
+
     axum::serve(listener, app).await?;
 
     Ok(())
@@ -76,4 +105,4 @@ async fn health_check() -> Json<serde_json::Value> {
         "service": "calendar-backend",
         "version": "0.1.0"
     }))
-}
+}

backend/src/main.rs

@@ -4,4 +4,4 @@ use calendar_backend::*;
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     run_server().await
-}
+}

backend/src/models.rs

@@ -16,8 +16,32 @@ pub struct CalDAVLoginRequest {
 #[derive(Debug, Serialize)]
 pub struct AuthResponse {
     pub token: String,
+    pub session_token: String,
     pub username: String,
     pub server_url: String,
+    pub preferences: UserPreferencesResponse,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct UserPreferencesResponse {
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_style: Option<String>,
+    pub calendar_colors: Option<String>,
+    pub last_used_calendar: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct UpdatePreferencesRequest {
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_style: Option<String>,
+    pub calendar_colors: Option<String>,
+    pub last_used_calendar: Option<String>,
 }
 
 #[derive(Debug, Serialize)]
@@ -32,6 +56,7 @@ pub struct CalendarInfo {
     pub path: String,
     pub display_name: String,
     pub color: String,
+    pub is_visible: bool,
 }
 
 #[derive(Debug, Deserialize)]
@@ -76,21 +101,21 @@ pub struct DeleteEventResponse {
 pub struct CreateEventRequest {
     pub title: String,
     pub description: String,
-    pub start_date: String,        // YYYY-MM-DD format
-    pub start_time: String,        // HH:MM format  
-    pub end_date: String,          // YYYY-MM-DD format
-    pub end_time: String,          // HH:MM format
+    pub start_date: String, // YYYY-MM-DD format
+    pub start_time: String, // HH:MM format
+    pub end_date: String,   // YYYY-MM-DD format
+    pub end_time: String,   // HH:MM format
     pub location: String,
     pub all_day: bool,
-    pub status: String,            // confirmed, tentative, cancelled
-    pub class: String,             // public, private, confidential
-    pub priority: Option<u8>,      // 0-9 priority level
-    pub organizer: String,         // organizer email
-    pub attendees: String,         // comma-separated attendee emails
-    pub categories: String,        // comma-separated categories
-    pub reminder: String,          // reminder type
-    pub recurrence: String,        // recurrence type
-    pub recurrence_days: Vec<bool>, // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
+    pub status: String,                // confirmed, tentative, cancelled
+    pub class: String,                 // public, private, confidential
+    pub priority: Option<u8>,          // 0-9 priority level
+    pub organizer: String,             // organizer email
+    pub attendees: String,             // comma-separated attendee emails
+    pub categories: String,            // comma-separated categories
+    pub reminder: String,              // reminder type
+    pub recurrence: String,            // recurrence type
+    pub recurrence_days: Vec<bool>,    // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
     pub calendar_path: Option<String>, // Optional - use first calendar if not specified
 }
 
@@ -103,24 +128,24 @@ pub struct CreateEventResponse {
 
 #[derive(Debug, Deserialize)]
 pub struct UpdateEventRequest {
-    pub uid: String,               // Event UID to identify which event to update
+    pub uid: String, // Event UID to identify which event to update
     pub title: String,
     pub description: String,
-    pub start_date: String,        // YYYY-MM-DD format
-    pub start_time: String,        // HH:MM format  
-    pub end_date: String,          // YYYY-MM-DD format
-    pub end_time: String,          // HH:MM format
+    pub start_date: String, // YYYY-MM-DD format
+    pub start_time: String, // HH:MM format
+    pub end_date: String,   // YYYY-MM-DD format
+    pub end_time: String,   // HH:MM format
     pub location: String,
     pub all_day: bool,
-    pub status: String,            // confirmed, tentative, cancelled
-    pub class: String,             // public, private, confidential
-    pub priority: Option<u8>,      // 0-9 priority level
-    pub organizer: String,         // organizer email
-    pub attendees: String,         // comma-separated attendee emails
-    pub categories: String,        // comma-separated categories
-    pub reminder: String,          // reminder type
-    pub recurrence: String,        // recurrence type
-    pub recurrence_days: Vec<bool>, // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
+    pub status: String,                // confirmed, tentative, cancelled
+    pub class: String,                 // public, private, confidential
+    pub priority: Option<u8>,          // 0-9 priority level
+    pub organizer: String,             // organizer email
+    pub attendees: String,             // comma-separated attendee emails
+    pub categories: String,            // comma-separated categories
+    pub reminder: String,              // reminder type
+    pub recurrence: String,            // recurrence type
+    pub recurrence_days: Vec<bool>,    // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
     pub calendar_path: Option<String>, // Optional - search all calendars if not specified
     pub update_action: Option<String>, // "update_series" for recurring events
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -139,22 +164,22 @@ pub struct UpdateEventResponse {
 pub struct CreateEventSeriesRequest {
     pub title: String,
     pub description: String,
-    pub start_date: String,        // YYYY-MM-DD format
-    pub start_time: String,        // HH:MM format  
-    pub end_date: String,          // YYYY-MM-DD format
-    pub end_time: String,          // HH:MM format
+    pub start_date: String, // YYYY-MM-DD format
+    pub start_time: String, // HH:MM format
+    pub end_date: String,   // YYYY-MM-DD format
+    pub end_time: String,   // HH:MM format
     pub location: String,
     pub all_day: bool,
-    pub status: String,            // confirmed, tentative, cancelled
-    pub class: String,             // public, private, confidential
-    pub priority: Option<u8>,      // 0-9 priority level
-    pub organizer: String,         // organizer email
-    pub attendees: String,         // comma-separated attendee emails
-    pub categories: String,        // comma-separated categories
-    pub reminder: String,          // reminder type
-    
+    pub status: String,       // confirmed, tentative, cancelled
+    pub class: String,        // public, private, confidential
+    pub priority: Option<u8>, // 0-9 priority level
+    pub organizer: String,    // organizer email
+    pub attendees: String,    // comma-separated attendee emails
+    pub categories: String,   // comma-separated categories
+    pub reminder: String,     // reminder type
+
     // Series-specific fields
-    pub recurrence: String,        // recurrence type (daily, weekly, monthly, yearly)
+    pub recurrence: String, // recurrence type (daily, weekly, monthly, yearly)
     pub recurrence_days: Vec<bool>, // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
     pub recurrence_interval: Option<u32>, // Every N days/weeks/months/years
     pub recurrence_end_date: Option<String>, // When the series ends (YYYY-MM-DD)
@@ -173,34 +198,35 @@ pub struct CreateEventSeriesResponse {
 
 #[derive(Debug, Deserialize)]
 pub struct UpdateEventSeriesRequest {
-    pub series_uid: String,        // Series UID to identify which series to update
+    pub series_uid: String, // Series UID to identify which series to update
     pub title: String,
     pub description: String,
-    pub start_date: String,        // YYYY-MM-DD format
-    pub start_time: String,        // HH:MM format  
-    pub end_date: String,          // YYYY-MM-DD format
-    pub end_time: String,          // HH:MM format
+    pub start_date: String, // YYYY-MM-DD format
+    pub start_time: String, // HH:MM format
+    pub end_date: String,   // YYYY-MM-DD format
+    pub end_time: String,   // HH:MM format
     pub location: String,
     pub all_day: bool,
-    pub status: String,            // confirmed, tentative, cancelled
-    pub class: String,             // public, private, confidential
-    pub priority: Option<u8>,      // 0-9 priority level
-    pub organizer: String,         // organizer email
-    pub attendees: String,         // comma-separated attendee emails
-    pub categories: String,        // comma-separated categories
-    pub reminder: String,          // reminder type
-    
+    pub status: String,       // confirmed, tentative, cancelled
+    pub class: String,        // public, private, confidential
+    pub priority: Option<u8>, // 0-9 priority level
+    pub organizer: String,    // organizer email
+    pub attendees: String,    // comma-separated attendee emails
+    pub categories: String,   // comma-separated categories
+    pub reminder: String,     // reminder type
+
     // Series-specific fields
-    pub recurrence: String,        // recurrence type (daily, weekly, monthly, yearly)
+    pub recurrence: String, // recurrence type (daily, weekly, monthly, yearly)
     pub recurrence_days: Vec<bool>, // [Sun, Mon, Tue, Wed, Thu, Fri, Sat] for weekly recurrence
     pub recurrence_interval: Option<u32>, // Every N days/weeks/months/years
     pub recurrence_end_date: Option<String>, // When the series ends (YYYY-MM-DD)
     pub recurrence_count: Option<u32>, // Number of occurrences
     pub calendar_path: Option<String>, // Optional - search all calendars if not specified
-    
+
     // Update scope control
-    pub update_scope: String,      // "this_only", "this_and_future", "all_in_series"
+    pub update_scope: String, // "this_only", "this_and_future", "all_in_series"
     pub occurrence_date: Option<String>, // ISO date string for specific occurrence being updated
+    pub changed_fields: Option<Vec<String>>, // List of field names that were changed (for optimization)
 }
 
 #[derive(Debug, Serialize)]
@@ -213,12 +239,12 @@ pub struct UpdateEventSeriesResponse {
 
 #[derive(Debug, Deserialize)]
 pub struct DeleteEventSeriesRequest {
-    pub series_uid: String,        // Series UID to identify which series to delete
+    pub series_uid: String, // Series UID to identify which series to delete
     pub calendar_path: String,
     pub event_href: String,
-    
+
     // Delete scope control
-    pub delete_scope: String,      // "this_only", "this_and_future", "all_in_series"
+    pub delete_scope: String, // "this_only", "this_and_future", "all_in_series"
     pub occurrence_date: Option<String>, // ISO date string for specific occurrence being deleted
 }
 
@@ -273,4 +299,4 @@ impl std::fmt::Display for ApiError {
     }
 }
 
-impl std::error::Error for ApiError {}
+impl std::error::Error for ApiError {}

backend/tests/integration_tests.rs

@@ -1,26 +1,26 @@
-use calendar_backend::AppState;
-use calendar_backend::auth::AuthService;
-use reqwest::Client;
-use serde_json::json;
-use std::time::Duration;
-use tokio::time::sleep;
 use axum::{
     response::Json,
     routing::{get, post},
     Router,
 };
-use tower_http::cors::{CorsLayer, Any};
+use calendar_backend::auth::AuthService;
+use calendar_backend::AppState;
+use reqwest::Client;
+use serde_json::json;
 use std::sync::Arc;
+use std::time::Duration;
+use tokio::time::sleep;
+use tower_http::cors::{Any, CorsLayer};
 
 /// Test utilities for integration testing
 mod test_utils {
     use super::*;
-    
+
     pub struct TestServer {
         pub base_url: String,
         pub client: Client,
     }
-    
+
     impl TestServer {
         pub async fn start() -> Self {
             // Create auth service
@@ -33,19 +33,55 @@ mod test_utils {
                 .route("/", get(root))
                 .route("/api/health", get(health_check))
                 .route("/api/auth/login", post(calendar_backend::handlers::login))
-                .route("/api/auth/verify", get(calendar_backend::handlers::verify_token))
-                .route("/api/user/info", get(calendar_backend::handlers::get_user_info))
-                .route("/api/calendar/create", post(calendar_backend::handlers::create_calendar))
-                .route("/api/calendar/delete", post(calendar_backend::handlers::delete_calendar))
-                .route("/api/calendar/events", get(calendar_backend::handlers::get_calendar_events))
-                .route("/api/calendar/events/create", post(calendar_backend::handlers::create_event))
-                .route("/api/calendar/events/update", post(calendar_backend::handlers::update_event))
-                .route("/api/calendar/events/delete", post(calendar_backend::handlers::delete_event))
-                .route("/api/calendar/events/:uid", get(calendar_backend::handlers::refresh_event))
+                .route(
+                    "/api/auth/verify",
+                    get(calendar_backend::handlers::verify_token),
+                )
+                .route(
+                    "/api/user/info",
+                    get(calendar_backend::handlers::get_user_info),
+                )
+                .route(
+                    "/api/calendar/create",
+                    post(calendar_backend::handlers::create_calendar),
+                )
+                .route(
+                    "/api/calendar/delete",
+                    post(calendar_backend::handlers::delete_calendar),
+                )
+                .route(
+                    "/api/calendar/events",
+                    get(calendar_backend::handlers::get_calendar_events),
+                )
+                .route(
+                    "/api/calendar/events/create",
+                    post(calendar_backend::handlers::create_event),
+                )
+                .route(
+                    "/api/calendar/events/update",
+                    post(calendar_backend::handlers::update_event),
+                )
+                .route(
+                    "/api/calendar/events/delete",
+                    post(calendar_backend::handlers::delete_event),
+                )
+                .route(
+                    "/api/calendar/events/:uid",
+                    get(calendar_backend::handlers::refresh_event),
+                )
                 // Event series-specific endpoints
-                .route("/api/calendar/events/series/create", post(calendar_backend::handlers::create_event_series))
-                .route("/api/calendar/events/series/update", post(calendar_backend::handlers::update_event_series))
-                .route("/api/calendar/events/series/delete", post(calendar_backend::handlers::delete_event_series))
+                .route(
+                    "/api/calendar/events/series/create",
+                    post(calendar_backend::handlers::create_event_series),
+                )
+                .route(
+                    "/api/calendar/events/series/update",
+                    post(calendar_backend::handlers::update_event_series),
+                )
+                .route(
+                    "/api/calendar/events/series/delete",
+                    post(calendar_backend::handlers::delete_event_series),
+                )
                 .layer(
                     CorsLayer::new()
                         .allow_origin(Any)
@@ -58,39 +94,47 @@ mod test_utils {
             let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
             let addr = listener.local_addr().unwrap();
             let base_url = format!("http://127.0.0.1:{}", addr.port());
-            
+
             tokio::spawn(async move {
                 axum::serve(listener, app).await.unwrap();
             });
-            
+
             // Wait for server to start
             sleep(Duration::from_millis(100)).await;
-            
+
             let client = Client::new();
             TestServer { base_url, client }
         }
-        
+
         pub async fn login(&self) -> String {
             let login_payload = json!({
-                "username": std::env::var("CALDAV_USERNAME").unwrap_or("test".to_string()),
-                "password": std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string()),
-                "server_url": std::env::var("CALDAV_SERVER_URL").unwrap_or("https://example.com".to_string())
+                "username": "test".to_string(),
+                "password": "test".to_string(),
+                "server_url": "https://example.com".to_string()
             });
-            
-            let response = self.client
+
+            let response = self
+                .client
                 .post(&format!("{}/api/auth/login", self.base_url))
                 .json(&login_payload)
                 .send()
                 .await
                 .expect("Failed to send login request");
-                
-            assert!(response.status().is_success(), "Login failed with status: {}", response.status());
-            
+
+            assert!(
+                response.status().is_success(),
+                "Login failed with status: {}",
+                response.status()
+            );
+
             let login_response: serde_json::Value = response.json().await.unwrap();
-            login_response["token"].as_str().expect("Login response should contain token").to_string()
+            login_response["token"]
+                .as_str()
+                .expect("Login response should contain token")
+                .to_string()
         }
     }
-    
+
     async fn root() -> &'static str {
         "Calendar Backend API v0.1.0"
     }
@@ -106,26 +150,27 @@ mod test_utils {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use super::test_utils::*;
+    use super::*;
 
     /// Test the health endpoint
     #[tokio::test]
     async fn test_health_endpoint() {
         let server = TestServer::start().await;
-        
-        let response = server.client
+
+        let response = server
+            .client
             .get(&format!("{}/api/health", server.base_url))
             .send()
             .await
             .unwrap();
-            
+
         assert_eq!(response.status(), 200);
-        
+
         let health_response: serde_json::Value = response.json().await.unwrap();
         assert_eq!(health_response["status"], "healthy");
         assert_eq!(health_response["service"], "calendar-backend");
-        
+
         println!("✓ Health endpoint test passed");
     }
 
@@ -133,33 +178,42 @@ mod tests {
     #[tokio::test]
     async fn test_auth_login() {
         let server = TestServer::start().await;
-        
-        // Load credentials from .env 
-        dotenvy::dotenv().ok();
-        let username = std::env::var("CALDAV_USERNAME").unwrap_or("test".to_string());
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
-        let server_url = std::env::var("CALDAV_SERVER_URL").unwrap_or("https://example.com".to_string());
-        
+
+        // Use test credentials
+        let username = "test".to_string();
+        let password = "test".to_string();
+        let server_url = "https://example.com".to_string();
+
         let login_payload = json!({
             "username": username,
             "password": password,
             "server_url": server_url
         });
-        
-        let response = server.client
+
+        let response = server
+            .client
             .post(&format!("{}/api/auth/login", server.base_url))
             .json(&login_payload)
             .send()
             .await
             .unwrap();
-            
-        assert!(response.status().is_success(), "Login failed with status: {}", response.status());
-        
+
+        assert!(
+            response.status().is_success(),
+            "Login failed with status: {}",
+            response.status()
+        );
+
         let login_response: serde_json::Value = response.json().await.unwrap();
-        assert!(login_response["token"].is_string(), "Login response should contain a token");
-        assert!(login_response["username"].is_string(), "Login response should contain username");
-        
+        assert!(
+            login_response["token"].is_string(),
+            "Login response should contain a token"
+        );
+        assert!(
+            login_response["username"].is_string(),
+            "Login response should contain username"
+        );
+
         println!("✓ Authentication login test passed");
     }
 
@@ -167,52 +221,57 @@ mod tests {
     #[tokio::test]
     async fn test_auth_verify() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
-        let response = server.client
+
+        let response = server
+            .client
             .get(&format!("{}/api/auth/verify", server.base_url))
             .header("Authorization", format!("Bearer {}", token))
             .send()
             .await
             .unwrap();
-            
+
         assert_eq!(response.status(), 200);
-        
+
         let verify_response: serde_json::Value = response.json().await.unwrap();
         assert!(verify_response["valid"].as_bool().unwrap_or(false));
-        
+
         println!("✓ Authentication verify test passed");
     }
 
     /// Test user info endpoint
-    #[tokio::test] 
+    #[tokio::test]
     async fn test_user_info() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
-        let response = server.client
+        let password = "test".to_string();
+
+        let response = server
+            .client
             .get(&format!("{}/api/user/info", server.base_url))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .send()
             .await
             .unwrap();
-            
+
         // Note: This might fail if CalDAV server discovery fails, which can happen
         if response.status().is_success() {
             let user_info: serde_json::Value = response.json().await.unwrap();
             assert!(user_info["username"].is_string());
             println!("✓ User info test passed");
         } else {
-            println!("⚠ User info test skipped (CalDAV server issues): {}", response.status());
+            println!(
+                "⚠ User info test skipped (CalDAV server issues): {}",
+                response.status()
+            );
         }
     }
 
@@ -220,48 +279,59 @@ mod tests {
     #[tokio::test]
     async fn test_get_calendar_events() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
-        // Load password from env for CalDAV requests  
+
+        // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
-        let response = server.client
-            .get(&format!("{}/api/calendar/events?year=2024&month=12", server.base_url))
+        let password = "test".to_string();
+
+        let response = server
+            .client
+            .get(&format!(
+                "{}/api/calendar/events?year=2024&month=12",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .send()
             .await
             .unwrap();
-            
-        assert!(response.status().is_success(), "Get events failed with status: {}", response.status());
-        
+
+        assert!(
+            response.status().is_success(),
+            "Get events failed with status: {}",
+            response.status()
+        );
+
         let events: serde_json::Value = response.json().await.unwrap();
         assert!(events.is_array());
-        
-        println!("✓ Get calendar events test passed (found {} events)", events.as_array().unwrap().len());
+
+        println!(
+            "✓ Get calendar events test passed (found {} events)",
+            events.as_array().unwrap().len()
+        );
     }
 
     /// Test event creation endpoint
     #[tokio::test]
     async fn test_create_event() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
-        dotenvy::dotenv().ok(); 
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
+        dotenvy::dotenv().ok();
+        let password = "test".to_string();
+
         let create_payload = json!({
             "title": "Integration Test Event",
             "description": "Created by integration test",
             "start_date": "2024-12-25",
             "start_time": "10:00",
-            "end_date": "2024-12-25", 
+            "end_date": "2024-12-25",
             "end_time": "11:00",
             "location": "Test Location",
             "all_day": false,
@@ -275,8 +345,9 @@ mod tests {
             "recurrence": "none",
             "recurrence_days": [false, false, false, false, false, false, false]
         });
-        
-        let response = server.client
+
+        let response = server
+            .client
             .post(&format!("{}/api/calendar/events/create", server.base_url))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
@@ -284,10 +355,10 @@ mod tests {
             .send()
             .await
             .unwrap();
-            
+
         let status = response.status();
         println!("Create event response status: {}", status);
-        
+
         // Note: This might fail if CalDAV server is not accessible, which is expected in CI
         if status.is_success() {
             let create_response: serde_json::Value = response.json().await.unwrap();
@@ -302,47 +373,58 @@ mod tests {
     #[tokio::test]
     async fn test_refresh_event() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
+        let password = "test".to_string();
+
         // Use a dummy UID for testing - this will likely return 404 but we're testing the endpoint structure
         let test_uid = "test-event-uid";
-        
-        let response = server.client
-            .get(&format!("{}/api/calendar/events/{}", server.base_url, test_uid))
+
+        let response = server
+            .client
+            .get(&format!(
+                "{}/api/calendar/events/{}",
+                server.base_url, test_uid
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .send()
             .await
             .unwrap();
-            
+
         // We expect either 200 (if event exists) or 404 (if not found) - both are valid responses
-        assert!(response.status() == 200 || response.status() == 404, 
-               "Refresh event failed with unexpected status: {}", response.status());
-               
+        assert!(
+            response.status() == 200 || response.status() == 404,
+            "Refresh event failed with unexpected status: {}",
+            response.status()
+        );
+
         println!("✓ Refresh event endpoint test passed");
     }
-    
+
     /// Test invalid authentication
     #[tokio::test]
     async fn test_invalid_auth() {
         let server = TestServer::start().await;
-        
-        let response = server.client
+
+        let response = server
+            .client
             .get(&format!("{}/api/user/info", server.base_url))
             .header("Authorization", "Bearer invalid-token")
             .send()
             .await
             .unwrap();
-            
+
         // Accept both 400 and 401 as valid responses for invalid tokens
-        assert!(response.status() == 401 || response.status() == 400, 
-               "Expected 401 or 400 for invalid token, got {}", response.status());
+        assert!(
+            response.status() == 401 || response.status() == 400,
+            "Expected 401 or 400 for invalid token, got {}",
+            response.status()
+        );
         println!("✓ Invalid authentication test passed");
     }
 
@@ -350,13 +432,14 @@ mod tests {
     #[tokio::test]
     async fn test_missing_auth() {
         let server = TestServer::start().await;
-        
-        let response = server.client
+
+        let response = server
+            .client
             .get(&format!("{}/api/user/info", server.base_url))
             .send()
             .await
             .unwrap();
-            
+
         assert_eq!(response.status(), 401);
         println!("✓ Missing authentication test passed");
     }
@@ -367,20 +450,20 @@ mod tests {
     #[tokio::test]
     async fn test_create_event_series() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
+        let password = "test".to_string();
+
         let create_payload = json!({
             "title": "Integration Test Series",
             "description": "Created by integration test for series",
             "start_date": "2024-12-25",
             "start_time": "10:00",
-            "end_date": "2024-12-25", 
+            "end_date": "2024-12-25",
             "end_time": "11:00",
             "location": "Test Series Location",
             "all_day": false,
@@ -397,19 +480,23 @@ mod tests {
             "recurrence_count": 4,
             "calendar_path": "/calendars/test/default/" // Provide explicit path to bypass discovery
         });
-        
-        let response = server.client
-            .post(&format!("{}/api/calendar/events/series/create", server.base_url))
+
+        let response = server
+            .client
+            .post(&format!(
+                "{}/api/calendar/events/series/create",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .json(&create_payload)
             .send()
             .await
             .unwrap();
-            
+
         let status = response.status();
         println!("Create series response status: {}", status);
-        
+
         // Note: This might fail if CalDAV server is not accessible, which is expected in CI
         if status.is_success() {
             let create_response: serde_json::Value = response.json().await.unwrap();
@@ -422,24 +509,24 @@ mod tests {
     }
 
     /// Test event series update endpoint
-    #[tokio::test] 
+    #[tokio::test]
     async fn test_update_event_series() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
+        let password = "test".to_string();
+
         let update_payload = json!({
             "series_uid": "test-series-uid",
             "title": "Updated Series Title",
             "description": "Updated by integration test",
             "start_date": "2024-12-26",
             "start_time": "14:00",
-            "end_date": "2024-12-26", 
+            "end_date": "2024-12-26",
             "end_time": "15:00",
             "location": "Updated Location",
             "all_day": false,
@@ -457,27 +544,36 @@ mod tests {
             "update_scope": "all_in_series",
             "calendar_path": "/calendars/test/default/" // Provide explicit path to bypass discovery
         });
-        
-        let response = server.client
-            .post(&format!("{}/api/calendar/events/series/update", server.base_url))
+
+        let response = server
+            .client
+            .post(&format!(
+                "{}/api/calendar/events/series/update",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .json(&update_payload)
             .send()
             .await
             .unwrap();
-            
+
         let status = response.status();
         println!("Update series response status: {}", status);
-        
+
         // Note: This might fail if CalDAV server is not accessible or event doesn't exist, which is expected in CI
         if status.is_success() {
             let update_response: serde_json::Value = response.json().await.unwrap();
             assert!(update_response["success"].as_bool().unwrap_or(false));
-            assert_eq!(update_response["series_uid"].as_str().unwrap(), "test-series-uid");
+            assert_eq!(
+                update_response["series_uid"].as_str().unwrap(),
+                "test-series-uid"
+            );
             println!("✓ Update event series test passed");
         } else if status == 404 {
-            println!("⚠ Update event series test skipped (event not found - expected for test data)");
+            println!(
+                "⚠ Update event series test skipped (event not found - expected for test data)"
+            );
         } else {
             println!("⚠ Update event series test skipped (CalDAV server not accessible)");
         }
@@ -487,40 +583,46 @@ mod tests {
     #[tokio::test]
     async fn test_delete_event_series() {
         let server = TestServer::start().await;
-        
-        // First login to get a token  
+
+        // First login to get a token
         let token = server.login().await;
-        
+
         // Load password from env for CalDAV requests
         dotenvy::dotenv().ok();
-        let password = std::env::var("CALDAV_PASSWORD").unwrap_or("test".to_string());
-        
+        let password = "test".to_string();
+
         let delete_payload = json!({
             "series_uid": "test-series-to-delete",
             "calendar_path": "/calendars/test/default/",
             "event_href": "test-series.ics",
             "delete_scope": "all_in_series"
         });
-        
-        let response = server.client
-            .post(&format!("{}/api/calendar/events/series/delete", server.base_url))
+
+        let response = server
+            .client
+            .post(&format!(
+                "{}/api/calendar/events/series/delete",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .header("X-CalDAV-Password", password)
             .json(&delete_payload)
             .send()
             .await
             .unwrap();
-            
+
         let status = response.status();
         println!("Delete series response status: {}", status);
-        
+
         // Note: This might fail if CalDAV server is not accessible or event doesn't exist, which is expected in CI
         if status.is_success() {
             let delete_response: serde_json::Value = response.json().await.unwrap();
             assert!(delete_response["success"].as_bool().unwrap_or(false));
             println!("✓ Delete event series test passed");
         } else if status == 404 {
-            println!("⚠ Delete event series test skipped (event not found - expected for test data)");
+            println!(
+                "⚠ Delete event series test skipped (event not found - expected for test data)"
+            );
         } else {
             println!("⚠ Delete event series test skipped (CalDAV server not accessible)");
         }
@@ -530,17 +632,17 @@ mod tests {
     #[tokio::test]
     async fn test_invalid_update_scope() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         let invalid_payload = json!({
             "series_uid": "test-series-uid",
             "title": "Test Title",
             "description": "Test",
             "start_date": "2024-12-25",
             "start_time": "10:00",
-            "end_date": "2024-12-25", 
+            "end_date": "2024-12-25",
             "end_time": "11:00",
             "location": "Test",
             "all_day": false,
@@ -554,16 +656,24 @@ mod tests {
             "recurrence_days": [false, false, false, false, false, false, false],
             "update_scope": "invalid_scope" // This should cause a 400 error
         });
-        
-        let response = server.client
-            .post(&format!("{}/api/calendar/events/series/update", server.base_url))
+
+        let response = server
+            .client
+            .post(&format!(
+                "{}/api/calendar/events/series/update",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .json(&invalid_payload)
             .send()
             .await
             .unwrap();
-            
-        assert_eq!(response.status(), 400, "Expected 400 for invalid update scope");
+
+        assert_eq!(
+            response.status(),
+            400,
+            "Expected 400 for invalid update scope"
+        );
         println!("✓ Invalid update scope test passed");
     }
 
@@ -571,16 +681,16 @@ mod tests {
     #[tokio::test]
     async fn test_non_recurring_series_rejection() {
         let server = TestServer::start().await;
-        
+
         // First login to get a token
         let token = server.login().await;
-        
+
         let non_recurring_payload = json!({
             "title": "Non-recurring Event",
             "description": "This should be rejected",
             "start_date": "2024-12-25",
             "start_time": "10:00",
-            "end_date": "2024-12-25", 
+            "end_date": "2024-12-25",
             "end_time": "11:00",
             "location": "Test",
             "all_day": false,
@@ -593,16 +703,24 @@ mod tests {
             "recurrence": "none", // This should cause rejection
             "recurrence_days": [false, false, false, false, false, false, false]
         });
-        
-        let response = server.client
-            .post(&format!("{}/api/calendar/events/series/create", server.base_url))
+
+        let response = server
+            .client
+            .post(&format!(
+                "{}/api/calendar/events/series/create",
+                server.base_url
+            ))
             .header("Authorization", format!("Bearer {}", token))
             .json(&non_recurring_payload)
             .send()
             .await
             .unwrap();
-            
-        assert_eq!(response.status(), 400, "Expected 400 for non-recurring event in series endpoint");
+
+        assert_eq!(
+            response.status(),
+            400,
+            "Expected 400 for non-recurring event in series endpoint"
+        );
         println!("✓ Non-recurring series rejection test passed");
     }
-}
+}

calendar-models/src/common.rs

@@ -1,6 +1,6 @@
 //! Common types and enums used across calendar components
 
-use chrono::{DateTime, Utc, Duration};
+use chrono::{DateTime, Duration, Utc};
 use serde::{Deserialize, Serialize};
 
 // ==================== ENUMS AND COMMON TYPES ====================
@@ -22,7 +22,7 @@ pub enum EventClass {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub enum TimeTransparency {
     Opaque,      // OPAQUE - time is not available
-    Transparent, // TRANSPARENT - time is available  
+    Transparent, // TRANSPARENT - time is available
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -64,11 +64,11 @@ pub enum AlarmAction {
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct CalendarUser {
-    pub cal_address: String,                    // Calendar user address (usually email)
-    pub common_name: Option<String>,            // CN parameter - display name
-    pub dir_entry_ref: Option<String>,          // DIR parameter - directory entry
-    pub sent_by: Option<String>,                // SENT-BY parameter
-    pub language: Option<String>,               // LANGUAGE parameter
+    pub cal_address: String,           // Calendar user address (usually email)
+    pub common_name: Option<String>,   // CN parameter - display name
+    pub dir_entry_ref: Option<String>, // DIR parameter - directory entry
+    pub sent_by: Option<String>,       // SENT-BY parameter
+    pub language: Option<String>,      // LANGUAGE parameter
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -78,130 +78,130 @@ pub struct Attendee {
     pub role: Option<AttendeeRole>,             // ROLE parameter
     pub part_stat: Option<ParticipationStatus>, // PARTSTAT parameter
     pub rsvp: Option<bool>,                     // RSVP parameter
-    pub cu_type: Option<String>,                // CUTYPE parameter (INDIVIDUAL, GROUP, RESOURCE, ROOM, UNKNOWN)
-    pub member: Vec<String>,                    // MEMBER parameter
-    pub delegated_to: Vec<String>,              // DELEGATED-TO parameter  
-    pub delegated_from: Vec<String>,            // DELEGATED-FROM parameter
-    pub sent_by: Option<String>,                // SENT-BY parameter
-    pub dir_entry_ref: Option<String>,          // DIR parameter
-    pub language: Option<String>,               // LANGUAGE parameter
+    pub cu_type: Option<String>, // CUTYPE parameter (INDIVIDUAL, GROUP, RESOURCE, ROOM, UNKNOWN)
+    pub member: Vec<String>,     // MEMBER parameter
+    pub delegated_to: Vec<String>, // DELEGATED-TO parameter
+    pub delegated_from: Vec<String>, // DELEGATED-FROM parameter
+    pub sent_by: Option<String>, // SENT-BY parameter
+    pub dir_entry_ref: Option<String>, // DIR parameter
+    pub language: Option<String>, // LANGUAGE parameter
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct VAlarm {
-    pub action: AlarmAction,                    // Action (ACTION) - REQUIRED
-    pub trigger: AlarmTrigger,                  // Trigger (TRIGGER) - REQUIRED
-    pub duration: Option<Duration>,             // Duration (DURATION)
-    pub repeat: Option<u32>,                    // Repeat count (REPEAT)
-    pub description: Option<String>,            // Description for DISPLAY/EMAIL
-    pub summary: Option<String>,                // Summary for EMAIL
-    pub attendees: Vec<Attendee>,               // Attendees for EMAIL
-    pub attach: Vec<Attachment>,                // Attachments for AUDIO/EMAIL
+    pub action: AlarmAction,         // Action (ACTION) - REQUIRED
+    pub trigger: AlarmTrigger,       // Trigger (TRIGGER) - REQUIRED
+    pub duration: Option<Duration>,  // Duration (DURATION)
+    pub repeat: Option<u32>,         // Repeat count (REPEAT)
+    pub description: Option<String>, // Description for DISPLAY/EMAIL
+    pub summary: Option<String>,     // Summary for EMAIL
+    pub attendees: Vec<Attendee>,    // Attendees for EMAIL
+    pub attach: Vec<Attachment>,     // Attachments for AUDIO/EMAIL
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum AlarmTrigger {
-    DateTime(DateTime<Utc>),                    // Absolute trigger time
-    Duration(Duration),                         // Duration relative to start/end
+    DateTime(DateTime<Utc>), // Absolute trigger time
+    Duration(Duration),      // Duration relative to start/end
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct Attachment {
-    pub format_type: Option<String>,            // FMTTYPE parameter (MIME type)
-    pub encoding: Option<String>,               // ENCODING parameter
-    pub value: Option<String>,                  // VALUE parameter (BINARY or URI)
-    pub uri: Option<String>,                    // URI reference
-    pub binary_data: Option<Vec<u8>>,           // Binary data (when ENCODING=BASE64)
+    pub format_type: Option<String>,  // FMTTYPE parameter (MIME type)
+    pub encoding: Option<String>,     // ENCODING parameter
+    pub value: Option<String>,        // VALUE parameter (BINARY or URI)
+    pub uri: Option<String>,          // URI reference
+    pub binary_data: Option<Vec<u8>>, // Binary data (when ENCODING=BASE64)
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct GeographicPosition {
-    pub latitude: f64,                          // Latitude in decimal degrees
-    pub longitude: f64,                         // Longitude in decimal degrees
+    pub latitude: f64,  // Latitude in decimal degrees
+    pub longitude: f64, // Longitude in decimal degrees
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct VTimeZone {
-    pub tzid: String,                           // Time zone ID (TZID) - REQUIRED
-    pub last_modified: Option<DateTime<Utc>>,   // Last modified (LAST-MODIFIED)
-    pub tzurl: Option<String>,                  // Time zone URL (TZURL)
+    pub tzid: String,                                // Time zone ID (TZID) - REQUIRED
+    pub last_modified: Option<DateTime<Utc>>,        // Last modified (LAST-MODIFIED)
+    pub tzurl: Option<String>,                       // Time zone URL (TZURL)
     pub standard_components: Vec<TimeZoneComponent>, // STANDARD components
     pub daylight_components: Vec<TimeZoneComponent>, // DAYLIGHT components
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TimeZoneComponent {
-    pub dtstart: DateTime<Utc>,                 // Start of this time zone definition
-    pub tzoffset_to: String,                    // UTC offset for this component
-    pub tzoffset_from: String,                  // UTC offset before this component  
-    pub rrule: Option<String>,                  // Recurrence rule
-    pub rdate: Vec<DateTime<Utc>>,              // Recurrence dates
-    pub tzname: Vec<String>,                    // Time zone names
-    pub comment: Vec<String>,                   // Comments
+    pub dtstart: DateTime<Utc>,    // Start of this time zone definition
+    pub tzoffset_to: String,       // UTC offset for this component
+    pub tzoffset_from: String,     // UTC offset before this component
+    pub rrule: Option<String>,     // Recurrence rule
+    pub rdate: Vec<DateTime<Utc>>, // Recurrence dates
+    pub tzname: Vec<String>,       // Time zone names
+    pub comment: Vec<String>,      // Comments
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct VJournal {
     // Required properties
-    pub dtstamp: DateTime<Utc>,                 // Date-time stamp (DTSTAMP) - REQUIRED
-    pub uid: String,                            // Unique identifier (UID) - REQUIRED
-    
+    pub dtstamp: DateTime<Utc>, // Date-time stamp (DTSTAMP) - REQUIRED
+    pub uid: String,            // Unique identifier (UID) - REQUIRED
+
     // Optional properties
-    pub dtstart: Option<DateTime<Utc>>,         // Start date-time (DTSTART)
-    pub summary: Option<String>,                // Summary/title (SUMMARY) 
-    pub description: Option<String>,            // Description (DESCRIPTION)
-    
+    pub dtstart: Option<DateTime<Utc>>, // Start date-time (DTSTART)
+    pub summary: Option<String>,        // Summary/title (SUMMARY)
+    pub description: Option<String>,    // Description (DESCRIPTION)
+
     // Classification and status
-    pub class: Option<EventClass>,              // Classification (CLASS)
-    pub status: Option<String>,                 // Status (STATUS)
-    
+    pub class: Option<EventClass>, // Classification (CLASS)
+    pub status: Option<String>,    // Status (STATUS)
+
     // People and organization
-    pub organizer: Option<CalendarUser>,        // Organizer (ORGANIZER)
-    pub attendees: Vec<Attendee>,               // Attendees (ATTENDEE)
-    
+    pub organizer: Option<CalendarUser>, // Organizer (ORGANIZER)
+    pub attendees: Vec<Attendee>,        // Attendees (ATTENDEE)
+
     // Categorization
-    pub categories: Vec<String>,                // Categories (CATEGORIES)
-    
+    pub categories: Vec<String>, // Categories (CATEGORIES)
+
     // Versioning and modification
-    pub sequence: Option<u32>,                  // Sequence number (SEQUENCE)
-    pub created: Option<DateTime<Utc>>,         // Creation time (CREATED)
-    pub last_modified: Option<DateTime<Utc>>,   // Last modified (LAST-MODIFIED)
-    
+    pub sequence: Option<u32>,                // Sequence number (SEQUENCE)
+    pub created: Option<DateTime<Utc>>,       // Creation time (CREATED)
+    pub last_modified: Option<DateTime<Utc>>, // Last modified (LAST-MODIFIED)
+
     // Recurrence
-    pub rrule: Option<String>,                  // Recurrence rule (RRULE)
-    pub rdate: Vec<DateTime<Utc>>,              // Recurrence dates (RDATE)
-    pub exdate: Vec<DateTime<Utc>>,             // Exception dates (EXDATE)
-    pub recurrence_id: Option<DateTime<Utc>>,   // Recurrence ID (RECURRENCE-ID)
-    
+    pub rrule: Option<String>,                // Recurrence rule (RRULE)
+    pub rdate: Vec<DateTime<Utc>>,            // Recurrence dates (RDATE)
+    pub exdate: Vec<DateTime<Utc>>,           // Exception dates (EXDATE)
+    pub recurrence_id: Option<DateTime<Utc>>, // Recurrence ID (RECURRENCE-ID)
+
     // Attachments
-    pub attachments: Vec<Attachment>,           // Attachments (ATTACH)
+    pub attachments: Vec<Attachment>, // Attachments (ATTACH)
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct VFreeBusy {
     // Required properties
-    pub dtstamp: DateTime<Utc>,                 // Date-time stamp (DTSTAMP) - REQUIRED
-    pub uid: String,                            // Unique identifier (UID) - REQUIRED
-    
+    pub dtstamp: DateTime<Utc>, // Date-time stamp (DTSTAMP) - REQUIRED
+    pub uid: String,            // Unique identifier (UID) - REQUIRED
+
     // Optional date-time properties
-    pub dtstart: Option<DateTime<Utc>>,         // Start date-time (DTSTART)
-    pub dtend: Option<DateTime<Utc>>,           // End date-time (DTEND)
-    
+    pub dtstart: Option<DateTime<Utc>>, // Start date-time (DTSTART)
+    pub dtend: Option<DateTime<Utc>>,   // End date-time (DTEND)
+
     // People
-    pub organizer: Option<CalendarUser>,        // Organizer (ORGANIZER)
-    pub attendees: Vec<Attendee>,               // Attendees (ATTENDEE)
-    
+    pub organizer: Option<CalendarUser>, // Organizer (ORGANIZER)
+    pub attendees: Vec<Attendee>,        // Attendees (ATTENDEE)
+
     // Free/busy time
-    pub freebusy: Vec<FreeBusyTime>,            // Free/busy time periods
-    pub url: Option<String>,                    // URL (URL)
-    pub comment: Vec<String>,                   // Comments (COMMENT)
-    pub contact: Option<String>,                // Contact information (CONTACT)
+    pub freebusy: Vec<FreeBusyTime>, // Free/busy time periods
+    pub url: Option<String>,         // URL (URL)
+    pub comment: Vec<String>,        // Comments (COMMENT)
+    pub contact: Option<String>,     // Contact information (CONTACT)
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct FreeBusyTime {
-    pub fb_type: FreeBusyType,                  // Free/busy type
-    pub periods: Vec<Period>,                   // Time periods
+    pub fb_type: FreeBusyType, // Free/busy type
+    pub periods: Vec<Period>,  // Time periods
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -214,7 +214,7 @@ pub enum FreeBusyType {
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct Period {
-    pub start: DateTime<Utc>,                   // Period start
-    pub end: Option<DateTime<Utc>>,             // Period end
-    pub duration: Option<Duration>,             // Period duration (alternative to end)
-}
+    pub start: DateTime<Utc>,       // Period start
+    pub end: Option<DateTime<Utc>>, // Period end
+    pub duration: Option<Duration>, // Period duration (alternative to end)
+}

calendar-models/src/lib.rs

@@ -1,10 +1,10 @@
 //! RFC 5545 Compliant Calendar Models
-//! 
+//!
 //! This crate provides shared data structures for calendar applications
 //! that comply with RFC 5545 (iCalendar) specification.
 
-pub mod vevent;
 pub mod common;
+pub mod vevent;
 
+pub use common::*;
 pub use vevent::*;
-pub use common::*;

calendar-models/src/vevent.rs

@@ -1,66 +1,66 @@
 //! VEvent - RFC 5545 compliant calendar event structure
 
-use chrono::{DateTime, Utc, Duration};
-use serde::{Deserialize, Serialize};
 use crate::common::*;
+use chrono::{DateTime, Duration, Utc};
+use serde::{Deserialize, Serialize};
 
 // ==================== VEVENT COMPONENT ====================
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct VEvent {
     // Required properties
-    pub dtstamp: DateTime<Utc>,                 // Date-time stamp (DTSTAMP) - REQUIRED
-    pub uid: String,                            // Unique identifier (UID) - REQUIRED
-    pub dtstart: DateTime<Utc>,                 // Start date-time (DTSTART) - REQUIRED
-    
+    pub dtstamp: DateTime<Utc>, // Date-time stamp (DTSTAMP) - REQUIRED
+    pub uid: String,            // Unique identifier (UID) - REQUIRED
+    pub dtstart: DateTime<Utc>, // Start date-time (DTSTART) - REQUIRED
+
     // Optional properties (commonly used)
-    pub dtend: Option<DateTime<Utc>>,           // End date-time (DTEND)
-    pub duration: Option<Duration>,             // Duration (DURATION) - alternative to DTEND
-    pub summary: Option<String>,                // Summary/title (SUMMARY)
-    pub description: Option<String>,            // Description (DESCRIPTION)
-    pub location: Option<String>,               // Location (LOCATION)
-    
+    pub dtend: Option<DateTime<Utc>>, // End date-time (DTEND)
+    pub duration: Option<Duration>,   // Duration (DURATION) - alternative to DTEND
+    pub summary: Option<String>,      // Summary/title (SUMMARY)
+    pub description: Option<String>,  // Description (DESCRIPTION)
+    pub location: Option<String>,     // Location (LOCATION)
+
     // Classification and status
-    pub class: Option<EventClass>,              // Classification (CLASS)
-    pub status: Option<EventStatus>,            // Status (STATUS)
-    pub transp: Option<TimeTransparency>,       // Time transparency (TRANSP)
-    pub priority: Option<u8>,                   // Priority 0-9 (PRIORITY)
-    
+    pub class: Option<EventClass>,        // Classification (CLASS)
+    pub status: Option<EventStatus>,      // Status (STATUS)
+    pub transp: Option<TimeTransparency>, // Time transparency (TRANSP)
+    pub priority: Option<u8>,             // Priority 0-9 (PRIORITY)
+
     // People and organization
-    pub organizer: Option<CalendarUser>,        // Organizer (ORGANIZER)
-    pub attendees: Vec<Attendee>,               // Attendees (ATTENDEE)
-    pub contact: Option<String>,                // Contact information (CONTACT)
-    
+    pub organizer: Option<CalendarUser>, // Organizer (ORGANIZER)
+    pub attendees: Vec<Attendee>,        // Attendees (ATTENDEE)
+    pub contact: Option<String>,         // Contact information (CONTACT)
+
     // Categorization and relationships
-    pub categories: Vec<String>,                // Categories (CATEGORIES)
-    pub comment: Option<String>,                // Comment (COMMENT)
-    pub resources: Vec<String>,                 // Resources (RESOURCES)
-    pub related_to: Option<String>,             // Related component (RELATED-TO)
-    pub url: Option<String>,                    // URL (URL)
-    
+    pub categories: Vec<String>,    // Categories (CATEGORIES)
+    pub comment: Option<String>,    // Comment (COMMENT)
+    pub resources: Vec<String>,     // Resources (RESOURCES)
+    pub related_to: Option<String>, // Related component (RELATED-TO)
+    pub url: Option<String>,        // URL (URL)
+
     // Geographical
-    pub geo: Option<GeographicPosition>,        // Geographic position (GEO)
-    
+    pub geo: Option<GeographicPosition>, // Geographic position (GEO)
+
     // Versioning and modification
-    pub sequence: Option<u32>,                  // Sequence number (SEQUENCE)
-    pub created: Option<DateTime<Utc>>,         // Creation time (CREATED)
-    pub last_modified: Option<DateTime<Utc>>,   // Last modified (LAST-MODIFIED)
-    
+    pub sequence: Option<u32>,                // Sequence number (SEQUENCE)
+    pub created: Option<DateTime<Utc>>,       // Creation time (CREATED)
+    pub last_modified: Option<DateTime<Utc>>, // Last modified (LAST-MODIFIED)
+
     // Recurrence
-    pub rrule: Option<String>,                  // Recurrence rule (RRULE)
-    pub rdate: Vec<DateTime<Utc>>,              // Recurrence dates (RDATE)
-    pub exdate: Vec<DateTime<Utc>>,             // Exception dates (EXDATE)
-    pub recurrence_id: Option<DateTime<Utc>>,   // Recurrence ID (RECURRENCE-ID)
-    
+    pub rrule: Option<String>,                // Recurrence rule (RRULE)
+    pub rdate: Vec<DateTime<Utc>>,            // Recurrence dates (RDATE)
+    pub exdate: Vec<DateTime<Utc>>,           // Exception dates (EXDATE)
+    pub recurrence_id: Option<DateTime<Utc>>, // Recurrence ID (RECURRENCE-ID)
+
     // Alarms and attachments
-    pub alarms: Vec<VAlarm>,                    // VALARM components
-    pub attachments: Vec<Attachment>,           // Attachments (ATTACH)
-    
+    pub alarms: Vec<VAlarm>,          // VALARM components
+    pub attachments: Vec<Attachment>, // Attachments (ATTACH)
+
     // CalDAV specific (for implementation)
-    pub etag: Option<String>,                   // ETag for CalDAV
-    pub href: Option<String>,                   // Href for CalDAV
-    pub calendar_path: Option<String>,          // Calendar path
-    pub all_day: bool,                          // All-day event flag
+    pub etag: Option<String>,          // ETag for CalDAV
+    pub href: Option<String>,          // Href for CalDAV
+    pub calendar_path: Option<String>, // Calendar path
+    pub all_day: bool,                 // All-day event flag
 }
 
 impl VEvent {
@@ -129,7 +129,9 @@ impl VEvent {
 
     /// Helper method to get display title (summary or "Untitled Event")
     pub fn get_title(&self) -> String {
-        self.summary.clone().unwrap_or_else(|| "Untitled Event".to_string())
+        self.summary
+            .clone()
+            .unwrap_or_else(|| "Untitled Event".to_string())
     }
 
     /// Helper method to get start date for UI compatibility
@@ -151,7 +153,7 @@ impl VEvent {
     pub fn get_status_display(&self) -> &'static str {
         match &self.status {
             Some(EventStatus::Tentative) => "Tentative",
-            Some(EventStatus::Confirmed) => "Confirmed", 
+            Some(EventStatus::Confirmed) => "Confirmed",
             Some(EventStatus::Cancelled) => "Cancelled",
             None => "Confirmed", // Default
         }
@@ -180,4 +182,4 @@ impl VEvent {
             Some(p) => format!("Priority {}", p),
         }
     }
-}
+}

compose.yml

@@ -0,0 +1,22 @@
+services:
+  calendar-backend:
+    build:
+      context: .
+      dockerfile: ./backend/Dockerfile
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./data/db:/db
+
+  calendar-frontend:
+    image: caddy
+    environment:
+      - BACKEND_API_URL=http://localhost:3000/api
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./frontend/dist:/srv/www:ro
+      - ./Caddyfile:/etc/caddy/Caddyfile:ro
+      - ./data/caddy/data:/data
+      - ./data/caddy/config:/config

deploy_frontend.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export BACKEND_API_URL="https://runway.rcjohnstone.com/api"
+trunk build --release --config /home/connor/docs/projects/calendar/frontend/Trunk.toml
+sudo rsync -azX --delete --info=progress2 -e 'ssh -T -q' --rsync-path='sudo rsync' /home/connor/docs/projects/calendar/frontend/dist connor@server.rcjohnstone.com:/home/connor/data/runway/
+unset BACKEND_API_URL

frontend/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "calendar-app"
+name = "runway"
 version = "0.1.0"
 edition = "2021"
 
@@ -13,6 +13,8 @@ web-sys = { version = "0.3", features = [
     "HtmlSelectElement", 
     "HtmlInputElement",
     "HtmlTextAreaElement",
+    "HtmlLinkElement",
+    "HtmlHeadElement",
     "Event",
     "MouseEvent",
     "InputEvent",
@@ -20,6 +22,8 @@ web-sys = { version = "0.3", features = [
     "Document",
     "Window",
     "Location",
+    "Navigator",
+    "DomTokenList",
     "Headers",
     "Request",
     "RequestInit",
@@ -28,6 +32,7 @@ web-sys = { version = "0.3", features = [
     "CssStyleDeclaration",
 ] }
 wasm-bindgen = "0.2"
+js-sys = "0.3"
 
 # HTTP client for CalDAV requests
 reqwest = { version = "0.11", features = ["json"] }
@@ -35,6 +40,7 @@ reqwest = { version = "0.11", features = ["json"] }
 ical = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde-wasm-bindgen = "0.6"
 
 # Date and time handling
 chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }

frontend/index.html

@@ -2,9 +2,19 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>Calendar App</title>
+    <title>Runway</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base data-trunk-public-url />
     <link data-trunk rel="css" href="styles.css">
+    <link data-trunk rel="copy-file" href="styles/google.css">
+    <link data-trunk rel="icon" href="favicon.ico">
 </head>
-<body></body>
-</html>
+<body>
+    <script>
+        console.log("HTML fully loaded, waiting for WASM...");
+        window.addEventListener('TrunkApplicationStarted', () => {
+            console.log("Trunk application started successfully!");
+        });
+    </script>
+</body>
+</html>

frontend/src/auth.rs

@@ -11,11 +11,22 @@ pub struct CalDAVLoginRequest {
     pub password: String,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct UserPreferencesResponse {
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_colors: Option<String>,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AuthResponse {
     pub token: String,
+    pub session_token: String,
     pub username: String,
     pub server_url: String,
+    pub preferences: UserPreferencesResponse,
 }
 
 #[derive(Debug, Deserialize)]
@@ -34,14 +45,58 @@ impl AuthService {
         let base_url = option_env!("BACKEND_API_URL")
             .unwrap_or("http://localhost:3000/api")
             .to_string();
-        
+
         Self { base_url }
     }
 
     pub async fn login(&self, request: CalDAVLoginRequest) -> Result<AuthResponse, String> {
         self.post_json("/auth/login", &request).await
     }
-    
+
+    pub async fn verify_token(&self, token: &str) -> Result<bool, String> {
+        let window = web_sys::window().ok_or("No global window exists")?;
+
+        let opts = RequestInit::new();
+        opts.set_method("GET");
+        opts.set_mode(RequestMode::Cors);
+
+        let url = format!("{}/auth/verify", self.base_url);
+        let request = Request::new_with_str_and_init(&url, &opts)
+            .map_err(|e| format!("Request creation failed: {:?}", e))?;
+
+        request
+            .headers()
+            .set("Authorization", &format!("Bearer {}", token))
+            .map_err(|e| format!("Header setting failed: {:?}", e))?;
+
+        let resp_value = JsFuture::from(window.fetch_with_request(&request))
+            .await
+            .map_err(|e| format!("Network request failed: {:?}", e))?;
+
+        let resp: Response = resp_value
+            .dyn_into()
+            .map_err(|e| format!("Response cast failed: {:?}", e))?;
+
+        if resp.ok() {
+            let text = JsFuture::from(
+                resp.text()
+                    .map_err(|e| format!("Text extraction failed: {:?}", e))?,
+            )
+            .await
+            .map_err(|e| format!("Text promise failed: {:?}", e))?;
+
+            let text_string = text.as_string().ok_or("Response text is not a string")?;
+            
+            // Parse the response to get the "valid" field
+            let response: serde_json::Value = serde_json::from_str(&text_string)
+                .map_err(|e| format!("JSON parsing failed: {}", e))?;
+            
+            Ok(response.get("valid").and_then(|v| v.as_bool()).unwrap_or(false))
+        } else {
+            Ok(false) // Invalid token
+        }
+    }
+
     // Helper method for POST requests with JSON body
     async fn post_json<T: Serialize, R: for<'de> Deserialize<'de>>(
         &self,
@@ -49,9 +104,9 @@ impl AuthService {
         body: &T,
     ) -> Result<R, String> {
         let window = web_sys::window().ok_or("No global window exists")?;
-        
-        let json_body = serde_json::to_string(body)
-            .map_err(|e| format!("JSON serialization failed: {}", e))?;
+
+        let json_body =
+            serde_json::to_string(body).map_err(|e| format!("JSON serialization failed: {}", e))?;
 
         let opts = RequestInit::new();
         opts.set_method("POST");
@@ -62,23 +117,27 @@ impl AuthService {
         let request = Request::new_with_str_and_init(&url, &opts)
             .map_err(|e| format!("Request creation failed: {:?}", e))?;
 
-        request.headers().set("Content-Type", "application/json")
+        request
+            .headers()
+            .set("Content-Type", "application/json")
             .map_err(|e| format!("Header setting failed: {:?}", e))?;
 
         let resp_value = JsFuture::from(window.fetch_with_request(&request))
             .await
             .map_err(|e| format!("Network request failed: {:?}", e))?;
 
-        let resp: Response = resp_value.dyn_into()
+        let resp: Response = resp_value
+            .dyn_into()
             .map_err(|e| format!("Response cast failed: {:?}", e))?;
 
-        let text = JsFuture::from(resp.text()
-            .map_err(|e| format!("Text extraction failed: {:?}", e))?)
-            .await
-            .map_err(|e| format!("Text promise failed: {:?}", e))?;
+        let text = JsFuture::from(
+            resp.text()
+                .map_err(|e| format!("Text extraction failed: {:?}", e))?,
+        )
+        .await
+        .map_err(|e| format!("Text promise failed: {:?}", e))?;
 
-        let text_string = text.as_string()
-            .ok_or("Response text is not a string")?;
+        let text_string = text.as_string().ok_or("Response text is not a string")?;
 
         if resp.ok() {
             serde_json::from_str::<R>(&text_string)
@@ -92,4 +151,4 @@ impl AuthService {
             }
         }
     }
-}
+}

frontend/src/components/calendar.rs

@@ -1,22 +1,23 @@
-use yew::prelude::*;
-use chrono::{Datelike, Local, NaiveDate, Duration};
+use crate::components::{
+    CalendarHeader, CreateEventModal, EventCreationData, EventModal, MonthView, ViewMode, WeekView,
+};
+use crate::models::ical::VEvent;
+use crate::services::{calendar_service::{UserInfo, ExternalCalendar}, CalendarService};
+use chrono::{Datelike, Duration, Local, NaiveDate};
+use gloo_storage::{LocalStorage, Storage};
 use std::collections::HashMap;
 use web_sys::MouseEvent;
-use crate::services::calendar_service::UserInfo;
-use crate::models::ical::VEvent;
-use crate::components::{EventModal, ViewMode, CalendarHeader, MonthView, WeekView, CreateEventModal, EventCreationData};
-use gloo_storage::{LocalStorage, Storage};
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct CalendarProps {
-    #[prop_or_default]
-    pub events: HashMap<NaiveDate, Vec<VEvent>>,
-    pub on_event_click: Callback<VEvent>,
-    #[prop_or_default]
-    pub refreshing_event_uid: Option<String>,
     #[prop_or_default]
     pub user_info: Option<UserInfo>,
     #[prop_or_default]
+    pub external_calendar_events: Vec<VEvent>,
+    #[prop_or_default]
+    pub external_calendars: Vec<ExternalCalendar>,
+    #[prop_or_default]
     pub on_event_context_menu: Option<Callback<(web_sys::MouseEvent, VEvent)>>,
     #[prop_or_default]
     pub on_calendar_context_menu: Option<Callback<(web_sys::MouseEvent, NaiveDate)>>,
@@ -25,7 +26,17 @@ pub struct CalendarProps {
     #[prop_or_default]
     pub on_create_event_request: Option<Callback<EventCreationData>>,
     #[prop_or_default]
-    pub on_event_update_request: Option<Callback<(VEvent, chrono::NaiveDateTime, chrono::NaiveDateTime, bool, Option<chrono::DateTime<chrono::Utc>>, Option<String>, Option<String>)>>,
+    pub on_event_update_request: Option<
+        Callback<(
+            VEvent,
+            chrono::NaiveDateTime,
+            chrono::NaiveDateTime,
+            bool,
+            Option<chrono::DateTime<chrono::Utc>>,
+            Option<String>,
+            Option<String>,
+        )>,
+    >,
     #[prop_or_default]
     pub context_menus_open: bool,
 }
@@ -33,6 +44,12 @@ pub struct CalendarProps {
 #[function_component]
 pub fn Calendar(props: &CalendarProps) -> Html {
     let today = Local::now().date_naive();
+    
+    // Event management state
+    let events = use_state(|| HashMap::<NaiveDate, Vec<VEvent>>::new());
+    let loading = use_state(|| true);
+    let error = use_state(|| None::<String>);
+    let refreshing_event_uid = use_state(|| None::<String>);
     // Track the currently selected date (the actual day the user has selected)
     let selected_date = use_state(|| {
         // Try to load saved selected date from localStorage
@@ -55,20 +72,19 @@ pub fn Calendar(props: &CalendarProps) -> Html {
             }
         }
     });
-    
+
     // Track the display date (what to show in the view)
-    let current_date = use_state(|| {
-        match props.view {
-            ViewMode::Month => selected_date.with_day(1).unwrap_or(*selected_date),
-            ViewMode::Week => *selected_date,
-        }
+    let current_date = use_state(|| match props.view {
+        ViewMode::Month => selected_date.with_day(1).unwrap_or(*selected_date),
+        ViewMode::Week => *selected_date,
     });
     let selected_event = use_state(|| None::<VEvent>);
-    
+
     // State for create event modal
     let show_create_modal = use_state(|| false);
-    let create_event_data = use_state(|| None::<(chrono::NaiveDate, chrono::NaiveTime, chrono::NaiveTime)>);
-    
+    let create_event_data =
+        use_state(|| None::<(chrono::NaiveDate, chrono::NaiveTime, chrono::NaiveTime)>);
+
     // State for time increment snapping (15 or 30 minutes)
     let time_increment = use_state(|| {
         // Try to load saved time increment from localStorage
@@ -82,7 +98,190 @@ pub fn Calendar(props: &CalendarProps) -> Html {
             15
         }
     });
-    
+
+    // Fetch events when current_date changes
+    {
+        let events = events.clone();
+        let loading = loading.clone();
+        let error = error.clone();
+        let current_date = current_date.clone();
+        let external_events = props.external_calendar_events.clone(); // Clone before the effect
+        let view = props.view.clone(); // Clone before the effect
+        
+        use_effect_with((*current_date, view.clone(), external_events.len(), props.user_info.clone()), move |(date, _view, _external_len, user_info)| {
+            let auth_token: Option<String> = LocalStorage::get("auth_token").ok();
+            let date = *date; // Clone the date to avoid lifetime issues
+            let external_events = external_events.clone(); // Clone external events to avoid lifetime issues
+            let user_info = user_info.clone(); // Clone user_info to avoid lifetime issues
+            
+            if let Some(token) = auth_token {
+                let events = events.clone();
+                let loading = loading.clone();
+                let error = error.clone();
+                
+                wasm_bindgen_futures::spawn_local(async move {
+                    let calendar_service = CalendarService::new();
+
+                    let password = if let Ok(credentials_str) =
+                        LocalStorage::get::<String>("caldav_credentials")
+                    {
+                        if let Ok(credentials) =
+                            serde_json::from_str::<serde_json::Value>(&credentials_str)
+                        {
+                            credentials["password"].as_str().unwrap_or("").to_string()
+                        } else {
+                            String::new()
+                        }
+                    } else {
+                        String::new()
+                    };
+
+                    let current_year = date.year();
+                    let current_month = date.month();
+
+                    match calendar_service
+                        .fetch_events_for_month_vevent(
+                            &token,
+                            &password,
+                            current_year,
+                            current_month,
+                        )
+                        .await
+                    {
+                        Ok(vevents) => {
+                            // Filter CalDAV events based on calendar visibility
+                            let mut filtered_events = if let Some(user_info) = user_info.as_ref() {
+                                vevents.into_iter()
+                                    .filter(|event| {
+                                        if let Some(calendar_path) = event.calendar_path.as_ref() {
+                                            // Find the calendar info for this event
+                                            user_info.calendars.iter()
+                                                .find(|cal| &cal.path == calendar_path)
+                                                .map(|cal| cal.is_visible)
+                                                .unwrap_or(true) // Default to visible if not found
+                                        } else {
+                                            true // Show events without calendar path
+                                        }
+                                    })
+                                    .collect()
+                            } else {
+                                vevents // Show all events if no user info
+                            };
+                            
+                            // Mark external events as external by adding a special category
+                            let marked_external_events: Vec<VEvent> = external_events
+                                .into_iter()
+                                .map(|mut event| {
+                                    // Add a special category to identify external events
+                                    event.categories.push("__EXTERNAL_CALENDAR__".to_string());
+                                    event
+                                })
+                                .collect();
+                            
+                            filtered_events.extend(marked_external_events);
+                            
+                            let grouped_events = CalendarService::group_events_by_date(filtered_events);
+                            events.set(grouped_events);
+                            loading.set(false);
+                        }
+                        Err(err) => {
+                            error.set(Some(format!("Failed to load events: {}", err)));
+                            loading.set(false);
+                        }
+                    }
+                });
+            } else {
+                loading.set(false);
+                error.set(Some("No authentication token found".to_string()));
+            }
+
+            || ()
+        });
+    }
+
+    // Handle event click to refresh individual events
+    let on_event_click = {
+        let events = events.clone();
+        let refreshing_event_uid = refreshing_event_uid.clone();
+        
+        Callback::from(move |event: VEvent| {
+            let auth_token: Option<String> = LocalStorage::get("auth_token").ok();
+            
+            if let Some(token) = auth_token {
+                let events = events.clone();
+                let refreshing_event_uid = refreshing_event_uid.clone();
+                let uid = event.uid.clone();
+
+                refreshing_event_uid.set(Some(uid.clone()));
+
+                wasm_bindgen_futures::spawn_local(async move {
+                    let calendar_service = CalendarService::new();
+
+                    let password = if let Ok(credentials_str) =
+                        LocalStorage::get::<String>("caldav_credentials")
+                    {
+                        if let Ok(credentials) =
+                            serde_json::from_str::<serde_json::Value>(&credentials_str)
+                        {
+                            credentials["password"].as_str().unwrap_or("").to_string()
+                        } else {
+                            String::new()
+                        }
+                    } else {
+                        String::new()
+                    };
+
+                    match calendar_service
+                        .refresh_event(&token, &password, &uid)
+                        .await
+                    {
+                        Ok(Some(refreshed_event)) => {
+                            let refreshed_vevent = refreshed_event;
+                            let mut updated_events = (*events).clone();
+
+                            for (_, day_events) in updated_events.iter_mut() {
+                                day_events.retain(|e| e.uid != uid);
+                            }
+
+                            if refreshed_vevent.rrule.is_some() {
+                                let new_occurrences =
+                                    CalendarService::expand_recurring_events(vec![
+                                        refreshed_vevent.clone(),
+                                    ]);
+
+                                for occurrence in new_occurrences {
+                                    let date = occurrence.get_date();
+                                    updated_events
+                                        .entry(date)
+                                        .or_insert_with(Vec::new)
+                                        .push(occurrence);
+                                }
+                            } else {
+                                let date = refreshed_vevent.get_date();
+                                updated_events
+                                    .entry(date)
+                                    .or_insert_with(Vec::new)
+                                    .push(refreshed_vevent);
+                            }
+
+                            events.set(updated_events);
+                        }
+                        Ok(None) => {
+                            let mut updated_events = (*events).clone();
+                            for (_, day_events) in updated_events.iter_mut() {
+                                day_events.retain(|e| e.uid != uid);
+                            }
+                            events.set(updated_events);
+                        }
+                        Err(_err) => {}
+                    }
+
+                    refreshing_event_uid.set(None);
+                });
+            }
+        })
+    };
+
     // Handle view mode changes - adjust current_date format when switching between month/week
     {
         let current_date = current_date.clone();
@@ -98,7 +297,7 @@ pub fn Calendar(props: &CalendarProps) -> Html {
             || {}
         });
     }
-    
+
     let on_prev = {
         let current_date = current_date.clone();
         let selected_date = selected_date.clone();
@@ -110,19 +309,22 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                     let prev_month = *current_date - Duration::days(1);
                     let first_of_prev = prev_month.with_day(1).unwrap();
                     (first_of_prev, first_of_prev)
-                },
+                }
                 ViewMode::Week => {
                     // Go to previous week
                     let prev_week = *selected_date - Duration::weeks(1);
                     (prev_week, prev_week)
-                },
+                }
             };
             selected_date.set(new_selected);
             current_date.set(new_display);
-            let _ = LocalStorage::set("calendar_selected_date", new_selected.format("%Y-%m-%d").to_string());
+            let _ = LocalStorage::set(
+                "calendar_selected_date",
+                new_selected.format("%Y-%m-%d").to_string(),
+            );
         })
     };
-    
+
     let on_next = {
         let current_date = current_date.clone();
         let selected_date = selected_date.clone();
@@ -134,19 +336,23 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                     let next_month = if current_date.month() == 12 {
                         NaiveDate::from_ymd_opt(current_date.year() + 1, 1, 1).unwrap()
                     } else {
-                        NaiveDate::from_ymd_opt(current_date.year(), current_date.month() + 1, 1).unwrap()
+                        NaiveDate::from_ymd_opt(current_date.year(), current_date.month() + 1, 1)
+                            .unwrap()
                     };
                     (next_month, next_month)
-                },
+                }
                 ViewMode::Week => {
                     // Go to next week
                     let next_week = *selected_date + Duration::weeks(1);
                     (next_week, next_week)
-                },
+                }
             };
             selected_date.set(new_selected);
             current_date.set(new_display);
-            let _ = LocalStorage::set("calendar_selected_date", new_selected.format("%Y-%m-%d").to_string());
+            let _ = LocalStorage::set(
+                "calendar_selected_date",
+                new_selected.format("%Y-%m-%d").to_string(),
+            );
         })
     };
 
@@ -160,15 +366,18 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                 ViewMode::Month => {
                     let first_of_today = today.with_day(1).unwrap();
                     (today, first_of_today) // Select today, but display the month
-                },
+                }
                 ViewMode::Week => (today, today), // Select and display today
             };
             selected_date.set(new_selected);
             current_date.set(new_display);
-            let _ = LocalStorage::set("calendar_selected_date", new_selected.format("%Y-%m-%d").to_string());
+            let _ = LocalStorage::set(
+                "calendar_selected_date",
+                new_selected.format("%Y-%m-%d").to_string(),
+            );
         })
     };
-    
+
     // Handle time increment toggle
     let on_time_increment_toggle = {
         let time_increment = time_increment.clone();
@@ -179,32 +388,68 @@ pub fn Calendar(props: &CalendarProps) -> Html {
             let _ = LocalStorage::set("calendar_time_increment", next);
         })
     };
-    
+
     // Handle drag-to-create event
     let on_create_event = {
         let show_create_modal = show_create_modal.clone();
         let create_event_data = create_event_data.clone();
-        Callback::from(move |(_date, start_datetime, end_datetime): (NaiveDate, chrono::NaiveDateTime, chrono::NaiveDateTime)| {
-            // For drag-to-create, we don't need the temporary event approach
-            // Instead, just pass the local times directly via initial_time props
-            create_event_data.set(Some((start_datetime.date(), start_datetime.time(), end_datetime.time())));
-            show_create_modal.set(true);
-        })
+        Callback::from(
+            move |(_date, start_datetime, end_datetime): (
+                NaiveDate,
+                chrono::NaiveDateTime,
+                chrono::NaiveDateTime,
+            )| {
+                // For drag-to-create, we don't need the temporary event approach
+                // Instead, just pass the local times directly via initial_time props
+                create_event_data.set(Some((
+                    start_datetime.date(),
+                    start_datetime.time(),
+                    end_datetime.time(),
+                )));
+                show_create_modal.set(true);
+            },
+        )
     };
-    
+
     // Handle drag-to-move event
     let on_event_update = {
         let on_event_update_request = props.on_event_update_request.clone();
-        Callback::from(move |(event, new_start, new_end, preserve_rrule, until_date, update_scope, occurrence_date): (VEvent, chrono::NaiveDateTime, chrono::NaiveDateTime, bool, Option<chrono::DateTime<chrono::Utc>>, Option<String>, Option<String>)| {
-            if let Some(callback) = &on_event_update_request {
-                callback.emit((event, new_start, new_end, preserve_rrule, until_date, update_scope, occurrence_date));
-            }
-        })
+        Callback::from(
+            move |(
+                event,
+                new_start,
+                new_end,
+                preserve_rrule,
+                until_date,
+                update_scope,
+                occurrence_date,
+            ): (
+                VEvent,
+                chrono::NaiveDateTime,
+                chrono::NaiveDateTime,
+                bool,
+                Option<chrono::DateTime<chrono::Utc>>,
+                Option<String>,
+                Option<String>,
+            )| {
+                if let Some(callback) = &on_event_update_request {
+                    callback.emit((
+                        event,
+                        new_start,
+                        new_end,
+                        preserve_rrule,
+                        until_date,
+                        update_scope,
+                        occurrence_date,
+                    ));
+                }
+            },
+        )
     };
 
     html! {
         <div class={classes!("calendar", match props.view { ViewMode::Week => Some("week-view"), _ => None })}>
-            <CalendarHeader 
+            <CalendarHeader
                 current_date={*current_date}
                 view_mode={props.view.clone()}
                 on_prev={on_prev}
@@ -213,9 +458,22 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                 time_increment={Some(*time_increment)}
                 on_time_increment_toggle={Some(on_time_increment_toggle)}
             />
-            
+
             {
-                match props.view {
+                if *loading {
+                    html! {
+                        <div class="calendar-loading">
+                            <p>{"Loading calendar events..."}</p>
+                        </div>
+                    }
+                } else if let Some(err) = (*error).clone() {
+                    html! {
+                        <div class="calendar-error">
+                            <p>{format!("Error: {}", err)}</p>
+                        </div>
+                    }
+                } else {
+                    match props.view {
                     ViewMode::Month => {
                         let on_day_select = {
                             let selected_date = selected_date.clone();
@@ -224,15 +482,16 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                                 let _ = LocalStorage::set("calendar_selected_date", date.format("%Y-%m-%d").to_string());
                             })
                         };
-                        
+
                         html! {
                             <MonthView
                                 current_month={*current_date}
                                 today={today}
-                                events={props.events.clone()}
-                                on_event_click={props.on_event_click.clone()}
-                                refreshing_event_uid={props.refreshing_event_uid.clone()}
+                                events={(*events).clone()}
+                                on_event_click={on_event_click.clone()}
+                                refreshing_event_uid={(*refreshing_event_uid).clone()}
                                 user_info={props.user_info.clone()}
+                                external_calendars={props.external_calendars.clone()}
                                 on_event_context_menu={props.on_event_context_menu.clone()}
                                 on_calendar_context_menu={props.on_calendar_context_menu.clone()}
                                 selected_date={Some(*selected_date)}
@@ -244,10 +503,11 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                         <WeekView
                             current_date={*current_date}
                             today={today}
-                            events={props.events.clone()}
-                            on_event_click={props.on_event_click.clone()}
-                            refreshing_event_uid={props.refreshing_event_uid.clone()}
+                            events={(*events).clone()}
+                            on_event_click={on_event_click.clone()}
+                            refreshing_event_uid={(*refreshing_event_uid).clone()}
                             user_info={props.user_info.clone()}
+                            external_calendars={props.external_calendars.clone()}
                             on_event_context_menu={props.on_event_context_menu.clone()}
                             on_calendar_context_menu={props.on_calendar_context_menu.clone()}
                             on_create_event={Some(on_create_event)}
@@ -257,11 +517,12 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                             time_increment={*time_increment}
                         />
                     },
+                    }
                 }
             }
-            
+
             // Event details modal
-            <EventModal 
+            <EventModal
                 event={(*selected_event).clone()}
                 on_close={{
                     let selected_event_clone = selected_event.clone();
@@ -270,7 +531,7 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                     })
                 }}
             />
-            
+
             // Create event modal
             <CreateEventModal
                 is_open={*show_create_modal}
@@ -294,23 +555,14 @@ pub fn Calendar(props: &CalendarProps) -> Html {
                     Callback::from(move |event_data: EventCreationData| {
                         show_create_modal.set(false);
                         create_event_data.set(None);
-                        
+
                         // Emit the create event request to parent
                         if let Some(callback) = &on_create_event_request {
                             callback.emit(event_data);
                         }
                     })
                 }}
-                on_update={{
-                    let show_create_modal = show_create_modal.clone();
-                    let create_event_data = create_event_data.clone();
-                    Callback::from(move |(_original_event, _updated_data): (VEvent, EventCreationData)| {
-                        show_create_modal.set(false);
-                        create_event_data.set(None);
-                        // TODO: Handle actual event update
-                    })
-                }}
             />
         </div>
     }
-}
+}

frontend/src/components/calendar_context_menu.rs

@@ -1,5 +1,5 @@
-use yew::prelude::*;
 use web_sys::MouseEvent;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct CalendarContextMenuProps {
@@ -13,14 +13,50 @@ pub struct CalendarContextMenuProps {
 #[function_component(CalendarContextMenu)]
 pub fn calendar_context_menu(props: &CalendarContextMenuProps) -> Html {
     let menu_ref = use_node_ref();
-    
+
     if !props.is_open {
         return html! {};
     }
 
+    // Smart positioning to keep menu within viewport
+    let (x, y) = {
+        let mut x = props.x;
+        let mut y = props.y;
+        
+        // Try to get actual viewport dimensions
+        if let Some(window) = web_sys::window() {
+            if let (Ok(width), Ok(height)) = (window.inner_width(), window.inner_height()) {
+                if let (Some(w), Some(h)) = (width.as_f64(), height.as_f64()) {
+                    let viewport_width = w as i32;
+                    let viewport_height = h as i32;
+                    
+                    // Calendar context menu: "Create Event" with icon
+                    let menu_width = 180; // "Create Event" text + icon + padding
+                    let menu_height = 60; // Single item + padding + margins
+                    
+                    // Adjust horizontally if too close to right edge
+                    if x + menu_width > viewport_width - 10 {
+                        x = x.saturating_sub(menu_width);
+                    }
+                    
+                    // Adjust vertically if too close to bottom edge
+                    if y + menu_height > viewport_height - 10 {
+                        y = y.saturating_sub(menu_height);
+                    }
+                    
+                    // Ensure minimum margins from edges
+                    x = x.max(5);
+                    y = y.max(5);
+                }
+            }
+        }
+        
+        (x, y)
+    };
+
     let style = format!(
         "position: fixed; left: {}px; top: {}px; z-index: 1001;",
-        props.x, props.y
+        x, y
     );
 
     let on_create_event_click = {
@@ -33,9 +69,9 @@ pub fn calendar_context_menu(props: &CalendarContextMenuProps) -> Html {
     };
 
     html! {
-        <div 
+        <div
             ref={menu_ref}
-            class="context-menu" 
+            class="context-menu"
             style={style}
         >
             <div class="context-menu-item context-menu-create" onclick={on_create_event_click}>
@@ -44,4 +80,4 @@ pub fn calendar_context_menu(props: &CalendarContextMenuProps) -> Html {
             </div>
         </div>
     }
-}
+}

frontend/src/components/calendar_header.rs

@@ -1,7 +1,7 @@
-use yew::prelude::*;
-use chrono::{NaiveDate, Datelike};
 use crate::components::ViewMode;
+use chrono::{Datelike, NaiveDate};
 use web_sys::MouseEvent;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct CalendarHeaderProps {
@@ -18,7 +18,11 @@ pub struct CalendarHeaderProps {
 
 #[function_component(CalendarHeader)]
 pub fn calendar_header(props: &CalendarHeaderProps) -> Html {
-    let title = format!("{} {}", get_month_name(props.current_date.month()), props.current_date.year());
+    let title = format!(
+        "{} {}",
+        get_month_name(props.current_date.month()),
+        props.current_date.year()
+    );
 
     html! {
         <div class="calendar-header">
@@ -48,7 +52,7 @@ pub fn calendar_header(props: &CalendarHeaderProps) -> Html {
 fn get_month_name(month: u32) -> &'static str {
     match month {
         1 => "January",
-        2 => "February", 
+        2 => "February",
         3 => "March",
         4 => "April",
         5 => "May",
@@ -59,6 +63,6 @@ fn get_month_name(month: u32) -> &'static str {
         10 => "October",
         11 => "November",
         12 => "December",
-        _ => "Invalid"
+        _ => "Invalid",
     }
-}
+}

frontend/src/components/calendar_list_item.rs

@@ -1,15 +1,16 @@
-use yew::prelude::*;
-use web_sys::MouseEvent;
 use crate::services::calendar_service::CalendarInfo;
+use web_sys::MouseEvent;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct CalendarListItemProps {
     pub calendar: CalendarInfo,
     pub color_picker_open: bool,
     pub on_color_change: Callback<(String, String)>, // (calendar_path, color)
-    pub on_color_picker_toggle: Callback<String>, // calendar_path
+    pub on_color_picker_toggle: Callback<String>,    // calendar_path
     pub available_colors: Vec<String>,
     pub on_context_menu: Callback<(MouseEvent, String)>, // (event, calendar_path)
+    pub on_visibility_toggle: Callback<String>,      // calendar_path
 }
 
 #[function_component(CalendarListItem)]
@@ -32,44 +33,59 @@ pub fn calendar_list_item(props: &CalendarListItemProps) -> Html {
         })
     };
 
+    let on_visibility_toggle = {
+        let cal_path = props.calendar.path.clone();
+        let on_visibility_toggle = props.on_visibility_toggle.clone();
+        Callback::from(move |_| {
+            on_visibility_toggle.emit(cal_path.clone());
+        })
+    };
+
     html! {
         <li key={props.calendar.path.clone()} oncontextmenu={on_context_menu}>
-            <span class="calendar-color" 
-                  style={format!("background-color: {}", props.calendar.color)}
-                  onclick={on_color_click}>
-                {
-                    if props.color_picker_open {
-                        html! {
-                            <div class="color-picker">
-                                {
-                                    props.available_colors.iter().map(|color| {
-                                        let color_str = color.clone();
-                                        let cal_path = props.calendar.path.clone();
-                                        let on_color_change = props.on_color_change.clone();
-                                        
-                                        let on_color_select = Callback::from(move |_: MouseEvent| {
-                                            on_color_change.emit((cal_path.clone(), color_str.clone()));
-                                        });
-                                        
-                                        let is_selected = props.calendar.color == *color;
-                                        let class_name = if is_selected { "color-option selected" } else { "color-option" };
-                                        
-                                        html! {
-                                            <div class={class_name}
-                                                 style={format!("background-color: {}", color)}
-                                                 onclick={on_color_select}>
-                                            </div>
-                                        }
-                                    }).collect::<Html>()
-                                }
-                            </div>
+            <div class="calendar-info">
+                <input
+                    type="checkbox"
+                    checked={props.calendar.is_visible}
+                    onchange={on_visibility_toggle}
+                />
+                <span class="calendar-color"
+                      style={format!("background-color: {}", props.calendar.color)}
+                      onclick={on_color_click}>
+                    {
+                        if props.color_picker_open {
+                            html! {
+                                <div class="color-picker-dropdown">
+                                    {
+                                        props.available_colors.iter().map(|color| {
+                                            let color_str = color.clone();
+                                            let cal_path = props.calendar.path.clone();
+                                            let on_color_change = props.on_color_change.clone();
+
+                                            let on_color_select = Callback::from(move |_: MouseEvent| {
+                                                on_color_change.emit((cal_path.clone(), color_str.clone()));
+                                            });
+
+                                            let is_selected = props.calendar.color == *color;
+                                            let class_name = if is_selected { "color-option selected" } else { "color-option" };
+
+                                            html! {
+                                                <div class={class_name}
+                                                     style={format!("background-color: {}", color)}
+                                                     onclick={on_color_select}>
+                                                </div>
+                                            }
+                                        }).collect::<Html>()
+                                    }
+                                </div>
+                            }
+                        } else {
+                            html! {}
                         }
-                    } else {
-                        html! {}
                     }
-                }
-            </span>
-            <span class="calendar-name">{&props.calendar.display_name}</span>
+                </span>
+                <span class="calendar-name">{&props.calendar.display_name}</span>
+            </div>
         </li>
     }
-}
+}

frontend/src/components/calendar_management_modal.rs

@@ -0,0 +1,449 @@
+use yew::prelude::*;
+use web_sys::HtmlInputElement;
+use wasm_bindgen::JsCast;
+use crate::services::calendar_service::CalendarService;
+
+#[derive(Clone, PartialEq)]
+pub enum CalendarTab {
+    Create,
+    External,
+}
+
+#[derive(Properties, PartialEq)]
+pub struct CalendarManagementModalProps {
+    pub is_open: bool,
+    pub on_close: Callback<()>,
+    pub on_create_calendar: Callback<(String, Option<String>, Option<String>)>, // name, description, color
+    pub on_external_success: Callback<i32>, // Pass the newly created external calendar ID
+    pub available_colors: Vec<String>,
+}
+
+#[function_component(CalendarManagementModal)]
+pub fn calendar_management_modal(props: &CalendarManagementModalProps) -> Html {
+    let active_tab = use_state(|| CalendarTab::Create);
+    
+    // Create Calendar state
+    let calendar_name = use_state(|| String::new());
+    let description = use_state(|| String::new());
+    let selected_color = use_state(|| None::<String>);
+    let create_error_message = use_state(|| None::<String>);
+    let is_creating = use_state(|| false);
+    
+    // External Calendar state
+    let external_name = use_state(|| String::new());
+    let external_url = use_state(|| String::new());
+    let external_selected_color = use_state(|| Some("#4285f4".to_string()));
+    let external_is_loading = use_state(|| false);
+    let external_error_message = use_state(|| None::<String>);
+
+    // Reset state when modal opens
+    use_effect_with(props.is_open, {
+        let calendar_name = calendar_name.clone();
+        let description = description.clone();
+        let selected_color = selected_color.clone();
+        let create_error_message = create_error_message.clone();
+        let is_creating = is_creating.clone();
+        let external_name = external_name.clone();
+        let external_url = external_url.clone();
+        let external_is_loading = external_is_loading.clone();
+        let external_error_message = external_error_message.clone();
+        let external_selected_color = external_selected_color.clone();
+        let active_tab = active_tab.clone();
+        
+        move |is_open| {
+            if *is_open {
+                // Reset all state when modal opens
+                calendar_name.set(String::new());
+                description.set(String::new());
+                selected_color.set(None);
+                create_error_message.set(None);
+                is_creating.set(false);
+                external_name.set(String::new());
+                external_url.set(String::new());
+                external_is_loading.set(false);
+                external_error_message.set(None);
+                external_selected_color.set(Some("#4285f4".to_string()));
+                active_tab.set(CalendarTab::Create);
+            }
+        }
+    });
+
+    let on_tab_click = {
+        let active_tab = active_tab.clone();
+        Callback::from(move |tab: CalendarTab| {
+            active_tab.set(tab);
+        })
+    };
+
+    let on_backdrop_click = {
+        let on_close = props.on_close.clone();
+        Callback::from(move |e: MouseEvent| {
+            if let Some(target) = e.target() {
+                let element = target.dyn_into::<web_sys::Element>().unwrap();
+                if element.class_list().contains("modal-backdrop") {
+                    on_close.emit(());
+                }
+            }
+        })
+    };
+
+    // Create Calendar handlers
+    let on_name_change = {
+        let calendar_name = calendar_name.clone();
+        Callback::from(move |e: InputEvent| {
+            let input: HtmlInputElement = e.target_unchecked_into();
+            calendar_name.set(input.value());
+        })
+    };
+
+    let on_description_change = {
+        let description = description.clone();
+        Callback::from(move |e: InputEvent| {
+            let input: web_sys::HtmlTextAreaElement = e.target_unchecked_into();
+            description.set(input.value());
+        })
+    };
+
+    let on_color_select = {
+        let selected_color = selected_color.clone();
+        Callback::from(move |color: String| {
+            selected_color.set(Some(color));
+        })
+    };
+
+    let on_external_color_select = {
+        let external_selected_color = external_selected_color.clone();
+        Callback::from(move |color: String| {
+            external_selected_color.set(Some(color));
+        })
+    };
+
+    let on_create_submit = {
+        let calendar_name = calendar_name.clone();
+        let description = description.clone();
+        let selected_color = selected_color.clone();
+        let create_error_message = create_error_message.clone();
+        let is_creating = is_creating.clone();
+        let on_create_calendar = props.on_create_calendar.clone();
+
+        Callback::from(move |e: SubmitEvent| {
+            e.prevent_default();
+
+            let name = (*calendar_name).trim();
+            if name.is_empty() {
+                create_error_message.set(Some("Calendar name is required".to_string()));
+                return;
+            }
+
+            is_creating.set(true);
+            create_error_message.set(None);
+
+            let desc = if description.is_empty() {
+                None
+            } else {
+                Some((*description).clone())
+            };
+
+            on_create_calendar.emit((name.to_string(), desc, (*selected_color).clone()));
+        })
+    };
+
+    // External Calendar handlers
+    let on_external_submit = {
+        let external_name = external_name.clone();
+        let external_url = external_url.clone();
+        let external_selected_color = external_selected_color.clone();
+        let external_is_loading = external_is_loading.clone();
+        let external_error_message = external_error_message.clone();
+        let on_close = props.on_close.clone();
+        let on_external_success = props.on_external_success.clone();
+
+        Callback::from(move |e: SubmitEvent| {
+            e.prevent_default();
+            
+            let name = (*external_name).trim().to_string();
+            let url = (*external_url).trim().to_string();
+            let color = (*external_selected_color).clone().unwrap_or_else(|| "#4285f4".to_string());
+
+            // Debug logging to understand the issue
+            web_sys::console::log_1(&format!("External calendar form submission - Name: '{}', URL: '{}'", name, url).into());
+
+            if name.is_empty() {
+                external_error_message.set(Some("Calendar name is required".to_string()));
+                web_sys::console::log_1(&"Validation failed: empty name".into());
+                return;
+            }
+
+            if url.is_empty() {
+                external_error_message.set(Some("Calendar URL is required".to_string()));
+                web_sys::console::log_1(&"Validation failed: empty URL".into());
+                return;
+            }
+
+            // Basic URL validation
+            if !url.starts_with("http://") && !url.starts_with("https://") {
+                external_error_message.set(Some("Please enter a valid HTTP or HTTPS URL".to_string()));
+                return;
+            }
+
+            external_is_loading.set(true);
+            external_error_message.set(None);
+
+            let external_is_loading = external_is_loading.clone();
+            let external_error_message = external_error_message.clone();
+            let on_close = on_close.clone();
+            let on_external_success = on_external_success.clone();
+
+            wasm_bindgen_futures::spawn_local(async move {
+                let calendar_service = CalendarService::new();
+                
+                match CalendarService::create_external_calendar(&name, &url, &color).await {
+                    Ok(calendar) => {
+                        external_is_loading.set(false);
+                        on_close.emit(());
+                        on_external_success.emit(calendar.id);
+                    }
+                    Err(e) => {
+                        external_is_loading.set(false);
+                        external_error_message.set(Some(format!("Failed to add calendar: {}", e)));
+                    }
+                }
+            });
+        })
+    };
+
+    // External input change handlers
+    let on_external_name_change = {
+        let external_name = external_name.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                external_name.set(input.value());
+            }
+        })
+    };
+
+    let on_external_url_change = {
+        let external_url = external_url.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                external_url.set(input.value());
+            }
+        })
+    };
+
+    if !props.is_open {
+        return html! {};
+    }
+
+    html! {
+        <div class="modal-backdrop" onclick={on_backdrop_click}>
+            <div class="modal-content calendar-management-modal">
+                <div class="modal-header">
+                    <h2>{"Add Calendar"}</h2>
+                    <button class="modal-close" onclick={
+                        let on_close = props.on_close.clone();
+                        Callback::from(move |_: MouseEvent| on_close.emit(()))
+                    }>{"×"}</button>
+                </div>
+                
+                <div class="calendar-management-tabs">
+                    <button 
+                        class={if *active_tab == CalendarTab::Create { "tab-button active" } else { "tab-button" }}
+                        onclick={
+                            let on_tab_click = on_tab_click.clone();
+                            Callback::from(move |_: MouseEvent| on_tab_click.emit(CalendarTab::Create))
+                        }
+                    >
+                        {"Create Calendar"}
+                    </button>
+                    <button 
+                        class={if *active_tab == CalendarTab::External { "tab-button active" } else { "tab-button" }}
+                        onclick={
+                            let on_tab_click = on_tab_click.clone();
+                            Callback::from(move |_: MouseEvent| on_tab_click.emit(CalendarTab::External))
+                        }
+                    >
+                        {"Add External"}
+                    </button>
+                </div>
+
+                <div class="modal-body">
+                    {
+                        match *active_tab {
+                            CalendarTab::Create => html! {
+                                <form onsubmit={on_create_submit}>
+                                    <div class="form-group">
+                                        <label for="calendar-name">{"Calendar Name"}</label>
+                                        <input
+                                            type="text"
+                                            id="calendar-name"
+                                            value={(*calendar_name).clone()}
+                                            oninput={on_name_change}
+                                            placeholder="Enter calendar name"
+                                            disabled={*is_creating}
+                                        />
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label for="calendar-description">{"Description (optional)"}</label>
+                                        <textarea
+                                            id="calendar-description"
+                                            value={(*description).clone()}
+                                            oninput={on_description_change}
+                                            placeholder="Enter calendar description"
+                                            disabled={*is_creating}
+                                        />
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>{"Calendar Color"}</label>
+                                        <div class="color-picker">
+                                            {
+                                                props.available_colors.iter().map(|color| {
+                                                    let is_selected = selected_color.as_ref() == Some(color);
+                                                    let color_clone = color.clone();
+                                                    let on_color_select = on_color_select.clone();
+                                                    
+                                                    html! {
+                                                        <div
+                                                            key={color.clone()}
+                                                            class={if is_selected { "color-option selected" } else { "color-option" }}
+                                                            style={format!("background-color: {}", color)}
+                                                            onclick={Callback::from(move |_: MouseEvent| {
+                                                                on_color_select.emit(color_clone.clone());
+                                                            })}
+                                                        />
+                                                    }
+                                                }).collect::<Html>()
+                                            }
+                                        </div>
+                                    </div>
+
+                                    {
+                                        if let Some(ref error) = *create_error_message {
+                                            html! {
+                                                <div class="error-message">
+                                                    {error}
+                                                </div>
+                                            }
+                                        } else {
+                                            html! {}
+                                        }
+                                    }
+
+                                    <div class="modal-footer">
+                                        <button 
+                                            type="button" 
+                                            class="cancel-button" 
+                                            onclick={
+                                                let on_close = props.on_close.clone();
+                                                Callback::from(move |_: MouseEvent| on_close.emit(()))
+                                            }
+                                            disabled={*is_creating}
+                                        >
+                                            {"Cancel"}
+                                        </button>
+                                        <button 
+                                            type="submit" 
+                                            class="create-button" 
+                                            disabled={*is_creating}
+                                        >
+                                            {if *is_creating { "Creating..." } else { "Create Calendar" }}
+                                        </button>
+                                    </div>
+                                </form>
+                            },
+                            CalendarTab::External => html! {
+                                <form onsubmit={on_external_submit}>
+                                    <div class="form-group">
+                                        <label for="external-name">{"Calendar Name"}</label>
+                                        <input
+                                            type="text"
+                                            id="external-name"
+                                            value={(*external_name).clone()}
+                                            onchange={on_external_name_change}
+                                            placeholder="Enter calendar name"
+                                            disabled={*external_is_loading}
+                                        />
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label for="external-url">{"Calendar URL"}</label>
+                                        <input
+                                            type="url"
+                                            id="external-url"
+                                            value={(*external_url).clone()}
+                                            onchange={on_external_url_change}
+                                            placeholder="https://example.com/calendar.ics"
+                                            disabled={*external_is_loading}
+                                        />
+                                        <small class="help-text">
+                                            {"Enter the ICS/CalDAV URL for your external calendar"}
+                                        </small>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>{"Calendar Color"}</label>
+                                        <div class="color-picker">
+                                            {
+                                                props.available_colors.iter().map(|color| {
+                                                    let is_selected = external_selected_color.as_ref() == Some(color);
+                                                    let color_clone = color.clone();
+                                                    let on_external_color_select = on_external_color_select.clone();
+                                                    
+                                                    html! {
+                                                        <div
+                                                            key={color.clone()}
+                                                            class={if is_selected { "color-option selected" } else { "color-option" }}
+                                                            style={format!("background-color: {}", color)}
+                                                            onclick={Callback::from(move |_: MouseEvent| {
+                                                                on_external_color_select.emit(color_clone.clone());
+                                                            })}
+                                                        />
+                                                    }
+                                                }).collect::<Html>()
+                                            }
+                                        </div>
+                                    </div>
+
+                                    {
+                                        if let Some(ref error) = *external_error_message {
+                                            html! {
+                                                <div class="error-message">
+                                                    {error}
+                                                </div>
+                                            }
+                                        } else {
+                                            html! {}
+                                        }
+                                    }
+
+                                    <div class="modal-footer">
+                                        <button 
+                                            type="button" 
+                                            class="cancel-button" 
+                                            onclick={
+                                                let on_close = props.on_close.clone();
+                                                Callback::from(move |_: MouseEvent| on_close.emit(()))
+                                            }
+                                            disabled={*external_is_loading}
+                                        >
+                                            {"Cancel"}
+                                        </button>
+                                        <button 
+                                            type="submit" 
+                                            class="create-button" 
+                                            disabled={*external_is_loading}
+                                        >
+                                            {if *external_is_loading { "Adding..." } else { "Add Calendar" }}
+                                        </button>
+                                    </div>
+                                </form>
+                            }
+                        }
+                    }
+                </div>
+            </div>
+        </div>
+    }
+}

frontend/src/components/context_menu.rs

@@ -1,5 +1,5 @@
-use yew::prelude::*;
 use web_sys::MouseEvent;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct ContextMenuProps {
@@ -13,16 +13,52 @@ pub struct ContextMenuProps {
 #[function_component(ContextMenu)]
 pub fn context_menu(props: &ContextMenuProps) -> Html {
     let menu_ref = use_node_ref();
-    
+
     // Close menu when clicking outside (handled by parent component)
 
     if !props.is_open {
         return html! {};
     }
 
+    // Smart positioning to keep menu within viewport
+    let (x, y) = {
+        let mut x = props.x;
+        let mut y = props.y;
+        
+        // Try to get actual viewport dimensions
+        if let Some(window) = web_sys::window() {
+            if let (Ok(width), Ok(height)) = (window.inner_width(), window.inner_height()) {
+                if let (Some(w), Some(h)) = (width.as_f64(), height.as_f64()) {
+                    let viewport_width = w as i32;
+                    let viewport_height = h as i32;
+                    
+                    // Generic context menu: "Delete Calendar" 
+                    let menu_width = 180; // "Delete Calendar" text + padding
+                    let menu_height = 60; // Single item + padding + margins
+                    
+                    // Adjust horizontally if too close to right edge
+                    if x + menu_width > viewport_width - 10 {
+                        x = x.saturating_sub(menu_width);
+                    }
+                    
+                    // Adjust vertically if too close to bottom edge
+                    if y + menu_height > viewport_height - 10 {
+                        y = y.saturating_sub(menu_height);
+                    }
+                    
+                    // Ensure minimum margins from edges
+                    x = x.max(5);
+                    y = y.max(5);
+                }
+            }
+        }
+        
+        (x, y)
+    };
+
     let style = format!(
         "position: fixed; left: {}px; top: {}px; z-index: 1001;",
-        props.x, props.y
+        x, y
     );
 
     let on_delete_click = {
@@ -35,9 +71,9 @@ pub fn context_menu(props: &ContextMenuProps) -> Html {
     };
 
     html! {
-        <div 
+        <div
             ref={menu_ref}
-            class="context-menu" 
+            class="context-menu"
             style={style}
         >
             <div class="context-menu-item context-menu-delete" onclick={on_delete_click}>
@@ -45,4 +81,4 @@ pub fn context_menu(props: &ContextMenuProps) -> Html {
             </div>
         </div>
     }
-}
+}

frontend/src/components/create_calendar_modal.rs

@@ -39,30 +39,32 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
         let error_message = error_message.clone();
         let is_creating = is_creating.clone();
         let on_create = props.on_create.clone();
-        
+
         Callback::from(move |e: SubmitEvent| {
             e.prevent_default();
-            
+
             let name = (*calendar_name).trim();
             if name.is_empty() {
                 error_message.set(Some("Calendar name is required".to_string()));
                 return;
             }
-            
+
             if name.len() > 100 {
-                error_message.set(Some("Calendar name too long (max 100 characters)".to_string()));
+                error_message.set(Some(
+                    "Calendar name too long (max 100 characters)".to_string(),
+                ));
                 return;
             }
-            
+
             error_message.set(None);
             is_creating.set(true);
-            
+
             let desc = if (*description).trim().is_empty() {
                 None
             } else {
                 Some((*description).clone())
             };
-            
+
             on_create.emit((name.to_string(), desc, (*selected_color).clone()));
         })
     };
@@ -90,7 +92,7 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                         {"×"}
                     </button>
                 </div>
-                
+
                 <form class="modal-body" onsubmit={on_submit}>
                     {
                         if let Some(ref error) = *error_message {
@@ -103,10 +105,10 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                             html! {}
                         }
                     }
-                    
+
                     <div class="form-group">
                         <label for="calendar-name">{"Calendar Name *"}</label>
-                        <input 
+                        <input
                             id="calendar-name"
                             type="text"
                             value={(*calendar_name).clone()}
@@ -116,7 +118,7 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                             disabled={*is_creating}
                         />
                     </div>
-                    
+
                     <div class="form-group">
                         <label for="calendar-description">{"Description"}</label>
                         <textarea
@@ -128,7 +130,7 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                             disabled={*is_creating}
                         />
                     </div>
-                    
+
                     <div class="form-group">
                         <label>{"Calendar Color"}</label>
                         <div class="color-grid">
@@ -143,13 +145,13 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                                             selected_color.set(Some(color.clone()));
                                         })
                                     };
-                                    
-                                    let class_name = if is_selected { 
-                                        "color-option selected" 
-                                    } else { 
-                                        "color-option" 
+
+                                    let class_name = if is_selected {
+                                        "color-option selected"
+                                    } else {
+                                        "color-option"
                                     };
-                                    
+
                                     html! {
                                         <button
                                             key={index}
@@ -165,18 +167,18 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
                         </div>
                         <p class="color-help-text">{"Optional: Choose a color for your calendar"}</p>
                     </div>
-                    
+
                     <div class="modal-actions">
-                        <button 
-                            type="button" 
+                        <button
+                            type="button"
                             class="cancel-button"
                             onclick={props.on_close.reform(|_| ())}
                             disabled={*is_creating}
                         >
                             {"Cancel"}
                         </button>
-                        <button 
-                            type="submit" 
+                        <button
+                            type="submit"
                             class="create-button"
                             disabled={*is_creating}
                         >
@@ -193,4 +195,4 @@ pub fn CreateCalendarModal(props: &CreateCalendarModalProps) -> Html {
             </div>
         </div>
     }
-}
+}

frontend/src/components/event_context_menu.rs

@@ -1,6 +1,6 @@
-use yew::prelude::*;
-use web_sys::MouseEvent;
 use crate::models::ical::VEvent;
+use web_sys::MouseEvent;
+use yew::prelude::*;
 
 #[derive(Clone, PartialEq, Debug)]
 pub enum DeleteAction {
@@ -9,40 +9,102 @@ pub enum DeleteAction {
     DeleteSeries,
 }
 
+#[derive(Clone, PartialEq, Debug)]
+pub enum EditAction {
+    EditThis,
+    EditFuture,
+    EditAll,
+}
+
 #[derive(Properties, PartialEq)]
 pub struct EventContextMenuProps {
     pub is_open: bool,
     pub x: i32,
     pub y: i32,
     pub event: Option<VEvent>,
-    pub on_edit: Callback<()>,
+    pub on_edit: Callback<EditAction>,
     pub on_delete: Callback<DeleteAction>,
+    pub on_view_details: Callback<VEvent>,
     pub on_close: Callback<()>,
 }
 
 #[function_component(EventContextMenu)]
 pub fn event_context_menu(props: &EventContextMenuProps) -> Html {
     let menu_ref = use_node_ref();
-    
+
     if !props.is_open {
         return html! {};
     }
 
+    // Smart positioning to keep menu within viewport
+    let (x, y) = {
+        let mut x = props.x;
+        let mut y = props.y;
+        
+        // Try to get actual viewport dimensions
+        if let Some(window) = web_sys::window() {
+            if let (Ok(width), Ok(height)) = (window.inner_width(), window.inner_height()) {
+                if let (Some(w), Some(h)) = (width.as_f64(), height.as_f64()) {
+                    let viewport_width = w as i32;
+                    let viewport_height = h as i32;
+                    
+                    // More accurate menu dimensions based on actual CSS and content
+                    let menu_width = if props.event.as_ref().map_or(false, |e| e.rrule.is_some()) {
+                        280 // Recurring: "Edit This and Future Events" is long text + padding
+                    } else {
+                        180 // Non-recurring: "Edit Event" + "Delete Event" + padding
+                    };
+                    let menu_height = if props.event.as_ref().map_or(false, |e| e.rrule.is_some()) {
+                        200 // 6 items × ~32px per item (12px padding top/bottom + text height + borders)
+                    } else {
+                        100 // 2 items × ~32px per item + some extra margin
+                    };
+                    
+                    // Adjust horizontally if too close to right edge
+                    if x + menu_width > viewport_width - 10 {
+                        x = x.saturating_sub(menu_width);
+                    }
+                    
+                    // Adjust vertically if too close to bottom edge
+                    if y + menu_height > viewport_height - 10 {
+                        y = y.saturating_sub(menu_height);
+                    }
+                    
+                    // Ensure minimum margins from edges
+                    x = x.max(5);
+                    y = y.max(5);
+                }
+            }
+        }
+        
+        (x, y)
+    };
+
     let style = format!(
         "position: fixed; left: {}px; top: {}px; z-index: 1001;",
-        props.x, props.y
+        x, y
     );
 
     // Check if the event is recurring
-    let is_recurring = props.event.as_ref()
+    let is_recurring = props
+        .event
+        .as_ref()
         .map(|event| event.rrule.is_some())
         .unwrap_or(false);
+    
+    // Check if the event is from an external calendar (read-only)
+    let is_external = props
+        .event
+        .as_ref()
+        .and_then(|event| event.calendar_path.as_ref())
+        .map(|path| path.starts_with("external_"))
+        .unwrap_or(false);
 
-    let on_edit_click = {
+    let create_edit_callback = |action: EditAction| {
         let on_edit = props.on_edit.clone();
         let on_close = props.on_close.clone();
         Callback::from(move |_: MouseEvent| {
-            on_edit.emit(());
+            on_edit.emit(action.clone());
             on_close.emit(());
         })
     };
@@ -56,38 +118,85 @@ pub fn event_context_menu(props: &EventContextMenuProps) -> Html {
         })
     };
 
+    let create_view_details_callback = {
+        let on_view_details = props.on_view_details.clone();
+        let on_close = props.on_close.clone();
+        let event = props.event.clone();
+        Callback::from(move |_: MouseEvent| {
+            if let Some(event) = &event {
+                on_view_details.emit(event.clone());
+            }
+            on_close.emit(());
+        })
+    };
+
     html! {
-        <div 
+        <div
             ref={menu_ref}
-            class="context-menu" 
+            class="context-menu"
             style={style}
         >
-            <div class="context-menu-item" onclick={on_edit_click}>
-                {"Edit Event"}
-            </div>
             {
-                if is_recurring {
+                if is_external {
+                    // External calendar events are read-only - only show "View Details"
+                    html! {
+                        <div class="context-menu-item" onclick={create_view_details_callback}>
+                            {"View Event Details"}
+                        </div>
+                    }
+                } else if is_recurring {
+                    // Regular recurring events - show edit options
                     html! {
                         <>
-                            <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteThis)}>
-                                                {"Delete This Event"}
+                            <div class="context-menu-item" onclick={create_edit_callback(EditAction::EditThis)}>
+                                {"Edit This Event"}
                             </div>
-                            <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteFollowing)}>
-                                                {"Delete Following Events"}
+                            <div class="context-menu-item" onclick={create_edit_callback(EditAction::EditFuture)}>
+                                {"Edit This and Future Events"}
                             </div>
-                            <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteSeries)}>
-                                                {"Delete Entire Series"}
+                            <div class="context-menu-item" onclick={create_edit_callback(EditAction::EditAll)}>
+                                {"Edit All Events in Series"}
                             </div>
                         </>
                     }
                 } else {
+                    // Regular single events - show edit option
                     html! {
-                        <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteThis)}>
-                                        {"Delete Event"}
+                        <div class="context-menu-item" onclick={create_edit_callback(EditAction::EditThis)}>
+                            {"Edit Event"}
                         </div>
                     }
                 }
             }
+            {
+                if !is_external {
+                    // Only show delete options for non-external events
+                    if is_recurring {
+                        html! {
+                            <>
+                                <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteThis)}>
+                                    {"Delete This Event"}
+                                </div>
+                                <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteFollowing)}>
+                                    {"Delete Following Events"}
+                                </div>
+                                <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteSeries)}>
+                                    {"Delete Entire Series"}
+                                </div>
+                            </>
+                        }
+                    } else {
+                        html! {
+                            <div class="context-menu-item context-menu-delete" onclick={create_delete_callback(DeleteAction::DeleteThis)}>
+                                {"Delete Event"}
+                            </div>
+                        }
+                    }
+                } else {
+                    // No delete options for external events
+                    html! {}
+                }
+            }
         </div>
     }
-}
+}

frontend/src/components/event_form/advanced.rs

@@ -0,0 +1,109 @@
+use super::types::*;
+// Types are already imported from super::types::*
+use wasm_bindgen::JsCast;
+use web_sys::HtmlSelectElement;
+use yew::prelude::*;
+
+#[function_component(AdvancedTab)]
+pub fn advanced_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    let on_status_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.status = match select.value().as_str() {
+                        "tentative" => EventStatus::Tentative,
+                        "cancelled" => EventStatus::Cancelled,
+                        _ => EventStatus::Confirmed,
+                    };
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_class_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.class = match select.value().as_str() {
+                        "private" => EventClass::Private,
+                        "confidential" => EventClass::Confidential,
+                        _ => EventClass::Public,
+                    };
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_priority_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    let value = select.value();
+                    event_data.priority = if value.is_empty() {
+                        None
+                    } else {
+                        value.parse::<u8>().ok().filter(|&p| p <= 9)
+                    };
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    html! {
+        <div class="tab-panel">
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="event-status">{"Status"}</label>
+                    <select
+                        id="event-status"
+                        class="form-input"
+                        onchange={on_status_change}
+                    >
+                        <option value="confirmed" selected={matches!(data.status, EventStatus::Confirmed)}>{"Confirmed"}</option>
+                        <option value="tentative" selected={matches!(data.status, EventStatus::Tentative)}>{"Tentative"}</option>
+                        <option value="cancelled" selected={matches!(data.status, EventStatus::Cancelled)}>{"Cancelled"}</option>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="event-class">{"Privacy"}</label>
+                    <select
+                        id="event-class"
+                        class="form-input"
+                        onchange={on_class_change}
+                    >
+                        <option value="public" selected={matches!(data.class, EventClass::Public)}>{"Public"}</option>
+                        <option value="private" selected={matches!(data.class, EventClass::Private)}>{"Private"}</option>
+                        <option value="confidential" selected={matches!(data.class, EventClass::Confidential)}>{"Confidential"}</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="event-priority">{"Priority"}</label>
+                <select 
+                    id="event-priority" 
+                    class="form-input"
+                    onchange={on_priority_change}
+                >
+                    <option value="" selected={data.priority.is_none()}>{"Not set"}</option>
+                    <option value="1" selected={data.priority == Some(1)}>{"High"}</option>
+                    <option value="5" selected={data.priority == Some(5)}>{"Medium"}</option>
+                    <option value="9" selected={data.priority == Some(9)}>{"Low"}</option>
+                </select>
+                <p class="form-help-text">{"Set the importance level for this event."}</p>
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/basic_details.rs

@@ -0,0 +1,730 @@
+use super::types::*;
+// Types are already imported from super::types::*
+use chrono::{Datelike, NaiveDate};
+use wasm_bindgen::JsCast;
+use web_sys::{HtmlInputElement, HtmlSelectElement, HtmlTextAreaElement};
+use yew::prelude::*;
+
+#[function_component(BasicDetailsTab)]
+pub fn basic_details_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    // Event handlers
+    let on_title_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.title = input.value();
+                    if !event_data.changed_fields.contains(&"title".to_string()) {
+                        event_data.changed_fields.push("title".to_string());
+                    }
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_description_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(textarea) = target.dyn_into::<HtmlTextAreaElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.description = textarea.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_calendar_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    let value = select.value();
+                    let new_calendar = if value.is_empty() { None } else { Some(value) };
+                    if event_data.selected_calendar != new_calendar {
+                        event_data.selected_calendar = new_calendar;
+                        if !event_data.changed_fields.contains(&"selected_calendar".to_string()) {
+                            event_data.changed_fields.push("selected_calendar".to_string());
+                        }
+                    }
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_all_day_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.all_day = input.checked();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_recurrence_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.recurrence = match select.value().as_str() {
+                        "daily" => RecurrenceType::Daily,
+                        "weekly" => RecurrenceType::Weekly,
+                        "monthly" => RecurrenceType::Monthly,
+                        "yearly" => RecurrenceType::Yearly,
+                        _ => RecurrenceType::None,
+                    };
+                    // Reset recurrence-related fields when changing type
+                    event_data.recurrence_days = vec![false; 7];
+                    event_data.recurrence_interval = 1;
+                    event_data.recurrence_until = None;
+                    event_data.recurrence_count = None;
+                    event_data.monthly_by_day = None;
+                    event_data.monthly_by_monthday = None;
+                    event_data.yearly_by_month = vec![false; 12];
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_reminder_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.reminder = match select.value().as_str() {
+                        "15min" => ReminderType::Minutes15,
+                        "30min" => ReminderType::Minutes30,
+                        "1hour" => ReminderType::Hour1,
+                        "1day" => ReminderType::Day1,
+                        "2days" => ReminderType::Days2,
+                        "1week" => ReminderType::Week1,
+                        _ => ReminderType::None,
+                    };
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_recurrence_interval_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                if let Ok(interval) = input.value().parse::<u32>() {
+                    let mut event_data = (*data).clone();
+                    event_data.recurrence_interval = interval.max(1);
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_recurrence_until_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                let mut event_data = (*data).clone();
+                if input.value().is_empty() {
+                    event_data.recurrence_until = None;
+                } else if let Ok(date) = NaiveDate::parse_from_str(&input.value(), "%Y-%m-%d") {
+                    event_data.recurrence_until = Some(date);
+                }
+                data.set(event_data);
+            }
+        })
+    };
+
+    let on_recurrence_count_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                let mut event_data = (*data).clone();
+                if input.value().is_empty() {
+                    event_data.recurrence_count = None;
+                } else if let Ok(count) = input.value().parse::<u32>() {
+                    event_data.recurrence_count = Some(count.max(1));
+                }
+                data.set(event_data);
+            }
+        })
+    };
+
+    let on_monthly_by_monthday_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                let mut event_data = (*data).clone();
+                if input.value().is_empty() {
+                    event_data.monthly_by_monthday = None;
+                } else if let Ok(day) = input.value().parse::<u8>() {
+                    if day >= 1 && day <= 31 {
+                        event_data.monthly_by_monthday = Some(day);
+                        event_data.monthly_by_day = None; // Clear the other option
+                    }
+                }
+                data.set(event_data);
+            }
+        })
+    };
+
+    let on_monthly_by_day_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(select) = e.target_dyn_into::<HtmlSelectElement>() {
+                let mut event_data = (*data).clone();
+                if select.value().is_empty() || select.value() == "none" {
+                    event_data.monthly_by_day = None;
+                } else {
+                    event_data.monthly_by_day = Some(select.value());
+                    event_data.monthly_by_monthday = None; // Clear the other option
+                }
+                data.set(event_data);
+            }
+        })
+    };
+
+    let on_weekday_change = {
+        let data = data.clone();
+        move |day_index: usize| {
+            let data = data.clone();
+            Callback::from(move |e: Event| {
+                if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    if day_index < event_data.recurrence_days.len() {
+                        event_data.recurrence_days[day_index] = input.checked();
+                        data.set(event_data);
+                    }
+                }
+            })
+        }
+    };
+
+    let on_yearly_month_change = {
+        let data = data.clone();
+        move |month_index: usize| {
+            let data = data.clone();
+            Callback::from(move |e: Event| {
+                if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    if month_index < event_data.yearly_by_month.len() {
+                        event_data.yearly_by_month[month_index] = input.checked();
+                        data.set(event_data);
+                    }
+                }
+            })
+        }
+    };
+
+    let on_start_date_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                if let Ok(date) = NaiveDate::parse_from_str(&input.value(), "%Y-%m-%d") {
+                    let mut event_data = (*data).clone();
+                    event_data.start_date = date;
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_start_time_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                if let Ok(time) = chrono::NaiveTime::parse_from_str(&input.value(), "%H:%M") {
+                    let mut event_data = (*data).clone();
+                    event_data.start_time = time;
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_end_date_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                if let Ok(date) = NaiveDate::parse_from_str(&input.value(), "%Y-%m-%d") {
+                    let mut event_data = (*data).clone();
+                    event_data.end_date = date;
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_end_time_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(input) = e.target_dyn_into::<HtmlInputElement>() {
+                if let Ok(time) = chrono::NaiveTime::parse_from_str(&input.value(), "%H:%M") {
+                    let mut event_data = (*data).clone();
+                    event_data.end_time = time;
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_location_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.location = input.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+    
+    html! {
+        <div class="tab-panel">
+            <div class="form-group">
+                <label for="event-title">{"Event Title *"}</label>
+                <input
+                    type="text"
+                    id="event-title"
+                    class="form-input"
+                    value={data.title.clone()}
+                    oninput={on_title_input}
+                    placeholder="Add a title"
+                    required=true
+                />
+            </div>
+
+            <div class="form-group">
+                <label for="event-description">{"Description"}</label>
+                <textarea
+                    id="event-description"
+                    class="form-input"
+                    value={data.description.clone()}
+                    oninput={on_description_input}
+                    placeholder="Add a description"
+                    rows="3"
+                ></textarea>
+            </div>
+
+            <div class="form-group">
+                <label for="event-calendar">{"Calendar"}</label>
+                <select
+                    id="event-calendar"
+                    class="form-input"
+                    onchange={on_calendar_change}
+                >
+                    <option value="">{"Select Calendar"}</option>
+                    {
+                        props.available_calendars.iter().map(|calendar| {
+                            html! {
+                                <option
+                                    key={calendar.path.clone()}
+                                    value={calendar.path.clone()}
+                                    selected={data.selected_calendar.as_ref() == Some(&calendar.path)}
+                                >
+                                    {&calendar.display_name}
+                                </option>
+                            }
+                        }).collect::<Html>()
+                    }
+                </select>
+            </div>
+
+            <div class="form-group">
+                <label class="checkbox-label">
+                    <input
+                        type="checkbox"
+                        checked={data.all_day}
+                        onchange={on_all_day_change}
+                    />
+                    {" All Day"}
+                </label>
+            </div>
+
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="event-recurrence-basic">{"Repeat"}</label>
+                    <select
+                        id="event-recurrence-basic"
+                        class="form-input"
+                        onchange={on_recurrence_change}
+                    >
+                        <option value="none" selected={matches!(data.recurrence, RecurrenceType::None)}>{"Does not repeat"}</option>
+                        <option value="daily" selected={matches!(data.recurrence, RecurrenceType::Daily)}>{"Daily"}</option>
+                        <option value="weekly" selected={matches!(data.recurrence, RecurrenceType::Weekly)}>{"Weekly"}</option>
+                        <option value="monthly" selected={matches!(data.recurrence, RecurrenceType::Monthly)}>{"Monthly"}</option>
+                        <option value="yearly" selected={matches!(data.recurrence, RecurrenceType::Yearly)}>{"Yearly"}</option>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="event-reminder-basic">{"Reminder"}</label>
+                    <select
+                        id="event-reminder-basic"
+                        class="form-input"
+                        onchange={on_reminder_change}
+                    >
+                        <option value="none" selected={matches!(data.reminder, ReminderType::None)}>{"None"}</option>
+                        <option value="15min" selected={matches!(data.reminder, ReminderType::Minutes15)}>{"15 minutes before"}</option>
+                        <option value="30min" selected={matches!(data.reminder, ReminderType::Minutes30)}>{"30 minutes before"}</option>
+                        <option value="1hour" selected={matches!(data.reminder, ReminderType::Hour1)}>{"1 hour before"}</option>
+                        <option value="1day" selected={matches!(data.reminder, ReminderType::Day1)}>{"1 day before"}</option>
+                    </select>
+                </div>
+            </div>
+
+            // RECURRENCE OPTIONS GO RIGHT HERE - directly below repeat/reminder!
+            if matches!(data.recurrence, RecurrenceType::Weekly) {
+                <div class="form-group">
+                    <label>{"Repeat on"}</label>
+                    <div class="weekday-selection">
+                        {
+                            ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+                                .iter()
+                                .enumerate()
+                                .map(|(i, day)| {
+                                    let day_checked = data.recurrence_days.get(i).cloned().unwrap_or(false);
+                                    let on_change = on_weekday_change(i);
+                                    html! {
+                                        <label key={i} class="weekday-checkbox">
+                                            <input
+                                                type="checkbox"
+                                                checked={day_checked}
+                                                onchange={on_change}
+                                            />
+                                            <span class="weekday-label">{day}</span>
+                                        </label>
+                                    }
+                                })
+                                .collect::<Html>()
+                        }
+                    </div>
+                </div>
+            }
+
+            if !matches!(data.recurrence, RecurrenceType::None) {
+                <div class="recurrence-options">
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label for="recurrence-interval">{"Every"}</label>
+                            <div class="interval-input">
+                                <input
+                                    id="recurrence-interval"
+                                    type="number"
+                                    class="form-input"
+                                    value={data.recurrence_interval.to_string()}
+                                    min="1"
+                                    max="999"
+                                    onchange={on_recurrence_interval_change}
+                                />
+                                <span class="interval-unit">
+                                    {match data.recurrence {
+                                        RecurrenceType::Daily => if data.recurrence_interval == 1 { "day" } else { "days" },
+                                        RecurrenceType::Weekly => if data.recurrence_interval == 1 { "week" } else { "weeks" },
+                                        RecurrenceType::Monthly => if data.recurrence_interval == 1 { "month" } else { "months" },
+                                        RecurrenceType::Yearly => if data.recurrence_interval == 1 { "year" } else { "years" },
+                                        RecurrenceType::None => "",
+                                    }}
+                                </span>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label>{"Ends"}</label>
+                            <div class="end-options">
+                                <div class="end-option">
+                                    <label class="radio-label">
+                                        <input
+                                            type="radio"
+                                            name="recurrence-end"
+                                            value="never"
+                                            checked={data.recurrence_until.is_none() && data.recurrence_count.is_none()}
+                                            onchange={{
+                                                let data = data.clone();
+                                                Callback::from(move |_| {
+                                                    let mut new_data = (*data).clone();
+                                                    new_data.recurrence_until = None;
+                                                    new_data.recurrence_count = None;
+                                                    data.set(new_data);
+                                                })
+                                            }}
+                                        />
+                                        {"Never"}
+                                    </label>
+                                </div>
+
+                                <div class="end-option">
+                                    <label class="radio-label">
+                                        <input
+                                            type="radio"
+                                            name="recurrence-end"
+                                            value="until"
+                                            checked={data.recurrence_until.is_some()}
+                                            onchange={{
+                                                let data = data.clone();
+                                                Callback::from(move |_| {
+                                                    let mut new_data = (*data).clone();
+                                                    new_data.recurrence_count = None;
+                                                    new_data.recurrence_until = Some(new_data.start_date);
+                                                    data.set(new_data);
+                                                })
+                                            }}
+                                        />
+                                        {"Until"}
+                                    </label>
+                                    <input
+                                        type="date"
+                                        class="form-input"
+                                        value={data.recurrence_until.map(|d| d.format("%Y-%m-%d").to_string()).unwrap_or_default()}
+                                        onchange={on_recurrence_until_change}
+                                    />
+                                </div>
+
+                                <div class="end-option">
+                                    <label class="radio-label">
+                                        <input
+                                            type="radio"
+                                            name="recurrence-end"
+                                            value="count"
+                                            checked={data.recurrence_count.is_some()}
+                                            onchange={{
+                                                let data = data.clone();
+                                                Callback::from(move |_| {
+                                                    let mut new_data = (*data).clone();
+                                                    new_data.recurrence_until = None;
+                                                    new_data.recurrence_count = Some(10); // Default count
+                                                    data.set(new_data);
+                                                })
+                                            }}
+                                        />
+                                        {"After"}
+                                    </label>
+                                    <input
+                                        type="number"
+                                        class="form-input count-input"
+                                        value={data.recurrence_count.map(|c| c.to_string()).unwrap_or_default()}
+                                        min="1"
+                                        max="999"
+                                        placeholder="1"
+                                        onchange={on_recurrence_count_change}
+                                    />
+                                    <span class="count-unit">{"occurrences"}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
+                    // Monthly specific options
+                    if matches!(data.recurrence, RecurrenceType::Monthly) {
+                        <div class="form-group">
+                            <label>{"Repeat by"}</label>
+                            <div class="monthly-options">
+                                <div class="monthly-option">
+                                    <label class="radio-label">
+                                        <input
+                                            type="radio"
+                                            name="monthly-type"
+                                            checked={data.monthly_by_monthday.is_some()}
+                                            onchange={{
+                                                let data = data.clone();
+                                                Callback::from(move |_| {
+                                                    let mut new_data = (*data).clone();
+                                                    new_data.monthly_by_day = None;
+                                                    new_data.monthly_by_monthday = Some(new_data.start_date.day() as u8);
+                                                    data.set(new_data);
+                                                })
+                                            }}
+                                        />
+                                        {"Day of month:"}
+                                    </label>
+                                    <input
+                                        type="number"
+                                        class="form-input day-input"
+                                        value={data.monthly_by_monthday.map(|d| d.to_string()).unwrap_or_else(|| data.start_date.day().to_string())}
+                                        min="1"
+                                        max="31"
+                                        onchange={on_monthly_by_monthday_change}
+                                    />
+                                </div>
+
+                                <div class="monthly-option">
+                                    <label class="radio-label">
+                                        <input
+                                            type="radio"
+                                            name="monthly-type"
+                                            checked={data.monthly_by_day.is_some()}
+                                            onchange={{
+                                                let data = data.clone();
+                                                Callback::from(move |_| {
+                                                    let mut new_data = (*data).clone();
+                                                    new_data.monthly_by_monthday = None;
+                                                    new_data.monthly_by_day = Some("1MO".to_string()); // Default to first Monday
+                                                    data.set(new_data);
+                                                })
+                                            }}
+                                        />
+                                        {"Day of week:"}
+                                    </label>
+                                    <select
+                                        class="form-input"
+                                        value={data.monthly_by_day.clone().unwrap_or_default()}
+                                        onchange={on_monthly_by_day_change}
+                                    >
+                                        <option value="none">{"Select..."}</option>
+                                        <option value="1MO">{"First Monday"}</option>
+                                        <option value="1TU">{"First Tuesday"}</option>
+                                        <option value="1WE">{"First Wednesday"}</option>
+                                        <option value="1TH">{"First Thursday"}</option>
+                                        <option value="1FR">{"First Friday"}</option>
+                                        <option value="1SA">{"First Saturday"}</option>
+                                        <option value="1SU">{"First Sunday"}</option>
+                                        <option value="2MO">{"Second Monday"}</option>
+                                        <option value="2TU">{"Second Tuesday"}</option>
+                                        <option value="2WE">{"Second Wednesday"}</option>
+                                        <option value="2TH">{"Second Thursday"}</option>
+                                        <option value="2FR">{"Second Friday"}</option>
+                                        <option value="2SA">{"Second Saturday"}</option>
+                                        <option value="2SU">{"Second Sunday"}</option>
+                                        <option value="3MO">{"Third Monday"}</option>
+                                        <option value="3TU">{"Third Tuesday"}</option>
+                                        <option value="3WE">{"Third Wednesday"}</option>
+                                        <option value="3TH">{"Third Thursday"}</option>
+                                        <option value="3FR">{"Third Friday"}</option>
+                                        <option value="3SA">{"Third Saturday"}</option>
+                                        <option value="3SU">{"Third Sunday"}</option>
+                                        <option value="4MO">{"Fourth Monday"}</option>
+                                        <option value="4TU">{"Fourth Tuesday"}</option>
+                                        <option value="4WE">{"Fourth Wednesday"}</option>
+                                        <option value="4TH">{"Fourth Thursday"}</option>
+                                        <option value="4FR">{"Fourth Friday"}</option>
+                                        <option value="4SA">{"Fourth Saturday"}</option>
+                                        <option value="4SU">{"Fourth Sunday"}</option>
+                                        <option value="-1MO">{"Last Monday"}</option>
+                                        <option value="-1TU">{"Last Tuesday"}</option>
+                                        <option value="-1WE">{"Last Wednesday"}</option>
+                                        <option value="-1TH">{"Last Thursday"}</option>
+                                        <option value="-1FR">{"Last Friday"}</option>
+                                        <option value="-1SA">{"Last Saturday"}</option>
+                                        <option value="-1SU">{"Last Sunday"}</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    
+                    // Yearly specific options  
+                    if matches!(data.recurrence, RecurrenceType::Yearly) {
+                        <div class="form-group">
+                            <label>{"Repeat in months"}</label>
+                            <div class="yearly-months">
+                                {
+                                    ["Jan", "Feb", "Mar", "Apr", "May", "Jun", 
+                                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+                                        .iter()
+                                        .enumerate()
+                                        .map(|(i, month)| {
+                                            let month_checked = data.yearly_by_month.get(i).cloned().unwrap_or(false);
+                                            let on_change = on_yearly_month_change(i);
+                                            html! {
+                                                <label key={i} class="month-checkbox">
+                                                    <input
+                                                        type="checkbox"
+                                                        checked={month_checked}
+                                                        onchange={on_change}
+                                                    />
+                                                    <span class="month-label">{month}</span>
+                                                </label>
+                                            }
+                                        })
+                                        .collect::<Html>()
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            }
+
+            // Date and time fields go here AFTER recurrence options
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="start-date">{"Start Date *"}</label>
+                    <input
+                        type="date"
+                        id="start-date"
+                        class="form-input"
+                        value={data.start_date.format("%Y-%m-%d").to_string()}
+                        onchange={on_start_date_change}
+                        required=true
+                    />
+                </div>
+                
+                if !data.all_day {
+                    <div class="form-group">
+                        <label for="start-time">{"Start Time"}</label>
+                        <input
+                            type="time"
+                            id="start-time"
+                            class="form-input"
+                            value={data.start_time.format("%H:%M").to_string()}
+                            onchange={on_start_time_change}
+                        />
+                    </div>
+                }
+            </div>
+
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="end-date">{"End Date *"}</label>
+                    <input
+                        type="date"
+                        id="end-date"
+                        class="form-input"
+                        value={data.end_date.format("%Y-%m-%d").to_string()}
+                        onchange={on_end_date_change}
+                        required=true
+                    />
+                </div>
+                
+                if !data.all_day {
+                    <div class="form-group">
+                        <label for="end-time">{"End Time"}</label>
+                        <input
+                            type="time"
+                            id="end-time"
+                            class="form-input"
+                            value={data.end_time.format("%H:%M").to_string()}
+                            onchange={on_end_time_change}
+                        />
+                    </div>
+                }
+            </div>
+
+            <div class="form-group">
+                <label for="event-location">{"Location"}</label>
+                <input
+                    type="text"
+                    id="event-location"
+                    class="form-input"
+                    value={data.location.clone()}
+                    oninput={on_location_input}
+                    placeholder="Enter event location"
+                />
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/categories.rs

@@ -0,0 +1,98 @@
+use super::types::*;
+use wasm_bindgen::JsCast;
+use web_sys::HtmlInputElement;
+use yew::prelude::*;
+
+#[function_component(CategoriesTab)]
+pub fn categories_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    let on_categories_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.categories = input.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let add_category = {
+        let data = data.clone();
+        move |category: &str| {
+            let data = data.clone();
+            let category = category.to_string();
+            Callback::from(move |_| {
+                let mut event_data = (*data).clone();
+                if event_data.categories.is_empty() {
+                    event_data.categories = category.clone();
+                } else {
+                    event_data.categories = format!("{}, {}", event_data.categories, category);
+                }
+                data.set(event_data);
+            })
+        }
+    };
+
+    html! {
+        <div class="tab-panel">
+            <div class="form-group">
+                <label for="event-categories">{"Categories"}</label>
+                <input
+                    type="text"
+                    id="event-categories"
+                    class="form-input"
+                    value={data.categories.clone()}
+                    oninput={on_categories_input}
+                    placeholder="work, meeting, personal, project, urgent"
+                />
+                <p class="form-help-text">{"Enter categories separated by commas to help organize and filter your events"}</p>
+            </div>
+
+            <div class="categories-suggestions">
+                <h5>{"Common Categories"}</h5>
+                <div class="category-tags">
+                    <button type="button" class="category-tag" onclick={add_category("work")}>{"work"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("meeting")}>{"meeting"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("personal")}>{"personal"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("project")}>{"project"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("urgent")}>{"urgent"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("social")}>{"social"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("travel")}>{"travel"}</button>
+                    <button type="button" class="category-tag" onclick={add_category("health")}>{"health"}</button>
+                </div>
+                <p class="form-help-text">{"Click to add these common categories to your event"}</p>
+            </div>
+
+            <div class="categories-info">
+                <h5>{"Event Organization & Filtering"}</h5>
+                <ul>
+                    <li>{"Categories help organize events in calendar views"}</li>
+                    <li>{"Filter events by category to focus on specific types"}</li>
+                    <li>{"Categories are searchable and can be used for reporting"}</li>
+                    <li>{"Multiple categories per event are fully supported"}</li>
+                </ul>
+
+                <div class="categories-examples">
+                    <h6>{"Category Usage Examples"}</h6>
+                    <div class="category-example">
+                        <strong>{"Work Events:"}</strong>
+                        <span>{"work, meeting, project, urgent, deadline"}</span>
+                    </div>
+                    <div class="category-example">
+                        <strong>{"Personal Events:"}</strong>
+                        <span>{"personal, family, health, social, travel"}</span>
+                    </div>
+                    <div class="category-example">
+                        <strong>{"Mixed Events:"}</strong>
+                        <span>{"work, travel, client, important"}</span>
+                    </div>
+                    <p class="form-help-text">{"Categories follow RFC 5545 CATEGORIES property standards"}</p>
+                </div>
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/location.rs

@@ -0,0 +1,118 @@
+use super::types::*;
+use wasm_bindgen::JsCast;
+use web_sys::HtmlInputElement;
+use yew::prelude::*;
+
+#[function_component(LocationTab)]
+pub fn location_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    let on_location_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.location = input.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let set_location = {
+        let data = data.clone();
+        move |location: &str| {
+            let data = data.clone();
+            let location = location.to_string();
+            Callback::from(move |_| {
+                let mut event_data = (*data).clone();
+                event_data.location = location.clone();
+                data.set(event_data);
+            })
+        }
+    };
+
+    html! {
+        <div class="tab-panel">
+            <div class="form-group">
+                <label for="event-location-detailed">{"Event Location"}</label>
+                <input
+                    type="text"
+                    id="event-location-detailed"
+                    class="form-input"
+                    value={data.location.clone()}
+                    oninput={on_location_input}
+                    placeholder="Conference Room A, 123 Main St, City, State 12345"
+                />
+                <p class="form-help-text">{"Enter the full address or location description for the event"}</p>
+            </div>
+
+            <div class="location-suggestions">
+                <h5>{"Common Locations"}</h5>
+                <div class="location-tags">
+                    <button type="button" class="location-tag" onclick={set_location("Conference Room")}>{"Conference Room"}</button>
+                    <button type="button" class="location-tag" onclick={set_location("Online Meeting")}>{"Online Meeting"}</button>
+                    <button type="button" class="location-tag" onclick={set_location("Main Office")}>{"Main Office"}</button>
+                    <button type="button" class="location-tag" onclick={set_location("Client Site")}>{"Client Site"}</button>
+                    <button type="button" class="location-tag" onclick={set_location("Home Office")}>{"Home Office"}</button>
+                    <button type="button" class="location-tag" onclick={set_location("Remote")}>{"Remote"}</button>
+                </div>
+                <p class="form-help-text">{"Click to quickly set common location types"}</p>
+            </div>
+
+            <div class="location-info">
+                <h5>{"Location Features & Integration"}</h5>
+                <ul>
+                    <li>{"Location information is included in calendar invitations"}</li>
+                    <li>{"Supports both physical addresses and virtual meeting links"}</li>
+                    <li>{"Compatible with mapping and navigation applications"}</li>
+                    <li>{"Room booking integration available for enterprise setups"}</li>
+                </ul>
+
+                <div class="geo-section">
+                    <h6>{"Geographic Coordinates (Advanced)"}</h6>
+                    <p>{"Future versions will support:"}</p>
+                    <div class="geo-features">
+                        <div class="geo-item">
+                            <strong>{"GPS Coordinates:"}</strong>
+                            <span>{"Precise latitude/longitude positioning"}</span>
+                        </div>
+                        <div class="geo-item">
+                            <strong>{"Map Integration:"}</strong>
+                            <span>{"Embedded maps in event details"}</span>
+                        </div>
+                        <div class="geo-item">
+                            <strong>{"Travel Time:"}</strong>
+                            <span>{"Automatic travel time calculation"}</span>
+                        </div>
+                        <div class="geo-item">
+                            <strong>{"Proximity Alerts:"}</strong>
+                            <span>{"Location-based notifications"}</span>
+                        </div>
+                    </div>
+                    <p class="form-help-text">{"Advanced geographic features will be implemented in future releases"}</p>
+                </div>
+
+                <div class="virtual-meeting-section">
+                    <h6>{"Virtual Meeting Integration"}</h6>
+                    <div class="meeting-platforms">
+                        <div class="platform-item">
+                            <strong>{"Video Conferencing:"}</strong>
+                            <span>{"Zoom, Teams, Google Meet links"}</span>
+                        </div>
+                        <div class="platform-item">
+                            <strong>{"Phone Conference:"}</strong>
+                            <span>{"Dial-in numbers and access codes"}</span>
+                        </div>
+                        <div class="platform-item">
+                            <strong>{"Webinar Links:"}</strong>
+                            <span>{"Live streaming and presentation URLs"}</span>
+                        </div>
+                    </div>
+                    <p class="form-help-text">{"Paste meeting links directly in the location field for virtual events"}</p>
+                </div>
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/mod.rs

@@ -0,0 +1,16 @@
+// Event form components module
+pub mod types;
+pub mod basic_details;
+pub mod advanced;
+pub mod people;
+pub mod categories;
+pub mod location;
+pub mod reminders;
+
+pub use types::*;
+pub use basic_details::BasicDetailsTab;
+pub use advanced::AdvancedTab;
+pub use people::PeopleTab;
+pub use categories::CategoriesTab;
+pub use location::LocationTab;
+pub use reminders::RemindersTab;

frontend/src/components/event_form/people.rs

@@ -0,0 +1,103 @@
+use super::types::*;
+use wasm_bindgen::JsCast;
+use web_sys::{HtmlInputElement, HtmlTextAreaElement};
+use yew::prelude::*;
+
+#[function_component(PeopleTab)]
+pub fn people_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    let on_organizer_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(input) = target.dyn_into::<HtmlInputElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.organizer = input.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    let on_attendees_input = {
+        let data = data.clone();
+        Callback::from(move |e: InputEvent| {
+            if let Some(target) = e.target() {
+                if let Ok(textarea) = target.dyn_into::<HtmlTextAreaElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.attendees = textarea.value();
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    html! {
+        <div class="tab-panel">
+            <div class="form-group">
+                <label for="event-organizer">{"Organizer"}</label>
+                <input
+                    type="email"
+                    id="event-organizer"
+                    class="form-input"
+                    value={data.organizer.clone()}
+                    oninput={on_organizer_input}
+                    placeholder="organizer@example.com"
+                />
+                <p class="form-help-text">{"Email address of the person organizing this event"}</p>
+            </div>
+
+            <div class="form-group">
+                <label for="event-attendees">{"Attendees"}</label>
+                <textarea
+                    id="event-attendees"
+                    class="form-input"
+                    value={data.attendees.clone()}
+                    oninput={on_attendees_input}
+                    placeholder="attendee1@example.com, attendee2@example.com, attendee3@example.com"
+                    rows="4"
+                ></textarea>
+                <p class="form-help-text">{"Enter attendee email addresses separated by commas"}</p>
+            </div>
+
+            <div class="people-info">
+                <h5>{"Invitation & Response Management"}</h5>
+                <ul>
+                    <li>{"Invitations are sent automatically when the event is saved"}</li>
+                    <li>{"Attendees can respond with Accept, Decline, or Tentative"}</li>
+                    <li>{"Response tracking follows RFC 5545 PARTSTAT standards"}</li>
+                    <li>{"Delegation and role management available after event creation"}</li>
+                </ul>
+
+                <div class="people-validation">
+                    <h6>{"Email Validation"}</h6>
+                    <p>{"Email addresses will be validated when you save the event. Invalid emails will be highlighted and must be corrected before proceeding."}</p>
+                </div>
+            </div>
+
+            <div class="attendee-roles-preview">
+                <h5>{"Advanced Attendee Features"}</h5>
+                <div class="role-examples">
+                    <div class="role-item">
+                        <strong>{"Required Participant:"}</strong>
+                        <span>{"Must attend for meeting to proceed"}</span>
+                    </div>
+                    <div class="role-item">
+                        <strong>{"Optional Participant:"}</strong>
+                        <span>{"Attendance welcome but not required"}</span>
+                    </div>
+                    <div class="role-item">
+                        <strong>{"Resource:"}</strong>
+                        <span>{"Meeting room, equipment, or facility"}</span>
+                    </div>
+                    <div class="role-item">
+                        <strong>{"Non-Participant:"}</strong>
+                        <span>{"For information only"}</span>
+                    </div>
+                </div>
+                <p class="form-help-text">{"Advanced role assignment and RSVP management will be available in future versions"}</p>
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/reminders.rs

@@ -0,0 +1,100 @@
+use super::types::*;
+// Types are already imported from super::types::*
+use wasm_bindgen::JsCast;
+use web_sys::HtmlSelectElement;
+use yew::prelude::*;
+
+#[function_component(RemindersTab)]
+pub fn reminders_tab(props: &TabProps) -> Html {
+    let data = &props.data;
+    
+    let on_reminder_change = {
+        let data = data.clone();
+        Callback::from(move |e: Event| {
+            if let Some(target) = e.target() {
+                if let Ok(select) = target.dyn_into::<HtmlSelectElement>() {
+                    let mut event_data = (*data).clone();
+                    event_data.reminder = match select.value().as_str() {
+                        "15min" => ReminderType::Minutes15,
+                        "30min" => ReminderType::Minutes30,
+                        "1hour" => ReminderType::Hour1,
+                        "1day" => ReminderType::Day1,
+                        "2days" => ReminderType::Days2,
+                        "1week" => ReminderType::Week1,
+                        _ => ReminderType::None,
+                    };
+                    data.set(event_data);
+                }
+            }
+        })
+    };
+
+    html! {
+        <div class="tab-panel">
+            <div class="form-group">
+                <label for="event-reminder-main">{"Primary Reminder"}</label>
+                <select
+                    id="event-reminder-main"
+                    class="form-input"
+                    onchange={on_reminder_change}
+                >
+                    <option value="none" selected={matches!(data.reminder, ReminderType::None)}>{"No reminder"}</option>
+                    <option value="15min" selected={matches!(data.reminder, ReminderType::Minutes15)}>{"15 minutes before"}</option>
+                    <option value="30min" selected={matches!(data.reminder, ReminderType::Minutes30)}>{"30 minutes before"}</option>
+                    <option value="1hour" selected={matches!(data.reminder, ReminderType::Hour1)}>{"1 hour before"}</option>
+                    <option value="1day" selected={matches!(data.reminder, ReminderType::Day1)}>{"1 day before"}</option>
+                    <option value="2days" selected={matches!(data.reminder, ReminderType::Days2)}>{"2 days before"}</option>
+                    <option value="1week" selected={matches!(data.reminder, ReminderType::Week1)}>{"1 week before"}</option>
+                </select>
+                <p class="form-help-text">{"Choose when you'd like to be reminded about this event"}</p>
+            </div>
+
+            <div class="reminder-types">
+                <h5>{"Reminder & Alarm Types"}</h5>
+                <div class="alarm-examples">
+                    <div class="alarm-type">
+                        <strong>{"Display Alarm"}</strong>
+                        <p>{"Pop-up notification on your device"}</p>
+                    </div>
+                    <div class="alarm-type">
+                        <strong>{"Email Reminder"}</strong>
+                        <p>{"Email notification sent to your address"}</p>
+                    </div>
+                    <div class="alarm-type">
+                        <strong>{"Audio Alert"}</strong>
+                        <p>{"Sound notification with custom audio"}</p>
+                    </div>
+                    <div class="alarm-type">
+                        <strong>{"SMS/Text"}</strong>
+                        <p>{"Text message reminder (enterprise feature)"}</p>
+                    </div>
+                </div>
+                <p class="form-help-text">{"Multiple alarm types follow RFC 5545 VALARM standards"}</p>
+            </div>
+
+            <div class="reminder-info">
+                <h5>{"Advanced Reminder Features"}</h5>
+                <ul>
+                    <li>{"Multiple reminders per event with different timing"}</li>
+                    <li>{"Custom reminder messages and descriptions"}</li>
+                    <li>{"Recurring reminders for recurring events"}</li>
+                    <li>{"Snooze and dismiss functionality"}</li>
+                    <li>{"Integration with system notifications"}</li>
+                </ul>
+
+                <div class="attachments-section">
+                    <h6>{"File Attachments & Documents"}</h6>
+                    <p>{"Future attachment features will include:"}</p>
+                    <ul>
+                        <li>{"Drag-and-drop file uploads"}</li>
+                        <li>{"Document preview and thumbnails"}</li>
+                        <li>{"Cloud storage integration (Google Drive, OneDrive)"}</li>
+                        <li>{"Version control for updated documents"}</li>
+                        <li>{"Shared access permissions for attendees"}</li>
+                    </ul>
+                    <p class="form-help-text">{"Attachment functionality will be implemented in a future release."}</p>
+                </div>
+            </div>
+        </div>
+    }
+}

frontend/src/components/event_form/types.rs

@@ -0,0 +1,262 @@
+use crate::services::calendar_service::CalendarInfo;
+use chrono::{Local, NaiveDate, NaiveTime};
+use yew::prelude::*;
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum EventStatus {
+    Confirmed,
+    Tentative,
+    Cancelled,
+}
+
+impl Default for EventStatus {
+    fn default() -> Self {
+        EventStatus::Confirmed
+    }
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum EventClass {
+    Public,
+    Private,
+    Confidential,
+}
+
+impl Default for EventClass {
+    fn default() -> Self {
+        EventClass::Public
+    }
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum ReminderType {
+    None,
+    Minutes15,
+    Minutes30,
+    Hour1,
+    Day1,
+    Days2,
+    Week1,
+}
+
+impl Default for ReminderType {
+    fn default() -> Self {
+        ReminderType::None
+    }
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum RecurrenceType {
+    None,
+    Daily,
+    Weekly,
+    Monthly,
+    Yearly,
+}
+
+impl Default for RecurrenceType {
+    fn default() -> Self {
+        RecurrenceType::None
+    }
+}
+
+#[derive(Clone, PartialEq)]
+pub enum ModalTab {
+    BasicDetails,
+    Advanced,
+    People,
+    Categories,
+    Location,
+    Reminders,
+}
+
+impl Default for ModalTab {
+    fn default() -> Self {
+        ModalTab::BasicDetails
+    }
+}
+
+// EditAction is now imported from event_context_menu - this duplicate removed
+
+#[derive(Clone, PartialEq, Debug)]
+pub struct EventCreationData {
+    // Basic event info
+    pub title: String,
+    pub description: String,
+    pub location: String,
+    pub all_day: bool,
+    
+    // Timing
+    pub start_date: NaiveDate,
+    pub end_date: NaiveDate,
+    pub start_time: NaiveTime,
+    pub end_time: NaiveTime,
+    
+    // Classification
+    pub status: EventStatus,
+    pub class: EventClass,
+    pub priority: Option<u8>,
+    
+    // People
+    pub organizer: String,
+    pub attendees: String,
+    
+    // Categorization
+    pub categories: String,
+    
+    // Reminders
+    pub reminder: ReminderType,
+    
+    // Recurrence
+    pub recurrence: RecurrenceType,
+    pub recurrence_interval: u32,
+    pub recurrence_until: Option<NaiveDate>,
+    pub recurrence_count: Option<u32>,
+    pub recurrence_days: Vec<bool>, // [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+    
+    // Advanced recurrence
+    pub monthly_by_day: Option<String>, // e.g., "1MO" for first Monday
+    pub monthly_by_monthday: Option<u8>, // e.g., 15 for 15th day of month
+    pub yearly_by_month: Vec<bool>, // [Jan, Feb, Mar, ...] 
+    
+    // Calendar selection
+    pub selected_calendar: Option<String>,
+    
+    // Edit tracking (for recurring events)
+    pub edit_scope: Option<crate::components::EditAction>,
+    pub changed_fields: Vec<String>,
+    pub original_uid: Option<String>, // Set when editing existing events
+    pub occurrence_date: Option<NaiveDate>, // The specific occurrence date being edited
+}
+
+impl EventCreationData {
+    pub fn to_create_event_params(&self) -> (
+        String, // title
+        String, // description
+        String, // start_date
+        String, // start_time
+        String, // end_date
+        String, // end_time
+        String, // location
+        bool,   // all_day
+        String, // status
+        String, // class
+        Option<u8>, // priority
+        String, // organizer
+        String, // attendees
+        String, // categories
+        String, // reminder
+        String, // recurrence
+        Vec<bool>, // recurrence_days
+        Option<String>, // calendar_path
+        Option<u32>, // recurrence_count
+        Option<String>, // recurrence_until
+    ) {
+        use chrono::{Local, TimeZone};
+        
+        // Convert local date/time to UTC for backend
+        let (utc_start_date, utc_start_time, utc_end_date, utc_end_time) = if self.all_day {
+            // For all-day events, just use the dates as-is (no time conversion needed)
+            (
+                self.start_date.format("%Y-%m-%d").to_string(),
+                self.start_time.format("%H:%M").to_string(),
+                self.end_date.format("%Y-%m-%d").to_string(),
+                self.end_time.format("%H:%M").to_string(),
+            )
+        } else {
+            // Convert local date/time to UTC
+            let start_local = Local.from_local_datetime(&self.start_date.and_time(self.start_time)).single();
+            let end_local = Local.from_local_datetime(&self.end_date.and_time(self.end_time)).single();
+            
+            if let (Some(start_dt), Some(end_dt)) = (start_local, end_local) {
+                let start_utc = start_dt.with_timezone(&chrono::Utc);
+                let end_utc = end_dt.with_timezone(&chrono::Utc);
+                (
+                    start_utc.format("%Y-%m-%d").to_string(),
+                    start_utc.format("%H:%M").to_string(),
+                    end_utc.format("%Y-%m-%d").to_string(),
+                    end_utc.format("%H:%M").to_string(),
+                )
+            } else {
+                // Fallback if timezone conversion fails - use local time as-is
+                web_sys::console::warn_1(&"⚠️ Failed to convert local time to UTC, using local time".into());
+                (
+                    self.start_date.format("%Y-%m-%d").to_string(),
+                    self.start_time.format("%H:%M").to_string(),
+                    self.end_date.format("%Y-%m-%d").to_string(),
+                    self.end_time.format("%H:%M").to_string(),
+                )
+            }
+        };
+        
+        (
+            self.title.clone(),
+            self.description.clone(),
+            utc_start_date,
+            utc_start_time,
+            utc_end_date,
+            utc_end_time,
+            self.location.clone(),
+            self.all_day,
+            format!("{:?}", self.status).to_uppercase(),
+            format!("{:?}", self.class).to_uppercase(),
+            self.priority,
+            self.organizer.clone(),
+            self.attendees.clone(),
+            self.categories.clone(),
+            format!("{:?}", self.reminder),
+            format!("{:?}", self.recurrence),
+            self.recurrence_days.clone(),
+            self.selected_calendar.clone(),
+            self.recurrence_count,
+            self.recurrence_until.map(|d| d.format("%Y-%m-%d").to_string()),
+        )
+    }
+}
+
+impl Default for EventCreationData {
+    fn default() -> Self {
+        let now_local = Local::now();
+        let start_date = now_local.date_naive();
+        let start_time = NaiveTime::from_hms_opt(9, 0, 0).unwrap_or_default();
+        let end_time = NaiveTime::from_hms_opt(10, 0, 0).unwrap_or_default();
+
+        Self {
+            title: String::new(),
+            description: String::new(),
+            location: String::new(),
+            all_day: false,
+            start_date,
+            end_date: start_date,
+            start_time,
+            end_time,
+            status: EventStatus::default(),
+            class: EventClass::default(),
+            priority: None,
+            organizer: String::new(),
+            attendees: String::new(),
+            categories: String::new(),
+            reminder: ReminderType::default(),
+            recurrence: RecurrenceType::default(),
+            recurrence_interval: 1,
+            recurrence_until: None,
+            recurrence_count: None,
+            recurrence_days: vec![false; 7],
+            monthly_by_day: None,
+            monthly_by_monthday: None,
+            yearly_by_month: vec![false; 12],
+            selected_calendar: None,
+            edit_scope: None,
+            changed_fields: vec![],
+            original_uid: None,
+            occurrence_date: None,
+        }
+    }
+}
+
+// Common props for all tab components
+#[derive(Properties, PartialEq)]
+pub struct TabProps {
+    pub data: UseStateHandle<EventCreationData>,
+    pub available_calendars: Vec<CalendarInfo>,
+}

frontend/src/components/event_modal.rs

@@ -1,6 +1,6 @@
-use yew::prelude::*;
-use chrono::{DateTime, Utc};
 use crate::models::ical::VEvent;
+use chrono::{DateTime, Utc};
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct EventModalProps {
@@ -16,7 +16,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
             on_close.emit(());
         })
     };
-    
+
     let backdrop_click = {
         let on_close = props.on_close.clone();
         Callback::from(move |e: MouseEvent| {
@@ -39,7 +39,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                             <strong>{"Title:"}</strong>
                             <span>{event.get_title()}</span>
                         </div>
-                        
+
                         {
                             if let Some(ref description) = event.description {
                                 html! {
@@ -52,30 +52,30 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         <div class="event-detail">
                             <strong>{"Start:"}</strong>
                             <span>{format_datetime(&event.dtstart, event.all_day)}</span>
                         </div>
-                        
+
                         {
                             if let Some(ref end) = event.dtend {
                                 html! {
                                     <div class="event-detail">
                                         <strong>{"End:"}</strong>
-                                        <span>{format_datetime(end, event.all_day)}</span>
+                                        <span>{format_datetime_end(end, event.all_day)}</span>
                                     </div>
                                 }
                             } else {
                                 html! {}
                             }
                         }
-                        
+
                         <div class="event-detail">
                             <strong>{"All Day:"}</strong>
                             <span>{if event.all_day { "Yes" } else { "No" }}</span>
                         </div>
-                        
+
                         {
                             if let Some(ref location) = event.location {
                                 html! {
@@ -88,22 +88,22 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         <div class="event-detail">
                             <strong>{"Status:"}</strong>
                             <span>{event.get_status_display()}</span>
                         </div>
-                        
+
                         <div class="event-detail">
                             <strong>{"Privacy:"}</strong>
                             <span>{event.get_class_display()}</span>
                         </div>
-                        
+
                         <div class="event-detail">
                             <strong>{"Priority:"}</strong>
                             <span>{event.get_priority_display()}</span>
                         </div>
-                        
+
                         {
                             if let Some(ref organizer) = event.organizer {
                                 html! {
@@ -116,7 +116,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         {
                             if !event.attendees.is_empty() {
                                 html! {
@@ -129,7 +129,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         {
                             if !event.categories.is_empty() {
                                 html! {
@@ -142,7 +142,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         {
                             if let Some(ref recurrence) = event.rrule {
                                 html! {
@@ -160,7 +160,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 }
                             }
                         }
-                        
+
                         {
                             if !event.alarms.is_empty() {
                                 html! {
@@ -178,7 +178,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 }
                             }
                         }
-                        
+
                         {
                             if let Some(ref created) = event.created {
                                 html! {
@@ -191,7 +191,7 @@ pub fn EventModal(props: &EventModalProps) -> Html {
                                 html! {}
                             }
                         }
-                        
+
                         {
                             if let Some(ref modified) = event.last_modified {
                                 html! {
@@ -221,6 +221,17 @@ fn format_datetime(dt: &DateTime<Utc>, all_day: bool) -> String {
     }
 }
 
+fn format_datetime_end(dt: &DateTime<Utc>, all_day: bool) -> String {
+    if all_day {
+        // For all-day events, subtract one day from end date for display
+        // RFC-5545 uses exclusive end dates, but users expect inclusive display
+        let display_date = *dt - chrono::Duration::days(1);
+        display_date.format("%B %d, %Y").to_string()
+    } else {
+        dt.format("%B %d, %Y at %I:%M %p").to_string()
+    }
+}
+
 fn format_recurrence_rule(rrule: &str) -> String {
     // Basic parsing of RRULE to display user-friendly text
     if rrule.contains("FREQ=DAILY") {
@@ -236,4 +247,3 @@ fn format_recurrence_rule(rrule: &str) -> String {
         format!("Custom ({})", rrule)
     }
 }
-

frontend/src/components/external_calendar_modal.rs

@@ -0,0 +1,222 @@
+use web_sys::HtmlInputElement;
+use yew::prelude::*;
+
+use crate::services::calendar_service::CalendarService;
+
+#[derive(Properties, PartialEq)]
+pub struct ExternalCalendarModalProps {
+    pub is_open: bool,
+    pub on_close: Callback<()>,
+    pub on_success: Callback<i32>, // Pass the newly created calendar ID
+}
+
+#[function_component(ExternalCalendarModal)]
+pub fn external_calendar_modal(props: &ExternalCalendarModalProps) -> Html {
+    let name_ref = use_node_ref();
+    let url_ref = use_node_ref();
+    let color_ref = use_node_ref();
+    let is_loading = use_state(|| false);
+    let error_message = use_state(|| None::<String>);
+
+    let on_submit = {
+        let name_ref = name_ref.clone();
+        let url_ref = url_ref.clone();
+        let color_ref = color_ref.clone();
+        let is_loading = is_loading.clone();
+        let error_message = error_message.clone();
+        let on_close = props.on_close.clone();
+        let on_success = props.on_success.clone();
+
+        Callback::from(move |e: SubmitEvent| {
+            e.prevent_default();
+            
+            let name = name_ref
+                .cast::<HtmlInputElement>()
+                .map(|input| input.value())
+                .unwrap_or_default()
+                .trim()
+                .to_string();
+            
+            let url = url_ref
+                .cast::<HtmlInputElement>()
+                .map(|input| input.value())
+                .unwrap_or_default()
+                .trim()
+                .to_string();
+                
+            let color = color_ref
+                .cast::<HtmlInputElement>()
+                .map(|input| input.value())
+                .unwrap_or_else(|| "#4285f4".to_string());
+
+            if name.is_empty() {
+                error_message.set(Some("Calendar name is required".to_string()));
+                return;
+            }
+
+            if url.is_empty() {
+                error_message.set(Some("Calendar URL is required".to_string()));
+                return;
+            }
+
+            // Basic URL validation
+            if !url.starts_with("http://") && !url.starts_with("https://") {
+                error_message.set(Some("Please enter a valid HTTP or HTTPS URL".to_string()));
+                return;
+            }
+
+            error_message.set(None);
+            is_loading.set(true);
+
+            let is_loading = is_loading.clone();
+            let error_message = error_message.clone();
+            let on_close = on_close.clone();
+            let on_success = on_success.clone();
+
+            wasm_bindgen_futures::spawn_local(async move {
+                match CalendarService::create_external_calendar(&name, &url, &color).await {
+                    Ok(new_calendar) => {
+                        is_loading.set(false);
+                        on_success.emit(new_calendar.id);
+                        on_close.emit(());
+                    }
+                    Err(e) => {
+                        is_loading.set(false);
+                        error_message.set(Some(format!("Failed to add calendar: {}", e)));
+                    }
+                }
+            });
+        })
+    };
+
+    let on_cancel = {
+        let on_close = props.on_close.clone();
+        Callback::from(move |_| {
+            on_close.emit(());
+        })
+    };
+    
+    let on_cancel_clone = on_cancel.clone();
+
+    if !props.is_open {
+        return html! {};
+    }
+
+    html! {
+        <div class="modal-backdrop" onclick={on_cancel_clone}>
+            <div class="external-calendar-modal" onclick={Callback::from(|e: MouseEvent| e.stop_propagation())}>
+                <div class="modal-header">
+                    <h3>{"Add External Calendar"}</h3>
+                    <button class="modal-close" onclick={on_cancel.clone()}>{"×"}</button>
+                </div>
+                
+                <form onsubmit={on_submit}>
+                    <div class="modal-body">
+                        {
+                            if let Some(error) = (*error_message).as_ref() {
+                                html! {
+                                    <div class="error-message">
+                                        {error}
+                                    </div>
+                                }
+                            } else {
+                                html! {}
+                            }
+                        }
+                        
+                        <div class="form-help" style="margin-bottom: 1.5rem; padding: 1rem; background: #f8f9fa; border-radius: 8px; border-left: 4px solid #007bff;">
+                            <h4 style="margin: 0 0 0.5rem 0; font-size: 0.9rem; color: #495057;">{"Setting up External Calendars"}</h4>
+                            <p style="margin: 0 0 0.5rem 0; font-size: 0.8rem; line-height: 1.4;">
+                                {"Currently tested with Outlook 365 and Google Calendar. To get your calendar link:"}
+                            </p>
+                            
+                            <div style="margin-bottom: 1rem;">
+                                <strong style="font-size: 0.8rem; color: #495057;">{"Outlook 365:"}</strong>
+                                <ol style="margin: 0.3rem 0 0 0; padding-left: 1.2rem; font-size: 0.8rem; line-height: 1.3;">
+                                    <li>{"Go to Outlook Settings"}</li>
+                                    <li>{"Navigate to Calendar → Shared Calendars"}</li>
+                                    <li>{"Click \"Publish a calendar\""}</li>
+                                    <li>{"Select your calendar and choose \"Can view all details\""}</li>
+                                    <li>{"Copy the ICS link and paste it below"}</li>
+                                </ol>
+                            </div>
+                            
+                            <div>
+                                <strong style="font-size: 0.8rem; color: #495057;">{"Google Calendar:"}</strong>
+                                <ol style="margin: 0.3rem 0 0 0; padding-left: 1.2rem; font-size: 0.8rem; line-height: 1.3;">
+                                    <li>{"Hover over your calendar name in the left sidebar"}</li>
+                                    <li>{"Click the three dots that appear"}</li>
+                                    <li>{"Select \"Settings and sharing\""}</li>
+                                    <li>{"Scroll to \"Integrate calendar\""}</li>
+                                    <li>{"Copy the \"Public address in iCal format\" link"}</li>
+                                </ol>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label for="external-calendar-name">{"Calendar Name"}</label>
+                            <input
+                                ref={name_ref}
+                                id="external-calendar-name"
+                                type="text"
+                                placeholder="My External Calendar"
+                                disabled={*is_loading}
+                                required={true}
+                            />
+                        </div>
+
+                        <div class="form-group">
+                            <label for="external-calendar-url">{"ICS URL"}</label>
+                            <input
+                                ref={url_ref}
+                                id="external-calendar-url"
+                                type="url"
+                                placeholder="https://example.com/calendar.ics"
+                                disabled={*is_loading}
+                                required={true}
+                            />
+                            <small class="form-help">
+                                {"Enter the public ICS URL for the calendar you want to add"}
+                            </small>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="external-calendar-color">{"Color"}</label>
+                            <input
+                                ref={color_ref}
+                                id="external-calendar-color"
+                                type="color"
+                                value="#4285f4"
+                                disabled={*is_loading}
+                            />
+                        </div>
+                    </div>
+
+                    <div class="modal-actions">
+                        <button
+                            type="button"
+                            class="btn btn-secondary"
+                            onclick={on_cancel}
+                            disabled={*is_loading}
+                        >
+                            {"Cancel"}
+                        </button>
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            disabled={*is_loading}
+                        >
+                            {
+                                if *is_loading {
+                                    "Adding..."
+                                } else {
+                                    "Add Calendar"
+                                }
+                            }
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    }
+}

frontend/src/components/login.rs

@@ -1,6 +1,6 @@
-use yew::prelude::*;
-use web_sys::HtmlInputElement;
 use gloo_storage::{LocalStorage, Storage};
+use web_sys::HtmlInputElement;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct LoginProps {
@@ -9,11 +9,20 @@ pub struct LoginProps {
 
 #[function_component]
 pub fn Login(props: &LoginProps) -> Html {
-    let server_url = use_state(String::new);
-    let username = use_state(String::new);
+    // Load remembered values from LocalStorage on mount
+    let server_url = use_state(|| {
+        LocalStorage::get::<String>("remembered_server_url").unwrap_or_default()
+    });
+    let username = use_state(|| {
+        LocalStorage::get::<String>("remembered_username").unwrap_or_default()
+    });
     let password = use_state(String::new);
     let error_message = use_state(|| Option::<String>::None);
     let is_loading = use_state(|| false);
+    
+    // Remember checkboxes state - default to checked
+    let remember_server = use_state(|| true);
+    let remember_username = use_state(|| true);
 
     let server_url_ref = use_node_ref();
     let username_ref = use_node_ref();
@@ -42,6 +51,38 @@ pub fn Login(props: &LoginProps) -> Html {
             password.set(target.value());
         })
     };
+    
+    let on_remember_server_change = {
+        let remember_server = remember_server.clone();
+        let server_url = server_url.clone();
+        Callback::from(move |e: Event| {
+            let target = e.target_unchecked_into::<HtmlInputElement>();
+            let checked = target.checked();
+            remember_server.set(checked);
+            
+            if checked {
+                let _ = LocalStorage::set("remembered_server_url", (*server_url).clone());
+            } else {
+                let _ = LocalStorage::delete("remembered_server_url");
+            }
+        })
+    };
+    
+    let on_remember_username_change = {
+        let remember_username = remember_username.clone();
+        let username = username.clone();
+        Callback::from(move |e: Event| {
+            let target = e.target_unchecked_into::<HtmlInputElement>();
+            let checked = target.checked();
+            remember_username.set(checked);
+            
+            if checked {
+                let _ = LocalStorage::set("remembered_username", (*username).clone());
+            } else {
+                let _ = LocalStorage::delete("remembered_username");
+            }
+        })
+    };
 
     let on_submit = {
         let server_url = server_url.clone();
@@ -53,7 +94,7 @@ pub fn Login(props: &LoginProps) -> Html {
 
         Callback::from(move |e: SubmitEvent| {
             e.prevent_default();
-            
+
             let server_url = (*server_url).clone();
             let username = (*username).clone();
             let password = (*password).clone();
@@ -73,11 +114,18 @@ pub fn Login(props: &LoginProps) -> Html {
             wasm_bindgen_futures::spawn_local(async move {
                 web_sys::console::log_1(&"🚀 Starting login process...".into());
                 match perform_login(server_url.clone(), username.clone(), password.clone()).await {
-                    Ok((token, credentials)) => {
+                    Ok((token, session_token, credentials, preferences)) => {
                         web_sys::console::log_1(&"✅ Login successful!".into());
                         // Store token and credentials in local storage
                         if let Err(_) = LocalStorage::set("auth_token", &token) {
-                            error_message.set(Some("Failed to store authentication token".to_string()));
+                            error_message
+                                .set(Some("Failed to store authentication token".to_string()));
+                            is_loading.set(false);
+                            return;
+                        }
+                        if let Err(_) = LocalStorage::set("session_token", &session_token) {
+                            error_message
+                                .set(Some("Failed to store session token".to_string()));
                             is_loading.set(false);
                             return;
                         }
@@ -87,11 +135,20 @@ pub fn Login(props: &LoginProps) -> Html {
                             return;
                         }
                         
+                        // Store preferences from database
+                        if let Ok(prefs_json) = serde_json::to_string(&preferences) {
+                            let _ = LocalStorage::set("user_preferences", &prefs_json);
+                        }
+
                         is_loading.set(false);
                         on_login.emit(token);
                     }
                     Err(err) => {
                         web_sys::console::log_1(&format!("❌ Login failed: {}", err).into());
+                        // Clear any existing invalid tokens
+                        let _ = LocalStorage::delete("auth_token");
+                        let _ = LocalStorage::delete("session_token");
+                        let _ = LocalStorage::delete("caldav_credentials");
                         error_message.set(Some(err));
                         is_loading.set(false);
                     }
@@ -116,6 +173,15 @@ pub fn Login(props: &LoginProps) -> Html {
                             onchange={on_server_url_change}
                             disabled={*is_loading}
                         />
+                        <div class="remember-checkbox">
+                            <input
+                                type="checkbox"
+                                id="remember_server"
+                                checked={*remember_server}
+                                onchange={on_remember_server_change}
+                            />
+                            <label for="remember_server">{"Remember server"}</label>
+                        </div>
                     </div>
 
                     <div class="form-group">
@@ -129,6 +195,15 @@ pub fn Login(props: &LoginProps) -> Html {
                             onchange={on_username_change}
                             disabled={*is_loading}
                         />
+                        <div class="remember-checkbox">
+                            <input
+                                type="checkbox"
+                                id="remember_username"
+                                checked={*remember_username}
+                                onchange={on_remember_username_change}
+                            />
+                            <label for="remember_username">{"Remember username"}</label>
+                        </div>
                     </div>
 
                     <div class="form-group">
@@ -172,21 +247,25 @@ pub fn Login(props: &LoginProps) -> Html {
 }
 
 /// Perform login using the CalDAV auth service
-async fn perform_login(server_url: String, username: String, password: String) -> Result<(String, String), String> {
+async fn perform_login(
+    server_url: String,
+    username: String,
+    password: String,
+) -> Result<(String, String, String, serde_json::Value), String> {
     use crate::auth::{AuthService, CalDAVLoginRequest};
     use serde_json;
-    
+
     web_sys::console::log_1(&format!("📡 Creating auth service and request...").into());
-    
+
     let auth_service = AuthService::new();
-    let request = CalDAVLoginRequest { 
-        server_url: server_url.clone(), 
-        username: username.clone(), 
-        password: password.clone() 
+    let request = CalDAVLoginRequest {
+        server_url: server_url.clone(),
+        username: username.clone(),
+        password: password.clone(),
     };
-    
+
     web_sys::console::log_1(&format!("🚀 Sending login request to backend...").into());
-    
+
     match auth_service.login(request).await {
         Ok(response) => {
             web_sys::console::log_1(&format!("✅ Backend responded successfully").into());
@@ -196,11 +275,21 @@ async fn perform_login(server_url: String, username: String, password: String) -
                 "username": username,
                 "password": password
             });
-            Ok((response.token, credentials.to_string()))
-        },
+            
+            // Extract preferences as JSON
+            let preferences = serde_json::json!({
+                "calendar_selected_date": response.preferences.calendar_selected_date,
+                "calendar_time_increment": response.preferences.calendar_time_increment,
+                "calendar_view_mode": response.preferences.calendar_view_mode,
+                "calendar_theme": response.preferences.calendar_theme,
+                "calendar_colors": response.preferences.calendar_colors,
+            });
+            
+            Ok((response.token, response.session_token, credentials.to_string(), preferences))
+        }
         Err(err) => {
             web_sys::console::log_1(&format!("❌ Backend error: {}", err).into());
             Err(err)
-        },
+        }
     }
-}
+}

frontend/src/components/mobile_warning_modal.rs

@@ -0,0 +1,96 @@
+use yew::prelude::*;
+use web_sys::window;
+use wasm_bindgen::JsCast;
+
+#[derive(Properties, PartialEq)]
+pub struct MobileWarningModalProps {
+    pub is_open: bool,
+    pub on_close: Callback<()>,
+}
+
+#[function_component(MobileWarningModal)]
+pub fn mobile_warning_modal(props: &MobileWarningModalProps) -> Html {
+    let on_backdrop_click = {
+        let on_close = props.on_close.clone();
+        Callback::from(move |e: MouseEvent| {
+            if let Some(target) = e.target() {
+                let element = target.dyn_into::<web_sys::Element>().unwrap();
+                if element.class_list().contains("modal-overlay") {
+                    on_close.emit(());
+                }
+            }
+        })
+    };
+
+    if !props.is_open {
+        return html! {};
+    }
+
+    html! {
+        <div class="modal-overlay mobile-warning-overlay" onclick={on_backdrop_click}>
+            <div class="modal-content mobile-warning-modal">
+                <div class="modal-header">
+                    <h2>{"Desktop Application"}</h2>
+                    <button class="modal-close" onclick={
+                        let on_close = props.on_close.clone();
+                        Callback::from(move |_: MouseEvent| on_close.emit(()))
+                    }>{"×"}</button>
+                </div>
+                <div class="modal-body">
+                    <div class="mobile-warning-icon">
+                        {"💻"}
+                    </div>
+                    <p class="mobile-warning-title">
+                        {"This calendar application is designed for desktop usage"}
+                    </p>
+                    <p class="mobile-warning-description">
+                        {"For the best mobile calendar experience, we recommend using dedicated CalDAV apps available on your device's app store:"}
+                    </p>
+                    <ul class="mobile-warning-apps">
+                        <li>
+                            <strong>{"iOS:"}</strong>
+                            {" Calendar (built-in), Calendars 5, Fantastical"}
+                        </li>
+                        <li>
+                            <strong>{"Android:"}</strong>
+                            {" Google Calendar, DAVx5, CalDAV Sync"}
+                        </li>
+                    </ul>
+                    <p class="mobile-warning-note">
+                        {"These apps can sync with the same CalDAV server you're using here."}
+                    </p>
+                </div>
+                <div class="modal-footer">
+                    <button class="continue-anyway-button" onclick={
+                        let on_close = props.on_close.clone();
+                        Callback::from(move |_: MouseEvent| on_close.emit(()))
+                    }>
+                        {"Continue Anyway"}
+                    </button>
+                </div>
+            </div>
+        </div>
+    }
+}
+
+// Helper function to detect mobile devices
+pub fn is_mobile_device() -> bool {
+    if let Some(window) = window() {
+        let navigator = window.navigator();
+        let user_agent = navigator.user_agent().unwrap_or_default();
+        let user_agent = user_agent.to_lowercase();
+        
+        // Check for mobile device indicators
+        user_agent.contains("mobile")
+            || user_agent.contains("android")
+            || user_agent.contains("iphone")
+            || user_agent.contains("ipad")
+            || user_agent.contains("ipod")
+            || user_agent.contains("blackberry")
+            || user_agent.contains("webos")
+            || user_agent.contains("opera mini")
+            || user_agent.contains("windows phone")
+    } else {
+        false
+    }
+}

frontend/src/components/mod.rs

@@ -1,31 +1,38 @@
-pub mod login;
 pub mod calendar;
-pub mod calendar_header;
-pub mod month_view;
-pub mod week_view;
-pub mod event_modal;
-pub mod create_calendar_modal;
-pub mod context_menu;
-pub mod event_context_menu;
 pub mod calendar_context_menu;
-pub mod create_event_modal;
-pub mod sidebar;
+pub mod calendar_management_modal;
+pub mod calendar_header;
 pub mod calendar_list_item;
-pub mod route_handler;
+pub mod context_menu;
+pub mod create_calendar_modal;
+pub mod create_event_modal;
+pub mod event_context_menu;
+pub mod event_form;
+pub mod event_modal;
+pub mod external_calendar_modal;
+pub mod login;
+pub mod mobile_warning_modal;
+pub mod month_view;
 pub mod recurring_edit_modal;
+pub mod route_handler;
+pub mod sidebar;
+pub mod week_view;
 
-pub use login::Login;
 pub use calendar::Calendar;
-pub use calendar_header::CalendarHeader;
-pub use month_view::MonthView;
-pub use week_view::WeekView;
-pub use event_modal::EventModal;
-pub use create_calendar_modal::CreateCalendarModal;
-pub use context_menu::ContextMenu;
-pub use event_context_menu::{EventContextMenu, DeleteAction};
 pub use calendar_context_menu::CalendarContextMenu;
-pub use create_event_modal::{CreateEventModal, EventCreationData, EventStatus, EventClass, ReminderType, RecurrenceType};
-pub use sidebar::{Sidebar, ViewMode, Theme};
+pub use calendar_management_modal::CalendarManagementModal;
+pub use calendar_header::CalendarHeader;
 pub use calendar_list_item::CalendarListItem;
+pub use context_menu::ContextMenu;
+pub use create_event_modal::CreateEventModal;
+// Re-export event form types for backwards compatibility
+pub use event_form::EventCreationData;
+pub use event_context_menu::{DeleteAction, EditAction, EventContextMenu};
+pub use event_modal::EventModal;
+pub use login::Login;
+pub use mobile_warning_modal::MobileWarningModal;
+pub use month_view::MonthView;
+pub use recurring_edit_modal::{RecurringEditAction, RecurringEditModal};
 pub use route_handler::RouteHandler;
-pub use recurring_edit_modal::{RecurringEditModal, RecurringEditAction};
+pub use sidebar::{Sidebar, Theme, ViewMode};
+pub use week_view::WeekView;

frontend/src/components/month_view.rs

@@ -1,10 +1,10 @@
-use yew::prelude::*;
+use crate::models::ical::VEvent;
+use crate::services::calendar_service::{UserInfo, ExternalCalendar};
 use chrono::{Datelike, NaiveDate, Weekday};
 use std::collections::HashMap;
-use web_sys::window;
 use wasm_bindgen::{prelude::*, JsCast};
-use crate::services::calendar_service::UserInfo;
-use crate::models::ical::VEvent;
+use web_sys::window;
+use yew::prelude::*;
 
 #[derive(Properties, PartialEq)]
 pub struct MonthViewProps {
@@ -17,6 +17,8 @@ pub struct MonthViewProps {
     #[prop_or_default]
     pub user_info: Option<UserInfo>,
     #[prop_or_default]
+    pub external_calendars: Vec<ExternalCalendar>,
+    #[prop_or_default]
     pub on_event_context_menu: Option<Callback<(web_sys::MouseEvent, VEvent)>>,
     #[prop_or_default]
     pub on_calendar_context_menu: Option<Callback<(web_sys::MouseEvent, NaiveDate)>>,
@@ -52,40 +54,58 @@ pub fn month_view(props: &MonthViewProps) -> Html {
         let calculate_max_events = calculate_max_events.clone();
         use_effect_with((), move |_| {
             let calculate_max_events_clone = calculate_max_events.clone();
-            
+
             // Initial calculation with a slight delay to ensure DOM is ready
             if let Some(window) = window() {
                 let timeout_closure = Closure::wrap(Box::new(move || {
                     calculate_max_events_clone();
                 }) as Box<dyn FnMut()>);
-                
+
                 let _ = window.set_timeout_with_callback_and_timeout_and_arguments_0(
                     timeout_closure.as_ref().unchecked_ref(),
                     100,
                 );
                 timeout_closure.forget();
             }
-            
+
             // Setup resize listener
             let resize_closure = Closure::wrap(Box::new(move || {
                 calculate_max_events();
             }) as Box<dyn Fn()>);
-            
+
             if let Some(window) = window() {
-                let _ = window.add_event_listener_with_callback("resize", resize_closure.as_ref().unchecked_ref());
+                let _ = window.add_event_listener_with_callback(
+                    "resize",
+                    resize_closure.as_ref().unchecked_ref(),
+                );
                 resize_closure.forget(); // Keep the closure alive
             }
-            
+
             || {}
         });
     }
 
     // Helper function to get calendar color for an event
     let get_event_color = |event: &VEvent| -> String {
-        if let Some(user_info) = &props.user_info {
-            if let Some(calendar_path) = &event.calendar_path {
-                if let Some(calendar) = user_info.calendars.iter()
-                    .find(|cal| &cal.path == calendar_path) {
+        if let Some(calendar_path) = &event.calendar_path {
+            // Check external calendars first (path format: "external_{id}")
+            if calendar_path.starts_with("external_") {
+                if let Ok(id_str) = calendar_path.strip_prefix("external_").unwrap_or("").parse::<i32>() {
+                    if let Some(external_calendar) = props.external_calendars
+                        .iter()
+                        .find(|cal| cal.id == id_str)
+                    {
+                        return external_calendar.color.clone();
+                    }
+                }
+            }
+            // Check regular calendars
+            else if let Some(user_info) = &props.user_info {
+                if let Some(calendar) = user_info
+                    .calendars
+                    .iter()
+                    .find(|cal| &cal.path == calendar_path)
+                {
                     return calendar.color.clone();
                 }
             }
@@ -103,7 +123,7 @@ pub fn month_view(props: &MonthViewProps) -> Html {
             <div class="weekday-header">{"Thu"}</div>
             <div class="weekday-header">{"Fri"}</div>
             <div class="weekday-header">{"Sat"}</div>
-            
+
             // Days from previous month (grayed out)
             {
                 days_from_prev_month.iter().map(|day| {
@@ -112,7 +132,7 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                     }
                 }).collect::<Html>()
             }
-            
+
             // Days of the current month
             {
                 (1..=days_in_month).map(|day| {
@@ -120,16 +140,16 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                     let is_today = date == props.today;
                     let is_selected = props.selected_date == Some(date);
                     let day_events = props.events.get(&date).cloned().unwrap_or_default();
-                    
+
                     // Calculate visible events and overflow
                     let max_events = *max_events_per_day as usize;
                     let visible_events: Vec<_> = day_events.iter().take(max_events).collect();
                     let hidden_count = day_events.len().saturating_sub(max_events);
-                    
+
                     html! {
-                        <div 
+                        <div
                             class={classes!(
-                                "calendar-day", 
+                                "calendar-day",
                                 if is_today { Some("today") } else { None },
                                 if is_selected { Some("selected") } else { None }
                             )}
@@ -162,7 +182,7 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                                     visible_events.iter().map(|event| {
                                         let event_color = get_event_color(event);
                                         let is_refreshing = props.refreshing_event_uid.as_ref() == Some(&event.uid);
-                                        
+
                                         let onclick = {
                                             let on_event_click = props.on_event_click.clone();
                                             let event = (*event).clone();
@@ -170,7 +190,7 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                                                 on_event_click.emit(event.clone());
                                             })
                                         };
-                                        
+
                                         let oncontextmenu = {
                                             if let Some(callback) = &props.on_event_context_menu {
                                                 let callback = callback.clone();
@@ -183,11 +203,12 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                                                 None
                                             }
                                         };
-                                        
+
                                         html! {
-                                            <div 
+                                            <div
                                                 class={classes!("event-box", if is_refreshing { Some("refreshing") } else { None })}
                                                 style={format!("background-color: {}", event_color)}
+                                                data-external={event.categories.contains(&"__EXTERNAL_CALENDAR__".to_string()).to_string()}
                                                 {onclick}
                                                 {oncontextmenu}
                                             >
@@ -212,7 +233,7 @@ pub fn month_view(props: &MonthViewProps) -> Html {
                     }
                 }).collect::<Html>()
             }
-            
+
             { render_next_month_days(days_from_prev_month.len(), days_in_month) }
         </div>
     }
@@ -221,20 +242,34 @@ pub fn month_view(props: &MonthViewProps) -> Html {
 fn render_next_month_days(prev_days_count: usize, current_days_count: u32) -> Html {
     let total_slots = 42; // 6 rows x 7 days
     let used_slots = prev_days_count + current_days_count as usize;
-    let remaining_slots = if used_slots < total_slots { total_slots - used_slots } else { 0 };
-    
-    (1..=remaining_slots).map(|day| {
-        html! {
-            <div class="calendar-day next-month">{day}</div>
-        }
-    }).collect::<Html>()
+    let remaining_slots = if used_slots < total_slots {
+        total_slots - used_slots
+    } else {
+        0
+    };
+
+    (1..=remaining_slots)
+        .map(|day| {
+            html! {
+                <div class="calendar-day next-month">{day}</div>
+            }
+        })
+        .collect::<Html>()
 }
 
 fn get_days_in_month(date: NaiveDate) -> u32 {
     NaiveDate::from_ymd_opt(
-        if date.month() == 12 { date.year() + 1 } else { date.year() },
-        if date.month() == 12 { 1 } else { date.month() + 1 },
-        1
+        if date.month() == 12 {
+            date.year() + 1
+        } else {
+            date.year()
+        },
+        if date.month() == 12 {
+            1
+        } else {
+            date.month() + 1
+        },
+        1,
     )
     .unwrap()
     .pred_opt()
@@ -252,7 +287,7 @@ fn get_days_from_previous_month(current_month: NaiveDate, first_weekday: Weekday
         Weekday::Fri => 5,
         Weekday::Sat => 6,
     };
-    
+
     if days_before == 0 {
         vec![]
     } else {
@@ -261,8 +296,8 @@ fn get_days_from_previous_month(current_month: NaiveDate, first_weekday: Weekday
         } else {
             NaiveDate::from_ymd_opt(current_month.year(), current_month.month() - 1, 1).unwrap()
         };
-        
+
         let prev_month_days = get_days_in_month(prev_month);
         ((prev_month_days - days_before as u32 + 1)..=prev_month_days).collect()
     }
-}
+}

frontend/src/components/recurring_edit_modal.rs

@@ -1,6 +1,6 @@
-use yew::prelude::*;
-use chrono::NaiveDateTime;
 use crate::models::ical::VEvent;
+use chrono::NaiveDateTime;
+use yew::prelude::*;
 
 #[derive(Clone, PartialEq)]
 pub enum RecurringEditAction {
@@ -25,29 +25,34 @@ pub fn recurring_edit_modal(props: &RecurringEditModalProps) -> Html {
         return html! {};
     }
 
-    let event_title = props.event.summary.as_ref().map(|s| s.as_str()).unwrap_or("Untitled Event");
-    
+    let event_title = props
+        .event
+        .summary
+        .as_ref()
+        .map(|s| s.as_str())
+        .unwrap_or("Untitled Event");
+
     let on_this_event = {
         let on_choice = props.on_choice.clone();
         Callback::from(move |_| {
             on_choice.emit(RecurringEditAction::ThisEvent);
         })
     };
-    
+
     let on_future_events = {
         let on_choice = props.on_choice.clone();
         Callback::from(move |_| {
             on_choice.emit(RecurringEditAction::FutureEvents);
         })
     };
-    
+
     let on_all_events = {
         let on_choice = props.on_choice.clone();
         Callback::from(move |_| {
             on_choice.emit(RecurringEditAction::AllEvents);
         })
     };
-    
+
     let on_cancel = {
         let on_cancel = props.on_cancel.clone();
         Callback::from(move |_| {
@@ -64,18 +69,18 @@ pub fn recurring_edit_modal(props: &RecurringEditModalProps) -> Html {
                 <div class="modal-body">
                     <p>{format!("You're modifying \"{}\" which is part of a recurring series.", event_title)}</p>
                     <p>{"How would you like to apply this change?"}</p>
-                    
+
                     <div class="recurring-edit-options">
                         <button class="btn btn-primary recurring-option" onclick={on_this_event}>
                             <div class="option-title">{"This event only"}</div>
                             <div class="option-description">{"Change only this occurrence"}</div>
                         </button>
-                        
+
                         <button class="btn btn-primary recurring-option" onclick={on_future_events}>
                             <div class="option-title">{"This and future events"}</div>
                             <div class="option-description">{"Change this occurrence and all future occurrences"}</div>
                         </button>
-                        
+
                         <button class="btn btn-primary recurring-option" onclick={on_all_events}>
                             <div class="option-title">{"All events in series"}</div>
                             <div class="option-description">{"Change all occurrences in the series"}</div>
@@ -90,4 +95,4 @@ pub fn recurring_edit_modal(props: &RecurringEditModalProps) -> Html {
             </div>
         </div>
     }
-}
+}

frontend/src/components/route_handler.rs

@@ -1,8 +1,8 @@
+use crate::components::{Login, ViewMode};
+use crate::models::ical::VEvent;
+use crate::services::calendar_service::{UserInfo, ExternalCalendar};
 use yew::prelude::*;
 use yew_router::prelude::*;
-use crate::components::{Login, ViewMode};
-use crate::services::calendar_service::UserInfo;
-use crate::models::ical::VEvent;
 
 #[derive(Clone, Routable, PartialEq)]
 pub enum Route {
@@ -20,6 +20,10 @@ pub struct RouteHandlerProps {
     pub user_info: Option<UserInfo>,
     pub on_login: Callback<String>,
     #[prop_or_default]
+    pub external_calendar_events: Vec<VEvent>,
+    #[prop_or_default]
+    pub external_calendars: Vec<ExternalCalendar>,
+    #[prop_or_default]
     pub on_event_context_menu: Option<Callback<(web_sys::MouseEvent, VEvent)>>,
     #[prop_or_default]
     pub on_calendar_context_menu: Option<Callback<(web_sys::MouseEvent, chrono::NaiveDate)>>,
@@ -28,7 +32,17 @@ pub struct RouteHandlerProps {
     #[prop_or_default]
     pub on_create_event_request: Option<Callback<crate::components::EventCreationData>>,
     #[prop_or_default]
-    pub on_event_update_request: Option<Callback<(VEvent, chrono::NaiveDateTime, chrono::NaiveDateTime, bool, Option<chrono::DateTime<chrono::Utc>>, Option<String>, Option<String>)>>,
+    pub on_event_update_request: Option<
+        Callback<(
+            VEvent,
+            chrono::NaiveDateTime,
+            chrono::NaiveDateTime,
+            bool,
+            Option<chrono::DateTime<chrono::Utc>>,
+            Option<String>,
+            Option<String>,
+        )>,
+    >,
     #[prop_or_default]
     pub context_menus_open: bool,
 }
@@ -38,25 +52,29 @@ pub fn route_handler(props: &RouteHandlerProps) -> Html {
     let auth_token = props.auth_token.clone();
     let user_info = props.user_info.clone();
     let on_login = props.on_login.clone();
+    let external_calendar_events = props.external_calendar_events.clone();
+    let external_calendars = props.external_calendars.clone();
     let on_event_context_menu = props.on_event_context_menu.clone();
     let on_calendar_context_menu = props.on_calendar_context_menu.clone();
     let view = props.view.clone();
     let on_create_event_request = props.on_create_event_request.clone();
     let on_event_update_request = props.on_event_update_request.clone();
     let context_menus_open = props.context_menus_open;
-    
+
     html! {
         <Switch<Route> render={move |route| {
             let auth_token = auth_token.clone();
             let user_info = user_info.clone();
             let on_login = on_login.clone();
+            let external_calendar_events = external_calendar_events.clone();
+            let external_calendars = external_calendars.clone();
             let on_event_context_menu = on_event_context_menu.clone();
             let on_calendar_context_menu = on_calendar_context_menu.clone();
             let view = view.clone();
             let on_create_event_request = on_create_event_request.clone();
             let on_event_update_request = on_event_update_request.clone();
             let context_menus_open = context_menus_open;
-            
+
             match route {
                 Route::Home => {
                     if auth_token.is_some() {
@@ -74,16 +92,18 @@ pub fn route_handler(props: &RouteHandlerProps) -> Html {
                 }
                 Route::Calendar => {
                     if auth_token.is_some() {
-                        html! { 
-                            <CalendarView 
-                                user_info={user_info} 
+                        html! {
+                            <CalendarView
+                                user_info={user_info}
+                                external_calendar_events={external_calendar_events}
+                                external_calendars={external_calendars}
                                 on_event_context_menu={on_event_context_menu}
                                 on_calendar_context_menu={on_calendar_context_menu}
                                 view={view}
                                 on_create_event_request={on_create_event_request}
                                 on_event_update_request={on_event_update_request}
                                 context_menus_open={context_menus_open}
-                            /> 
+                            />
                         }
                     } else {
                         html! { <Redirect<Route> to={Route::Login}/> }
@@ -98,6 +118,10 @@ pub fn route_handler(props: &RouteHandlerProps) -> Html {
 pub struct CalendarViewProps {
     pub user_info: Option<UserInfo>,
     #[prop_or_default]
+    pub external_calendar_events: Vec<VEvent>,
+    #[prop_or_default]
+    pub external_calendars: Vec<ExternalCalendar>,
+    #[prop_or_default]
     pub on_event_context_menu: Option<Callback<(web_sys::MouseEvent, VEvent)>>,
     #[prop_or_default]
     pub on_calendar_context_menu: Option<Callback<(web_sys::MouseEvent, chrono::NaiveDate)>>,
@@ -106,192 +130,38 @@ pub struct CalendarViewProps {
     #[prop_or_default]
     pub on_create_event_request: Option<Callback<crate::components::EventCreationData>>,
     #[prop_or_default]
-    pub on_event_update_request: Option<Callback<(VEvent, chrono::NaiveDateTime, chrono::NaiveDateTime, bool, Option<chrono::DateTime<chrono::Utc>>, Option<String>, Option<String>)>>,
+    pub on_event_update_request: Option<
+        Callback<(
+            VEvent,
+            chrono::NaiveDateTime,
+            chrono::NaiveDateTime,
+            bool,
+            Option<chrono::DateTime<chrono::Utc>>,
+            Option<String>,
+            Option<String>,
+        )>,
+    >,
     #[prop_or_default]
     pub context_menus_open: bool,
 }
 
-use gloo_storage::{LocalStorage, Storage};
-use crate::services::CalendarService;
 use crate::components::Calendar;
-use std::collections::HashMap;
-use chrono::{Local, NaiveDate, Datelike};
 
 #[function_component(CalendarView)]
 pub fn calendar_view(props: &CalendarViewProps) -> Html {
-    let events = use_state(|| HashMap::<NaiveDate, Vec<VEvent>>::new());
-    let loading = use_state(|| true);
-    let error = use_state(|| None::<String>);
-    let refreshing_event = use_state(|| None::<String>);
-    
-    let auth_token: Option<String> = LocalStorage::get("auth_token").ok();
-    
-    
-    let today = Local::now().date_naive();
-    let current_year = today.year();
-    let current_month = today.month();
-    
-    let on_event_click = {
-        let events = events.clone();
-        let refreshing_event = refreshing_event.clone();
-        let auth_token = auth_token.clone();
-        
-        Callback::from(move |event: VEvent| {
-            if let Some(token) = auth_token.clone() {
-                let events = events.clone();
-                let refreshing_event = refreshing_event.clone();
-                let uid = event.uid.clone();
-                
-                refreshing_event.set(Some(uid.clone()));
-                
-                wasm_bindgen_futures::spawn_local(async move {
-                    let calendar_service = CalendarService::new();
-                    
-                    let password = if let Ok(credentials_str) = LocalStorage::get::<String>("caldav_credentials") {
-                        if let Ok(credentials) = serde_json::from_str::<serde_json::Value>(&credentials_str) {
-                            credentials["password"].as_str().unwrap_or("").to_string()
-                        } else {
-                            String::new()
-                        }
-                    } else {
-                        String::new()
-                    };
-                    
-                    match calendar_service.refresh_event(&token, &password, &uid).await {
-                        Ok(Some(refreshed_event)) => {
-                            let refreshed_vevent = refreshed_event; // CalendarEvent is now VEvent
-                            let mut updated_events = (*events).clone();
-                            
-                            for (_, day_events) in updated_events.iter_mut() {
-                                day_events.retain(|e| e.uid != uid);
-                            }
-                            
-                            if refreshed_vevent.rrule.is_some() {
-                                let new_occurrences = CalendarService::expand_recurring_events(vec![refreshed_vevent.clone()]);
-                                
-                                for occurrence in new_occurrences {
-                                    let date = occurrence.get_date();
-                                    updated_events.entry(date)
-                                        .or_insert_with(Vec::new)
-                                        .push(occurrence);
-                                }
-                            } else {
-                                let date = refreshed_vevent.get_date();
-                                updated_events.entry(date)
-                                    .or_insert_with(Vec::new)
-                                    .push(refreshed_vevent);
-                            }
-                            
-                            events.set(updated_events);
-                        }
-                        Ok(None) => {
-                            let mut updated_events = (*events).clone();
-                            for (_, day_events) in updated_events.iter_mut() {
-                                day_events.retain(|e| e.uid != uid);
-                            }
-                            events.set(updated_events);
-                        }
-                        Err(_err) => {
-                        }
-                    }
-                    
-                    refreshing_event.set(None);
-                });
-            }
-        })
-    };
-    
-    {
-        let events = events.clone();
-        let loading = loading.clone();
-        let error = error.clone();
-        let auth_token = auth_token.clone();
-        
-        use_effect_with((), move |_| {
-            if let Some(token) = auth_token {
-                let events = events.clone();
-                let loading = loading.clone();
-                let error = error.clone();
-                
-                wasm_bindgen_futures::spawn_local(async move {
-                    let calendar_service = CalendarService::new();
-                    
-                    let password = if let Ok(credentials_str) = LocalStorage::get::<String>("caldav_credentials") {
-                        if let Ok(credentials) = serde_json::from_str::<serde_json::Value>(&credentials_str) {
-                            credentials["password"].as_str().unwrap_or("").to_string()
-                        } else {
-                            String::new()
-                        }
-                    } else {
-                        String::new()
-                    };
-                    
-                    match calendar_service.fetch_events_for_month_vevent(&token, &password, current_year, current_month).await {
-                        Ok(vevents) => {
-                            let grouped_events = CalendarService::group_events_by_date(vevents);
-                            events.set(grouped_events);
-                            loading.set(false);
-                        }
-                        Err(err) => {
-                            error.set(Some(format!("Failed to load events: {}", err)));
-                            loading.set(false);
-                        }
-                    }
-                });
-            } else {
-                loading.set(false);
-                error.set(Some("No authentication token found".to_string()));
-            }
-            
-            || ()
-        });
-    }
-    
     html! {
         <div class="calendar-view">
-            {
-                if *loading {
-                    html! {
-                        <div class="calendar-loading">
-                            <p>{"Loading calendar events..."}</p>
-                        </div>
-                    }
-                } else if let Some(err) = (*error).clone() {
-                    let dummy_callback = Callback::from(|_: VEvent| {});
-                    html! {
-                        <div class="calendar-error">
-                            <p>{format!("Error: {}", err)}</p>
-                            <Calendar 
-                                events={HashMap::new()} 
-                                on_event_click={dummy_callback} 
-                                refreshing_event_uid={(*refreshing_event).clone()} 
-                                user_info={props.user_info.clone()}
-                                on_event_context_menu={props.on_event_context_menu.clone()}
-                                on_calendar_context_menu={props.on_calendar_context_menu.clone()}
-                                view={props.view.clone()}
-                                on_create_event_request={props.on_create_event_request.clone()}
-                                on_event_update_request={props.on_event_update_request.clone()}
-                                context_menus_open={props.context_menus_open}
-                            />
-                        </div>
-                    }
-                } else {
-                    html! {
-                        <Calendar 
-                            events={(*events).clone()} 
-                            on_event_click={on_event_click} 
-                            refreshing_event_uid={(*refreshing_event).clone()} 
-                            user_info={props.user_info.clone()}
-                            on_event_context_menu={props.on_event_context_menu.clone()}
-                            on_calendar_context_menu={props.on_calendar_context_menu.clone()}
-                            view={props.view.clone()}
-                            on_create_event_request={props.on_create_event_request.clone()}
-                            on_event_update_request={props.on_event_update_request.clone()}
-                            context_menus_open={props.context_menus_open}
-                        />
-                    }
-                }
-            }
+            <Calendar
+                user_info={props.user_info.clone()}
+                external_calendar_events={props.external_calendar_events.clone()}
+                external_calendars={props.external_calendars.clone()}
+                on_event_context_menu={props.on_event_context_menu.clone()}
+                on_calendar_context_menu={props.on_calendar_context_menu.clone()}
+                view={props.view.clone()}
+                on_create_event_request={props.on_create_event_request.clone()}
+                on_event_update_request={props.on_event_update_request.clone()}
+                context_menus_open={props.context_menus_open}
+            />
         </div>
     }
-}
+}

frontend/src/components/sidebar.rs

@@ -1,8 +1,8 @@
+use crate::components::CalendarListItem;
+use crate::services::calendar_service::{UserInfo, ExternalCalendar};
+use web_sys::HtmlSelectElement;
 use yew::prelude::*;
 use yew_router::prelude::*;
-use web_sys::HtmlSelectElement;
-use crate::services::calendar_service::UserInfo;
-use crate::components::CalendarListItem;
 
 #[derive(Clone, Routable, PartialEq)]
 pub enum Route {
@@ -32,13 +32,18 @@ pub enum Theme {
     Mint,
 }
 
+#[derive(Clone, PartialEq)]
+pub enum Style {
+    Default,
+    Google,
+}
+
 impl Theme {
-    
     pub fn value(&self) -> &'static str {
         match self {
             Theme::Default => "default",
             Theme::Ocean => "ocean",
-            Theme::Forest => "forest", 
+            Theme::Forest => "forest",
             Theme::Sunset => "sunset",
             Theme::Purple => "purple",
             Theme::Dark => "dark",
@@ -46,7 +51,7 @@ impl Theme {
             Theme::Mint => "mint",
         }
     }
-    
+
     pub fn from_value(value: &str) -> Self {
         match value {
             "ocean" => Theme::Ocean,
@@ -61,6 +66,30 @@ impl Theme {
     }
 }
 
+impl Style {
+    pub fn value(&self) -> &'static str {
+        match self {
+            Style::Default => "default",
+            Style::Google => "google",
+        }
+    }
+
+    pub fn from_value(value: &str) -> Self {
+        match value {
+            "google" => Style::Google,
+            _ => Style::Default,
+        }
+    }
+
+
+    pub fn stylesheet_path(&self) -> Option<&'static str> {
+        match self {
+            Style::Default => None, // No additional stylesheet needed - uses base styles.css
+            Style::Google => Some("google.css"), // Trunk copies to root level
+        }
+    }
+}
+
 impl Default for ViewMode {
     fn default() -> Self {
         ViewMode::Month
@@ -71,20 +100,29 @@ impl Default for ViewMode {
 pub struct SidebarProps {
     pub user_info: Option<UserInfo>,
     pub on_logout: Callback<()>,
-    pub on_create_calendar: Callback<()>,
+    pub on_add_calendar: Callback<()>,
+    pub external_calendars: Vec<ExternalCalendar>,
+    pub on_external_calendar_toggle: Callback<i32>,
+    pub on_external_calendar_delete: Callback<i32>,
+    pub on_external_calendar_refresh: Callback<i32>,
     pub color_picker_open: Option<String>,
     pub on_color_change: Callback<(String, String)>,
     pub on_color_picker_toggle: Callback<String>,
     pub available_colors: Vec<String>,
+    pub refreshing_calendar_id: Option<i32>,
     pub on_calendar_context_menu: Callback<(MouseEvent, String)>,
+    pub on_calendar_visibility_toggle: Callback<String>,
     pub current_view: ViewMode,
     pub on_view_change: Callback<ViewMode>,
     pub current_theme: Theme,
     pub on_theme_change: Callback<Theme>,
+    pub current_style: Style,
+    pub on_style_change: Callback<Style>,
 }
 
 #[function_component(Sidebar)]
 pub fn sidebar(props: &SidebarProps) -> Html {
+    let external_context_menu_open = use_state(|| None::<i32>);
     let on_view_change = {
         let on_view_change = props.on_view_change.clone();
         Callback::from(move |e: Event| {
@@ -112,10 +150,46 @@ pub fn sidebar(props: &SidebarProps) -> Html {
         })
     };
 
+    let on_style_change = {
+        let on_style_change = props.on_style_change.clone();
+        Callback::from(move |e: Event| {
+            let target = e.target_dyn_into::<HtmlSelectElement>();
+            if let Some(select) = target {
+                let value = select.value();
+                let new_style = Style::from_value(&value);
+                on_style_change.emit(new_style);
+            }
+        })
+    };
+
+    let on_external_calendar_context_menu = {
+        let external_context_menu_open = external_context_menu_open.clone();
+        Callback::from(move |(e, cal_id): (MouseEvent, i32)| {
+            e.prevent_default();
+            external_context_menu_open.set(Some(cal_id));
+        })
+    };
+
+    let on_external_calendar_delete = {
+        let on_external_calendar_delete = props.on_external_calendar_delete.clone();
+        let external_context_menu_open = external_context_menu_open.clone();
+        Callback::from(move |cal_id: i32| {
+            on_external_calendar_delete.emit(cal_id);
+            external_context_menu_open.set(None);
+        })
+    };
+
+    let close_external_context_menu = {
+        let external_context_menu_open = external_context_menu_open.clone();
+        Callback::from(move |_| {
+            external_context_menu_open.set(None);
+        })
+    };
+
     html! {
         <aside class="app-sidebar">
             <div class="sidebar-header">
-                <h1>{"Calendar App"}</h1>
+                <h1>{"Runway"}</h1>
                 {
                     if let Some(ref info) = props.user_info {
                         html! {
@@ -129,9 +203,6 @@ pub fn sidebar(props: &SidebarProps) -> Html {
                     }
                 }
             </div>
-            <nav class="sidebar-nav">
-                <Link<Route> to={Route::Calendar} classes="nav-link">{"Calendar"}</Link<Route>>
-            </nav>
             {
                 if let Some(ref info) = props.user_info {
                     if !info.calendars.is_empty() {
@@ -149,6 +220,7 @@ pub fn sidebar(props: &SidebarProps) -> Html {
                                                     on_color_picker_toggle={props.on_color_picker_toggle.clone()}
                                                     available_colors={props.available_colors.clone()}
                                                     on_context_menu={props.on_calendar_context_menu.clone()}
+                                                    on_visibility_toggle={props.on_calendar_visibility_toggle.clone()}
                                                 />
                                             }
                                         }).collect::<Html>()
@@ -163,18 +235,183 @@ pub fn sidebar(props: &SidebarProps) -> Html {
                     html! {}
                 }
             }
+            
+            // External calendars section
+            <div class="external-calendar-list">
+                <h3>{"External Calendars"}</h3>
+                {
+                    if !props.external_calendars.is_empty() {
+                        html! {
+                            <ul class="external-calendar-items">
+                                {
+                                    props.external_calendars.iter().map(|cal| {
+                                        let on_toggle = {
+                                            let on_external_calendar_toggle = props.on_external_calendar_toggle.clone();
+                                            let cal_id = cal.id;
+                                            Callback::from(move |_| {
+                                                on_external_calendar_toggle.emit(cal_id);
+                                            })
+                                        };
+                                        
+                                        html! {
+                                            <li class="external-calendar-item" style="position: relative;">
+                                                <div 
+                                                    class={if props.color_picker_open.as_ref() == Some(&format!("external_{}", cal.id)) { 
+                                                        "external-calendar-info color-picker-active" 
+                                                    } else { 
+                                                        "external-calendar-info" 
+                                                    }}
+                                                    oncontextmenu={{
+                                                        let on_context_menu = on_external_calendar_context_menu.clone();
+                                                        let cal_id = cal.id;
+                                                        Callback::from(move |e: MouseEvent| {
+                                                            on_context_menu.emit((e, cal_id));
+                                                        })
+                                                    }}
+                                                >
+                                                    <input
+                                                        type="checkbox"
+                                                        checked={cal.is_visible}
+                                                        onchange={on_toggle}
+                                                    />
+                                                    <span 
+                                                        class="external-calendar-color" 
+                                                        style={format!("background-color: {}", cal.color)}
+                                                        onclick={{
+                                                            let on_color_picker_toggle = props.on_color_picker_toggle.clone();
+                                                            let external_id = format!("external_{}", cal.id);
+                                                            Callback::from(move |e: MouseEvent| {
+                                                                e.stop_propagation();
+                                                                on_color_picker_toggle.emit(external_id.clone());
+                                                            })
+                                                        }}
+                                                    >
+                                                        {
+                                                            if props.color_picker_open.as_ref() == Some(&format!("external_{}", cal.id)) {
+                                                                html! {
+                                                                    <div class="color-picker-dropdown">
+                                                                        {
+                                                                            props.available_colors.iter().map(|color| {
+                                                                                let color_str = color.clone();
+                                                                                let external_id = format!("external_{}", cal.id);
+                                                                                let on_color_change = props.on_color_change.clone();
+                                                                                
+                                                                                let on_color_select = Callback::from(move |_: MouseEvent| {
+                                                                                    on_color_change.emit((external_id.clone(), color_str.clone()));
+                                                                                });
+                                                                                
+                                                                                let is_selected = cal.color == *color;
+                                                                                
+                                                                                html! {
+                                                                                    <div
+                                                                                        key={color.clone()}
+                                                                                        class={if is_selected { "color-option selected" } else { "color-option" }}
+                                                                                        style={format!("background-color: {}", color)}
+                                                                                        onclick={on_color_select}
+                                                                                    />
+                                                                                }
+                                                                            }).collect::<Html>()
+                                                                        }
+                                                                    </div>
+                                                                }
+                                                            } else {
+                                                                html! {}
+                                                            }
+                                                        }
+                                                    </span>
+                                                    <span class="external-calendar-name">{&cal.name}</span>
+                                                    <div class="external-calendar-actions">
+                                                        {
+                                                            if let Some(last_fetched) = cal.last_fetched {
+                                                                let local_time = last_fetched.with_timezone(&chrono::Local);
+                                                                html! {
+                                                                    <span class="last-updated" title={format!("Last updated: {}", local_time.format("%Y-%m-%d %H:%M"))}>
+                                                                        {format!("{}", local_time.format("%H:%M"))}
+                                                                    </span>
+                                                                }
+                                                            } else {
+                                                                html! {
+                                                                    <span class="last-updated">{"Never"}</span>
+                                                                }
+                                                            }
+                                                        }
+                                                        <button 
+                                                            class="external-calendar-refresh-btn" 
+                                                            title="Refresh calendar"
+                                                            onclick={{
+                                                                let on_refresh = props.on_external_calendar_refresh.clone();
+                                                                let cal_id = cal.id;
+                                                                Callback::from(move |e: MouseEvent| {
+                                                                    e.stop_propagation();
+                                                                    on_refresh.emit(cal_id);
+                                                                })
+                                                            }}
+                                                            disabled={props.refreshing_calendar_id == Some(cal.id)}
+                                                        >
+                                                            {
+                                                                if props.refreshing_calendar_id == Some(cal.id) {
+                                                                    "⏳" // Loading spinner
+                                                                } else {
+                                                                    "🔄" // Normal refresh icon
+                                                                }
+                                                            }
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                {
+                                                    if *external_context_menu_open == Some(cal.id) {
+                                                        html! {
+                                                            <>
+                                                                <div 
+                                                                    class="context-menu-overlay" 
+                                                                    onclick={close_external_context_menu.clone()}
+                                                                    style="position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; z-index: 999;"
+                                                                />
+                                                                <div class="context-menu" style="position: absolute; top: 0; right: 0; background: white; border: 1px solid #ccc; border-radius: 4px; box-shadow: 0 2px 8px rgba(0,0,0,0.15); z-index: 1000; min-width: 120px;">
+                                                                    <div 
+                                                                        class="context-menu-item" 
+                                                                        style="padding: 8px 12px; cursor: pointer; color: #d73a49;"
+                                                                        onclick={{
+                                                                            let on_delete = on_external_calendar_delete.clone();
+                                                                            let cal_id = cal.id;
+                                                                            Callback::from(move |_| {
+                                                                                on_delete.emit(cal_id);
+                                                                            })
+                                                                        }}
+                                                                    >
+                                                                        {"Delete Calendar"}
+                                                                    </div>
+                                                                </div>
+                                                            </>
+                                                        }
+                                                    } else {
+                                                        html! {}
+                                                    }
+                                                }
+                                            </li>
+                                        }
+                                    }).collect::<Html>()
+                                }
+                            </ul>
+                        }
+                    } else {
+                        html! {}
+                    }
+                }
+            </div>
+            
             <div class="sidebar-footer">
-                <button onclick={props.on_create_calendar.reform(|_| ())} class="create-calendar-button">
-                    {"+ Create Calendar"}
+                <button onclick={props.on_add_calendar.reform(|_| ())} class="add-calendar-button">
+                    {"+ Add Calendar"}
                 </button>
-                
+
                 <div class="view-selector">
                     <select class="view-selector-dropdown" onchange={on_view_change}>
                         <option value="month" selected={matches!(props.current_view, ViewMode::Month)}>{"Month"}</option>
                         <option value="week" selected={matches!(props.current_view, ViewMode::Week)}>{"Week"}</option>
                     </select>
                 </div>
-                
+
                 <div class="theme-selector">
                     <select class="theme-selector-dropdown" onchange={on_theme_change}>
                         <option value="default" selected={matches!(props.current_theme, Theme::Default)}>{"Default"}</option>
@@ -187,9 +424,16 @@ pub fn sidebar(props: &SidebarProps) -> Html {
                         <option value="mint" selected={matches!(props.current_theme, Theme::Mint)}>{"Mint"}</option>
                     </select>
                 </div>
-                
+
+                <div class="style-selector">
+                    <select class="style-selector-dropdown" onchange={on_style_change}>
+                        <option value="default" selected={matches!(props.current_style, Style::Default)}>{"Default"}</option>
+                        <option value="google" selected={matches!(props.current_style, Style::Google)}>{"Google Calendar"}</option>
+                    </select>
+                </div>
+
                 <button onclick={props.on_logout.reform(|_| ())} class="logout-button">{"Logout"}</button>
             </div>
         </aside>
     }
-}
+}

frontend/src/config.rs

@@ -1,284 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::env;
-use base64::prelude::*;
-
-/// Configuration for CalDAV server connection and authentication.
-/// 
-/// This struct holds all the necessary information to connect to a CalDAV server,
-/// including server URL, credentials, and optional collection paths.
-/// 
-/// # Security Note
-/// 
-/// The password field contains sensitive information and should be handled carefully.
-/// This struct implements `Debug` but in production, consider implementing a custom
-/// `Debug` that masks the password field.
-/// 
-/// # Example
-/// 
-/// ```rust
-/// use crate::config::CalDAVConfig;
-/// 
-/// // Load configuration from environment variables
-/// let config = CalDAVConfig::from_env()?;
-/// 
-/// // Use the configuration for HTTP requests
-/// let auth_header = format!("Basic {}", config.get_basic_auth());
-/// ```
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CalDAVConfig {
-    /// The base URL of the CalDAV server (e.g., "https://caldav.example.com/dav/")
-    pub server_url: String,
-    
-    /// Username for authentication with the CalDAV server
-    pub username: String,
-    
-    /// Password for authentication with the CalDAV server
-    /// 
-    /// **Security Note**: This contains sensitive information
-    pub password: String,
-    
-    /// Optional path to the calendar collection on the server
-    /// 
-    /// If not provided, the client will need to discover available calendars
-    /// through CalDAV PROPFIND requests
-    pub calendar_path: Option<String>,
-    
-    /// Optional path to the tasks/todo collection on the server
-    /// 
-    /// Some CalDAV servers store tasks separately from calendar events
-    pub tasks_path: Option<String>,
-}
-
-impl CalDAVConfig {
-    /// Creates a new CalDAVConfig by loading values from environment variables.
-    /// 
-    /// This method will attempt to load a `.env` file from the current directory
-    /// and then read the following required environment variables:
-    /// 
-    /// - `CALDAV_SERVER_URL`: The CalDAV server base URL
-    /// - `CALDAV_USERNAME`: Username for authentication
-    /// - `CALDAV_PASSWORD`: Password for authentication
-    /// 
-    /// Optional environment variables:
-    /// 
-    /// - `CALDAV_CALENDAR_PATH`: Path to calendar collection
-    /// - `CALDAV_TASKS_PATH`: Path to tasks collection
-    /// 
-    /// # Errors
-    /// 
-    /// Returns `ConfigError::MissingVar` if any required environment variable
-    /// is not set or cannot be read.
-    /// 
-    /// # Example
-    /// 
-    /// ```rust
-    /// use crate::config::CalDAVConfig;
-    /// 
-    /// match CalDAVConfig::from_env() {
-    ///     Ok(config) => {
-    ///         println!("Loaded config for server: {}", config.server_url);
-    ///     }
-    ///     Err(e) => {
-    ///         eprintln!("Failed to load config: {}", e);
-    ///     }
-    /// }
-    /// ```
-    pub fn from_env() -> Result<Self, ConfigError> {
-        // Attempt to load .env file, but don't fail if it doesn't exist
-        dotenvy::dotenv().ok();
-
-        let server_url = env::var("CALDAV_SERVER_URL")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_SERVER_URL".to_string()))?;
-
-        let username = env::var("CALDAV_USERNAME")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_USERNAME".to_string()))?;
-
-        let password = env::var("CALDAV_PASSWORD")
-            .map_err(|_| ConfigError::MissingVar("CALDAV_PASSWORD".to_string()))?;
-
-        // Optional paths - it's fine if these are not set
-        let calendar_path = env::var("CALDAV_CALENDAR_PATH").ok();
-        let tasks_path = env::var("CALDAV_TASKS_PATH").ok();
-
-        Ok(CalDAVConfig {
-            server_url,
-            username,
-            password,
-            calendar_path,
-            tasks_path,
-        })
-    }
-
-    /// Generates a Base64-encoded string for HTTP Basic Authentication.
-    /// 
-    /// This method combines the username and password in the format
-    /// `username:password` and encodes it using Base64, which is the
-    /// standard format for the `Authorization: Basic` HTTP header.
-    /// 
-    /// # Returns
-    /// 
-    /// A Base64-encoded string that can be used directly in the
-    /// `Authorization` header: `Authorization: Basic <returned_value>`
-    /// 
-    /// # Example
-    /// 
-    /// ```rust
-    /// use crate::config::CalDAVConfig;
-    /// 
-    /// let config = CalDAVConfig {
-    ///     server_url: "https://example.com".to_string(),
-    ///     username: "user".to_string(),
-    ///     password: "pass".to_string(),
-    ///     calendar_path: None,
-    ///     tasks_path: None,
-    /// };
-    /// 
-    /// let auth_value = config.get_basic_auth();
-    /// let auth_header = format!("Basic {}", auth_value);
-    /// ```
-    pub fn get_basic_auth(&self) -> String {
-        let credentials = format!("{}:{}", self.username, self.password);
-        BASE64_STANDARD.encode(&credentials)
-    }
-}
-
-/// Errors that can occur when loading or using CalDAV configuration.
-#[derive(Debug, thiserror::Error)]
-pub enum ConfigError {
-    /// A required environment variable is missing or cannot be read.
-    /// 
-    /// This error occurs when calling `CalDAVConfig::from_env()` and one of the
-    /// required environment variables (`CALDAV_SERVER_URL`, `CALDAV_USERNAME`,
-    /// or `CALDAV_PASSWORD`) is not set.
-    #[error("Missing environment variable: {0}")]
-    MissingVar(String),
-    
-    /// The configuration contains invalid or malformed values.
-    /// 
-    /// This could include malformed URLs, invalid authentication credentials,
-    /// or other configuration issues that prevent proper CalDAV operation.
-    #[error("Invalid configuration: {0}")]
-    Invalid(String),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_basic_auth_encoding() {
-        let config = CalDAVConfig {
-            server_url: "https://example.com".to_string(),
-            username: "testuser".to_string(),
-            password: "testpass".to_string(),
-            calendar_path: None,
-            tasks_path: None,
-        };
-
-        let auth = config.get_basic_auth();
-        let expected = BASE64_STANDARD.encode("testuser:testpass");
-        assert_eq!(auth, expected);
-    }
-
-    /// Integration test that authenticates with the actual Baikal CalDAV server
-    /// 
-    /// This test requires a valid .env file with:
-    /// - CALDAV_SERVER_URL
-    /// - CALDAV_USERNAME  
-    /// - CALDAV_PASSWORD
-    /// 
-    /// Run with: `cargo test test_baikal_auth`
-    #[tokio::test]
-    async fn test_baikal_auth() {
-        // Load config from .env
-        let config = CalDAVConfig::from_env()
-            .expect("Failed to load CalDAV config from environment");
-
-        println!("Testing authentication to: {}", config.server_url);
-
-        // Create HTTP client
-        let client = reqwest::Client::new();
-
-        // Make a simple OPTIONS request to test authentication
-        let response = client
-            .request(reqwest::Method::OPTIONS, &config.server_url)
-            .header("Authorization", format!("Basic {}", config.get_basic_auth()))
-            .header("User-Agent", "calendar-app/0.1.0")
-            .send()
-            .await
-            .expect("Failed to send request to CalDAV server");
-
-        println!("Response status: {}", response.status());
-        println!("Response headers: {:#?}", response.headers());
-
-        // Check if we got a successful response or at least not a 401 Unauthorized
-        assert!(
-            response.status().is_success() || response.status() != 401,
-            "Authentication failed with status: {}. Check your credentials in .env",
-            response.status()
-        );
-
-        // For Baikal/CalDAV servers, we should see DAV headers
-        assert!(
-            response.headers().contains_key("dav") || 
-            response.headers().contains_key("DAV") ||
-            response.status().is_success(),
-            "Server doesn't appear to be a CalDAV server - missing DAV headers"
-        );
-
-        println!("✓ Authentication test passed!");
-    }
-
-    /// Test making a PROPFIND request to discover calendars
-    /// 
-    /// This test requires a valid .env file and makes an actual CalDAV PROPFIND request
-    /// 
-    /// Run with: `cargo test test_propfind_calendars`
-    #[tokio::test]
-    async fn test_propfind_calendars() {
-        let config = CalDAVConfig::from_env()
-            .expect("Failed to load CalDAV config from environment");
-
-        let client = reqwest::Client::new();
-
-        // CalDAV PROPFIND request to discover calendars
-        let propfind_body = r#"<?xml version="1.0" encoding="utf-8" ?>
-<d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
-    <d:prop>
-        <d:resourcetype />
-        <d:displayname />
-        <c:calendar-description />
-        <c:supported-calendar-component-set />
-    </d:prop>
-</d:propfind>"#;
-
-        let response = client
-            .request(reqwest::Method::from_bytes(b"PROPFIND").unwrap(), &config.server_url)
-            .header("Authorization", format!("Basic {}", config.get_basic_auth()))
-            .header("Content-Type", "application/xml")
-            .header("Depth", "1")
-            .header("User-Agent", "calendar-app/0.1.0")
-            .body(propfind_body)
-            .send()
-            .await
-            .expect("Failed to send PROPFIND request");
-
-        let status = response.status();
-        println!("PROPFIND Response status: {}", status);
-        
-        let body = response.text().await.expect("Failed to read response body");
-        println!("PROPFIND Response body: {}", body);
-
-        // We should get a 207 Multi-Status for PROPFIND
-        assert_eq!(
-            status,
-            reqwest::StatusCode::from_u16(207).unwrap(),
-            "PROPFIND should return 207 Multi-Status"
-        );
-
-        // The response should contain XML with calendar information
-        assert!(body.contains("calendar"), "Response should contain calendar information");
-
-        println!("✓ PROPFIND calendars test passed!");
-    }
-}

frontend/src/main.rs

@@ -1,4 +1,3 @@
-
 mod app;
 mod auth;
 mod components;
@@ -9,4 +8,4 @@ use app::App;
 
 fn main() {
     yew::Renderer::<App>::new().render();
-}
+}

frontend/src/models/ical.rs

@@ -1,2 +1,2 @@
 // Re-export from shared calendar-models library for backward compatibility
-pub use calendar_models::*;
+pub use calendar_models::*;

frontend/src/models/mod.rs

@@ -1,5 +1,5 @@
 // RFC 5545 Compliant iCalendar Models
 pub mod ical;
 
-// Re-export commonly used types  
-// pub use ical::VEvent;
+// Re-export commonly used types
+// pub use ical::VEvent;

frontend/src/services/mod.rs

@@ -1,3 +1,4 @@
 pub mod calendar_service;
+pub mod preferences;
 
-pub use calendar_service::CalendarService;
+pub use calendar_service::CalendarService;

frontend/src/services/preferences.rs

@@ -0,0 +1,206 @@
+use gloo_storage::{LocalStorage, Storage};
+use serde::{Deserialize, Serialize};
+use serde_json;
+use wasm_bindgen::JsCast;
+use wasm_bindgen_futures::JsFuture;
+use web_sys::{Request, RequestInit, RequestMode, Response};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct UserPreferences {
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_colors: Option<String>,
+    pub last_used_calendar: Option<String>,
+}
+
+#[derive(Debug, Serialize)]
+#[allow(dead_code)]
+pub struct UpdatePreferencesRequest {
+    pub calendar_selected_date: Option<String>,
+    pub calendar_time_increment: Option<i32>,
+    pub calendar_view_mode: Option<String>,
+    pub calendar_theme: Option<String>,
+    pub calendar_colors: Option<String>,
+    pub last_used_calendar: Option<String>,
+}
+
+#[allow(dead_code)]
+pub struct PreferencesService {
+    base_url: String,
+}
+
+#[allow(dead_code)]
+impl PreferencesService {
+    pub fn new() -> Self {
+        let base_url = option_env!("BACKEND_API_URL")
+            .unwrap_or("http://localhost:3000/api")
+            .to_string();
+        
+        Self { base_url }
+    }
+    
+    /// Load preferences from LocalStorage (cached from login)
+    pub fn load_cached() -> Option<UserPreferences> {
+        if let Ok(prefs_json) = LocalStorage::get::<String>("user_preferences") {
+            serde_json::from_str(&prefs_json).ok()
+        } else {
+            None
+        }
+    }
+    
+    /// Update a single preference field and sync with backend
+    pub async fn update_preference(&self, field: &str, value: serde_json::Value) -> Result<(), String> {
+        // Get session token
+        let session_token = LocalStorage::get::<String>("session_token")
+            .map_err(|_| "No session token found".to_string())?;
+        
+        // Load current preferences
+        let mut preferences = Self::load_cached().unwrap_or(UserPreferences {
+            calendar_selected_date: None,
+            calendar_time_increment: None,
+            calendar_view_mode: None,
+            calendar_theme: None,
+            calendar_colors: None,
+            last_used_calendar: None,
+        });
+        
+        // Update the specific field
+        match field {
+            "calendar_selected_date" => {
+                preferences.calendar_selected_date = value.as_str().map(|s| s.to_string());
+            }
+            "calendar_time_increment" => {
+                preferences.calendar_time_increment = value.as_i64().map(|i| i as i32);
+            }
+            "calendar_view_mode" => {
+                preferences.calendar_view_mode = value.as_str().map(|s| s.to_string());
+            }
+            "calendar_theme" => {
+                preferences.calendar_theme = value.as_str().map(|s| s.to_string());
+            }
+            "calendar_colors" => {
+                preferences.calendar_colors = value.as_str().map(|s| s.to_string());
+            }
+            _ => return Err(format!("Unknown preference field: {}", field)),
+        }
+        
+        // Save to LocalStorage cache
+        if let Ok(prefs_json) = serde_json::to_string(&preferences) {
+            let _ = LocalStorage::set("user_preferences", &prefs_json);
+        }
+        
+        // Sync with backend
+        let request = UpdatePreferencesRequest {
+            calendar_selected_date: preferences.calendar_selected_date.clone(),
+            calendar_time_increment: preferences.calendar_time_increment,
+            calendar_view_mode: preferences.calendar_view_mode.clone(),
+            calendar_theme: preferences.calendar_theme.clone(),
+            calendar_colors: preferences.calendar_colors.clone(),
+            last_used_calendar: preferences.last_used_calendar.clone(),
+        };
+        
+        self.sync_preferences(&session_token, &request).await
+    }
+    
+    /// Sync all preferences with backend
+    async fn sync_preferences(
+        &self,
+        session_token: &str,
+        request: &UpdatePreferencesRequest,
+    ) -> Result<(), String> {
+        let window = web_sys::window().ok_or("No global window exists")?;
+        
+        let json_body = serde_json::to_string(request)
+            .map_err(|e| format!("JSON serialization failed: {}", e))?;
+        
+        let opts = RequestInit::new();
+        opts.set_method("POST");
+        opts.set_mode(RequestMode::Cors);
+        opts.set_body(&wasm_bindgen::JsValue::from_str(&json_body));
+        
+        let url = format!("{}/preferences", self.base_url);
+        let request = Request::new_with_str_and_init(&url, &opts)
+            .map_err(|e| format!("Request creation failed: {:?}", e))?;
+        
+        request
+            .headers()
+            .set("Content-Type", "application/json")
+            .map_err(|e| format!("Header setting failed: {:?}", e))?;
+        
+        request
+            .headers()
+            .set("X-Session-Token", session_token)
+            .map_err(|e| format!("Header setting failed: {:?}", e))?;
+        
+        let resp_value = JsFuture::from(window.fetch_with_request(&request))
+            .await
+            .map_err(|e| format!("Network request failed: {:?}", e))?;
+        
+        let resp: Response = resp_value
+            .dyn_into()
+            .map_err(|e| format!("Response cast failed: {:?}", e))?;
+        
+        if resp.ok() {
+            Ok(())
+        } else {
+            Err(format!("Failed to update preferences: {}", resp.status()))
+        }
+    }
+    
+    /// Migrate preferences from LocalStorage to backend (on first login after update)
+    pub async fn migrate_from_local_storage(&self) -> Result<(), String> {
+        let session_token = LocalStorage::get::<String>("session_token")
+            .map_err(|_| "No session token found".to_string())?;
+        
+        let request = UpdatePreferencesRequest {
+            calendar_selected_date: LocalStorage::get::<String>("calendar_selected_date").ok(),
+            calendar_time_increment: LocalStorage::get::<u32>("calendar_time_increment").ok().map(|i| i as i32),
+            calendar_view_mode: LocalStorage::get::<String>("calendar_view_mode").ok(),
+            calendar_theme: LocalStorage::get::<String>("calendar_theme").ok(),
+            calendar_colors: LocalStorage::get::<String>("calendar_colors").ok(),
+            last_used_calendar: LocalStorage::get::<String>("last_used_calendar").ok(),
+        };
+        
+        // Only migrate if we have some preferences to migrate
+        if request.calendar_selected_date.is_some()
+            || request.calendar_time_increment.is_some()
+            || request.calendar_view_mode.is_some()
+            || request.calendar_theme.is_some()
+            || request.calendar_colors.is_some()
+            || request.last_used_calendar.is_some()
+        {
+            self.sync_preferences(&session_token, &request).await?;
+            
+            // Clear old LocalStorage entries after successful migration
+            let _ = LocalStorage::delete("calendar_selected_date");
+            let _ = LocalStorage::delete("calendar_time_increment");
+            let _ = LocalStorage::delete("calendar_view_mode");
+            let _ = LocalStorage::delete("calendar_theme");
+            let _ = LocalStorage::delete("calendar_colors");
+        }
+        
+        Ok(())
+    }
+
+    /// Update the last used calendar and sync with backend
+    pub async fn update_last_used_calendar(&self, calendar_path: &str) -> Result<(), String> {
+        // Get session token
+        let session_token = LocalStorage::get::<String>("session_token")
+            .map_err(|_| "No session token found".to_string())?;
+        
+        // Create minimal update request with only the last used calendar
+        let request = UpdatePreferencesRequest {
+            calendar_selected_date: None,
+            calendar_time_increment: None,
+            calendar_view_mode: None,
+            calendar_theme: None,
+            calendar_colors: None,
+            last_used_calendar: Some(calendar_path.to_string()),
+        };
+        
+        // Sync to backend
+        self.sync_preferences(&session_token, &request).await
+    }
+}

frontend/styles/base.css

@@ -0,0 +1,51 @@
+/* Base Styles - Always Loaded */
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body {
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    background-color: #f8f9fa;
+    color: #333;
+    line-height: 1.6;
+}
+
+.app {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: row;
+}
+
+.login-layout {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+
+/* Base Layout */
+.main-content {
+    flex: 1;
+    margin-left: 280px;
+    overflow-x: hidden;
+}
+
+/* Basic Form Elements */
+input, select, textarea, button {
+    font-family: inherit;
+}
+
+/* Utility Classes */
+.loading {
+    opacity: 0.7;
+}
+
+.error {
+    color: #dc3545;
+}
+
+.success {
+    color: #28a745;
+}

frontend/styles/google.css

@@ -0,0 +1,645 @@
+/* Google Calendar-inspired styles */
+
+/* Override CSS Variables for Google Calendar Style */
+:root {
+    /* Google-style spacing */
+    --spacing-xs: 2px;
+    --spacing-sm: 4px;
+    --spacing-md: 8px;
+    --spacing-lg: 12px;
+    --spacing-xl: 16px;
+    
+    /* Google-style borders and radius */
+    --border-radius-small: 2px;
+    --border-radius-medium: 4px;
+    --border-radius-large: 8px;
+    --border-light: 1px solid #dadce0;
+    --border-medium: 1px solid #dadce0;
+    
+    /* Google-style shadows */
+    --shadow-sm: 0 1px 2px 0 rgba(60,64,67,.3), 0 1px 3px 1px rgba(60,64,67,.15);
+    --shadow-md: 0 1px 3px 0 rgba(60,64,67,.3), 0 4px 8px 3px rgba(60,64,67,.15);
+    --shadow-lg: 0 4px 6px 0 rgba(60,64,67,.3), 0 8px 25px 5px rgba(60,64,67,.15);
+}
+
+/* Google-style sidebar - override all theme variants */
+body .app-sidebar,
+[data-theme] .app-sidebar,
+[data-theme="default"] .app-sidebar,
+[data-theme="ocean"] .app-sidebar,
+[data-theme="forest"] .app-sidebar,
+[data-theme="sunset"] .app-sidebar,
+[data-theme="purple"] .app-sidebar,
+[data-theme="dark"] .app-sidebar,
+[data-theme="rose"] .app-sidebar,
+[data-theme="mint"] .app-sidebar {
+    background: #ffffff !important;
+    border-right: 1px solid #dadce0 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+    box-shadow: 2px 0 8px rgba(60,64,67,.1) !important;
+}
+
+body .sidebar-header,
+[data-theme] .sidebar-header {
+    background: transparent !important;
+    border-bottom: 1px solid #dadce0 !important;
+}
+
+body .sidebar-header h1,
+[data-theme] .sidebar-header h1 {
+    font-size: 20px !important;
+    font-weight: 500 !important;
+    color: #3c4043 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+body .user-info,
+[data-theme] .user-info {
+    color: #3c4043 !important;
+}
+
+body .user-info .username,
+[data-theme] .user-info .username {
+    font-weight: 500 !important;
+    color: #3c4043 !important;
+}
+
+body .user-info .server-url,
+[data-theme] .user-info .server-url {
+    color: #5f6368 !important;
+}
+
+/* Google-style buttons */
+.create-calendar-button {
+    background: #1a73e8 !important;
+    color: white !important;
+    border: none !important;
+    border-radius: 4px !important;
+    padding: 8px 16px !important;
+    font-weight: 500 !important;
+    font-size: 14px !important;
+    cursor: pointer !important;
+    box-shadow: 0 1px 2px 0 rgba(60,64,67,.3), 0 1px 3px 1px rgba(60,64,67,.15) !important;
+    transition: box-shadow 0.2s ease !important;
+}
+
+.create-calendar-button:hover {
+    box-shadow: 0 1px 3px 0 rgba(60,64,67,.3), 0 4px 8px 3px rgba(60,64,67,.15) !important;
+}
+
+.logout-button {
+    background: transparent !important;
+    color: #1a73e8 !important;
+    border: 1px solid #dadce0 !important;
+    border-radius: 4px !important;
+    padding: 8px 16px !important;
+    font-weight: 500 !important;
+    font-size: 14px !important;
+    cursor: pointer !important;
+    transition: background-color 0.2s ease !important;
+}
+
+.logout-button:hover {
+    background: #f8f9fa !important;
+}
+
+/* Google-style navigation and sidebar text */
+body .sidebar-nav .nav-link,
+[data-theme] .sidebar-nav .nav-link {
+    color: #3c4043 !important;
+    text-decoration: none !important;
+}
+
+body .sidebar-nav .nav-link:hover,
+[data-theme] .sidebar-nav .nav-link:hover {
+    color: #1a73e8 !important;
+    background: #f1f3f4 !important;
+}
+
+/* Calendar list styling */
+body .calendar-list h3,
+[data-theme] .calendar-list h3 {
+    color: #3c4043 !important;
+}
+
+body .calendar-list .calendar-name,
+[data-theme] .calendar-list .calendar-name {
+    color: #3c4043 !important;
+}
+
+body .no-calendars,
+[data-theme] .no-calendars {
+    color: #5f6368 !important;
+}
+
+/* Form labels and text */
+body .sidebar-footer label,
+[data-theme] .sidebar-footer label,
+body .view-selector label,
+[data-theme] .view-selector label,
+body .theme-selector label,
+[data-theme] .theme-selector label,
+body .style-selector label,
+[data-theme] .style-selector label {
+    color: #3c4043 !important;
+}
+
+/* Google-style selectors */
+body .view-selector-dropdown,
+body .theme-selector-dropdown,
+body .style-selector-dropdown,
+[data-theme] .view-selector-dropdown,
+[data-theme] .theme-selector-dropdown,
+[data-theme] .style-selector-dropdown {
+    border: 1px solid #dadce0 !important;
+    border-radius: 4px !important;
+    padding: 8px !important;
+    font-size: 14px !important;
+    color: #3c4043 !important;
+    background: white !important;
+    font-family: inherit !important;
+}
+
+.view-selector-dropdown:focus,
+.theme-selector-dropdown:focus,
+.style-selector-dropdown:focus {
+    outline: none;
+    border-color: #1a73e8;
+    box-shadow: 0 0 0 2px rgba(26,115,232,.2);
+}
+
+/* Google-style calendar list items */
+.calendar-list h3 {
+    font-size: 14px;
+    font-weight: 500;
+    color: #3c4043;
+    margin-bottom: 8px;
+}
+
+.calendar-list ul {
+    list-style: none;
+}
+
+.calendar-list .calendar-item {
+    padding: 4px 0;
+    border-radius: 4px;
+    transition: background-color 0.15s ease;
+}
+
+.calendar-list .calendar-item:hover {
+    background-color: #f1f3f4;
+}
+
+.calendar-list .calendar-name {
+    color: #3c4043;
+    font-size: 14px;
+    font-weight: 400;
+}
+
+/* Google-style main content area */
+body .app-main,
+[data-theme] .app-main {
+    background: #ffffff !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+    color: #3c4043 !important;
+}
+
+/* Calendar header elements */
+body .calendar-header,
+[data-theme] .calendar-header {
+    background: #f8f9fa !important;
+    color: #3c4043 !important;
+}
+
+body .calendar-header h2,
+body .calendar-header h3,
+body .month-header,
+body .week-header,
+[data-theme] .calendar-header h2,
+[data-theme] .calendar-header h3,
+[data-theme] .month-header,
+[data-theme] .week-header {
+    color: #3c4043 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+/* Month name and title - aggressive override */
+body h1,
+body h2, 
+body h3,
+body .month-title,
+body .calendar-title,
+body .current-month,
+body .month-year,
+body .header-title,
+[data-theme] h1,
+[data-theme] h2,
+[data-theme] h3,
+[data-theme] .month-title,
+[data-theme] .calendar-title,
+[data-theme] .current-month,
+[data-theme] .month-year,
+[data-theme] .header-title {
+    color: #3c4043 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+/* Navigation arrows and buttons - aggressive override */
+body button,
+body .nav-button,
+body .calendar-nav-button,
+body .prev-button,
+body .next-button,
+body .arrow-button,
+body .navigation-arrow,
+body [class*="arrow"],
+body [class*="nav"],
+body [class*="button"],
+[data-theme] button,
+[data-theme] .nav-button,
+[data-theme] .calendar-nav-button,
+[data-theme] .prev-button,
+[data-theme] .next-button,
+[data-theme] .arrow-button,
+[data-theme] .navigation-arrow,
+[data-theme] [class*="arrow"],
+[data-theme] [class*="nav"],
+[data-theme] [class*="button"] {
+    color: #3c4043 !important;
+    background: #f8f9fa !important;
+    border: 1px solid #dadce0 !important;
+    border-radius: 4px !important;
+}
+
+body button:hover,
+body .nav-button:hover,
+body .calendar-nav-button:hover,
+body .prev-button:hover,
+body .next-button:hover,
+body .arrow-button:hover,
+[data-theme] button:hover,
+[data-theme] .nav-button:hover,
+[data-theme] .calendar-nav-button:hover,
+[data-theme] .prev-button:hover,
+[data-theme] .next-button:hover,
+[data-theme] .arrow-button:hover {
+    background: #e8f0fe !important;
+    color: #1a73e8 !important;
+    border-color: #1a73e8 !important;
+}
+
+/* Calendar controls and date display */
+body .calendar-controls,
+body .current-date,
+body .date-display,
+[data-theme] .calendar-controls,
+[data-theme] .current-date,
+[data-theme] .date-display {
+    color: #3c4043 !important;
+}
+
+/* Ultimate nuclear approach - override EVERYTHING */
+html body .app-main,
+html body .app-main *,
+html body .main-content,
+html body .main-content *,
+html body .calendar-container,
+html body .calendar-container *,
+html [data-theme] .app-main,
+html [data-theme] .app-main *,
+html [data-theme] .main-content,
+html [data-theme] .main-content *,
+html [data-theme] .calendar-container,
+html [data-theme] .calendar-container *,
+html [data-theme="default"] .app-main *,
+html [data-theme="ocean"] .app-main *,
+html [data-theme="forest"] .app-main *,
+html [data-theme="sunset"] .app-main *,
+html [data-theme="purple"] .app-main *,
+html [data-theme="dark"] .app-main *,
+html [data-theme="rose"] .app-main *,
+html [data-theme="mint"] .app-main * {
+    color: #3c4043 !important;
+    text-shadow: none !important;
+}
+
+/* Force all text elements */
+html body .app-main h1,
+html body .app-main h2,
+html body .app-main h3,
+html body .app-main h4,
+html body .app-main h5,
+html body .app-main h6,
+html body .app-main p,
+html body .app-main span,
+html body .app-main div,
+html body .app-main button,
+html [data-theme] .app-main h1,
+html [data-theme] .app-main h2,
+html [data-theme] .app-main h3,
+html [data-theme] .app-main h4,
+html [data-theme] .app-main h5,
+html [data-theme] .app-main h6,
+html [data-theme] .app-main p,
+html [data-theme] .app-main span,
+html [data-theme] .app-main div,
+html [data-theme] .app-main button {
+    color: #3c4043 !important;
+}
+
+/* Exception for buttons - make them stand out */
+body .app-main button,
+body .main-content button,
+[data-theme] .app-main button,
+[data-theme] .main-content button {
+    color: #3c4043 !important;
+    background: #f8f9fa !important;
+    border: 1px solid #dadce0 !important;
+}
+
+/* Google-style calendar grid - more aggressive styling */
+html body .calendar-grid,
+html [data-theme] .calendar-grid,
+body .calendar-container,
+[data-theme] .calendar-container {
+    border: 1px solid #dadce0 !important;
+    border-radius: 8px !important;
+    overflow: hidden !important;
+    background: white !important;
+    box-shadow: 0 1px 3px 0 rgba(60,64,67,.3), 0 4px 8px 3px rgba(60,64,67,.15) !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+html body .calendar-header,
+html [data-theme] .calendar-header {
+    background: #f8f9fa !important;
+    border-bottom: 1px solid #dadce0 !important;
+    padding: 16px !important;
+}
+
+html body .month-header,
+html body .week-header,
+html [data-theme] .month-header,
+html [data-theme] .week-header {
+    font-size: 22px !important;
+    font-weight: 400 !important;
+    color: #3c4043 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+/* Google-style calendar cells - complete overhaul */
+html body .calendar-day,
+html [data-theme] .calendar-day,
+body .day-cell,
+[data-theme] .day-cell {
+    border: 1px solid #e8eaed !important;
+    background: white !important;
+    transition: background-color 0.15s ease !important;
+    padding: 8px !important;
+    min-height: 120px !important;
+    position: relative !important;
+}
+
+html body .calendar-day:hover,
+html [data-theme] .calendar-day:hover,
+body .day-cell:hover,
+[data-theme] .day-cell:hover {
+    background: #f8f9fa !important;
+    box-shadow: inset 0 0 0 1px #dadce0 !important;
+}
+
+html body .calendar-day.today,
+html [data-theme] .calendar-day.today,
+body .day-cell.today,
+[data-theme] .day-cell.today {
+    background: #e8f0fe !important;
+    border-color: #1a73e8 !important;
+}
+
+html body .calendar-day.other-month,
+html [data-theme] .calendar-day.other-month,
+body .day-cell.other-month,
+[data-theme] .day-cell.other-month {
+    background: #fafafa !important;
+    color: #9aa0a6 !important;
+}
+
+html body .day-number,
+html [data-theme] .day-number,
+body .date-number,
+[data-theme] .date-number {
+    font-size: 14px !important;
+    font-weight: 500 !important;
+    color: #3c4043 !important;
+    margin-bottom: 4px !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+/* Day headers (Mon, Tue, Wed, etc.) */
+html body .day-header,
+html [data-theme] .day-header,
+body .weekday-header,
+[data-theme] .weekday-header {
+    background: #f8f9fa !important;
+    color: #5f6368 !important;
+    font-size: 12px !important;
+    font-weight: 500 !important;
+    text-transform: uppercase !important;
+    letter-spacing: 0.8px !important;
+    padding: 8px !important;
+    border-bottom: 1px solid #dadce0 !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+}
+
+/* Google Calendar-style events - complete redesign */
+html body .app-main .event,
+html [data-theme] .app-main .event,
+html body .calendar-container .event,
+html [data-theme] .calendar-container .event,
+body .event,
+[data-theme] .event {
+    border-radius: 4px !important;
+    padding: 2px 8px !important;
+    font-size: 11px !important;
+    font-weight: 400 !important;
+    margin: 1px 0 2px 0 !important;
+    cursor: pointer !important;
+    border: none !important;
+    color: white !important;
+    font-family: 'Google Sans', 'Roboto', sans-serif !important;
+    box-shadow: 0 1px 3px rgba(60,64,67,.3) !important;
+    transition: transform 0.1s ease, box-shadow 0.1s ease !important;
+    display: block !important;
+    text-overflow: ellipsis !important;
+    overflow: hidden !important;
+    white-space: nowrap !important;
+    line-height: 1.3 !important;
+}
+
+html body .app-main .event *,
+html [data-theme] .app-main .event *,
+html body .calendar-container .event *,
+html [data-theme] .calendar-container .event *,
+body .event *,
+[data-theme] .event * {
+    color: white !important;
+    font-family: inherit !important;
+}
+
+html body .app-main .event:hover,
+html [data-theme] .app-main .event:hover,
+body .event:hover,
+[data-theme] .event:hover {
+    transform: translateY(-1px) !important;
+    box-shadow: 0 2px 8px rgba(60,64,67,.4) !important;
+}
+
+/* All-day events styling */
+html body .event.all-day,
+html [data-theme] .event.all-day {
+    border-radius: 12px !important;
+    padding: 4px 12px !important;
+    font-weight: 500 !important;
+    margin: 2px 0 !important;
+}
+
+/* Event time display */
+html body .event-time,
+html [data-theme] .event-time {
+    opacity: 0.9 !important;
+    font-size: 10px !important;
+    margin-right: 4px !important;
+}
+
+/* Week view events */
+html body .week-view .event,
+html [data-theme] .week-view .event {
+    border-left: 3px solid rgba(255,255,255,0.8) !important;
+    border-radius: 0 4px 4px 0 !important;
+    padding-left: 6px !important;
+}
+
+/* Calendar table structure */
+html body .calendar-table,
+html [data-theme] .calendar-table,
+body table,
+[data-theme] table {
+    border-collapse: separate !important;
+    border-spacing: 0 !important;
+    width: 100% !important;
+    background: white !important;
+}
+
+html body .calendar-table td,
+html [data-theme] .calendar-table td,
+body table td,
+[data-theme] table td {
+    vertical-align: top !important;
+    border: 1px solid #e8eaed !important;
+    background: white !important;
+}
+
+/* Month/Week view toggle */
+html body .view-toggle,
+html [data-theme] .view-toggle {
+    display: flex !important;
+    gap: 4px !important;
+    background: #f1f3f4 !important;
+    border-radius: 6px !important;
+    padding: 2px !important;
+}
+
+html body .view-toggle button,
+html [data-theme] .view-toggle button {
+    padding: 6px 12px !important;
+    border: none !important;
+    background: transparent !important;
+    color: #5f6368 !important;
+    border-radius: 4px !important;
+    font-size: 13px !important;
+    font-weight: 500 !important;
+    cursor: pointer !important;
+    transition: all 0.15s ease !important;
+}
+
+html body .view-toggle button.active,
+html [data-theme] .view-toggle button.active {
+    background: white !important;
+    color: #1a73e8 !important;
+    box-shadow: 0 1px 3px rgba(60,64,67,.3) !important;
+}
+
+/* Today button */
+html body .today-button,
+html [data-theme] .today-button {
+    background: white !important;
+    border: 1px solid #dadce0 !important;
+    color: #1a73e8 !important;
+    padding: 8px 16px !important;
+    border-radius: 4px !important;
+    font-weight: 500 !important;
+    font-size: 14px !important;
+    cursor: pointer !important;
+    transition: all 0.15s ease !important;
+}
+
+html body .today-button:hover,
+html [data-theme] .today-button:hover {
+    background: #f8f9fa !important;
+    border-color: #1a73e8 !important;
+}
+
+/* Google-style modals */
+.modal-overlay {
+    background: rgba(0, 0, 0, 0.5);
+}
+
+.modal-content {
+    background: white;
+    border-radius: 8px;
+    box-shadow: var(--shadow-lg);
+    border: none;
+}
+
+.modal h2 {
+    font-size: 20px;
+    font-weight: 500;
+    color: #3c4043;
+    font-family: 'Google Sans', sans-serif;
+}
+
+/* Google-style form inputs */
+input[type="text"],
+input[type="email"],
+input[type="password"],
+input[type="url"],
+input[type="date"],
+input[type="time"],
+textarea,
+select {
+    border: 1px solid #dadce0;
+    border-radius: 4px;
+    padding: 8px 12px;
+    font-size: 14px;
+    color: #3c4043;
+    background: white;
+    font-family: inherit;
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+input:focus,
+textarea:focus,
+select:focus {
+    outline: none;
+    border-color: #1a73e8;
+    box-shadow: 0 0 0 2px rgba(26,115,232,.2);
+}
+
+/* Google-style labels */
+label {
+    font-size: 14px;
+    font-weight: 500;
+    color: #3c4043;
+    margin-bottom: 4px;
+    display: block;
+}

integration_plan.md

@@ -1,186 +0,0 @@
-# RFC 5545 Integration Plan
-
-## Phase 1: Core Structure Replacement (High Impact, Low Risk)
-
-### 1.1 Replace Event Models
-**Files to Update:**
-- `backend/src/calendar.rs` - Replace `CalendarEvent` with `VEvent`
-- `src/services/calendar_service.rs` - Replace `CalendarEvent` with `VEvent`
-- Remove duplicate structures, use single source of truth
-
-**Benefits:**
-- ✅ Eliminate duplicate event definitions
-- ✅ Add missing DTSTAMP (RFC required)
-- ✅ Add SEQUENCE for proper versioning
-- ✅ Standardize on DateTime<Utc> instead of string parsing
-
-### 1.2 Simplify Request/Response Models
-**Files to Update:**
-- `backend/src/models.rs` - Replace string-based fields
-
-**Current (Complex):**
-```rust
-pub start_date: String,        // YYYY-MM-DD format
-pub start_time: String,        // HH:MM format  
-pub categories: String,        // comma-separated
-pub attendees: String,         // comma-separated
-```
-
-**New (Simple):**
-```rust
-pub dtstart: DateTime<Utc>,
-pub categories: Vec<String>,
-pub attendees: Vec<Attendee>,
-```
-
-**Benefits:**
-- ✅ Remove ~50 lines of manual string parsing in handlers
-- ✅ Better type safety
-- ✅ Automatic validation
-
-## Phase 2: Enhanced Functionality (Medium Impact, Medium Risk)
-
-### 2.1 Add Rich Attendee Support
-**Current:** `Vec<String>` (just emails)
-**New:** `Vec<Attendee>` with roles, status, RSVP
-
-**Benefits:**
-- ✅ Proper meeting invitations
-- ✅ RSVP tracking
-- ✅ Role-based permissions (Chair, Required, Optional)
-
-### 2.2 Structured Reminders/Alarms
-**Current:** Simple reminder minutes
-**New:** Full `VAlarm` component with actions, triggers
-
-**Benefits:**
-- ✅ Multiple reminder types (email, display, audio)
-- ✅ Complex trigger patterns
-- ✅ Better CalDAV compatibility
-
-### 2.3 Geographic Location Support
-**New Addition:** `GEO` property for latitude/longitude
-
-**Benefits:**
-- ✅ Map integration possibilities
-- ✅ Location-based reminders
-- ✅ Travel time calculations
-
-## Phase 3: Advanced Components (High Impact, Higher Risk)
-
-### 3.1 Add VTODO Support
-**New Component:** Task/To-Do management
-
-**Benefits:**
-- ✅ Unified calendar + task system
-- ✅ Due dates, completion tracking
-- ✅ Priority management
-
-### 3.2 Add VJOURNAL Support
-**New Component:** Journal/diary entries
-
-**Benefits:**
-- ✅ Meeting notes integration
-- ✅ Daily journaling
-- ✅ Full calendar suite
-
-### 3.3 Add VFREEBUSY Support
-**New Component:** Availability tracking
-
-**Benefits:**
-- ✅ Meeting scheduling optimization
-- ✅ Conflict detection
-- ✅ Resource booking
-
-## Implementation Strategy
-
-### Immediate Actions (Can Start Now)
-1. **Add compatibility layer** in existing `CalendarEvent` to support new fields
-2. **Implement conversion functions** between old/new structures
-3. **Update backend models** to use DateTime instead of string parsing
-
-### Quick Wins (1-2 hours each)
-1. **Replace string date parsing** in `backend/src/handlers.rs`
-2. **Add missing DTSTAMP** to all events (RFC compliance)
-3. **Convert categories/attendees** from comma-separated strings to vectors
-
-### Medium Effort (3-5 hours each)
-1. **Unified event structure** across frontend/backend
-2. **Rich attendee management** with roles and status
-3. **Structured alarm system**
-
-### Long Term (Future enhancements)
-1. **Full VTODO implementation**
-2. **VJOURNAL support**
-3. **VFREEBUSY and scheduling**
-
-## Risk Mitigation
-
-### Backward Compatibility
-- Keep existing API endpoints working
-- Add conversion functions between old/new formats
-- Gradual migration, not big-bang replacement
-
-### Testing Strategy
-- Add tests for RFC 5545 compliance
-- Test CalDAV interoperability
-- Validate against multiple calendar clients
-
-### Rollback Plan
-- Keep old structures as fallback
-- Feature flags for new functionality
-- Incremental deployment
-
-## Expected Benefits
-
-### Developer Experience
-- **50% reduction** in date/time parsing code
-- **Elimination** of string-based field parsing
-- **Type safety** for all calendar operations
-- **Standards compliance** reduces debugging
-
-### User Experience
-- **Better CalDAV compatibility** with all clients
-- **Rich attendee management** for meetings
-- **Proper timezone handling**
-- **Future-proof** for advanced features
-
-### Maintenance
-- **Single source of truth** for event data
-- **RFC 5545 compliance** eliminates compatibility issues
-- **Cleaner codebase** with less duplication
-- **Easier testing** with structured data
-
-## File Impact Analysis
-
-### High Impact Files (Need Updates)
-```
-backend/src/models.rs       - Replace request/response structs
-backend/src/handlers.rs     - Remove string parsing logic
-backend/src/calendar.rs     - Replace CalendarEvent
-src/services/calendar_service.rs - Use unified structures
-```
-
-### Medium Impact Files (Minor Changes)
-```
-src/components/create_event_modal.rs - Update form handling
-src/components/event_modal.rs        - Display enhancements
-backend/src/lib.rs                   - Add new modules
-```
-
-### Low Impact Files (Minimal/No Changes)
-```
-src/components/week_view.rs   - Just use new event structure
-src/components/month_view.rs  - Just use new event structure
-styles.css                   - No changes needed
-```
-
-## Next Steps
-
-1. **Review this plan** with team/stakeholders
-2. **Create branch** for RFC 5545 integration
-3. **Start with Phase 1.1** - Core structure replacement
-4. **Implement conversion functions** for compatibility
-5. **Update one handler at a time** to reduce risk
-
-The integration will significantly simplify the codebase while adding professional-grade calendar functionality!

test_backend_url.js

@@ -1 +0,0 @@
-console.log("Backend URL test");