Implement Phase 2 and Phase 3: Core models, state management, and basic views

Co-authored-by: GZTimeWalker <28180262+GZTimeWalker@users.noreply.github.com>

Author: Copilot

crates/wsrx-desktop-gpui/src/main.rs

@@ -1,18 +1,37 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 use anyhow::Result;
-use gpui::{App, Application, WindowOptions, WindowBounds, Bounds, Size};
+use gpui::{App, AppContext, Application, Bounds, WindowOptions, WindowBounds, px, size};
 
 mod logging;
+mod models;
+mod styles;
+mod views;
+mod components;
+mod bridges;
+
+use views::RootView;
 
 fn main() -> Result<()> {
     // Initialize logging
     let (_console_guard, _file_guard) = logging::setup()?;
 
     // Create and run the GPUI application
-    Application::new().run(|_cx: &mut App| {
-        // TODO: Initialize main window and root view
-        // This will be implemented in the next migration phase
+    Application::new().run(|cx: &mut App| {
+        // Create main window with centered bounds
+        let bounds = Bounds::centered(None, size(px(1200.0), px(800.0)), cx);
+        
+        cx.open_window(
+            WindowOptions {
+                window_bounds: Some(WindowBounds::Windowed(bounds)),
+                titlebar: None,
+                ..Default::default()
+            },
+            |window, cx| cx.new(|cx| RootView::new(window, cx)),
+        )
+        .expect("Failed to open window");
+        
+        cx.activate(true);
     });
 
     Ok(())

crates/wsrx-desktop-gpui/src/models/app_state.rs

@@ -0,0 +1,100 @@
+// Application State - Global application state management
+use std::collections::VecDeque;
+use super::{Tunnel, Connection, LogEntry, Settings};
+
+/// Current active page in the application
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Page {
+    GetStarted,
+    Connections,
+    NetworkLogs,
+    Settings,
+}
+
+/// Daemon connection status
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum DaemonStatus {
+    Stopped,
+    Starting,
+    Running,
+    Stopping,
+    Error,
+}
+
+/// Global application state
+/// This struct holds the main application data that is shared across views
+pub struct AppState {
+    /// Currently active page
+    pub current_page: Page,
+    
+    /// List of configured tunnels
+    pub tunnels: Vec<Tunnel>,
+    
+    /// Active connections
+    pub connections: Vec<Connection>,
+    
+    /// Application settings
+    pub settings: Settings,
+    
+    /// Recent log entries (circular buffer)
+    pub recent_logs: VecDeque<LogEntry>,
+    
+    /// Maximum number of logs to keep in memory
+    pub max_logs: usize,
+    
+    /// Current daemon status
+    pub daemon_status: DaemonStatus,
+}
+
+impl AppState {
+    /// Create a new AppState with default values
+    pub fn new() -> Self {
+        Self {
+            current_page: Page::GetStarted,
+            tunnels: Vec::new(),
+            connections: Vec::new(),
+            settings: Settings::default(),
+            recent_logs: VecDeque::new(),
+            max_logs: 10000,
+            daemon_status: DaemonStatus::Stopped,
+        }
+    }
+    
+    /// Add a log entry, removing oldest if over capacity
+    pub fn add_log(&mut self, entry: LogEntry) {
+        if self.recent_logs.len() >= self.max_logs {
+            self.recent_logs.pop_front();
+        }
+        self.recent_logs.push_back(entry);
+    }
+    
+    /// Clear all logs
+    pub fn clear_logs(&mut self) {
+        self.recent_logs.clear();
+    }
+    
+    /// Add or update a tunnel
+    pub fn upsert_tunnel(&mut self, tunnel: Tunnel) {
+        if let Some(pos) = self.tunnels.iter().position(|t| t.id == tunnel.id) {
+            self.tunnels[pos] = tunnel;
+        } else {
+            self.tunnels.push(tunnel);
+        }
+    }
+    
+    /// Remove a tunnel by ID
+    pub fn remove_tunnel(&mut self, tunnel_id: &str) {
+        self.tunnels.retain(|t| t.id != tunnel_id);
+    }
+    
+    /// Get a tunnel by ID
+    pub fn get_tunnel(&self, tunnel_id: &str) -> Option<&Tunnel> {
+        self.tunnels.iter().find(|t| t.id == tunnel_id)
+    }
+}
+
+impl Default for AppState {
+    fn default() -> Self {
+        Self::new()
+    }
+}

crates/wsrx-desktop-gpui/src/models/events.rs

@@ -0,0 +1,39 @@
+// Events - Application event definitions for inter-component communication
+
+use super::{Tunnel, Connection, LogEntry};
+
+/// Events that can occur in the application
+#[derive(Clone, Debug)]
+pub enum AppEvent {
+    /// Page navigation event
+    NavigateToPage(super::app_state::Page),
+    
+    /// Tunnel-related events
+    TunnelCreated(Tunnel),
+    TunnelUpdated(Tunnel),
+    TunnelDeleted(String), // tunnel_id
+    TunnelEnabled(String),
+    TunnelDisabled(String),
+    
+    /// Connection-related events
+    ConnectionEstablished(Connection),
+    ConnectionClosed(String), // connection_id
+    ConnectionError { connection_id: String, error: String },
+    
+    /// Daemon-related events
+    DaemonStarted,
+    DaemonStopped,
+    DaemonError(String),
+    
+    /// Log events
+    LogReceived(LogEntry),
+    ClearLogs,
+    
+    /// Settings events
+    SettingsUpdated,
+    ThemeChanged,
+    
+    /// UI events
+    ShowNotification { title: String, message: String },
+    ShowError(String),
+}

crates/wsrx-desktop-gpui/src/models/mod.rs

@@ -4,6 +4,12 @@
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 
+pub mod app_state;
+pub mod events;
+
+pub use app_state::{AppState, Page, DaemonStatus};
+pub use events::AppEvent;
+
 /// Represents a WebSocket tunnel configuration
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Tunnel {

crates/wsrx-desktop-gpui/src/styles/mod.rs

@@ -32,54 +32,54 @@ pub mod colors {
 
 /// Typography settings
 pub mod typography {
-    use gpui::Pixels;
+    use gpui::{Pixels, px};
 
     pub fn font_size_xs() -> Pixels {
-        Pixels(11.0)
+        px(11.0)
     }
 
     pub fn font_size_sm() -> Pixels {
-        Pixels(12.0)
+        px(12.0)
     }
 
     pub fn font_size_base() -> Pixels {
-        Pixels(14.0)
+        px(14.0)
     }
 
     pub fn font_size_lg() -> Pixels {
-        Pixels(16.0)
+        px(16.0)
     }
 
     pub fn font_size_xl() -> Pixels {
-        Pixels(20.0)
+        px(20.0)
     }
 }
 
 /// Spacing constants
 pub mod spacing {
-    use gpui::Pixels;
+    use gpui::{Pixels, px};
 
     pub fn xs() -> Pixels {
-        Pixels(2.0)
+        px(2.0)
     }
 
     pub fn sm() -> Pixels {
-        Pixels(4.0)
+        px(4.0)
     }
 
     pub fn base() -> Pixels {
-        Pixels(8.0)
+        px(8.0)
     }
 
     pub fn md() -> Pixels {
-        Pixels(12.0)
+        px(12.0)
     }
 
     pub fn lg() -> Pixels {
-        Pixels(16.0)
+        px(16.0)
     }
 
     pub fn xl() -> Pixels {
-        Pixels(24.0)
+        px(24.0)
     }
 }

crates/wsrx-desktop-gpui/src/views/connections.rs

@@ -1,6 +1,36 @@
 // Connections view - Manage tunnels and connections
+use gpui::{Context, Render, Window, div, prelude::*};
+use crate::styles::colors;
+
 pub struct ConnectionsView {
-    // TODO: Define state
 }
 
-// Placeholder - Will be implemented in next phase
+impl ConnectionsView {
+    pub fn new(_window: &mut Window, _cx: &mut Context<Self>) -> Self {
+        Self {}
+    }
+}
+
+impl Render for ConnectionsView {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .flex()
+            .flex_col()
+            .w_full()
+            .h_full()
+            .p_4()
+            .child(
+                div()
+                    .text_xl()
+                    .text_color(colors::foreground())
+                    .mb_4()
+                    .child("Connections")
+            )
+            .child(
+                div()
+                    .text_color(colors::foreground())
+                    .child("No tunnels configured yet")
+            )
+    }
+}
+

crates/wsrx-desktop-gpui/src/views/get_started.rs

@@ -1,6 +1,38 @@
 // Get Started view - Onboarding page
+use gpui::{Context, Render, Window, div, prelude::*};
+use crate::styles::colors;
+
 pub struct GetStartedView {
-    // TODO: Define state
 }
 
-// Placeholder - Will be implemented in next phase
+impl GetStartedView {
+    pub fn new(_window: &mut Window, _cx: &mut Context<Self>) -> Self {
+        Self {}
+    }
+}
+
+impl Render for GetStartedView {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .flex()
+            .flex_col()
+            .items_center()
+            .justify_center()
+            .w_full()
+            .h_full()
+            .gap_4()
+            .child(
+                div()
+                    .text_2xl()
+                    .text_color(colors::foreground())
+                    .child("Welcome to WebSocket Reflector X")
+            )
+            .child(
+                div()
+                    .text_base()
+                    .text_color(colors::foreground())
+                    .child("Get started by creating your first tunnel")
+            )
+    }
+}
+

crates/wsrx-desktop-gpui/src/views/network_logs.rs

@@ -1,6 +1,36 @@
 // Network Logs view - Display real-time logs
+use gpui::{Context, Render, Window, div, prelude::*};
+use crate::styles::colors;
+
 pub struct NetworkLogsView {
-    // TODO: Define state
 }
 
-// Placeholder - Will be implemented in next phase
+impl NetworkLogsView {
+    pub fn new(_window: &mut Window, _cx: &mut Context<Self>) -> Self {
+        Self {}
+    }
+}
+
+impl Render for NetworkLogsView {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .flex()
+            .flex_col()
+            .w_full()
+            .h_full()
+            .p_4()
+            .child(
+                div()
+                    .text_xl()
+                    .text_color(colors::foreground())
+                    .mb_4()
+                    .child("Network Logs")
+            )
+            .child(
+                div()
+                    .text_color(colors::foreground())
+                    .child("No logs yet")
+            )
+    }
+}
+