small cleanup

Cargo.lock

@@ -493,7 +493,7 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "canvas"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -584,7 +584,7 @@ dependencies = [
 
 [[package]]
 name = "client"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -635,7 +635,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "prost",
  "prost-types",
@@ -3022,7 +3022,7 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "search"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "common",
@@ -3121,7 +3121,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "bcrypt",

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # TODO: idk how to do the name, fix later
 # name = "komp_ac"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
 authors = ["Filip Priečinský <filippriec@gmail.com>"]

canvas/Cargo.toml

@@ -39,6 +39,7 @@ validation = ["regex"]
 computed = []
 textarea = ["dep:ropey","gui"]
 syntect = ["dep:syntect", "gui", "textarea"]
+keymap = ["gui"]
 
 # text modes (mutually exclusive; default to vim)
 textmode-vim = []
@@ -50,7 +51,8 @@ all-nontextmodes = [
     "cursor-style",
     "validation",
     "computed",
-    "textarea"
+    "textarea",
+    "keymap"
 ]
 
 [[example]]
@@ -106,3 +108,8 @@ path = "examples/textarea_normal.rs"
 name = "textarea_syntax"
 required-features = ["gui", "cursor-style", "textarea", "textmode-normal", "syntect"]
 path = "examples/textarea_syntax.rs"
+
+[[example]]
+name = "canvas_keymap"
+required-features = ["gui", "keymap", "cursor-style"]
+path = "examples/canvas_keymap.rs"

canvas/examples/canvas_keymap.rs

@@ -0,0 +1,376 @@
+// examples/canvas_keymap.rs
+//! Demonstrates the centralized keymap system for canvas interactions
+//!
+//! This example shows how to use the canvas-keymap feature to delegate
+//! all canvas key handling to the library, supporting complex sequences
+//! like "gg", "ge", etc.
+//!
+//! Run with:
+//! cargo run --example canvas_keymap --features "gui,keymap,cursor-style"
+
+#[cfg(not(feature = "keymap"))]
+compile_error!(
+    "This example requires the 'keymap' feature. \
+     Run with: cargo run --example canvas_keymap --features \"gui,keymap,cursor-style\""
+);
+
+use std::collections::HashMap;
+use std::io;
+use crossterm::{
+    event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyEvent},
+    execute,
+    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+};
+use ratatui::{
+    backend::{Backend, CrosstermBackend},
+    layout::{Constraint, Direction, Layout},
+    style::{Color, Style},
+    text::{Line, Span},
+    widgets::{Block, Borders, Paragraph},
+    Frame, Terminal,
+};
+
+use canvas::{
+    canvas::{gui::render_canvas_default, modes::AppMode},
+    keymap::{CanvasKeyMap, KeyEventOutcome},
+    DataProvider, FormEditor,
+};
+
+/// Demo application using centralized keymap system
+struct KeymapDemoApp {
+    editor: FormEditor<DemoData>,
+    message: String,
+    quit: bool,
+}
+
+impl KeymapDemoApp {
+    fn new() -> Self {
+        let data = DemoData::new();
+        let mut editor = FormEditor::new(data);
+        
+        // Build and inject the keymap from our config
+        let keymap = Self::build_demo_keymap();
+        editor.set_keymap(keymap);
+        
+        Self {
+            editor,
+            message: "🎯 Keymap system loaded! Try: gg, ge, hjkl, w/b/e, v, i, etc.".to_string(),
+            quit: false,
+        }
+    }
+
+    /// Build a comprehensive keymap configuration
+    fn build_demo_keymap() -> CanvasKeyMap {
+        let mut read_only = HashMap::new();
+        let mut edit = HashMap::new();
+        let mut highlight = HashMap::new();
+
+        // === READ-ONLY MODE KEYBINDINGS ===
+        
+        // Basic movement
+        read_only.insert("move_left".to_string(), vec!["h".to_string(), "Left".to_string()]);
+        read_only.insert("move_right".to_string(), vec!["l".to_string(), "Right".to_string()]);
+        read_only.insert("move_up".to_string(), vec!["k".to_string(), "Up".to_string()]);
+        read_only.insert("move_down".to_string(), vec!["j".to_string(), "Down".to_string()]);
+
+        // Word movement
+        read_only.insert("move_word_next".to_string(), vec!["w".to_string()]);
+        read_only.insert("move_word_prev".to_string(), vec!["b".to_string()]);
+        read_only.insert("move_word_end".to_string(), vec!["e".to_string()]);
+        read_only.insert("move_word_end_prev".to_string(), vec!["ge".to_string()]); // Multi-key!
+
+        // Big word movement  
+        read_only.insert("move_big_word_next".to_string(), vec!["W".to_string()]);
+        read_only.insert("move_big_word_prev".to_string(), vec!["B".to_string()]);
+        read_only.insert("move_big_word_end".to_string(), vec!["E".to_string()]);
+        read_only.insert("move_big_word_end_prev".to_string(), vec!["gE".to_string()]); // Multi-key!
+
+        // Line movement
+        read_only.insert("move_line_start".to_string(), vec!["0".to_string(), "Home".to_string()]);
+        read_only.insert("move_line_end".to_string(), vec!["$".to_string(), "End".to_string()]);
+        
+        // Field movement
+        read_only.insert("move_first_line".to_string(), vec!["gg".to_string()]); // Multi-key!
+        read_only.insert("move_last_line".to_string(), vec!["G".to_string()]);
+        read_only.insert("next_field".to_string(), vec!["Tab".to_string()]);
+        read_only.insert("prev_field".to_string(), vec!["Shift+Tab".to_string()]);
+
+        // Mode transitions
+        read_only.insert("enter_edit_mode_before".to_string(), vec!["i".to_string()]);
+        read_only.insert("enter_edit_mode_after".to_string(), vec!["a".to_string()]);
+        read_only.insert("enter_highlight_mode".to_string(), vec!["v".to_string()]);
+        read_only.insert("enter_highlight_mode_linewise".to_string(), vec!["V".to_string()]);
+
+        // Editing actions in normal mode
+        read_only.insert("delete_char_forward".to_string(), vec!["x".to_string()]);
+        read_only.insert("delete_char_backward".to_string(), vec!["X".to_string()]);
+        read_only.insert("open_line_below".to_string(), vec!["o".to_string()]);
+        read_only.insert("open_line_above".to_string(), vec!["O".to_string()]);
+
+        // === EDIT MODE KEYBINDINGS ===
+        
+        edit.insert("exit_edit_mode".to_string(), vec!["esc".to_string()]);
+        edit.insert("move_left".to_string(), vec!["Left".to_string()]);
+        edit.insert("move_right".to_string(), vec!["Right".to_string()]);
+        edit.insert("move_up".to_string(), vec!["Up".to_string()]);
+        edit.insert("move_down".to_string(), vec!["Down".to_string()]);
+        edit.insert("move_line_start".to_string(), vec!["Home".to_string()]);
+        edit.insert("move_line_end".to_string(), vec!["End".to_string()]);
+        edit.insert("move_word_next".to_string(), vec!["Ctrl+Right".to_string()]);
+        edit.insert("move_word_prev".to_string(), vec!["Ctrl+Left".to_string()]);
+        edit.insert("next_field".to_string(), vec!["Tab".to_string()]);
+        edit.insert("prev_field".to_string(), vec!["Shift+Tab".to_string()]);
+        edit.insert("delete_char_backward".to_string(), vec!["Backspace".to_string()]);
+        edit.insert("delete_char_forward".to_string(), vec!["Delete".to_string()]);
+
+        // === HIGHLIGHT MODE KEYBINDINGS ===
+        
+        highlight.insert("exit_highlight_mode".to_string(), vec!["esc".to_string()]);
+        highlight.insert("enter_highlight_mode_linewise".to_string(), vec!["V".to_string()]);
+        
+        // Movement (extends selection)
+        highlight.insert("move_left".to_string(), vec!["h".to_string(), "Left".to_string()]);
+        highlight.insert("move_right".to_string(), vec!["l".to_string(), "Right".to_string()]);
+        highlight.insert("move_up".to_string(), vec!["k".to_string(), "Up".to_string()]);
+        highlight.insert("move_down".to_string(), vec!["j".to_string(), "Down".to_string()]);
+        highlight.insert("move_word_next".to_string(), vec!["w".to_string()]);
+        highlight.insert("move_word_prev".to_string(), vec!["b".to_string()]);
+        highlight.insert("move_word_end".to_string(), vec!["e".to_string()]);
+        highlight.insert("move_word_end_prev".to_string(), vec!["ge".to_string()]);
+        highlight.insert("move_line_start".to_string(), vec!["0".to_string()]);
+        highlight.insert("move_line_end".to_string(), vec!["$".to_string()]);
+        highlight.insert("move_first_line".to_string(), vec!["gg".to_string()]);
+        highlight.insert("move_last_line".to_string(), vec!["G".to_string()]);
+
+        CanvasKeyMap::from_mode_maps(&read_only, &edit, &highlight)
+    }
+
+    fn handle_key_event(&mut self, key_event: KeyEvent) -> io::Result<()> {
+        // First, try canvas keymap
+        match self.editor.handle_key_event(key_event) {
+            KeyEventOutcome::Consumed(Some(msg)) => {
+                self.message = format!("🎯 Canvas: {}", msg);
+                return Ok(());
+            }
+            KeyEventOutcome::Consumed(None) => {
+                self.message = "🎯 Canvas action executed".to_string();
+                return Ok(());
+            }
+            KeyEventOutcome::Pending => {
+                self.message = "⏳ Waiting for next key in sequence...".to_string();
+                return Ok(());
+            }
+            KeyEventOutcome::NotMatched => {
+                // Fall through to client actions
+            }
+        }
+
+        // Handle client-specific actions (non-canvas)
+        use crossterm::event::{KeyCode, KeyModifiers};
+        match (key_event.code, key_event.modifiers) {
+            (KeyCode::Char('q'), KeyModifiers::CONTROL) |
+            (KeyCode::Char('c'), KeyModifiers::CONTROL) => {
+                self.quit = true;
+                self.message = "👋 Goodbye!".to_string();
+            }
+            (KeyCode::F(1), _) => {
+                self.message = "ℹ️  F1: This is a client action (not handled by canvas keymap)".to_string();
+            }
+            (KeyCode::F(2), _) => {
+                // Demonstrate saving
+                self.message = "💾 F2: Save action (client-side)".to_string();
+            }
+            (KeyCode::Char('?'), _) if self.editor.mode() == AppMode::ReadOnly => {
+                self.show_help();
+            }
+            _ => {
+                // Unknown key
+                self.message = format!(
+                    "❓ Unhandled key: {:?} (mode: {:?})",
+                    key_event.code,
+                    self.editor.mode()
+                );
+            }
+        }
+
+        Ok(())
+    }
+
+    fn show_help(&mut self) {
+        self.message = "📖 Help: Multi-key sequences work! Try gg, ge, gE. Also: hjkl, w/b/e, v/V, i/a/o".to_string();
+    }
+
+    fn should_quit(&self) -> bool {
+        self.quit
+    }
+
+    fn editor(&self) -> &FormEditor<DemoData> {
+        &self.editor
+    }
+
+    fn message(&self) -> &str {
+        &self.message
+    }
+}
+
+/// Demo form data with interesting examples for keymap testing
+struct DemoData {
+    fields: Vec<(String, String)>,
+}
+
+impl DemoData {
+    fn new() -> Self {
+        Self {
+            fields: vec![
+                ("🎯 Name".to_string(), "John-Paul McDonald-Smith".to_string()),
+                ("📧 Email".to_string(), "user@long-domain-name.example.com".to_string()),
+                ("📱 Phone".to_string(), "+1 (555) 123-4567 ext. 890".to_string()),
+                ("🏠 Address".to_string(), "123 Main Street, Apartment 4B, Suite 100".to_string()),
+                ("🏷️  Tags".to_string(), "urgent,important,follow-up,high-priority".to_string()),
+                ("📝 Notes".to_string(), "Test word movements: w=next-word, b=prev-word, e=word-end, ge=prev-word-end".to_string()),
+                ("🔥 Multi-key".to_string(), "Try multi-key sequences: gg=first-field, ge=prev-word-end, gE=prev-WORD-end".to_string()),
+                ("⚡ Vim Actions".to_string(), "Normal mode: x=delete-char, o=open-line-below, v=visual, i=insert".to_string()),
+            ],
+        }
+    }
+}
+
+impl DataProvider for DemoData {
+    fn field_count(&self) -> usize {
+        self.fields.len()
+    }
+
+    fn field_name(&self, index: usize) -> &str {
+        &self.fields[index].0
+    }
+
+    fn field_value(&self, index: usize) -> &str {
+        &self.fields[index].1
+    }
+
+    fn set_field_value(&mut self, index: usize, value: String) {
+        self.fields[index].1 = value;
+    }
+}
+
+fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: KeymapDemoApp) -> io::Result<()> {
+    loop {
+        terminal.draw(|f| ui(f, &app))?;
+
+        if let Event::Key(key) = event::read()? {
+            app.handle_key_event(key)?;
+            if app.should_quit() {
+                break;
+            }
+        }
+    }
+    Ok(())
+}
+
+fn ui(f: &mut Frame, app: &KeymapDemoApp) {
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([Constraint::Min(8), Constraint::Length(12)])
+        .split(f.area());
+
+    // Render the canvas
+    render_canvas_default(f, chunks[0], app.editor());
+
+    // Render status and help
+    render_status_and_help(f, chunks[1], app);
+}
+
+fn render_status_and_help(f: &mut Frame, area: ratatui::layout::Rect, app: &KeymapDemoApp) {
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([Constraint::Length(3), Constraint::Min(9)])
+        .split(area);
+
+    // Status message
+    let status_text = format!(
+        "Mode: {:?} | Field: {}/{} | Pos: {} | {}",
+        app.editor().mode(),
+        app.editor().current_field() + 1,
+        app.editor().data_provider().field_count(),
+        app.editor().cursor_position(),
+        app.message()
+    );
+
+    let status = Paragraph::new(Line::from(Span::raw(status_text)))
+        .block(Block::default().borders(Borders::ALL).title("🎯 Keymap Demo Status"));
+
+    f.render_widget(status, chunks[0]);
+
+    // Help text based on current mode
+    let help_text = match app.editor().mode() {
+        AppMode::ReadOnly => {
+            "🎯 KEYMAP DEMO - All keys handled by centralized keymap system!\n\
+             \n\
+             📍 MOVEMENT: hjkl(basic) | w/b/e(words) | W/B/E(WORDS) | 0/$(line) | gg/G(fields)\n\
+             🔥 MULTI-KEY: gg=first-field, ge=prev-word-end, gE=prev-WORD-end\n\
+             ✏️  MODES: i/a(insert) | v/V(visual) | o/O(open-line)\n\
+             🗑️  DELETE: x/X(delete-char)\n\
+             📂 FIELDS: Tab/Shift+Tab\n\
+             \n\
+             💡 Try multi-key sequences like 'gg' or 'ge' - watch the status for 'Waiting...'\n\
+             🚪 Ctrl+C=quit | ?=help | F1/F2=client actions (not canvas)"
+        }
+        AppMode::Edit => {
+            "✏️  INSERT MODE - Keys handled by keymap system\n\
+             \n\
+             🔄 NAVIGATION: arrows | Ctrl+arrows(words) | Home/End(line) | Tab/Shift+Tab(fields)\n\
+             🗑️  DELETE: Backspace/Delete\n\
+             🚪 EXIT: Esc=normal\n\
+             \n\
+             💡 Type text normally - the keymap handles navigation!"
+        }
+        AppMode::Highlight => {
+            "🎯 VISUAL MODE - Selection extended by keymap movements\n\
+             \n\
+             📍 EXTEND: hjkl(basic) | w/b/e(words) | 0/$(line) | gg/G(fields)\n\
+             🔄 SWITCH: V=toggle-line-mode\n\
+             🚪 EXIT: Esc=normal\n\
+             \n\
+             💡 All movements extend the selection automatically!"
+        }
+        _ => "🎯 Keymap system active!"
+    };
+
+    let help = Paragraph::new(help_text)
+        .block(Block::default().borders(Borders::ALL).title("🚀 Centralized Keymap System"))
+        .style(Style::default().fg(Color::Gray));
+
+    f.render_widget(help, chunks[1]);
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("🎯 Canvas Keymap Demo");
+    println!("✅ canvas-keymap feature: ENABLED");
+    println!("🚀 Centralized key handling: ACTIVE");
+    println!("📖 Multi-key sequences: SUPPORTED (gg, ge, gE, etc.)");
+    println!();
+
+    enable_raw_mode()?;
+    let mut stdout = io::stdout();
+    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    let backend = CrosstermBackend::new(stdout);
+    let mut terminal = Terminal::new(backend)?;
+
+    let app = KeymapDemoApp::new();
+    let res = run_app(&mut terminal, app);
+
+    disable_raw_mode()?;
+    execute!(
+        terminal.backend_mut(),
+        LeaveAlternateScreen,
+        DisableMouseCapture
+    )?;
+    terminal.show_cursor()?;
+
+    if let Err(err) = res {
+        println!("{err:?}");
+    }
+
+    println!("🎯 Keymap demo completed!");
+    Ok(())
+}

canvas/src/editor/core.rs

@@ -9,6 +9,10 @@ use crate::DataProvider;
 #[cfg(feature = "suggestions")]
 use crate::SuggestionItem;
 
+// NEW: Import keymap types when keymap feature is enabled
+#[cfg(feature = "keymap")]
+use crate::keymap::{CanvasKeyMap, KeySequenceTracker};
+
 pub struct FormEditor<D: DataProvider> {
     pub(crate) ui_state: EditorState,
     pub(crate) data_provider: D,
@@ -23,6 +27,12 @@ pub struct FormEditor<D: DataProvider> {
                 + Sync,
         >,
     >,
+
+    // NEW: Injected keymap and sequence tracker (keymap feature only)
+    #[cfg(feature = "keymap")]
+    pub(crate) keymap: Option<CanvasKeyMap>,
+    #[cfg(feature = "keymap")]
+    pub(crate) seq_tracker: KeySequenceTracker,
 }
 
 impl<D: DataProvider> FormEditor<D> {
@@ -47,6 +57,11 @@ impl<D: DataProvider> FormEditor<D> {
             suggestions: Vec::new(),
             #[cfg(feature = "validation")]
             external_validation_callback: None,
+            // NEW: Initialize keymap fields
+            #[cfg(feature = "keymap")]
+            keymap: None,
+            #[cfg(feature = "keymap")]
+            seq_tracker: KeySequenceTracker::new(400), // 400ms default timeout
         };
 
         #[cfg(feature = "validation")]
@@ -70,6 +85,26 @@ impl<D: DataProvider> FormEditor<D> {
         }
     }
 
+    // NEW: Keymap management methods (keymap feature only)
+    
+    /// Set the keymap for this editor instance
+    #[cfg(feature = "keymap")]
+    pub fn set_keymap(&mut self, keymap: CanvasKeyMap) {
+        self.keymap = Some(keymap);
+    }
+
+    /// Check if this editor has a keymap configured
+    #[cfg(feature = "keymap")]
+    pub fn has_keymap(&self) -> bool {
+        self.keymap.is_some()
+    }
+
+    /// Set the timeout for multi-key sequences (in milliseconds)
+    #[cfg(feature = "keymap")]
+    pub fn set_key_sequence_timeout_ms(&mut self, timeout_ms: u64) {
+        self.seq_tracker = KeySequenceTracker::new(timeout_ms);
+    }
+
     // Library-internal, used by multiple modules
     pub(crate) fn current_text(&self) -> &str {
         let field_index = self.ui_state.current_field;

canvas/src/editor/key_input.rs

@@ -0,0 +1,228 @@
+// src/editor/key_input.rs
+use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
+
+use crate::canvas::modes::AppMode;
+use crate::editor::FormEditor;
+use crate::DataProvider;
+
+#[cfg(feature = "keymap")]
+use crate::keymap::{KeyEventOutcome, KeyStroke};
+
+impl<D: DataProvider> FormEditor<D> {
+    #[cfg(feature = "keymap")]
+    pub fn handle_key_event(&mut self, evt: KeyEvent) -> KeyEventOutcome {
+        // Check if keymap exists first
+        if self.keymap.is_none() {
+            return KeyEventOutcome::NotMatched;
+        }
+
+        let mode = self.ui_state.current_mode;
+
+        // Convert event to normalized stroke
+        let stroke = KeyStroke {
+            code: evt.code,
+            modifiers: evt.modifiers,
+        };
+
+        // Add key to sequence tracker
+        self.seq_tracker.add_key(stroke);
+
+        // Look up the action in keymap
+        let (matched, is_prefix) = {
+            let km = self.keymap.as_ref().unwrap();
+            km.lookup(mode, self.seq_tracker.sequence())
+        };
+
+        if let Some(action) = matched {
+            // Clone the action string to avoid borrow checker issues
+            let action_owned = action.to_string();
+            let msg = self.dispatch_canvas_action(&action_owned);
+            self.seq_tracker.reset();
+            return KeyEventOutcome::Consumed(msg);
+        }
+
+        if is_prefix {
+            // Wait for more keys
+            return KeyEventOutcome::Pending;
+        }
+
+        // No match: reset sequence and try insert-char fallback in Edit
+        self.seq_tracker.reset();
+
+        if mode == AppMode::Edit {
+            if let KeyCode::Char(c) = evt.code {
+                // Skip control/alt combos
+                let m = evt.modifiers;
+                let is_plain =
+                    m.is_empty() || m == KeyModifiers::SHIFT;
+                if is_plain {
+                    if self.insert_char(c).is_ok() {
+                        return KeyEventOutcome::Consumed(None);
+                    }
+                }
+            }
+        }
+
+        KeyEventOutcome::NotMatched
+    }
+
+    #[cfg(feature = "keymap")]
+    fn dispatch_canvas_action(&mut self, action: &str) -> Option<String> {
+        match action {
+            // Movement
+            "move_left" => {
+                let _ = self.move_left();
+                None
+            }
+            "move_right" => {
+                let _ = self.move_right();
+                None
+            }
+            "move_up" => {
+                let _ = self.move_up();
+                None
+            }
+            "move_down" => {
+                let _ = self.move_down();
+                None
+            }
+            "next_field" => {
+                let _ = self.next_field();
+                None
+            }
+            "prev_field" => {
+                let _ = self.prev_field();
+                None
+            }
+            "move_line_start" => {
+                self.move_line_start();
+                None
+            }
+            "move_line_end" => {
+                self.move_line_end();
+                None
+            }
+            "move_first_line" => {
+                let _ = self.move_first_line();
+                None
+            }
+            "move_last_line" => {
+                let _ = self.move_last_line();
+                None
+            }
+
+            // Word/big-word movement (cross-field aware)
+            "move_word_next" => {
+                self.move_word_next();
+                None
+            }
+            "move_word_prev" => {
+                self.move_word_prev();
+                None
+            }
+            "move_word_end" => {
+                self.move_word_end();
+                None
+            }
+            "move_word_end_prev" => {
+                self.move_word_end_prev();
+                None
+            }
+            "move_big_word_next" => {
+                self.move_big_word_next();
+                None
+            }
+            "move_big_word_prev" => {
+                self.move_big_word_prev();
+                None
+            }
+            "move_big_word_end" => {
+                self.move_big_word_end();
+                None
+            }
+            "move_big_word_end_prev" => {
+                self.move_big_word_end_prev();
+                None
+            }
+
+            // Editing
+            "delete_char_backward" => {
+                let _ = self.delete_backward();
+                None
+            }
+            "delete_char_forward" => {
+                let _ = self.delete_forward();
+                None
+            }
+            "open_line_below" => {
+                let _ = self.open_line_below();
+                None
+            }
+            "open_line_above" => {
+                let _ = self.open_line_above();
+                None
+            }
+
+            // Suggestions (only when feature is enabled)
+            #[cfg(feature = "suggestions")]
+            "open_suggestions" => {
+                let idx = self.current_field();
+                self.open_suggestions(idx);
+                None
+            }
+            #[cfg(feature = "suggestions")]
+            "apply_suggestion" | "enter_decider" => {
+                if let Some(_applied) = self.apply_suggestion() {
+                    None
+                } else {
+                    None
+                }
+            }
+            #[cfg(feature = "suggestions")]
+            "suggestion_down" => {
+                self.suggestions_next();
+                None
+            }
+            #[cfg(feature = "suggestions")]
+            "suggestion_up" => {
+                self.suggestions_prev();
+                None
+            }
+
+            // Mode transitions (vim-like)
+            "enter_edit_mode_before" => {
+                self.enter_edit_mode();
+                None
+            }
+            "enter_edit_mode_after" => {
+                // Move forward 1 char if possible (vim 'a'), then enter insert
+                let txt_len = self.current_text().chars().count();
+                let pos = self.ui_state.cursor_pos;
+                if pos < txt_len {
+                    self.ui_state.cursor_pos = pos + 1;
+                    self.ui_state.ideal_cursor_column = self.ui_state.cursor_pos;
+                }
+                self.enter_edit_mode();
+                None
+            }
+            "exit" | "exit_edit_mode" => {
+                let _ = self.exit_edit_mode();
+                None
+            }
+            "enter_highlight_mode" => {
+                self.enter_highlight_mode();
+                None
+            }
+            "enter_highlight_mode_linewise" => {
+                self.enter_highlight_line_mode();
+                None
+            }
+            "exit_highlight_mode" => {
+                self.exit_highlight_mode();
+                None
+            }
+
+            _ => None,
+        }
+    }
+}

canvas/src/editor/mod.rs

@@ -21,5 +21,8 @@ pub mod validation_helpers;
 #[cfg(feature = "computed")]
 pub mod computed_helpers;
 
+#[cfg(feature = "keymap")] 
+pub mod key_input;
+
 // Re-export the main type
 pub use core::FormEditor;

canvas/src/editor/suggestions.rs

@@ -133,6 +133,21 @@ impl<D: DataProvider> FormEditor<D> {
         self.update_inline_completion();
     }
 
+    pub fn suggestions_prev(&mut self) {
+        if !self.ui_state.suggestions.is_active || self.suggestions.is_empty() {
+            return;
+        }
+
+        let current = self.ui_state.suggestions.selected_index.unwrap_or(0);
+        let prev = if current == 0 {
+            self.suggestions.len() - 1
+        } else {
+            current - 1
+        };
+        self.ui_state.suggestions.selected_index = Some(prev);
+        self.update_inline_completion();
+    }
+
     pub fn apply_suggestion(&mut self) -> Option<String> {
         if let Some(selected_index) = self.ui_state.suggestions.selected_index {
             if let Some(suggestion) = self.suggestions.get(selected_index).cloned()

canvas/src/keymap/mod.rs

@@ -0,0 +1,344 @@
+// src/keymap/mod.rs
+use std::collections::HashMap;
+use std::time::{Duration, Instant};
+
+use crossterm::event::{KeyCode, KeyModifiers};
+
+use crate::canvas::modes::AppMode;
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct KeyStroke {
+    pub code: KeyCode,
+    pub modifiers: KeyModifiers,
+}
+
+#[derive(Clone, Debug)]
+struct Binding {
+    action: String,
+    sequence: Vec<KeyStroke>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct CanvasKeyMap {
+    ro: Vec<Binding>,
+    edit: Vec<Binding>,
+    hl: Vec<Binding>,
+}
+
+// FIXED: Removed Copy because Option<String> is not Copy
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum KeyEventOutcome {
+    Consumed(Option<String>),
+    Pending,
+    NotMatched,
+}
+
+#[derive(Debug, Clone)]
+pub struct KeySequenceTracker {
+    sequence: Vec<KeyStroke>,
+    last_key_time: Instant,
+    timeout: Duration,
+}
+
+impl KeySequenceTracker {
+    pub fn new(timeout_ms: u64) -> Self {
+        Self {
+            sequence: Vec::new(),
+            last_key_time: Instant::now(),
+            timeout: Duration::from_millis(timeout_ms),
+        }
+    }
+
+    pub fn reset(&mut self) {
+        self.sequence.clear();
+        self.last_key_time = Instant::now();
+    }
+
+    pub fn add_key(&mut self, stroke: KeyStroke) {
+        let now = Instant::now();
+        if now.duration_since(self.last_key_time) > self.timeout {
+            self.reset();
+        }
+        self.sequence.push(normalize_stroke(stroke));
+        self.last_key_time = now;
+    }
+
+    pub fn sequence(&self) -> &[KeyStroke] {
+        &self.sequence
+    }
+}
+
+fn normalize_stroke(mut s: KeyStroke) -> KeyStroke {
+    // Normalize Shift+Tab to BackTab
+    let is_shift_tab =
+        s.code == KeyCode::Tab && s.modifiers.contains(KeyModifiers::SHIFT);
+    if is_shift_tab {
+        s.code = KeyCode::BackTab;
+        s.modifiers.remove(KeyModifiers::SHIFT);
+        return s;
+    }
+
+    // Normalize Shift+char to uppercase char without SHIFT when possible
+    if let KeyCode::Char(c) = s.code {
+        if s.modifiers.contains(KeyModifiers::SHIFT) {
+            let mut up = c;
+            // Only letters transform meaningfully
+            if c.is_ascii_alphabetic() {
+                up = c.to_ascii_uppercase();
+            }
+            s.code = KeyCode::Char(up);
+            s.modifiers.remove(KeyModifiers::SHIFT);
+            return s;
+        }
+    }
+    s
+}
+
+impl CanvasKeyMap {
+    pub fn from_mode_maps(
+        read_only: &HashMap<String, Vec<String>>,
+        edit: &HashMap<String, Vec<String>>,
+        highlight: &HashMap<String, Vec<String>>,
+    ) -> Self {
+        let mut km = Self::default();
+        km.ro = collect_bindings(read_only);
+        km.edit = collect_bindings(edit);
+        km.hl = collect_bindings(highlight);
+        km
+    }
+
+    pub fn lookup(
+        &self,
+        mode: AppMode,
+        seq: &[KeyStroke],
+    ) -> (Option<&str>, bool) {
+        let bindings = match mode {
+            AppMode::ReadOnly => &self.ro,
+            AppMode::Edit => &self.edit,
+            AppMode::Highlight => &self.hl,
+            _ => return (None, false),
+        };
+
+        if seq.is_empty() {
+            return (None, false);
+        }
+
+        // Exact match
+        for b in bindings {
+            if sequences_equal(&b.sequence, seq) {
+                return (Some(b.action.as_str()), false);
+            }
+        }
+
+        // Prefix match
+        for b in bindings {
+            if is_prefix(&b.sequence, seq) {
+                return (None, true);
+            }
+        }
+
+        (None, false)
+    }
+}
+
+fn sequences_equal(a: &[KeyStroke], b: &[KeyStroke]) -> bool {
+    if a.len() != b.len() {
+        return false;
+    }
+    a.iter().zip(b.iter()).all(|(x, y)| strokes_equal(x, y))
+}
+
+fn strokes_equal(a: &KeyStroke, b: &KeyStroke) -> bool {
+    // Both KeyStroke are already normalized
+    a.code == b.code && a.modifiers == b.modifiers
+}
+
+fn is_prefix(binding: &[KeyStroke], seq: &[KeyStroke]) -> bool {
+    if seq.len() >= binding.len() {
+        return false;
+    }
+    binding
+        .iter()
+        .zip(seq.iter())
+        .all(|(b, s)| strokes_equal(b, s))
+}
+
+fn collect_bindings(
+    mode_map: &HashMap<String, Vec<String>>,
+) -> Vec<Binding> {
+    let mut out = Vec::new();
+    for (action, list) in mode_map {
+        for binding_str in list {
+            if let Some(seq) = parse_binding_to_sequence(binding_str) {
+                out.push(Binding {
+                    action: action.to_string(),
+                    sequence: seq,
+                });
+            }
+        }
+    }
+    out
+}
+
+fn parse_binding_to_sequence(input: &str) -> Option<Vec<KeyStroke>> {
+    let s = input.trim();
+    if s.is_empty() {
+        return None;
+    }
+
+    let has_space = s.contains(' ');
+    let has_plus = s.contains('+');
+
+    if has_space {
+        let mut seq = Vec::new();
+        for part in s.split_whitespace() {
+            if let Some(mut strokes) = parse_part_to_sequence(part) {
+                seq.append(&mut strokes);
+            } else {
+                return None;
+            }
+        }
+        return Some(seq);
+    }
+
+    if has_plus {
+        if contains_modifier_token(s) {
+            if let Some(k) = parse_chord_with_modifiers(s) {
+                return Some(vec![k]);
+            }
+            return None;
+        } else {
+            let mut seq = Vec::new();
+            for t in s.split('+') {
+                if let Some(mut strokes) = parse_part_to_sequence(t) {
+                    seq.append(&mut strokes);
+                } else {
+                    return None;
+                }
+            }
+            return Some(seq);
+        }
+    }
+
+    if is_compound_key(s) {
+        if let Some(k) = parse_simple_key(s) {
+            return Some(vec![k]);
+        }
+        return None;
+    }
+
+    if s.len() > 1 {
+        let mut seq = Vec::new();
+        for ch in s.chars() {
+            seq.push(KeyStroke {
+                code: KeyCode::Char(ch),
+                modifiers: KeyModifiers::empty(),
+            });
+        }
+        return Some(seq);
+    }
+
+    if let Some(k) = parse_simple_key(s) {
+        return Some(vec![k]);
+    }
+    None
+}
+
+fn parse_part_to_sequence(part: &str) -> Option<Vec<KeyStroke>> {
+    let p = part.trim();
+    if p.is_empty() {
+        return None;
+    }
+
+    if p.contains('+') && contains_modifier_token(p) {
+        if let Some(k) = parse_chord_with_modifiers(p) {
+            return Some(vec![k]);
+        }
+        return None;
+    }
+
+    if is_compound_key(p) {
+        if let Some(k) = parse_simple_key(p) {
+            return Some(vec![k]);
+        }
+        return None;
+    }
+
+    if p.len() > 1 {
+        let mut seq = Vec::new();
+        for ch in p.chars() {
+            seq.push(KeyStroke {
+                code: KeyCode::Char(ch),
+                modifiers: KeyModifiers::empty(),
+            });
+        }
+        return Some(seq);
+    }
+
+    parse_simple_key(p).map(|k| vec![k])
+}
+
+fn contains_modifier_token(s: &str) -> bool {
+    let low = s.to_lowercase();
+    low.contains("ctrl") || low.contains("shift") || low.contains("alt") || 
+    low.contains("super") || low.contains("cmd") || low.contains("meta")
+}
+
+fn parse_chord_with_modifiers(s: &str) -> Option<KeyStroke> {
+    let mut mods = KeyModifiers::empty();
+    let mut key: Option<KeyCode> = None;
+
+    for comp in s.split('+') {
+        match comp.to_lowercase().as_str() {
+            "ctrl" => mods |= KeyModifiers::CONTROL,
+            "shift" => mods |= KeyModifiers::SHIFT,
+            "alt" => mods |= KeyModifiers::ALT,
+            "super" | "cmd" => mods |= KeyModifiers::SUPER,
+            "meta" => mods |= KeyModifiers::META,
+            other => {
+                key = string_to_keycode(other);
+            }
+        }
+    }
+
+    key.map(|k| normalize_stroke(KeyStroke { code: k, modifiers: mods }))
+}
+
+fn is_compound_key(s: &str) -> bool {
+    matches!(s.to_lowercase().as_str(),
+        "left" | "right" | "up" | "down" | "esc" | "enter" | "backspace" | 
+        "delete" | "tab" | "home" | "end" | "$" | "0"
+    )
+}
+
+fn parse_simple_key(s: &str) -> Option<KeyStroke> {
+    if let Some(kc) = string_to_keycode(&s.to_lowercase()) {
+        return Some(KeyStroke { code: kc, modifiers: KeyModifiers::empty() });
+    }
+
+    if s.chars().count() == 1 {
+        let ch = s.chars().next().unwrap();
+        return Some(KeyStroke { code: KeyCode::Char(ch), modifiers: KeyModifiers::empty() });
+    }
+
+    None
+}
+
+fn string_to_keycode(s: &str) -> Option<KeyCode> {
+    Some(match s {
+        "left" => KeyCode::Left,
+        "right" => KeyCode::Right, 
+        "up" => KeyCode::Up,
+        "down" => KeyCode::Down,
+        "esc" => KeyCode::Esc,
+        "enter" => KeyCode::Enter,
+        "backspace" => KeyCode::Backspace,
+        "delete" => KeyCode::Delete,
+        "tab" => KeyCode::Tab,
+        "home" => KeyCode::Home,
+        "end" => KeyCode::End,
+        "$" => KeyCode::Char('$'),
+        "0" => KeyCode::Char('0'),
+        _ => return None,
+    })
+}

canvas/src/lib.rs

@@ -4,22 +4,21 @@ pub mod canvas;
 pub mod editor;
 pub mod data_provider;
 
-// Only include suggestions module if feature is enabled
 #[cfg(feature = "suggestions")]
 pub mod suggestions;
 
-// Only include validation module if feature is enabled
 #[cfg(feature = "validation")]
 pub mod validation;
 
-// First-class textarea module and exports
 #[cfg(feature = "textarea")]
 pub mod textarea;
 
-// Only include computed module if feature is enabled
 #[cfg(feature = "computed")]
 pub mod computed;
 
+#[cfg(feature = "keymap")]
+pub mod keymap;
+
 #[cfg(feature = "cursor-style")]
 pub use canvas::CursorManager;
 
@@ -71,6 +70,8 @@ pub use canvas::gui::{CanvasDisplayOptions, OverflowMode};
 #[cfg(all(feature = "gui", feature = "suggestions"))]
 pub use suggestions::gui::render_suggestions_dropdown;
 
+#[cfg(feature = "keymap")]
+pub use keymap::{CanvasKeyMap, KeyEventOutcome};
 
 #[cfg(feature = "textarea")]
 pub use textarea::{TextArea, TextAreaProvider, TextAreaState, TextAreaEditor};

client/Cargo.toml

@@ -8,7 +8,7 @@ license.workspace = true
 anyhow = { workspace = true }
 async-trait = "0.1.88"
 common = { path = "../common" }
-canvas = { path = "../canvas", features = ["gui", "suggestions"] }
+canvas = { path = "../canvas", features = ["gui", "suggestions", "cursor-style", "keymap"] }
 
 ratatui = { workspace = true }
 crossterm = { workspace = true }

client/config.toml

@@ -40,7 +40,7 @@ previous_entry = ["left","q"]
 next_entry = ["right","1"]
 
 enter_highlight_mode = ["v"]
-enter_highlight_mode_linewise = ["ctrl+v"]
+enter_highlight_mode_linewise = ["shift+v"]
 
 ### AUTOGENERATED CANVAS CONFIG
 # Required
@@ -50,7 +50,7 @@ move_right = ["l", "Right"]
 move_down = ["j", "Down"]
 # Optional
 move_line_end = ["$"]
-# move_word_next = ["w"]
+move_word_next = ["w"]
 next_field = ["Tab"]
 move_word_prev = ["b"]
 move_word_end = ["e"]
@@ -91,23 +91,23 @@ suggestion_up = ["ctrl+p", "shift+tab"]
 
 ### AUTOGENERATED CANVAS CONFIG
 # Required
-move_right = ["Right", "l"]
+move_right = ["Right"]
 delete_char_backward = ["Backspace"]
 next_field = ["Tab", "Enter"]
-move_up = ["Up", "k"]
-move_down = ["Down", "j"]
+move_up = ["Up"]
+move_down = ["Down"]
 prev_field = ["Shift+Tab"]
-move_left = ["Left", "h"]
+move_left = ["Left"]
 # Optional
-move_last_line = ["Ctrl+End", "G"]
+move_last_line = ["Ctrl+End"]
 delete_char_forward = ["Delete"]
-move_word_prev = ["Ctrl+Left", "b"]
-move_word_end = ["e"]
-move_word_end_prev = ["ge"]
-move_first_line = ["Ctrl+Home", "gg"]
-move_word_next = ["Ctrl+Right", "w"]
-move_line_start = ["Home", "0"]
-move_line_end = ["End", "$"]
+move_word_prev = ["Ctrl+Left"]
+# move_word_end = ["e"]
+# move_word_end_prev = ["ge"]
+move_first_line = ["Ctrl+Home"]
+move_word_next = ["Ctrl+Right"]
+move_line_start = ["Home"]
+move_line_end = ["End"]
 
 [keybindings.command]
 exit_command_mode = ["ctrl+g", "esc"]

client/src/bottom_panel/find_file_palette.rs

@@ -1,4 +1,4 @@
-// src/components/common/find_file_palette.rs
+// src/bottom_panel/find_file_palette.rs
 
 use crate::config::colors::themes::Theme;
 use crate::modes::general::command_navigation::NavigationState; // Corrected path

client/src/bottom_panel/layout.rs

@@ -0,0 +1,97 @@
+// src/bottom_panel/layout.rs
+
+use ratatui::{layout::Constraint, layout::Rect, Frame};
+use crate::bottom_panel::{status_line::render_status_line, command_line::render_command_line};
+use crate::bottom_panel::find_file_palette;
+use crate::config::colors::themes::Theme;
+use crate::modes::general::command_navigation::NavigationState;
+use crate::state::app::state::AppState;
+
+/// Calculate the layout constraints for the bottom panel (status line + command line/palette).
+pub fn bottom_panel_constraints(
+    app_state: &AppState,
+    navigation_state: &NavigationState,
+    event_handler_command_mode_active: bool,
+) -> Vec<Constraint> {
+    let mut status_line_height = 1;
+    #[cfg(feature = "ui-debug")]
+    {
+        if let Some(debug_state) = &app_state.debug_state {
+            if debug_state.is_error {
+                status_line_height = 4;
+            }
+        }
+    }
+
+    const PALETTE_OPTIONS_HEIGHT_FOR_LAYOUT: u16 = 15;
+    let command_palette_area_height = if navigation_state.active {
+        1 + PALETTE_OPTIONS_HEIGHT_FOR_LAYOUT
+    } else if event_handler_command_mode_active {
+        1
+    } else {
+        0
+    };
+
+    let mut constraints = vec![Constraint::Length(status_line_height)];
+    if command_palette_area_height > 0 {
+        constraints.push(Constraint::Length(command_palette_area_height));
+    }
+    constraints
+}
+
+/// Render the bottom panel (status line + command line/palette).
+pub fn render_bottom_panel(
+    f: &mut Frame,
+    root_chunks: &[Rect],
+    chunk_idx: &mut usize,
+    current_dir: &str,
+    theme: &Theme,
+    is_event_handler_edit_mode: bool,
+    current_fps: f64,
+    app_state: &AppState,
+    navigation_state: &NavigationState,
+    event_handler_command_input: &str,
+    event_handler_command_mode_active: bool,
+    event_handler_command_message: &str,
+) {
+    // --- Status line area ---
+    let status_line_area = root_chunks[*chunk_idx];
+    *chunk_idx += 1;
+
+    // --- Command line / palette area ---
+    let command_render_area = if root_chunks.len() > *chunk_idx {
+        Some(root_chunks[*chunk_idx])
+    } else {
+        None
+    };
+    if command_render_area.is_some() {
+        *chunk_idx += 1;
+    }
+
+    // --- Render status line ---
+    render_status_line(
+        f,
+        status_line_area,
+        current_dir,
+        theme,
+        is_event_handler_edit_mode,
+        current_fps,
+        app_state,
+    );
+
+    // --- Render command line or palette ---
+    if let Some(area) = command_render_area {
+        if navigation_state.active {
+            find_file_palette::render_find_file_palette(f, area, theme, navigation_state);
+        } else if event_handler_command_mode_active {
+            render_command_line(
+                f,
+                area,
+                event_handler_command_input,
+                true,
+                theme,
+                event_handler_command_message,
+            );
+        }
+    }
+}

client/src/bottom_panel/mod.rs

@@ -0,0 +1,6 @@
+// src/bottom_panel/mod.rs
+
+pub mod status_line; 
+pub mod command_line;
+pub mod layout;
+pub mod find_file_palette;

client/src/bottom_panel/status_line.rs

@@ -5,10 +5,9 @@ use ratatui::{
     layout::Rect,
     style::Style,
     text::{Line, Span, Text},
-    widgets::Paragraph,
+    widgets::{Paragraph, Wrap},
     Frame,
 };
-use ratatui::widgets::Wrap;
 use std::path::Path;
 use unicode_width::UnicodeWidthStr;
 

client/src/buffer/functions.rs

@@ -1,7 +1,7 @@
-// src/functions/common/buffer.rs
+// src/buffer/functions/buffer.rs
 
-use crate::state::app::buffer::BufferState;
-use crate::state::app::buffer::AppView;
+use crate::buffer::state::BufferState;
+use crate::buffer::state::AppView;
 
 pub fn get_view_layer(view: &AppView) -> u8 {
     match view {

client/src/buffer/logic.rs

@@ -0,0 +1,20 @@
+// src/buffer/logic.rs
+use crossterm::event::{KeyCode, KeyModifiers};
+use crate::config::binds::config::Config;
+use crate::state::app::state::UiState;
+
+/// Toggle the buffer list visibility based on keybindings.
+pub fn toggle_buffer_list(
+    ui_state: &mut UiState,
+    config: &Config,
+    key: KeyCode,
+    modifiers: KeyModifiers,
+) -> bool {
+    if let Some(action) = config.get_common_action(key, modifiers) {
+        if action == "toggle_buffer_list" {
+            ui_state.show_buffer_list = !ui_state.show_buffer_list;
+            return true;
+        }
+    }
+    false
+}

client/src/buffer/mod.rs

@@ -0,0 +1,11 @@
+// src/buffer/mod.rs
+
+pub mod state;
+pub mod functions;
+pub mod ui;
+pub mod logic;
+
+pub use state::{AppView, BufferState};
+pub use functions::*;
+pub use ui::render_buffer_list;
+pub use logic::toggle_buffer_list;

client/src/buffer/state.rs

@@ -1,4 +1,4 @@
-// src/state/app/buffer.rs
+// src/buffer/state/buffer.rs
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum AppView {

client/src/buffer/ui.rs

@@ -1,7 +1,7 @@
-// src/components/handlers/buffer_list.rs
+// src/buffer/ui.rs
 
 use crate::config::colors::themes::Theme;
-use crate::state::app::buffer::BufferState;
+use crate::buffer::state::BufferState;
 use crate::state::app::state::AppState;  // Add this import
 use ratatui::{
     layout::{Alignment, Rect},
@@ -11,7 +11,7 @@ use ratatui::{
     Frame,
 };
 use unicode_width::UnicodeWidthStr;
-use crate::functions::common::buffer::get_view_layer;
+use crate::buffer::functions::get_view_layer;
 
 pub fn render_buffer_list(
     f: &mut Frame,

client/src/components/admin/add_logic.rs

@@ -1,6 +1,5 @@
 // src/components/admin/add_logic.rs
 use crate::config::colors::themes::Theme;
-use crate::state::app::highlight::HighlightState;
 use crate::state::app::state::AppState;
 use crate::state::pages::add_logic::{AddLogicFocus, AddLogicState};
 use canvas::{render_canvas, FormEditor};

client/src/components/admin/add_table.rs

@@ -1,9 +1,8 @@
 // src/components/admin/add_table.rs
 use crate::config::colors::themes::Theme;
-use crate::state::app::highlight::HighlightState;
 use crate::state::app::state::AppState;
 use crate::state::pages::add_table::{AddTableFocus, AddTableState};
-use canvas::{render_canvas_default, render_canvas, FormEditor};
+use canvas::{render_canvas, FormEditor};
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Modifier, Style},

client/src/components/auth/login.rs

@@ -12,7 +12,6 @@ use ratatui::{
     widgets::{Block, BorderType, Borders, Paragraph},
     Frame,
 };
-use crate::state::app::highlight::HighlightState;
 use canvas::{
     FormEditor,
     render_canvas,

client/src/components/auth/register.rs

@@ -13,18 +13,7 @@ use ratatui::{
     widgets::{Block, BorderType, Borders, Paragraph},
     Frame,
 };
-use crate::state::app::highlight::HighlightState;
-use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
-use canvas::canvas::HighlightState as CanvasHighlightState;
-
-// Helper function to convert between HighlightState types
-fn convert_highlight_state(local: &HighlightState) -> CanvasHighlightState {
-    match local {
-        HighlightState::Off => CanvasHighlightState::Off,
-        HighlightState::Characterwise { anchor } => CanvasHighlightState::Characterwise { anchor: *anchor },
-        HighlightState::Linewise { anchor_line } => CanvasHighlightState::Linewise { anchor_line: *anchor_line },
-    }
-}
+use canvas::{FormEditor, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
 
 pub fn render_register(
     f: &mut Frame,

client/src/components/common.rs

@@ -1,18 +1,11 @@
 // src/components/common.rs
-pub mod command_line;
-pub mod status_line;
+
 pub mod text_editor;
 pub mod background;
 pub mod dialog;
 pub mod autocomplete;
-pub mod search_palette;
-pub mod find_file_palette;
 
-pub use command_line::*;
-pub use status_line::*;
 pub use text_editor::*;
 pub use background::*;
 pub use dialog::*;
 pub use autocomplete::*;
-pub use search_palette::*;
-pub use find_file_palette::*;

client/src/components/common/autocomplete.rs

@@ -1,8 +1,8 @@
 // src/components/common/autocomplete.rs
 
 use crate::config::colors::themes::Theme;
-use crate::state::pages::form::FormState;
 use common::proto::komp_ac::search::search_response::Hit;
+use crate::pages::forms::FormState;
 use ratatui::{
     layout::Rect,
     style::{Color, Modifier, Style},

client/src/components/form.rs

@@ -1,4 +0,0 @@
-// src/components/form.rs
-pub mod form;
-
-pub use form::*;

client/src/components/handlers.rs

@@ -1,6 +0,0 @@
-// src/components/handlers.rs
-pub mod sidebar;
-pub mod buffer_list;
-
-pub use sidebar::*;
-pub use buffer_list::*;

client/src/components/mod.rs

@@ -1,16 +1,12 @@
 // src/components/mod.rs
-pub mod handlers;
 pub mod intro;
 pub mod admin;
 pub mod common;
-pub mod form;
 pub mod auth;
 pub mod utils;
 
-pub use handlers::*;
 pub use intro::*;
 pub use admin::*;
 pub use common::*;
-pub use form::*;
 pub use auth::*;
 pub use utils::*;

client/src/config/binds/config.rs

@@ -5,6 +5,7 @@ use std::collections::HashMap;
 use std::path::Path;
 use anyhow::{Context, Result};
 use crossterm::event::{KeyCode, KeyModifiers};
+use canvas::CanvasKeyMap;
 
 // NEW: Editor Keybinding Mode Enum
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -760,4 +761,43 @@ impl Config {
         }
         false
     }
+
+    /// Unified action resolver for app-level actions
+    pub fn get_app_action(
+        &self,
+        key_code: crossterm::event::KeyCode,
+        modifiers: crossterm::event::KeyModifiers,
+    ) -> Option<&str> {
+        // First check common actions
+        if let Some(action) = self.get_common_action(key_code, modifiers) {
+            return Some(action);
         }
+
+        // Then check read-only mode actions
+        if let Some(action) = self.get_read_only_action_for_key(key_code, modifiers) {
+            return Some(action);
+        }
+
+        // Then check highlight mode actions
+        if let Some(action) = self.get_highlight_action_for_key(key_code, modifiers) {
+            return Some(action);
+        }
+
+        // Then check edit mode actions
+        if let Some(action) = self.get_edit_action_for_key(key_code, modifiers) {
+            return Some(action);
+        }
+
+        None
+    }
+
+    pub fn build_canvas_keymap(&self) -> CanvasKeyMap {
+        CanvasKeyMap::from_mode_maps(
+            &self.keybindings.read_only,
+            &self.keybindings.edit,
+            &self.keybindings.highlight,
+        )
+    }
+}
+
+

client/src/functions/common.rs

@@ -1,5 +0,0 @@
-// src/functions/common.rs
-
-pub mod buffer;
-
-pub use buffer::*;

client/src/functions/mod.rs

@@ -1,6 +1,5 @@
 // src/functions/mod.rs
 
-pub mod common;
 pub mod modes;
 
 pub use modes::*;

client/src/functions/modes/navigation/add_logic_nav.rs

@@ -3,16 +3,17 @@ use crate::config::binds::config::{Config, EditorKeybindingMode};
 use crate::state::{
     app::state::AppState,
     pages::add_logic::{AddLogicFocus, AddLogicState},
-    app::buffer::AppView,
-    app::buffer::BufferState,
 };
+use crate::buffer::{AppView, BufferState};
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::services::GrpcClient;
 use tokio::sync::mpsc;
 use anyhow::Result;
 use crate::components::common::text_editor::TextEditor;
 use crate::services::ui_service::UiService;
-use tui_textarea::CursorMove; // Ensure this import is present
+use tui_textarea::CursorMove;
+use crate::state::pages::admin::AdminState;
+use crate::pages::routing::{Router, Page};
 
 pub type SaveLogicResultSender = mpsc::Sender<Result<String>>;
 
@@ -20,13 +21,15 @@ pub fn handle_add_logic_navigation(
     key_event: KeyEvent,
     config: &Config,
     app_state: &mut AppState,
-    add_logic_state: &mut AddLogicState,
     is_edit_mode: &mut bool,
     buffer_state: &mut BufferState,
     grpc_client: GrpcClient,
-    _save_logic_sender: SaveLogicResultSender, // Marked as unused
+    save_logic_sender: SaveLogicResultSender,
     command_message: &mut String,
+    router: &mut Router,
 ) -> bool {
+    if let Page::AddLogic(add_logic_state) = &mut router.current {
+
         // === FULLSCREEN SCRIPT EDITING - COMPLETE ISOLATION ===
         if add_logic_state.current_focus == AddLogicFocus::InsideScriptContent {
             // === AUTOCOMPLETE HANDLING ===
@@ -381,9 +384,9 @@ pub fn handle_add_logic_navigation(
                     }
                     AddLogicFocus::CancelButton => {
                         buffer_state.update_history(AppView::Admin);
-                    app_state.ui.show_add_logic = false;
                         *command_message = "Cancelled Add Logic".to_string();
                         *is_edit_mode = false;
+
                     }
                     AddLogicFocus::InputLogicName | AddLogicFocus::InputTargetColumn | AddLogicFocus::InputDescription => {
                         *is_edit_mode = !*is_edit_mode;
@@ -422,6 +425,9 @@ pub fn handle_add_logic_navigation(
             }
         }
         handled
+    } else {
+        return false; // not on AddLogic page
+    }
 }
 
 fn replace_autocomplete_text(

client/src/functions/modes/navigation/admin_nav.rs

@@ -2,7 +2,7 @@
 use crate::state::pages::admin::{AdminFocus, AdminState};
 use crate::state::app::state::AppState;
 use crate::config::binds::config::Config;
-use crate::state::app::buffer::{BufferState, AppView};
+use crate::buffer::state::{BufferState, AppView};
 use crate::state::pages::add_table::{AddTableState, LinkDefinition};
 use ratatui::widgets::ListState;
 use crate::state::pages::add_logic::{AddLogicState, AddLogicFocus}; // Added AddLogicFocus import

client/src/lib.rs

@@ -8,6 +8,11 @@ pub mod modes;
 pub mod functions;
 pub mod services;
 pub mod utils;
+pub mod buffer;
+pub mod sidebar;
+pub mod search;
+pub mod bottom_panel;
+pub mod pages;
 
 pub use ui::run_ui;
 

client/src/modes/canvas/common_mode.rs

@@ -1,41 +1,42 @@
 // src/modes/canvas/common_mode.rs
 
 use crate::tui::terminal::core::TerminalCore;
-use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState, auth::AuthState};
+use crate::state::pages::auth::AuthState;
 use crate::state::app::state::AppState;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
 use crate::modes::handlers::event::EventOutcome;
-use crate::tui::functions::common::form::SaveOutcome;
+crate::pages::forms::logic::SaveOutcome;
 use anyhow::{Context, Result};
 use crate::tui::functions::common::{
     form::{save as form_save, revert as form_revert},
     login::{save as login_save, revert as login_revert},
     register::{revert as register_revert},
 };
+use crate::pages::routing::{Router, Page};
 
 pub async fn handle_core_action(
     action: &str,
-    form_state: &mut FormState,
     auth_state: &mut AuthState,
-    login_state: &mut LoginState,
-    register_state: &mut RegisterState,
     grpc_client: &mut GrpcClient,
     auth_client: &mut AuthClient,
     terminal: &mut TerminalCore,
     app_state: &mut AppState,
+    router: &mut Router,
 ) -> Result<EventOutcome> {
     match action {
         "save" => {
-            if app_state.ui.show_login {
-                let message = login_save(auth_state, login_state, auth_client, app_state).await.context("Login save action failed")?;
+            match &mut router.current {
+                Page::Login(state) => {
+                    let message = login_save(auth_state, state, auth_client, app_state)
+                        .await
+                        .context("Login save action failed")?;
                     Ok(EventOutcome::Ok(message))
-            } else {
-                let save_outcome = form_save(
-                    app_state,
-                    form_state,
-                    grpc_client,
-                ).await.context("Register save action failed")?;
+                }
+                Page::Form(form_state) => {
+                    let save_outcome = form_save(app_state, form_state, grpc_client)
+                        .await
+                        .context("Form save action failed")?;
                     let message = match save_outcome {
                         SaveOutcome::NoChange => "No changes to save.".to_string(),
                         SaveOutcome::UpdatedExisting => "Entry updated.".to_string(),
@@ -43,44 +44,52 @@ pub async fn handle_core_action(
                     };
                     Ok(EventOutcome::DataSaved(save_outcome, message))
                 }
-        },
+                _ => Ok(EventOutcome::Ok("Save not applicable".into())),
+            }
+        }
         "force_quit" => {
             terminal.cleanup()?;
             Ok(EventOutcome::Exit("Force exiting without saving.".to_string()))
-        },
+        }
         "save_and_quit" => {
-            let message = if app_state.ui.show_login {
-                login_save(auth_state, login_state, auth_client, app_state).await.context("Login save n quit action failed")?
-            } else {
-                let save_outcome = form_save(
-                    app_state,
-                    form_state,
-                    grpc_client,
-                ).await?;
+            let message = match &mut router.current {
+                Page::Login(state) => {
+                    login_save(auth_state, state, auth_client, app_state)
+                        .await
+                        .context("Login save and quit action failed")?
+                }
+                Page::Form(form_state) => {
+                    let save_outcome = form_save(app_state, form_state, grpc_client).await?;
                     match save_outcome {
                         SaveOutcome::NoChange => "No changes to save.".to_string(),
                         SaveOutcome::UpdatedExisting => "Entry updated.".to_string(),
                         SaveOutcome::CreatedNew(_) => "New entry created.".to_string(),
                     }
+                }
+                _ => "Save not applicable".to_string(),
             };
             terminal.cleanup()?;
             Ok(EventOutcome::Exit(format!("{}. Exiting application.", message)))
-        },
+        }
         "revert" => {
-            if app_state.ui.show_login {
-                let message = login_revert(login_state, app_state).await;
-                Ok(EventOutcome::Ok(message))
-            } else if app_state.ui.show_register {
-                let message = register_revert(register_state, app_state).await;
-                Ok(EventOutcome::Ok(message))
-            } else {
-                let message = form_revert(
-                    form_state,
-                    grpc_client,
-                ).await.context("Form revert x action failed")?;
+            match &mut router.current {
+                Page::Login(state) => {
+                    let message = login_revert(state, app_state).await;
                     Ok(EventOutcome::Ok(message))
                 }
-        },
+                Page::Register(state) => {
+                    let message = register_revert(state, app_state).await;
+                    Ok(EventOutcome::Ok(message))
+                }
+                Page::Form(form_state) => {
+                    let message = form_revert(form_state, grpc_client)
+                        .await
+                        .context("Form revert action failed")?;
+                    Ok(EventOutcome::Ok(message))
+                }
+                _ => Ok(EventOutcome::Ok("Revert not applicable".into())),
+            }
+        }
         _ => Ok(EventOutcome::Ok(format!("Core action not handled: {}", action))),
     }
 }

client/src/modes/common/command_mode.rs

@@ -3,22 +3,19 @@
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::pages::form::FormState;
-use crate::state::{app::state::AppState, pages::auth::LoginState, pages::auth::RegisterState};
+use crate::state::app::state::AppState;
 use crate::modes::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
-use crate::tui::functions::common::form::{save, revert};
+use crate::pages::forms::logic::{save, revert ,SaveOutcome};
 use crate::modes::handlers::event::EventOutcome;
-use crate::tui::functions::common::form::SaveOutcome;
+use crate::pages::routing::{Router, Page};
 use anyhow::Result;
 
 pub async fn handle_command_event(
     key: KeyEvent,
     config: &Config,
     app_state: &mut AppState,
-    login_state: &LoginState,
-    register_state: &RegisterState,
-    form_state: &mut FormState,
+    router: &mut Router,
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
@@ -27,21 +24,19 @@ pub async fn handle_command_event(
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<EventOutcome> {
-    // Exit command mode (via configurable keybinding)
+    // Exit command mode
     if config.is_exit_command_mode(key.code, key.modifiers) {
         command_input.clear();
         *command_message = "".to_string();
         return Ok(EventOutcome::Ok("Exited command mode".to_string()));
     }
 
-    // Execute command (via configurable keybinding, defaults to Enter)
+    // Execute command
     if config.is_command_execute(key.code, key.modifiers) {
         return process_command(
             config,
-            form_state,
             app_state,
-            login_state,
-            register_state,
+            router,
             command_input,
             command_message,
             grpc_client,
@@ -49,34 +44,31 @@ pub async fn handle_command_event(
             terminal,
             current_position,
             total_count,
-        ).await;
+        )
+        .await;
     }
 
-    // Backspace (via configurable keybinding, defaults to Backspace)
+    // Backspace
     if config.is_command_backspace(key.code, key.modifiers) {
         command_input.pop();
         return Ok(EventOutcome::Ok("".to_string()));
     }
 
-    // Regular character input - accept any character in command mode
+    // Regular character input
     if let KeyCode::Char(c) = key.code {
-        // Accept regular or shifted characters (e.g., 'a' or 'A')
         if key.modifiers.is_empty() || key.modifiers == KeyModifiers::SHIFT {
             command_input.push(c);
             return Ok(EventOutcome::Ok("".to_string()));
         }
     }
 
-    // Ignore all other keys
     Ok(EventOutcome::Ok("".to_string()))
 }
 
 async fn process_command(
     config: &Config,
-    form_state: &mut FormState,
     app_state: &mut AppState,
-    login_state: &LoginState,
-    register_state: &RegisterState,
+    router: &mut Router,
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
@@ -85,28 +77,18 @@ async fn process_command(
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<EventOutcome> {
-    // Clone the trimmed command to avoid borrow issues
     let command = command_input.trim().to_string();
     if command.is_empty() {
         *command_message = "Empty command".to_string();
         return Ok(EventOutcome::Ok(command_message.clone()));
     }
 
-    // Get the action for the command (now checks global and common bindings too)
-    let action = config.get_action_for_command(&command)
-        .unwrap_or("unknown");
+    let action = config.get_action_for_command(&command).unwrap_or("unknown");
 
     match action {
         "force_quit" | "save_and_quit" | "quit" => {
             let (should_exit, message) = command_handler
-                .handle_command(
-                    action,
-                    terminal,
-                    app_state,
-                    form_state,
-                    login_state,
-                    register_state,
-                )
+                .handle_command(action, terminal, app_state, router)
                 .await?;
             command_input.clear();
             if should_exit {
@@ -114,13 +96,9 @@ async fn process_command(
             } else {
                 Ok(EventOutcome::Ok(message))
             }
-        },
+        }
         "save" => {
-            let outcome = save(
-                app_state,
-                form_state,
-                grpc_client,
-            ).await?;
+            let outcome = save(app_state, grpc_client).await?;
             let message = match outcome {
                 SaveOutcome::CreatedNew(_) => "New entry created".to_string(),
                 SaveOutcome::UpdatedExisting => "Entry updated".to_string(),
@@ -128,15 +106,12 @@ async fn process_command(
             };
             command_input.clear();
             Ok(EventOutcome::DataSaved(outcome, message))
-        },
+        }
         "revert" => {
-            let message = revert(
-                form_state,
-                grpc_client,
-            ).await?;
+            let message = revert(app_state, grpc_client).await?;
             command_input.clear();
             Ok(EventOutcome::Ok(message))
-        },
+        }
         _ => {
             let message = format!("Unhandled action: {}", action);
             command_input.clear();

client/src/modes/common/commands.rs

@@ -1,7 +1,7 @@
 // src/modes/common/commands.rs
 use crate::tui::terminal::core::TerminalCore;
 use crate::state::app::state::AppState;
-use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState};
+use crate::pages::routing::{Router, Page};
 use anyhow::Result;
 
 pub struct CommandHandler;
@@ -15,13 +15,11 @@ impl CommandHandler {
         &mut self,
         action: &str,
         terminal: &mut TerminalCore,
-        app_state: &AppState,
-        form_state: &FormState,
-        login_state: &LoginState,
-        register_state: &RegisterState,
+        app_state: &mut AppState,
+        router: &Router,
     ) -> Result<(bool, String)> {
         match action {
-            "quit" => self.handle_quit(terminal, app_state, form_state, login_state, register_state).await,
+            "quit" => self.handle_quit(terminal, app_state, router).await,
             "force_quit" => self.handle_force_quit(terminal).await,
             "save_and_quit" => self.handle_save_quit(terminal).await,
             _ => Ok((false, format!("Unknown command: {}", action))),
@@ -31,18 +29,15 @@ impl CommandHandler {
     async fn handle_quit(
         &self,
         terminal: &mut TerminalCore,
-        app_state: &AppState,
-        form_state: &FormState,
-        login_state: &LoginState,
-        register_state: &RegisterState,
+        app_state: &mut AppState,
+        router: &Router,
     ) -> Result<(bool, String)> {
-        // Use actual unsaved changes state instead of is_saved flag
-        let has_unsaved = if app_state.ui.show_login {
-            login_state.has_unsaved_changes()
-        } else if app_state.ui.show_register {
-            register_state.has_unsaved_changes()
-        } else {
-            form_state.has_unsaved_changes
+        // Use router to check unsaved changes
+        let has_unsaved = match &router.current {
+            Page::Login(state) => state.has_unsaved_changes(),
+            Page::Register(state) => state.has_unsaved_changes(),
+            Page::Form(fs) => fs.has_unsaved_changes,
+            _ => false,
         };
 
         if !has_unsaved {

client/src/modes/general/dialog.rs

@@ -3,13 +3,13 @@
 use crossterm::event::{Event, KeyCode};
 use crate::config::binds::config::Config;
 use crate::ui::handlers::context::DialogPurpose;
-use crate::state::app::{state::AppState, buffer::AppView};
-use crate::state::app::buffer::BufferState;
-use crate::state::pages::auth::{LoginState, RegisterState};
-use crate::state::pages::admin::AdminState;
+use crate::state::app::state::AppState;
+use crate::buffer::AppView;
+use crate::buffer::state::BufferState;
 use crate::modes::handlers::event::EventOutcome;
 use crate::tui::functions::common::{login, register};
 use crate::tui::functions::common::add_table::handle_delete_selected_columns;
+use crate::pages::routing::{Router, Page};
 use anyhow::Result;
 
 /// Handles key events specifically when a dialog is active.
@@ -19,10 +19,8 @@ pub async fn handle_dialog_event(
     event: &Event,
     config: &Config,
     app_state: &mut AppState,
-    login_state: &mut LoginState,
-    register_state: &mut RegisterState,
     buffer_state: &mut BufferState,
-    admin_state: &mut AdminState,
+    router: &mut Router,
 ) -> Option<Result<EventOutcome>> {
     if let Event::Key(key) = event {
         // Always allow Esc to dismiss
@@ -55,100 +53,131 @@ pub async fn handle_dialog_event(
                         Some(p) => p,
                         None => {
                             app_state.hide_dialog();
-                            return Some(Ok(EventOutcome::Ok("Internal Error: Dialog context lost".to_string())));
+                            return Some(Ok(EventOutcome::Ok(
+                                "Internal Error: Dialog context lost".to_string(),
+                            )));
                         }
                     };
 
                     // Handle Dialog Actions Directly Here
                     match purpose {
-                        DialogPurpose::LoginSuccess => {
-                            match selected_index {
-                                0 => { // "Menu" button selected
+                        DialogPurpose::LoginSuccess => match selected_index {
+                            0 => {
+                                // "Menu" button selected
                                 app_state.hide_dialog();
-                                    let message = login::back_to_main(login_state, app_state, buffer_state).await;
+                                if let Page::Login(state) = &mut router.current {
+                                    let message =
+                                        login::back_to_main(state, app_state, buffer_state).await;
                                     return Some(Ok(EventOutcome::Ok(message)));
                                 }
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Login state not active".to_string(),
+                                )));
+                            }
                             1 => {
                                 app_state.hide_dialog();
                                 return Some(Ok(EventOutcome::Ok("Exiting dialog".to_string())));
                             }
                             _ => {
                                 app_state.hide_dialog();
-                                    return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Unknown dialog button selected".to_string(),
+                                )));
                             }
-                            }
-                        }
-                        DialogPurpose::LoginFailed => {
-                            match selected_index {
-                                0 => { // "OK" button selected
+                        },
+                        DialogPurpose::LoginFailed => match selected_index {
+                            0 => {
+                                // "OK" button selected
                                 app_state.hide_dialog();
-                                    return Some(Ok(EventOutcome::Ok("Login failed dialog dismissed".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Login failed dialog dismissed".to_string(),
+                                )));
                             }
                             _ => {
                                 app_state.hide_dialog();
-                                    return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Unknown dialog button selected".to_string(),
+                                )));
                             }
-                            }
-                        }
-                        DialogPurpose::RegisterSuccess => { // Add this arm
-                            match selected_index {
-                                0 => { // "OK" button for RegisterSuccess
+                        },
+                        DialogPurpose::RegisterSuccess => match selected_index {
+                            0 => {
+                                // "OK" button for RegisterSuccess
                                 app_state.hide_dialog();
-                                    let message = register::back_to_login(register_state, app_state, buffer_state).await;
+                                if let Page::Register(state) = &mut router.current {
+                                    let message =
+                                        register::back_to_login(state, app_state, buffer_state)
+                                            .await;
                                     return Some(Ok(EventOutcome::Ok(message)));
                                 }
-                                _ => { // Default for RegisterSuccess
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Register state not active".to_string(),
+                                )));
+                            }
+                            _ => {
                                 app_state.hide_dialog();
-                                    return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Unknown dialog button selected".to_string(),
+                                )));
                             }
-                            }
-                        }
-                        DialogPurpose::RegisterFailed => { // Add this arm
-                             match selected_index {
-                                0 => { // "OK" button for RegisterFailed
+                        },
+                        DialogPurpose::RegisterFailed => match selected_index {
+                            0 => {
+                                // "OK" button for RegisterFailed
                                 app_state.hide_dialog(); // Just dismiss
-                                    return Some(Ok(EventOutcome::Ok("Register failed dialog dismissed".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Register failed dialog dismissed".to_string(),
+                                )));
                             }
-                                _ => { // Default for RegisterFailed
+                            _ => {
                                 app_state.hide_dialog();
-                                    return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Unknown dialog button selected".to_string(),
+                                )));
                             }
-                            }
-                        }
-                        DialogPurpose::ConfirmDeleteColumns => {
-                            match selected_index {
-                                0 => { // "Confirm" button selected
-                                    let outcome_message = handle_delete_selected_columns(&mut admin_state.add_table_state);
+                        },
+                        DialogPurpose::ConfirmDeleteColumns => match selected_index {
+                            0 => {
+                                // "Confirm" button selected
+                                if let Page::Admin(state) = &mut router.current {
+                                    let outcome_message =
+                                        handle_delete_selected_columns(&mut state.add_table_state);
                                     app_state.hide_dialog();
                                     return Some(Ok(EventOutcome::Ok(outcome_message)));
                                 }
-                                1 => { // "Cancel" button selected
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Admin state not active".to_string(),
+                                )));
+                            }
+                            1 => {
+                                // "Cancel" button selected
                                 app_state.hide_dialog();
                                 return Some(Ok(EventOutcome::Ok("Deletion cancelled.".to_string())));
                             }
                             _ => { /* Handle unexpected index */ }
-                            }
-                        }
-                        DialogPurpose::SaveTableSuccess => {
-                            match selected_index {
-                                0 => { // "OK" button selected
+                        },
+                        DialogPurpose::SaveTableSuccess => match selected_index {
+                            0 => {
+                                // "OK" button selected
                                 app_state.hide_dialog();
                                 buffer_state.update_history(AppView::Admin); // Navigate back
-                                    return Some(Ok(EventOutcome::Ok("Save success dialog dismissed.".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Save success dialog dismissed.".to_string(),
+                                )));
                             }
                             _ => { /* Handle unexpected index */ }
-                            }
-                        }
-                        DialogPurpose::SaveLogicSuccess => {
-                            match selected_index {
-                                0 => { // "OK" button selected
+                        },
+                        DialogPurpose::SaveLogicSuccess => match selected_index {
+                            0 => {
+                                // "OK" button selected
                                 app_state.hide_dialog();
                                 buffer_state.update_history(AppView::Admin);
-                                    return Some(Ok(EventOutcome::Ok("Save success dialog dismissed.".to_string())));
+                                return Some(Ok(EventOutcome::Ok(
+                                    "Save success dialog dismissed.".to_string(),
+                                )));
                             }
                             _ => { /* Handle unexpected index */ }
-                            }
-                        }
+                        },
                     }
                 }
                 _ => {} // Ignore other general actions when dialog is shown

client/src/modes/general/navigation.rs

@@ -3,11 +3,8 @@
 use crossterm::event::KeyEvent;
 use crate::config::binds::config::Config;
 use crate::state::app::state::AppState;
-use crate::state::pages::form::FormState;
-use crate::state::pages::auth::LoginState;
-use crate::state::pages::auth::RegisterState;
-use crate::state::pages::intro::IntroState;
-use crate::state::pages::admin::AdminState;
+use crate::pages::routing::{Router, Page};
+use crate::pages::forms::FormState;
 use crate::ui::handlers::context::UiContext;
 use crate::modes::handlers::event::EventOutcome;
 use crate::modes::general::command_navigation::{handle_command_navigation_event, NavigationState};
@@ -17,12 +14,8 @@ use anyhow::Result;
 pub async fn handle_navigation_event(
     key: KeyEvent,
     config: &Config,
-    form_state: &mut FormState,
     app_state: &mut AppState,
-    login_state: &mut LoginState,
-    register_state: &mut RegisterState,
-    intro_state: &mut IntroState,
-    admin_state: &mut AdminState,
+    router: &mut Router,
     command_mode: &mut bool,
     command_input: &mut String,
     command_message: &mut String,
@@ -36,27 +29,31 @@ pub async fn handle_navigation_event(
     if let Some(action) = config.get_general_action(key.code, key.modifiers) {
         match action {
             "move_up" => {
-                move_up(app_state, login_state, register_state, intro_state, admin_state);
+                move_up(app_state, router);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "move_down" => {
-                move_down(app_state, intro_state, admin_state);
+                move_down(app_state, router);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "next_option" => {
-                next_option(app_state, intro_state);
+                next_option(app_state, router);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "previous_option" => {
-                previous_option(app_state, intro_state);
+                previous_option(app_state, router);
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "next_field" => {
-                next_field(form_state);
+                if let Some(fs) = app_state.form_state_mut() {
+                    next_field(fs);
+                }
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "prev_field" => {
-                prev_field(form_state);
+                if let Some(fs) = app_state.form_state_mut() {
+                    prev_field(fs);
+                }
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "enter_command_mode" => {
@@ -64,18 +61,21 @@ pub async fn handle_navigation_event(
                 return Ok(EventOutcome::Ok(String::new()));
             }
             "select" => {
-                let (context, index) = if app_state.ui.show_intro {
-                    (UiContext::Intro, intro_state.selected_option)
-                } else if app_state.ui.show_login && app_state.ui.focus_outside_canvas {
+                let (context, index) = match &router.current {
+                    Page::Intro(state) => (UiContext::Intro, state.selected_option),
+                    Page::Login(_) if app_state.ui.focus_outside_canvas => {
                         (UiContext::Login, app_state.focused_button_index)
-                } else if app_state.ui.show_register && app_state.ui.focus_outside_canvas {
+                    }
+                    Page::Register(_) if app_state.ui.focus_outside_canvas => {
                         (UiContext::Register, app_state.focused_button_index)
-                } else if app_state.ui.show_admin {
-                    (UiContext::Admin, admin_state.get_selected_index().unwrap_or(0))
-                } else if app_state.ui.dialog.dialog_show {
+                    }
+                    Page::Admin(state) => {
+                        (UiContext::Admin, state.get_selected_index().unwrap_or(0))
+                    }
+                    _ if app_state.ui.dialog.dialog_show => {
                         (UiContext::Dialog, app_state.ui.dialog.dialog_active_button_index)
-                } else {
-                    return Ok(EventOutcome::Ok("Select (No Action)".to_string()));
+                    }
+                    _ => return Ok(EventOutcome::Ok("Select (No Action)".to_string())),
                 };
                 return Ok(EventOutcome::ButtonSelected { context, index });
             }
@@ -85,55 +85,68 @@ pub async fn handle_navigation_event(
     Ok(EventOutcome::Ok(String::new()))
 }
 
-pub fn move_up(app_state: &mut AppState, login_state: &mut LoginState, register_state: &mut RegisterState, intro_state: &mut IntroState, admin_state: &mut AdminState) {
-    if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register{
+pub fn move_up(app_state: &mut AppState, router: &mut Router) {
+    match &mut router.current {
+        Page::Login(state) if app_state.ui.focus_outside_canvas => {
             if app_state.focused_button_index == 0 {
                 app_state.ui.focus_outside_canvas = false;
-            if app_state.ui.show_login {
-                let last_field_index = login_state.field_count().saturating_sub(1);
-                login_state.set_current_field(last_field_index);
+                let last_field_index = state.field_count().saturating_sub(1);
+                state.set_current_field(last_field_index);
             } else {
-                let last_field_index = register_state.field_count().saturating_sub(1);
-                register_state.set_current_field(last_field_index);
+                app_state.focused_button_index =
+                    app_state.focused_button_index.saturating_sub(1);
             }
+        }
+        Page::Register(state) if app_state.ui.focus_outside_canvas => {
+            if app_state.focused_button_index == 0 {
+                app_state.ui.focus_outside_canvas = false;
+                let last_field_index = state.field_count().saturating_sub(1);
+                state.set_current_field(last_field_index);
             } else {
-            app_state.focused_button_index = app_state.focused_button_index.saturating_sub(1);
+                app_state.focused_button_index =
+                    app_state.focused_button_index.saturating_sub(1);
             }
-    } else if app_state.ui.show_intro {
-        intro_state.previous_option();
-    } else if app_state.ui.show_admin {
-        admin_state.previous();
+        }
+        Page::Intro(state) => state.previous_option(),
+        Page::Admin(state) => state.previous(),
+        _ => {}
     }
 }
 
-pub fn move_down(app_state: &mut AppState, intro_state: &mut IntroState, admin_state: &mut AdminState) {
-    if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register {
+pub fn move_down(app_state: &mut AppState, router: &mut Router) {
+    match &mut router.current {
+        Page::Login(_) | Page::Register(_) if app_state.ui.focus_outside_canvas => {
             let num_general_elements = 2;
             if app_state.focused_button_index < num_general_elements - 1 {
                 app_state.focused_button_index += 1;
             }
-    } else if app_state.ui.show_intro {
-        intro_state.next_option();
-    } else if app_state.ui.show_admin {
-        admin_state.next();
+        }
+        Page::Intro(state) => state.next_option(),
+        Page::Admin(state) => state.next(),
+        _ => {}
     }
 }
 
-pub fn next_option(app_state: &mut AppState, intro_state: &mut IntroState) { 
-    if app_state.ui.show_intro {
-        intro_state.next_option();
-    } else {
-        // Get option count from state instead of parameter
+pub fn next_option(app_state: &mut AppState, router: &mut Router) {
+    match &mut router.current {
+        Page::Intro(state) => state.next_option(),
+        Page::Admin(_) => {
             let option_count = app_state.profile_tree.profiles.len();
-        app_state.focused_button_index = (app_state.focused_button_index + 1) % option_count;
+            if option_count > 0 {
+                app_state.focused_button_index =
+                    (app_state.focused_button_index + 1) % option_count;
+            }
+        }
+        _ => {}
     }
 }
 
-pub fn previous_option(app_state: &mut AppState, intro_state: &mut IntroState) {
-    if app_state.ui.show_intro {
-        intro_state.previous_option();
-    } else {
+pub fn previous_option(app_state: &mut AppState, router: &mut Router) {
+    match &mut router.current {
+        Page::Intro(state) => state.previous_option(),
+        Page::Admin(_) => {
             let option_count = app_state.profile_tree.profiles.len();
+            if option_count > 0 {
                 app_state.focused_button_index = if app_state.focused_button_index == 0 {
                     option_count.saturating_sub(1)
                 } else {
@@ -141,6 +154,9 @@ pub fn previous_option(app_state: &mut AppState, intro_state: &mut IntroState) {
                 };
             }
         }
+        _ => {}
+    }
+}
 
 pub fn next_field(form_state: &mut FormState) {
     if !form_state.fields.is_empty() {
@@ -161,7 +177,7 @@ pub fn prev_field(form_state: &mut FormState) {
 pub fn handle_enter_command_mode(
     command_mode: &mut bool,
     command_input: &mut String,
-    command_message: &mut String
+    command_message: &mut String,
 ) {
     *command_mode = true;
     command_input.clear();

client/src/modes/handlers/mode_manager.rs

@@ -2,52 +2,62 @@
 use crate::state::app::state::AppState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::pages::add_logic::AddLogicFocus;
-use crate::state::app::highlight::HighlightState;
-use crate::state::pages::admin::AdminState;
+use crate::pages::routing::{Router, Page};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AppMode {
     General,   // For intro and admin screens
     ReadOnly,  // Canvas read-only mode
     Edit,      // Canvas edit mode
-    Highlight, // Cnavas highlight/visual mode
+    Highlight, // Canvas highlight/visual mode
     Command,   // Command mode overlay
 }
 
+impl From<canvas::AppMode> for AppMode {
+    fn from(mode: canvas::AppMode) -> Self {
+        match mode {
+            canvas::AppMode::General => AppMode::General,
+            canvas::AppMode::ReadOnly => AppMode::ReadOnly,
+            canvas::AppMode::Edit => AppMode::Edit,
+            canvas::AppMode::Highlight => AppMode::Highlight,
+            canvas::AppMode::Command => AppMode::Command,
+        }
+    }
+}
+
 pub struct ModeManager;
 
 impl ModeManager {
-    // Determine current mode based on app state
+    /// Determine current mode based on app state + router
     pub fn derive_mode(
         app_state: &AppState,
         event_handler: &EventHandler,
-        admin_state: &AdminState,
+        router: &Router,
     ) -> AppMode {
+        // Navigation palette always forces General
         if event_handler.navigation_state.active {
             return AppMode::General;
         }
 
+        // Explicit command mode flag
         if event_handler.command_mode {
             return AppMode::Command;
         }
 
-        if !matches!(event_handler.highlight_state, HighlightState::Off) {
-            return AppMode::Highlight;
+        match &router.current {
+            // --- Form view ---
+            Page::Form(_) if !app_state.ui.focus_outside_canvas => {
+                if let Some(editor) = &app_state.form_editor {
+                    return AppMode::from(editor.mode());
+                }
+                AppMode::General
             }
 
-        let is_canvas_view = app_state.ui.show_login
-            || app_state.ui.show_register
-            || app_state.ui.show_form
-            || app_state.ui.show_add_table
-            || app_state.ui.show_add_logic;
-
-        if app_state.ui.show_add_logic {
-            // Specific logic for AddLogic view
-            match admin_state.add_logic_state.current_focus {
+            // --- AddLogic view ---
+            Page::AddLogic(state) => match state.current_focus {
                 AddLogicFocus::InputLogicName
                 | AddLogicFocus::InputTargetColumn
                 | AddLogicFocus::InputDescription => {
-                    // These are canvas inputs
                     if event_handler.is_edit_mode {
                         AppMode::Edit
                     } else {
@@ -55,29 +65,30 @@ impl ModeManager {
                     }
                 }
                 _ => AppMode::General,
-            }
-        } else if app_state.ui.show_add_table {
+            },
+
+            // --- AddTable view ---
+            Page::AddTable(_) => {
                 if app_state.ui.focus_outside_canvas {
                     AppMode::General
+                } else if event_handler.is_edit_mode {
+                    AppMode::Edit
                 } else {
+                    AppMode::ReadOnly
+                }
+            }
+
+            // --- Login/Register views ---
+            Page::Login(_) | Page::Register(_) => {
                 if event_handler.is_edit_mode {
                     AppMode::Edit
                 } else {
                     AppMode::ReadOnly
                 }
             }
-        } else if is_canvas_view {
-            if app_state.ui.focus_outside_canvas {
-                AppMode::General
-            } else {
-                if event_handler.is_edit_mode {
-                    AppMode::Edit
-                } else {
-                    AppMode::ReadOnly
-                }
-            }
-        } else {
-            AppMode::General
+
+            // --- Everything else (Intro, Admin, etc.) ---
+            _ => AppMode::General,
         }
     }
 
@@ -91,7 +102,10 @@ pub fn can_enter_command_mode(current_mode: AppMode) -> bool {
     }
 
     pub fn can_enter_read_only_mode(current_mode: AppMode) -> bool {
-        matches!(current_mode, AppMode::Edit | AppMode::Command | AppMode::Highlight)
+        matches!(
+            current_mode,
+            AppMode::Edit | AppMode::Command | AppMode::Highlight
+        )
     }
 
     pub fn can_enter_highlight_mode(current_mode: AppMode) -> bool {

client/src/modes/mod.rs

@@ -7,4 +7,3 @@ pub mod canvas;
 pub use handlers::*;
 pub use general::*;
 pub use common::*;
-pub use canvas::*;

client/src/pages/forms/logic.rs

@@ -0,0 +1,182 @@
+// src/pages/forms/logic.rs
+use crate::services::grpc_client::GrpcClient;
+use crate::state::app::state::AppState;
+use crate::pages::forms::FormState;
+use crate::utils::data_converter;
+use anyhow::{anyhow, Context, Result};
+use std::collections::HashMap;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SaveOutcome {
+    NoChange,
+    UpdatedExisting,
+    CreatedNew(i64),
+}
+
+pub async fn save(
+    app_state: &mut AppState,
+    grpc_client: &mut GrpcClient,
+) -> Result<SaveOutcome> {
+    if let Some(fs) = app_state.form_state_mut() {
+        if !fs.has_unsaved_changes {
+            return Ok(SaveOutcome::NoChange);
+        }
+
+        let profile_name = fs.profile_name.clone();
+        let table_name = fs.table_name.clone();
+        let fields = fs.fields.clone();
+        let values = fs.values.clone();
+        let id = fs.id;
+        let total_count = fs.total_count;
+        let current_position = fs.current_position;
+
+        let cache_key = format!("{}.{}", profile_name, table_name);
+        let schema = app_state
+            .schema_cache
+            .get(&cache_key)
+            .ok_or_else(|| {
+                anyhow!(
+                    "Schema for table '{}' not found in cache. Cannot save.",
+                    table_name
+                )
+            })?;
+
+        let data_map: HashMap<String, String> = fields
+            .iter()
+            .zip(values.iter())
+            .map(|(field_def, value)| (field_def.data_key.clone(), value.clone()))
+            .collect();
+
+        let converted_data =
+            data_converter::convert_and_validate_data(&data_map, schema)
+            .map_err(|user_error| anyhow!(user_error))?;
+
+        let is_new_entry = id == 0
+            || (total_count > 0 && current_position > total_count)
+            || (total_count == 0 && current_position == 1);
+
+        let outcome = if is_new_entry {
+            let response = grpc_client
+                .post_table_data(profile_name.clone(), table_name.clone(), converted_data)
+                .await
+                .context("Failed to post new table data")?;
+
+            if response.success {
+                if let Some(fs) = app_state.form_state_mut() {
+                    fs.id = response.inserted_id;
+                    fs.total_count += 1;
+                    fs.current_position = fs.total_count;
+                    fs.has_unsaved_changes = false;
+                }
+                SaveOutcome::CreatedNew(response.inserted_id)
+            } else {
+                return Err(anyhow!("Server failed to insert data: {}", response.message));
+            }
+        } else {
+            if id == 0 {
+                return Err(anyhow!(
+                    "Cannot update record: ID is 0, but not classified as new entry."
+                ));
+            }
+            let response = grpc_client
+                .put_table_data(profile_name.clone(), table_name.clone(), id, converted_data)
+                .await
+                .context("Failed to put (update) table data")?;
+
+            if response.success {
+                if let Some(fs) = app_state.form_state_mut() {
+                    fs.has_unsaved_changes = false;
+                }
+                SaveOutcome::UpdatedExisting
+            } else {
+                return Err(anyhow!("Server failed to update data: {}", response.message));
+            }
+        };
+
+        Ok(outcome)
+    } else {
+        Ok(SaveOutcome::NoChange)
+    }
+}
+
+pub async fn revert(
+    app_state: &mut AppState,
+    grpc_client: &mut GrpcClient,
+) -> Result<String> {
+    if let Some(fs) = app_state.form_state_mut() {
+        if fs.id == 0
+            || (fs.total_count > 0 && fs.current_position > fs.total_count)
+            || (fs.total_count == 0 && fs.current_position == 1)
+        {
+            let old_total_count = fs.total_count;
+            fs.reset_to_empty();
+            fs.total_count = old_total_count;
+            if fs.total_count > 0 {
+                fs.current_position = fs.total_count + 1;
+            } else {
+                fs.current_position = 1;
+            }
+            return Ok("New entry cleared".to_string());
+        }
+
+        if fs.current_position == 0 || fs.current_position > fs.total_count {
+            if fs.total_count > 0 {
+                fs.current_position = 1;
+            } else {
+                fs.reset_to_empty();
+                return Ok("No saved data to revert to; form cleared.".to_string());
+            }
+        }
+
+        let response = grpc_client
+            .get_table_data_by_position(
+                fs.profile_name.clone(),
+                fs.table_name.clone(),
+                fs.current_position as i32,
+            )
+            .await
+            .context(format!(
+                "Failed to get table data by position {} for table {}.{}",
+                fs.current_position, fs.profile_name, fs.table_name
+            ))?;
+
+        fs.update_from_response(&response.data, fs.current_position);
+        Ok("Changes discarded, reloaded last saved version".to_string())
+    } else {
+        Ok("Nothing to revert".to_string())
+    }
+}
+
+pub async fn handle_action(
+    action: &str,
+    form_state: &mut FormState,
+    _grpc_client: &mut GrpcClient,
+    ideal_cursor_column: &mut usize,
+) -> Result<String> {
+    if form_state.has_unsaved_changes() {
+        return Ok(
+            "Unsaved changes. Save (Ctrl+S) or Revert (Ctrl+R) before navigating."
+                .to_string(),
+        );
+    }
+
+    let total_count = form_state.total_count;
+
+    match action {
+        "previous_entry" => {
+            if form_state.current_position > 1 {
+                form_state.current_position -= 1;
+                *ideal_cursor_column = 0;
+            }
+        }
+        "next_entry" => {
+            if form_state.current_position <= total_count {
+                form_state.current_position += 1;
+                *ideal_cursor_column = 0;
+            }
+        }
+        _ => return Err(anyhow!("Unknown form action: {}", action)),
+    }
+
+    Ok(String::new())
+}

client/src/pages/forms/mod.rs

@@ -0,0 +1,9 @@
+// src/pages/forms/mod.rs
+
+pub mod ui;
+pub mod state;
+pub mod logic;
+
+pub use ui::*;
+pub use state::*;
+pub use logic::*;

client/src/pages/forms/state.rs

@@ -1,11 +1,7 @@
-// src/state/pages/form.rs
+// src/pages/forms/state.rs
 
-use crate::config::colors::themes::Theme;
-use canvas::{DataProvider, AppMode, EditorState, FormEditor};
-use canvas::canvas::HighlightState;
+use canvas::{DataProvider, AppMode};
 use common::proto::komp_ac::search::search_response::Hit;
-use ratatui::layout::Rect;
-use ratatui::Frame;
 use std::collections::HashMap;
 
 fn json_value_to_string(value: &serde_json::Value) -> String {
@@ -25,7 +21,7 @@ pub struct FieldDefinition {
     pub link_target_table: Option<String>,
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct FormState {
     pub id: i64,
     pub profile_name: String,
@@ -117,27 +113,6 @@ impl FormState {
         }
     }
 
-    pub fn render(
-        &self,
-        f: &mut Frame,
-        area: Rect,
-        theme: &Theme,
-        is_edit_mode: bool,
-        highlight_state: &HighlightState,
-    ) {
-        // Wrap in FormEditor for new API
-        let mut editor = FormEditor::new(self.clone());
-        
-        // Use new canvas rendering
-        canvas::render_canvas_default(f, area, &editor);
-        
-        // If autocomplete is active, render suggestions
-        if self.autocomplete_active && !self.autocomplete_suggestions.is_empty() {
-            // Note: This will need to be updated when suggestions are integrated
-            // canvas::render_suggestions_dropdown(f, area, input_rect, &canvas::DefaultCanvasTheme, &editor);
-        }
-    }
-
     pub fn reset_to_empty(&mut self) {
         self.id = 0;
         self.values.iter_mut().for_each(|v| v.clear());
@@ -228,15 +203,6 @@ impl FormState {
         self.autocomplete_loading = false;
     }
 
-    // NEW: Add these methods to change modes
-    pub fn set_edit_mode(&mut self) {
-        self.app_mode = AppMode::Edit;
-    }
-
-    pub fn set_readonly_mode(&mut self) {
-        self.app_mode = AppMode::ReadOnly;
-    }
-
     // Legacy method compatibility
     pub fn fields(&self) -> Vec<&str> {
         self.fields

client/src/pages/forms/ui.rs

@@ -1,26 +1,24 @@
-// src/components/form/form.rs
+// src/pages/forms/ui.rs
 use crate::config::colors::themes::Theme;
-use crate::state::pages::form::FormState;
+use crate::state::app::state::AppState;
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Margin, Rect},
     style::Style,
     widgets::{Block, Borders, Paragraph},
     Frame,
 };
-use canvas::canvas::HighlightState;
-use canvas::{FormEditor, render_canvas_default, render_canvas, render_suggestions_dropdown, DefaultCanvasTheme};
+use crate::pages::forms::FormState;
+use canvas::{
+    render_canvas, render_suggestions_dropdown, DefaultCanvasTheme,
+};
 
-pub fn render_form(
+pub fn render_form_page(
     f: &mut Frame,
     area: Rect,
-    form_state: &FormState,
-    fields: &[&str],            // no longer needed, FormEditor handles this
-    current_field_idx: &usize,  // no longer needed
-    inputs: &[&String],         // no longer needed
+    app_state: &AppState,
+    form_state: &FormState, // not needed directly anymore, editor holds it
     table_name: &str,
     theme: &Theme,
-    is_edit_mode: bool,         // FormEditor tracks mode internally
-    highlight_state: &HighlightState,
     total_count: u64,
     current_position: u64,
 ) {
@@ -62,15 +60,9 @@ pub fn render_form(
         .alignment(Alignment::Left);
     f.render_widget(count_para, main_layout[0]);
 
-    // --- FORM RENDERING (Using new canvas API) ---
-    let editor = FormEditor::new(form_state.clone());
-
-    let active_field_rect = render_canvas(
-        f,
-        main_layout[1],
-        &editor,
-        theme,
-    );
+    // --- FORM RENDERING (Using persistent FormEditor) ---
+    if let Some(editor) = &app_state.form_editor {
+        let active_field_rect = render_canvas(f, main_layout[1], editor, theme);
 
         // --- SUGGESTIONS DROPDOWN ---
         if let Some(active_rect) = active_field_rect {
@@ -79,7 +71,8 @@ pub fn render_form(
                 main_layout[1],
                 active_rect,
                 &DefaultCanvasTheme,
-            &editor,
+                editor,
             );
         }
     }
+}

client/src/pages/mod.rs

@@ -0,0 +1,4 @@
+// src/pages/mod.rs
+
+pub mod routing;
+pub mod forms;

client/src/pages/routing/mod.rs

@@ -0,0 +1,5 @@
+// src/pages/routing/mod.rs
+
+pub mod router;
+
+pub use router::{Page, Router};

client/src/pages/routing/router.rs

@@ -0,0 +1,36 @@
+// src/pages/routing/router.rs
+use crate::state::pages::{
+    admin::AdminState,
+    auth::{AuthState, LoginState, RegisterState},
+    intro::IntroState,
+    add_logic::AddLogicState,
+    add_table::AddTableState,
+};
+use crate::pages::forms::FormState;
+
+#[derive(Debug)]
+pub enum Page {
+    Intro(IntroState),
+    Login(LoginState),
+    Register(RegisterState),
+    Admin(AdminState),
+    AddLogic(AddLogicState),
+    AddTable(AddTableState),
+    Form(FormState),
+}
+
+pub struct Router {
+    pub current: Page,
+}
+
+impl Router {
+    pub fn new() -> Self {
+        Self {
+            current: Page::Intro(IntroState::default()),
+        }
+    }
+
+    pub fn navigate(&mut self, page: Page) {
+        self.current = page;
+    }
+}

client/src/search/event.rs

@@ -0,0 +1,106 @@
+// src/search/event.rs
+use crate::state::app::state::AppState;
+use crate::services::grpc_client::GrpcClient;
+use common::proto::komp_ac::search::search_response::Hit;
+use crossterm::event::KeyCode;
+use tokio::sync::mpsc;
+use tracing::{error, info};
+use std::collections::HashMap;
+use anyhow::Result;
+
+pub async fn handle_search_palette_event(
+    key_event: crossterm::event::KeyEvent,
+    app_state: &mut AppState,
+    grpc_client: &mut GrpcClient,
+    search_result_sender: mpsc::UnboundedSender<Vec<Hit>>,
+) -> Result<Option<String>> {
+    let mut should_close = false;
+    let mut outcome_message = None;
+    let mut trigger_search = false;
+
+    if let Some(search_state) = app_state.search_state.as_mut() {
+        match key_event.code {
+            KeyCode::Esc => {
+                should_close = true;
+                outcome_message = Some("Search cancelled".to_string());
+            }
+            KeyCode::Enter => {
+                // Step 1: Extract the data we need while holding the borrow
+                let maybe_data = search_state
+                    .results
+                    .get(search_state.selected_index)
+                    .map(|hit| (hit.id, hit.content_json.clone()));
+
+                // Step 2: Process outside the borrow
+                if let Some((id, content_json)) = maybe_data {
+                    if let Ok(data) = serde_json::from_str::<HashMap<String, String>>(&content_json) {
+                        if let Some(fs) = app_state.form_state_mut() {
+                            let detached_pos = fs.total_count + 2;
+                            fs.update_from_response(&data, detached_pos);
+                        }
+                        should_close = true;
+                        outcome_message = Some(format!("Loaded record ID {}", id));
+                    }
+                }
+            }
+            KeyCode::Up => search_state.previous_result(),
+            KeyCode::Down => search_state.next_result(),
+            KeyCode::Char(c) => {
+                search_state.input.insert(search_state.cursor_position, c);
+                search_state.cursor_position += 1;
+                trigger_search = true;
+            }
+            KeyCode::Backspace => {
+                if search_state.cursor_position > 0 {
+                    search_state.cursor_position -= 1;
+                    search_state.input.remove(search_state.cursor_position);
+                    trigger_search = true;
+                }
+            }
+            KeyCode::Left => {
+                search_state.cursor_position =
+                    search_state.cursor_position.saturating_sub(1);
+            }
+            KeyCode::Right => {
+                if search_state.cursor_position < search_state.input.len() {
+                    search_state.cursor_position += 1;
+                }
+            }
+            _ => {}
+        }
+    }
+
+    if trigger_search {
+        if let Some(search_state) = app_state.search_state.as_mut() {
+            search_state.is_loading = true;
+            search_state.results.clear();
+            search_state.selected_index = 0;
+
+            let query = search_state.input.clone();
+            let table_name = search_state.table_name.clone();
+            let sender = search_result_sender.clone();
+            let mut grpc_client = grpc_client.clone();
+
+            info!("Spawning search task for query: '{}'", query);
+            tokio::spawn(async move {
+                match grpc_client.search_table(table_name, query).await {
+                    Ok(response) => {
+                        let _ = sender.send(response.hits);
+                    }
+                    Err(e) => {
+                        error!("Search failed: {:?}", e);
+                        let _ = sender.send(vec![]);
+                    }
+                }
+            });
+        }
+    }
+
+    if should_close {
+        app_state.search_state = None;
+        app_state.ui.show_search_palette = false;
+        app_state.ui.focus_outside_canvas = false;
+    }
+
+    Ok(outcome_message)
+}

client/src/search/grpc.rs

@@ -0,0 +1,31 @@
+// src/search/grpc.rs
+
+use common::proto::komp_ac::search::{
+    searcher_client::SearcherClient, SearchRequest, SearchResponse,
+};
+use tonic::transport::Channel;
+use anyhow::Result;
+
+/// Internal search gRPC wrapper
+#[derive(Clone)]
+pub struct SearchGrpc {
+    client: SearcherClient<Channel>,
+}
+
+impl SearchGrpc {
+    pub fn new(channel: Channel) -> Self {
+        Self {
+            client: SearcherClient::new(channel),
+        }
+    }
+
+    pub async fn search_table(
+        &mut self,
+        table_name: String,
+        query: String,
+    ) -> Result<SearchResponse> {
+        let request = tonic::Request::new(SearchRequest { table_name, query });
+        let response = self.client.search_table(request).await?;
+        Ok(response.into_inner())
+    }
+}

client/src/search/mod.rs

@@ -0,0 +1,9 @@
+// src/search/mod.rs
+
+pub mod state;
+pub mod ui;
+pub mod event;
+pub mod grpc;
+
+pub use ui::*;
+pub use grpc::SearchGrpc;

client/src/search/state.rs

@@ -1,4 +1,4 @@
-// src/state/app/search.rs
+// src/search/state.rs
 
 use common::proto::komp_ac::search::search_response::Hit;
 

client/src/search/ui.rs

@@ -1,7 +1,7 @@
-// src/components/common/search_palette.rs
+// src/search/ui.rs
 
 use crate::config::colors::themes::Theme;
-use crate::state::app::search::SearchState;
+use crate::search::state::SearchState;
 use ratatui::{
     layout::{Constraint, Direction, Layout, Rect},
     style::{Modifier, Style},

client/src/services/grpc_client.rs

@@ -22,9 +22,8 @@ use common::proto::komp_ac::tables_data::{
     PostTableDataRequest, PostTableDataResponse, PutTableDataRequest,
     PutTableDataResponse,
 };
-use common::proto::komp_ac::search::{
-    searcher_client::SearcherClient, SearchRequest, SearchResponse,
-};
+use crate::search::SearchGrpc;
+use common::proto::komp_ac::search::SearchResponse;
 use anyhow::{Context, Result};
 use std::collections::HashMap;
 use tonic::transport::Channel;
@@ -36,7 +35,7 @@ pub struct GrpcClient {
     table_definition_client: TableDefinitionClient<Channel>,
     table_script_client: TableScriptClient<Channel>,
     tables_data_client: TablesDataClient<Channel>,
-    search_client: SearcherClient<Channel>,
+    search_client: SearchGrpc,
 }
 
 impl GrpcClient {
@@ -52,7 +51,7 @@ impl GrpcClient {
             TableDefinitionClient::new(channel.clone());
         let table_script_client = TableScriptClient::new(channel.clone());
         let tables_data_client = TablesDataClient::new(channel.clone());
-        let search_client = SearcherClient::new(channel.clone());
+        let search_client = SearchGrpc::new(channel.clone());
 
         Ok(Self {
             table_structure_client,
@@ -247,11 +246,6 @@ impl GrpcClient {
         table_name: String,
         query: String,
     ) -> Result<SearchResponse> {
-        let request = tonic::Request::new(SearchRequest { table_name, query });
-        let response = self
-            .search_client
-            .search_table(request)
-            .await?;
-        Ok(response.into_inner())
+        self.search_client.search_table(table_name, query).await
     }
 }

client/src/services/ui_service.rs

@@ -3,9 +3,9 @@
 use crate::services::grpc_client::GrpcClient;
 use crate::state::app::state::AppState;
 use crate::state::pages::add_logic::AddLogicState;
-use crate::state::pages::form::{FieldDefinition, FormState};
-use crate::tui::functions::common::form::SaveOutcome;
+use crate::pages::forms::logic::SaveOutcome;
 use crate::utils::columns::filter_user_columns;
+use crate::pages::forms::{FieldDefinition, FormState};
 use anyhow::{anyhow, Context, Result};
 use std::sync::Arc;
 

client/src/sidebar/logic.rs

@@ -0,0 +1,21 @@
+// src/sidebar/state.rs
+use crossterm::event::{KeyCode, KeyModifiers};
+use crate::config::binds::config::Config;
+use crate::state::app::state::UiState;
+
+pub fn toggle_sidebar(
+    ui_state: &mut UiState,
+    config: &Config,
+    key: KeyCode,
+    modifiers: KeyModifiers,
+) -> bool {
+    if let Some(action) =
+        config.get_action_for_key_in_mode(&config.keybindings.common, key, modifiers)
+    {
+        if action == "toggle_sidebar" {
+            ui_state.show_sidebar = !ui_state.show_sidebar;
+            return true;
+        }
+    }
+    false
+}

client/src/sidebar/mod.rs

@@ -0,0 +1,7 @@
+// src/sidebar/mod.rs
+
+pub mod ui;
+pub mod logic;
+
+pub use ui::{calculate_sidebar_layout, render_sidebar};
+pub use logic::toggle_sidebar;

client/src/sidebar/ui.rs

@@ -1,4 +1,4 @@
-// src/components/handlers/sidebar.rs
+// src/sidebar/ui.rs
 use ratatui::{
     widgets::{Block, List, ListItem},
     layout::{Rect, Direction, Layout, Constraint},

client/src/state/app.rs

@@ -1,6 +1,3 @@
 // src/state/app.rs
 
 pub mod state;
-pub mod buffer;
-pub mod search;
-pub mod highlight;

client/src/state/app/highlight.rs

@@ -1,20 +0,0 @@
-// src/state/app/highlight.rs
-
-/// Represents the different states of text highlighting.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum HighlightState {
-    /// Highlighting is inactive.
-    Off,
-    /// Highlighting character by character. Stores the anchor point (line index, char index).
-    Characterwise { anchor: (usize, usize) },
-    /// Highlighting line by line. Stores the anchor line index.
-    Linewise { anchor_line: usize },
-}
-
-impl Default for HighlightState {
-    /// The default state is no highlighting.
-    fn default() -> Self {
-        HighlightState::Off
-    }
-}
-

client/src/state/app/state.rs

@@ -5,8 +5,11 @@ use common::proto::komp_ac::table_definition::ProfileTreeResponse;
 // NEW: Import the types we need for the cache
 use common::proto::komp_ac::table_structure::TableStructureResponse;
 use crate::modes::handlers::mode_manager::AppMode;
-use crate::state::app::search::SearchState;
+use crate::search::state::SearchState;
 use crate::ui::handlers::context::DialogPurpose;
+use crate::config::binds::Config;
+use crate::pages::forms::FormState;
+use canvas::FormEditor;
 use std::collections::HashMap;
 use std::env;
 use std::sync::Arc;
@@ -67,6 +70,8 @@ pub struct AppState {
     // UI preferences
     pub ui: UiState,
 
+    pub form_editor: Option<FormEditor<FormState>>,
+
     #[cfg(feature = "ui-debug")]
     pub debug_state: Option<DebugState>,
 }
@@ -86,6 +91,7 @@ impl AppState {
             pending_table_structure_fetch: None,
             search_state: None,
             ui: UiState::default(),
+            form_editor: None,
 
             #[cfg(feature = "ui-debug")]
             debug_state: None,
@@ -180,6 +186,29 @@ impl AppState {
             .get(self.ui.dialog.dialog_active_button_index)
             .map(|s| s.as_str())
     }
+
+    pub fn init_form_editor(&mut self, form_state: FormState, config: &Config) {
+        let mut editor = FormEditor::new(form_state);
+        editor.set_keymap(config.build_canvas_keymap()); // inject keymap
+        self.form_editor = Some(editor);
+    }
+
+    /// Replace the current form state and wrap it in a FormEditor with keymap
+    pub fn set_form_state(&mut self, form_state: FormState, config: &Config) {
+        let mut editor = FormEditor::new(form_state);
+        editor.set_keymap(config.build_canvas_keymap());
+        self.form_editor = Some(editor);
+    }
+
+    /// Immutable access to the underlying FormState
+    pub fn form_state(&self) -> Option<&FormState> {
+        self.form_editor.as_ref().map(|e| e.data_provider())
+    }
+
+    /// Mutable access to the underlying FormState
+    pub fn form_state_mut(&mut self) -> Option<&mut FormState> {
+        self.form_editor.as_mut().map(|e| e.data_provider_mut())
+    }
 }
 
 impl Default for UiState {

client/src/state/pages.rs

@@ -1,6 +1,5 @@
 // src/state/pages.rs
 
-pub mod form;
 pub mod auth;
 pub mod admin;
 pub mod intro;

client/src/state/pages/add_table.rs

@@ -1,6 +1,6 @@
 // src/state/pages/add_table.rs
 
-use canvas::{DataProvider, CanvasAction, AppMode};
+use canvas::{DataProvider, AppMode};
 use ratatui::widgets::TableState;
 use serde::{Deserialize, Serialize};
 

client/src/state/pages/auth.rs

@@ -1,5 +1,5 @@
 // src/state/pages/auth.rs
-use canvas::{DataProvider, AppMode, SuggestionItem};
+use canvas::{DataProvider, AppMode};
 use lazy_static::lazy_static;
 
 lazy_static! {
@@ -21,7 +21,7 @@ pub struct AuthState {
 }
 
 /// Represents the state of the Login form UI
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct LoginState {
     pub username: String,
     pub password: String,
@@ -49,7 +49,7 @@ impl Default for LoginState {
 }
 
 /// Represents the state of the Registration form UI
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct RegisterState {
     pub username: String,
     pub email: String,

client/src/tui/functions.rs

@@ -3,9 +3,7 @@
 pub mod admin;
 pub mod intro;
 pub mod login;
-pub mod form;
 pub mod common;
 
 pub use admin::*;
 pub use intro::*;
-pub use form::*;

client/src/tui/functions/common.rs

@@ -1,6 +1,5 @@
 // src/tui/functions/common.rs
 
-pub mod form;
 pub mod login;
 pub mod logout;
 pub mod register;

client/src/tui/functions/common/form.rs

@@ -1,156 +0,0 @@
-// src/tui/functions/common/form.rs
-
-use crate::services::grpc_client::GrpcClient;
-use crate::state::app::state::AppState; // NEW: Import AppState
-use crate::state::pages::form::FormState;
-use crate::utils::data_converter; // NEW: Import our translator
-use anyhow::{anyhow, Context, Result};
-use std::collections::HashMap;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum SaveOutcome {
-    NoChange,
-    UpdatedExisting,
-    CreatedNew(i64),
-}
-
-// MODIFIED save function signature and logic
-pub async fn save(
-    app_state: &AppState, // NEW: Pass in AppState
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-) -> Result<SaveOutcome> {
-    if !form_state.has_unsaved_changes {
-        return Ok(SaveOutcome::NoChange);
-    }
-
-    // --- NEW: VALIDATION & CONVERSION STEP ---
-    let cache_key =
-        format!("{}.{}", form_state.profile_name, form_state.table_name);
-    let schema = match app_state.schema_cache.get(&cache_key) {
-        Some(s) => s,
-        None => {
-            return Err(anyhow!(
-                "Schema for table '{}' not found in cache. Cannot save.",
-                form_state.table_name
-            ));
-        }
-    };
-
-    let data_map: HashMap<String, String> = form_state
-        .fields
-        .iter()
-        .zip(form_state.values.iter())
-        .map(|(field_def, value)| (field_def.data_key.clone(), value.clone()))
-        .collect();
-
-    // Use our new translator. It returns a user-friendly error on failure.
-    let converted_data =
-        match data_converter::convert_and_validate_data(&data_map, schema) {
-            Ok(data) => data,
-            Err(user_error) => return Err(anyhow!(user_error)),
-        };
-    // --- END OF NEW STEP ---
-
-    let outcome: SaveOutcome;
-    let is_new_entry = form_state.id == 0
-        || (form_state.total_count > 0
-            && form_state.current_position > form_state.total_count)
-        || (form_state.total_count == 0 && form_state.current_position == 1);
-
-    if is_new_entry {
-        let response = grpc_client
-            .post_table_data(
-                form_state.profile_name.clone(),
-                form_state.table_name.clone(),
-                converted_data, // Use the validated & converted data
-            )
-            .await
-            .context("Failed to post new table data")?;
-
-        if response.success {
-            form_state.id = response.inserted_id;
-            form_state.total_count += 1;
-            form_state.current_position = form_state.total_count;
-            outcome = SaveOutcome::CreatedNew(response.inserted_id);
-        } else {
-            return Err(anyhow!(
-                "Server failed to insert data: {}",
-                response.message
-            ));
-        }
-    } else {
-        if form_state.id == 0 {
-            return Err(anyhow!(
-                "Cannot update record: ID is 0, but not classified as new entry."
-            ));
-        }
-        let response = grpc_client
-            .put_table_data(
-                form_state.profile_name.clone(),
-                form_state.table_name.clone(),
-                form_state.id,
-                converted_data, // Use the validated & converted data
-            )
-            .await
-            .context("Failed to put (update) table data")?;
-
-        if response.success {
-            outcome = SaveOutcome::UpdatedExisting;
-        } else {
-            return Err(anyhow!(
-                "Server failed to update data: {}",
-                response.message
-            ));
-        }
-    }
-
-    form_state.has_unsaved_changes = false;
-    Ok(outcome)
-}
-
-pub async fn revert(
-    form_state: &mut FormState, // Takes &mut FormState to update it
-    grpc_client: &mut GrpcClient,
-) -> Result<String> {
-    if form_state.id == 0 || (form_state.total_count > 0 && form_state.current_position > form_state.total_count) || (form_state.total_count == 0 && form_state.current_position == 1) {
-        let old_total_count = form_state.total_count; // Preserve for correct new position
-        form_state.reset_to_empty(); // reset_to_empty will clear values and set id=0
-        form_state.total_count = old_total_count; // Restore total_count
-        if form_state.total_count > 0 { // Correctly set current_position for new
-             form_state.current_position = form_state.total_count + 1;
-        } else {
-             form_state.current_position = 1;
-        }
-        return Ok("New entry cleared".to_string());
-    }
-
-    if form_state.current_position == 0 || form_state.current_position > form_state.total_count {
-        if form_state.total_count > 0 {
-            form_state.current_position = 1;
-        } else {
-            // No records to revert to, effectively a new entry state.
-            form_state.reset_to_empty();
-            return Ok("No saved data to revert to; form cleared.".to_string());
-        }
-    }
-
-    let response = grpc_client
-        .get_table_data_by_position(
-            form_state.profile_name.clone(),
-            form_state.table_name.clone(),
-            form_state.current_position as i32,
-        )
-        .await
-        .context(format!(
-            "Failed to get table data by position {} for table {}.{}",
-            form_state.current_position,
-            form_state.profile_name,
-            form_state.table_name
-        ))?;
-
-    // FIX: Pass the current position as the second argument
-    form_state.update_from_response(&response.data, form_state.current_position);
-    Ok("Changes discarded, reloaded last saved version".to_string())
-}
-

client/src/tui/functions/common/login.rs

@@ -4,7 +4,7 @@ use crate::services::auth::AuthClient;
 use crate::state::pages::auth::AuthState;
 use crate::state::pages::auth::LoginState;
 use crate::state::app::state::AppState;
-use crate::state::app::buffer::{AppView, BufferState};
+use crate::buffer::state::{AppView, BufferState};
 use crate::config::storage::storage::{StoredAuthData, save_auth_data};
 use crate::ui::handlers::context::DialogPurpose;
 use common::proto::komp_ac::auth::LoginResponse;

client/src/tui/functions/common/logout.rs

@@ -2,7 +2,7 @@
 use crate::config::storage::delete_auth_data;
 use crate::state::pages::auth::AuthState;
 use crate::state::app::state::AppState;
-use crate::state::app::buffer::{AppView, BufferState};
+use crate::buffer::state::{AppView, BufferState};
 use crate::ui::handlers::context::DialogPurpose;
 use tracing::{error, info};
 

client/src/tui/functions/common/register.rs

@@ -6,7 +6,7 @@ use crate::state::{
     app::state::AppState,
 };
 use crate::ui::handlers::context::DialogPurpose;
-use crate::state::app::buffer::{AppView, BufferState};
+use crate::buffer::state::{AppView, BufferState};
 use common::proto::komp_ac::auth::AuthResponse;
 use anyhow::Context;
 use tokio::spawn;

client/src/tui/functions/form.rs

@@ -1,44 +0,0 @@
-// src/tui/functions/form.rs
-use crate::state::pages::form::FormState;
-use crate::services::grpc_client::GrpcClient;
-use anyhow::{anyhow, Result};
-
-pub async fn handle_action(
-    action: &str,
-    form_state: &mut FormState,
-    _grpc_client: &mut GrpcClient,
-    ideal_cursor_column: &mut usize,
-) -> Result<String> {
-    if form_state.has_unsaved_changes() {
-        return Ok(
-            "Unsaved changes. Save (Ctrl+S) or Revert (Ctrl+R) before navigating."
-                .to_string(),
-        );
-    }
-
-    let total_count = form_state.total_count;
-
-    match action {
-        "previous_entry" => {
-            // Only decrement if the current position is greater than the first record.
-            // This prevents wrapping from 1 to total_count.
-            // It also correctly handles moving from "New Entry" (total_count + 1) to the last record.
-            if form_state.current_position > 1 {
-                form_state.current_position -= 1;
-                *ideal_cursor_column = 0;
-            }
-        }
-        "next_entry" => {
-            // Only increment if the current position is not yet at the "New Entry" stage.
-            // The "New Entry" position is total_count + 1.
-            // This allows moving from the last record to "New Entry", but stops there.
-            if form_state.current_position <= total_count {
-                form_state.current_position += 1;
-                *ideal_cursor_column = 0;
-            }
-        }
-        _ => return Err(anyhow!("Unknown form action: {}", action)),
-    }
-
-    Ok(String::new())
-}

client/src/tui/functions/intro.rs

@@ -1,6 +1,6 @@
 // src/tui/functions/intro.rs
 use crate::state::app::state::AppState;
-use crate::state::app::buffer::{AppView, BufferState};
+use crate::buffer::state::{AppView, BufferState};
 
 /// Handles intro screen selection by updating view history and managing focus state.
 /// 0: Continue (restores last form or default)

client/src/ui/handlers.rs

@@ -2,9 +2,7 @@
 
 pub mod ui;
 pub mod render;
-pub mod rat_state;
 pub mod context;
 
 pub use ui::run_ui;
-pub use rat_state::*;
 pub use context::*;

client/src/ui/handlers/rat_state.rs

@@ -1,38 +0,0 @@
-// client/src/ui/handlers/rat_state.rs
-use crossterm::event::{KeyCode, KeyModifiers};
-use crate::config::binds::config::Config;
-use crate::state::app::state::UiState;
-
-pub struct UiStateHandler;
-
-impl UiStateHandler {
-    pub fn toggle_sidebar(
-        ui_state: &mut UiState,
-        config: &Config,
-        key: KeyCode,
-        modifiers: KeyModifiers,
-    ) -> bool {
-        if let Some(action) = config.get_action_for_key_in_mode(&config.keybindings.common, key, modifiers) {
-            if action == "toggle_sidebar" {
-                ui_state.show_sidebar = !ui_state.show_sidebar;
-                return true;
-            }
-        }
-        false
-    }
-    
-   pub fn toggle_buffer_list(
-       ui_state: &mut UiState,
-       config: &Config,
-       key: KeyCode,
-       modifiers: KeyModifiers,
-   ) -> bool {
-       if let Some(action) = config.get_common_action(key, modifiers) {
-           if action == "toggle_buffer_list" {
-               ui_state.show_buffer_list = !ui_state.show_buffer_list;
-               return true;
-           }
-       }
-       false
-   }
-}

client/src/ui/handlers/render.rs

@@ -5,54 +5,35 @@ use crate::components::{
     admin::render_add_table,
     auth::{login::render_login, register::render_register},
     common::dialog::render_dialog,
-    common::find_file_palette,
-    common::search_palette::render_search_palette,
-    handlers::sidebar::{self, calculate_sidebar_layout},
     intro::intro::render_intro,
     render_background,
-    render_buffer_list,
-    render_command_line,
-    render_status_line,
 };
+use crate::bottom_panel::{
+    command_line::render_command_line,
+    status_line::render_status_line,
+    find_file_palette,
+};
+use crate::sidebar::{calculate_sidebar_layout, render_sidebar};
+use crate::buffer::render_buffer_list;
+use crate::search::render_search_palette;
 use crate::config::colors::themes::Theme;
 use crate::modes::general::command_navigation::NavigationState;
-use crate::state::app::buffer::BufferState;
-use crate::state::app::highlight::HighlightState as LocalHighlightState;
-use canvas::canvas::HighlightState as CanvasHighlightState;
+use crate::buffer::state::BufferState;
 use crate::state::app::state::AppState;
-use crate::state::pages::admin::AdminState;
 use crate::state::pages::auth::AuthState;
-use crate::state::pages::auth::LoginState;
-use crate::state::pages::auth::RegisterState;
-use crate::state::pages::form::FormState;
-use crate::state::pages::intro::IntroState;
+use crate::bottom_panel::layout::{bottom_panel_constraints, render_bottom_panel};
 use ratatui::{
     layout::{Constraint, Direction, Layout},
     Frame,
 };
+use crate::pages::routing::{Router, Page};
 
-// Helper function to convert between HighlightState types
-fn convert_highlight_state(local: &LocalHighlightState) -> CanvasHighlightState {
-    match local {
-        LocalHighlightState::Off => CanvasHighlightState::Off,
-        LocalHighlightState::Characterwise { anchor } => CanvasHighlightState::Characterwise { anchor: *anchor },
-        LocalHighlightState::Linewise { anchor_line } => CanvasHighlightState::Linewise { anchor_line: *anchor_line },
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
 pub fn render_ui(
     f: &mut Frame,
-    form_state: &mut FormState,
-    auth_state: &mut AuthState,
-    login_state: &LoginState,
-    register_state: &RegisterState,
-    intro_state: &IntroState,
-    admin_state: &mut AdminState,
+    router: &mut Router,
     buffer_state: &BufferState,
     theme: &Theme,
     is_event_handler_edit_mode: bool,
-    highlight_state: &LocalHighlightState, // Keep using local version
     event_handler_command_input: &str,
     event_handler_command_mode_active: bool,
     event_handler_command_message: &str,
@@ -63,38 +44,16 @@ pub fn render_ui(
 ) {
     render_background(f, f.area(), theme);
 
-    // --- START DYNAMIC LAYOUT LOGIC ---
-    let mut status_line_height = 1;
-    #[cfg(feature = "ui-debug")]
-    {
-        if let Some(debug_state) = &app_state.debug_state {
-            if debug_state.is_error {
-                status_line_height = 4;
-            }
-        }
-    }
-    // --- END DYNAMIC LAYOUT LOGIC ---
-
-    const PALETTE_OPTIONS_HEIGHT_FOR_LAYOUT: u16 = 15;
-
-    let mut bottom_area_constraints: Vec<Constraint> = vec![Constraint::Length(status_line_height)];
-    let command_palette_area_height = if navigation_state.active {
-        1 + PALETTE_OPTIONS_HEIGHT_FOR_LAYOUT
-    } else if event_handler_command_mode_active {
-        1
-    } else {
-        0
-    };
-
-    if command_palette_area_height > 0 {
-        bottom_area_constraints.push(Constraint::Length(command_palette_area_height));
-    }
-
+    // Layout: optional buffer list + main content + bottom panel
     let mut main_layout_constraints = vec![Constraint::Min(1)];
     if app_state.ui.show_buffer_list {
         main_layout_constraints.insert(0, Constraint::Length(1));
     }
-    main_layout_constraints.extend(bottom_area_constraints);
+    main_layout_constraints.extend(bottom_panel_constraints(
+        app_state,
+        navigation_state,
+        event_handler_command_mode_active,
+    ));
 
     let root_chunks = Layout::default()
         .direction(Direction::Vertical)
@@ -113,73 +72,56 @@ pub fn render_ui(
     let main_content_area = root_chunks[chunk_idx];
     chunk_idx += 1;
 
-    let status_line_area = root_chunks[chunk_idx];
-    chunk_idx += 1;
-
-    let command_render_area = if command_palette_area_height > 0 {
-        if root_chunks.len() > chunk_idx {
-            Some(root_chunks[chunk_idx])
-        } else {
-            None
-        }
-    } else {
-        None
-    };
-
-    if app_state.ui.show_intro {
-        render_intro(f, intro_state, main_content_area, theme);
-    } else if app_state.ui.show_register {
-        render_register(
+    // Page rendering is now fully router-driven
+    match &mut router.current {
+        Page::Intro(state) => render_intro(f, state, main_content_area, theme),
+        Page::Login(state) => render_login(
             f,
             main_content_area,
             theme,
-            register_state,
+            state,
             app_state,
-            register_state.current_field() < 4, // Now using CanvasState trait method
-        );
-    } else if app_state.ui.show_add_table {
-        render_add_table(
+            state.current_field() < 2,
+        ),
+        Page::Register(state) => render_register(
             f,
             main_content_area,
             theme,
+            state,
             app_state,
-            &mut admin_state.add_table_state,
-            is_event_handler_edit_mode,
-        );
-    } else if app_state.ui.show_add_logic {
-        render_add_logic(
-            f,
-            main_content_area,
-            theme,
-            app_state,
-            &mut admin_state.add_logic_state,
-            is_event_handler_edit_mode,
-        );
-    } else if app_state.ui.show_login {
-        render_login(
-            f,
-            main_content_area,
-            theme,
-            login_state,
-            app_state,
-            login_state.current_field() < 2, // Now using CanvasState trait method
-        );
-    } else if app_state.ui.show_admin {
-        crate::components::admin::admin_panel::render_admin_panel(
+            state.current_field() < 4,
+        ),
+        Page::Admin(state) => crate::components::admin::admin_panel::render_admin_panel(
             f,
             app_state,
-            auth_state,
-            admin_state,
+            &mut AuthState::default(), // TODO: later move AuthState into Router
+            state,
             main_content_area,
             theme,
             &app_state.profile_tree,
             &app_state.selected_profile,
-        );
-    } else if app_state.ui.show_form {
+        ),
+        Page::AddLogic(state) => render_add_logic(
+            f,
+            main_content_area,
+            theme,
+            app_state,
+            state,
+            is_event_handler_edit_mode,
+        ),
+        Page::AddTable(state) => render_add_table(
+            f,
+            main_content_area,
+            theme,
+            app_state,
+            state,
+            is_event_handler_edit_mode,
+        ),
+        Page::Form(state) => {
             let (sidebar_area, form_actual_area) =
                 calculate_sidebar_layout(app_state.ui.show_sidebar, main_content_area);
             if let Some(sidebar_rect) = sidebar_area {
-            sidebar::render_sidebar(
+                render_sidebar(
                     f,
                     sidebar_rect,
                     theme,
@@ -204,52 +146,24 @@ pub fn render_ui(
                     .split(form_actual_area)[1]
             };
 
-        // CHANGED: Convert local HighlightState to canvas HighlightState for FormState
-        let canvas_highlight_state = convert_highlight_state(highlight_state);
-        form_state.render(
+            render_form_page(
                 f,
                 form_render_area,
+                app_state,
+                state,
+                app_state.current_view_table_name.as_deref().unwrap_or(""),
                 theme,
-            is_event_handler_edit_mode,
-            &canvas_highlight_state, // Use converted version
+                state.total_count,
+                state.current_position,
             );
         }
+    }
 
+    // Global overlays (not tied to a page)
     if let Some(area) = buffer_list_area {
         render_buffer_list(f, area, theme, buffer_state, app_state);
     }
 
-    render_status_line(
-        f,
-        status_line_area,
-        current_dir,
-        theme,
-        is_event_handler_edit_mode,
-        current_fps,
-        app_state,
-    );
-
-    if let Some(palette_or_command_area) = command_render_area {
-        if navigation_state.active {
-            find_file_palette::render_find_file_palette(
-                f,
-                palette_or_command_area,
-                theme,
-                navigation_state,
-            );
-        } else if event_handler_command_mode_active {
-            render_command_line(
-                f,
-                palette_or_command_area,
-                event_handler_command_input,
-                true,
-                theme,
-                event_handler_command_message,
-            );
-        }
-    }
-
-    // This block now correctly handles drawing popups over any view.
     if app_state.ui.show_search_palette {
         if let Some(search_state) = &app_state.search_state {
             render_search_palette(f, f.area(), theme, search_state);
@@ -266,4 +180,19 @@ pub fn render_ui(
             app_state.ui.dialog.is_loading,
         );
     }
+
+    render_bottom_panel(
+        f,
+        &root_chunks,
+        &mut chunk_idx,
+        current_dir,
+        theme,
+        is_event_handler_edit_mode,
+        current_fps,
+        app_state,
+        navigation_state,
+        event_handler_command_input,
+        event_handler_command_mode_active,
+        event_handler_command_message,
+    );
 }

client/src/ui/handlers/ui.rs

@@ -8,15 +8,16 @@ use crate::config::storage::storage::load_auth_data;
 use crate::modes::common::commands::CommandHandler;
 use crate::modes::handlers::event::{EventHandler, EventOutcome};
 use crate::modes::handlers::mode_manager::{AppMode, ModeManager};
-use crate::state::pages::form::{FormState, FieldDefinition};
 use crate::state::pages::auth::AuthState;
 use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
 use crate::state::pages::admin::AdminState;
 use crate::state::pages::admin::AdminFocus;
 use crate::state::pages::intro::IntroState;
-use crate::state::app::buffer::BufferState;
-use crate::state::app::buffer::AppView;
+use crate::pages::forms::{FormState, FieldDefinition};
+use crate::pages::routing::{Router, Page};
+use crate::buffer::state::BufferState;
+use crate::buffer::state::AppView;
 use crate::state::app::state::AppState;
 use crate::tui::terminal::{EventReader, TerminalCore};
 use crate::ui::handlers::render::render_ui;
@@ -26,12 +27,14 @@ use crate::ui::handlers::context::DialogPurpose;
 use crate::tui::functions::common::login;
 use crate::tui::functions::common::register;
 use crate::utils::columns::filter_user_columns;
+use canvas::keymap::KeyEventOutcome;
 use anyhow::{Context, Result};
 use crossterm::cursor::SetCursorStyle;
 use crossterm::event as crossterm_event;
 use tracing::{error, info, warn};
 use tokio::sync::mpsc;
-use std::time::{Instant, Duration};
+use std::time::Instant;
+use std::time::Duration;
 #[cfg(feature = "ui-debug")]
 use crate::state::app::state::DebugState;
 #[cfg(feature = "ui-debug")]
@@ -66,6 +69,7 @@ pub async fn run_ui() -> Result<()> {
     let mut register_state = RegisterState::default();
     let mut intro_state = IntroState::default();
     let mut admin_state = AdminState::default();
+    let mut router = Router::new();
     let mut buffer_state = BufferState::default();
     let mut app_state = AppState::new().context("Failed to create initial app state")?;
 
@@ -102,13 +106,15 @@ pub async fn run_ui() -> Result<()> {
         })
         .collect();
 
-    let mut form_state = FormState::new(
-        initial_profile.clone(),
-        initial_table.clone(),
-        initial_field_defs,
+    // Replace local form_state with app_state.form_editor
+    app_state.set_form_state(
+        FormState::new(initial_profile.clone(), initial_table.clone(), initial_field_defs),
+        &config,
     );
 
-    UiService::fetch_and_set_table_count(&mut grpc_client, &mut form_state)
+    // Fetch initial count using app_state accessor
+    if let Some(form_state) = app_state.form_state_mut() {
+        UiService::fetch_and_set_table_count(&mut grpc_client, form_state)
             .await
             .context(format!(
                 "Failed to fetch initial count for table {}.{}",
@@ -116,12 +122,13 @@ pub async fn run_ui() -> Result<()> {
             ))?;
 
         if form_state.total_count > 0 {
-        if let Err(e) = UiService::load_table_data_by_position(&mut grpc_client, &mut form_state).await {
+            if let Err(e) = UiService::load_table_data_by_position(&mut grpc_client, form_state).await {
                 event_handler.command_message = format!("Error loading initial data: {}", e);
             }
         } else {
             form_state.reset_to_empty();
         }
+    }
 
     if auto_logged_in {
         buffer_state.history = vec![AppView::Form];
@@ -137,7 +144,9 @@ pub async fn run_ui() -> Result<()> {
     let mut table_just_switched = false;
 
     loop {
-        let position_before_event = form_state.current_position;
+        let position_before_event = app_state.form_state()
+            .map(|fs| fs.current_position)
+            .unwrap_or(1);
         let mut event_processed = false;
 
         // --- CHANNEL RECEIVERS ---
@@ -162,6 +171,7 @@ pub async fn run_ui() -> Result<()> {
         // --- ADDED: For live form autocomplete ---
         match event_handler.autocomplete_result_receiver.try_recv() {
             Ok(hits) => {
+                if let Some(form_state) = app_state.form_state_mut() {
                     if form_state.autocomplete_active {
                         form_state.autocomplete_suggestions = hits;
                         form_state.autocomplete_loading = false;
@@ -172,6 +182,7 @@ pub async fn run_ui() -> Result<()> {
                         }
                         event_handler.command_message = format!("Found {} suggestions.", form_state.autocomplete_suggestions.len());
                     }
+                }
                 needs_redraw = true;
             }
             Err(mpsc::error::TryRecvError::Empty) => {}
@@ -180,28 +191,51 @@ pub async fn run_ui() -> Result<()> {
             }
         }
 
-
         if app_state.ui.show_search_palette {
             needs_redraw = true;
         }
         if crossterm_event::poll(std::time::Duration::from_millis(1))? {
             let event = event_reader.read_event().context("Failed to read terminal event")?;
             event_processed = true;
+
+            if let crossterm_event::Event::Key(key_event) = &event {
+                if let Page::Form(_) = &router.current {
+                    if let Some(editor) = app_state.form_editor.as_mut() {
+                        match editor.handle_key_event(*key_event) {
+                            KeyEventOutcome::Consumed(Some(msg)) => {
+                                event_handler.command_message = msg;
+                                needs_redraw = true;
+                                continue;
+                            }
+                            KeyEventOutcome::Consumed(None) => {
+                                needs_redraw = true;
+                                continue;
+                            }
+                            KeyEventOutcome::Pending => {
+                                needs_redraw = true;
+                                continue;
+                            }
+                            KeyEventOutcome::NotMatched => {
+                                // fall through to client-level handling
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Get form state from app_state and pass to handle_event
+            let form_state = app_state.form_state_mut().unwrap();
+
             let event_outcome_result = event_handler.handle_event(
                 event,
                 &config,
                 &mut terminal,
                 &mut command_handler,
-                &mut form_state,
                 &mut auth_state,
-                &mut login_state,
-                &mut register_state,
-                &mut intro_state,
-                &mut admin_state,
                 &mut buffer_state,
                 &mut app_state,
+                &mut router,
             ).await;
-
             let mut should_exit = false;
             match event_outcome_result {
                 Ok(outcome) => match outcome {
@@ -216,15 +250,21 @@ pub async fn run_ui() -> Result<()> {
                     }
                     EventOutcome::DataSaved(save_outcome, message) => {
                         event_handler.command_message = message;
+                        // Clone form_state to avoid double borrow
+                        let mut temp_form_state = app_state.form_state().unwrap().clone();
                         if let Err(e) = UiService::handle_save_outcome(
                             save_outcome,
                             &mut grpc_client,
                             &mut app_state,
-                            &mut form_state,
+                            &mut temp_form_state,
                         ).await {
                             event_handler.command_message =
                                 format!("Error handling save outcome: {}", e);
                         }
+                        // Update app_state with changes
+                        if let Some(form_state) = app_state.form_state_mut() {
+                            *form_state = temp_form_state;
+                        }
                     }
                     EventOutcome::ButtonSelected { .. } => {}
                     EventOutcome::TableSelected { path } => {
@@ -300,17 +340,10 @@ pub async fn run_ui() -> Result<()> {
         }
 
         if let Some(active_view) = buffer_state.get_active_view() {
-            app_state.ui.show_intro = false;
-            app_state.ui.show_login = false;
-            app_state.ui.show_register = false;
-            app_state.ui.show_admin = false;
-            app_state.ui.show_add_table = false;
-            app_state.ui.show_add_logic = false;
-            app_state.ui.show_form = false;
             match active_view {
-                AppView::Intro => app_state.ui.show_intro = true,
-                AppView::Login => app_state.ui.show_login = true,
-                AppView::Register => app_state.ui.show_register = true,
+                AppView::Intro => router.navigate(Page::Intro(intro_state.clone())),
+                AppView::Login => router.navigate(Page::Login(login_state.clone())),
+                AppView::Register => router.navigate(Page::Register(register_state.clone())),
                 AppView::Admin => {
                     info!("Active view is Admin, refreshing profile tree...");
                     match grpc_client.get_profile_tree().await {
@@ -319,37 +352,43 @@ pub async fn run_ui() -> Result<()> {
                         }
                         Err(e) => {
                             error!("Failed to refresh profile tree for Admin panel: {}", e);
-                            event_handler.command_message = format!("Error refreshing admin data: {}", e);
+                            event_handler.command_message =
+                                format!("Error refreshing admin data: {}", e);
                         }
                     }
-                    app_state.ui.show_admin = true;
                     let profile_names = app_state.profile_tree.profiles.iter()
                         .map(|p| p.name.clone())
                         .collect();
                     admin_state.set_profiles(profile_names);
 
-                    if admin_state.current_focus == AdminFocus::default() ||
-                    !matches!(admin_state.current_focus,
+                    if admin_state.current_focus == AdminFocus::default()
+                        || !matches!(admin_state.current_focus,
                             AdminFocus::InsideProfilesList |
                             AdminFocus::Tables | AdminFocus::InsideTablesList |
-                                AdminFocus::Button1 | AdminFocus::Button2 | AdminFocus::Button3) {
+                            AdminFocus::Button1 | AdminFocus::Button2 | AdminFocus::Button3)
+                    {
                         admin_state.current_focus = AdminFocus::ProfilesPane;
                     }
-                    if admin_state.profile_list_state.selected().is_none() && !app_state.profile_tree.profiles.is_empty() {
+                    if admin_state.profile_list_state.selected().is_none()
+                        && !app_state.profile_tree.profiles.is_empty()
+                    {
                         admin_state.profile_list_state.select(Some(0));
                     }
+
+                    router.navigate(Page::Admin(admin_state.clone()));
+                }
+                AppView::AddTable => router.navigate(Page::AddTable(admin_state.add_table_state.clone())),
+                AppView::AddLogic => router.navigate(Page::AddLogic(admin_state.add_logic_state.clone())),
+                AppView::Form => {
+                    if let Some(form_state) = app_state.form_state().cloned() {
+                        router.navigate(Page::Form(form_state));
+                    }
                 }
-                AppView::AddTable => app_state.ui.show_add_table = true,
-                AppView::AddLogic => app_state.ui.show_add_logic = true,
-                AppView::Form => app_state.ui.show_form = true,
                 AppView::Scratch => {}
             }
         }
 
-        // Continue with the rest of the function...
-        // (The rest remains the same, but now CanvasState trait methods are available)
-        
-        if app_state.ui.show_form {
+        if let Page::Form(_) = &router.current {
             let current_view_profile = app_state.current_view_profile_name.clone();
             let current_view_table = app_state.current_view_table_name.clone();
 
@@ -373,10 +412,14 @@ pub async fn run_ui() -> Result<()> {
                     )
                     .await
                     {
-                        Ok(mut new_form_state) => {
+                        Ok(new_form_state) => {
+                            // Set the new form state and fetch count
+                            app_state.set_form_state(new_form_state, &config);
+                            
+                            if let Some(form_state) = app_state.form_state_mut() {
                                 if let Err(e) = UiService::fetch_and_set_table_count(
                                     &mut grpc_client,
-                                &mut new_form_state,
+                                    form_state,
                                 )
                                 .await
                                 {
@@ -385,10 +428,10 @@ pub async fn run_ui() -> Result<()> {
                                         vec!["OK".to_string()],
                                         DialogPurpose::LoginFailed,
                                     );
-                            } else if new_form_state.total_count > 0 {
+                                } else if form_state.total_count > 0 {
                                     if let Err(e) = UiService::load_table_data_by_position(
                                         &mut grpc_client,
-                                    &mut new_form_state,
+                                        form_state,
                                     )
                                     .await
                                     {
@@ -401,11 +444,11 @@ pub async fn run_ui() -> Result<()> {
                                         app_state.hide_dialog();
                                     }
                                 } else {
-                                new_form_state.reset_to_empty();
+                                    form_state.reset_to_empty();
                                     app_state.hide_dialog();
                                 }
+                            }
 
-                            form_state = new_form_state;
                             prev_view_profile_name = current_view_profile;
                             prev_view_table_name = current_view_table;
                             table_just_switched = true;
@@ -431,15 +474,18 @@ pub async fn run_ui() -> Result<()> {
         // Now we can use CanvasState methods like get_current_input(), current_field(), etc.
 
         if let Some((profile_name, table_name)) = app_state.pending_table_structure_fetch.take() {
-            if app_state.ui.show_add_logic {
-                if admin_state.add_logic_state.profile_name == profile_name &&
-                admin_state.add_logic_state.selected_table_name.as_deref() == Some(table_name.as_str()) {
+            if let Page::AddLogic(state) = &mut router.current {
+                if state.profile_name == profile_name
+                    && state.selected_table_name.as_deref() == Some(table_name.as_str())
+                {
                     info!("Fetching table structure for {}.{}", profile_name, table_name);
                     let fetch_message = UiService::initialize_add_logic_table_data(
                         &mut grpc_client,
-                        &mut admin_state.add_logic_state,
+                        state,
                         &app_state.profile_tree,
-                    ).await.unwrap_or_else(|e| {
+                    )
+                        .await
+                        .unwrap_or_else(|e| {
                             error!("Error initializing add_logic_table_data: {}", e);
                             format!("Error fetching table structure: {}", e)
                         });
@@ -452,10 +498,11 @@ pub async fn run_ui() -> Result<()> {
                     needs_redraw = true;
                 } else {
                     error!(
-                        "Mismatch in pending_table_structure_fetch: app_state wants {}.{}, but add_logic_state is for {}.{:?}",
-                        profile_name, table_name,
-                        admin_state.add_logic_state.profile_name,
-                        admin_state.add_logic_state.selected_table_name
+                        "Mismatch in pending_table_structure_fetch: app_state wants {}.{}, but AddLogic state is for {}.{:?}",
+                        profile_name,
+                        table_name,
+                        state.profile_name,
+                        state.selected_table_name
                     );
                 }
             } else {
@@ -466,21 +513,21 @@ pub async fn run_ui() -> Result<()> {
             }
         }
 
-        if let Some(table_name) = admin_state.add_logic_state.script_editor_awaiting_column_autocomplete.clone() {
-            if app_state.ui.show_add_logic {
-                let profile_name = admin_state.add_logic_state.profile_name.clone();
+        if let Page::AddLogic(state) = &mut router.current {
+            if let Some(table_name) = state.script_editor_awaiting_column_autocomplete.clone() {
+                let profile_name = state.profile_name.clone();
 
                 info!("Fetching columns for table selection: {}.{}", profile_name, table_name);
                 match UiService::fetch_columns_for_table(&mut grpc_client, &profile_name, &table_name).await {
                     Ok(columns) => {
-                        admin_state.add_logic_state.set_columns_for_table_autocomplete(columns.clone());
+                        state.set_columns_for_table_autocomplete(columns.clone());
                         info!("Loaded {} columns for table '{}'", columns.len(), table_name);
                         event_handler.command_message = format!("Columns for '{}' loaded. Select a column.", table_name);
                     }
                     Err(e) => {
                         error!("Failed to fetch columns for {}.{}: {}", profile_name, table_name, e);
-                        admin_state.add_logic_state.script_editor_awaiting_column_autocomplete = None;
-                        admin_state.add_logic_state.deactivate_script_editor_autocomplete();
+                        state.script_editor_awaiting_column_autocomplete = None;
+                        state.deactivate_script_editor_autocomplete();
                         event_handler.command_message = format!("Error loading columns for '{}': {}", table_name, e);
                     }
                 }
@@ -488,39 +535,54 @@ pub async fn run_ui() -> Result<()> {
             }
         }
 
-        let position_changed = form_state.current_position != position_before_event;
+        let current_position = app_state.form_state()
+            .map(|fs| fs.current_position)
+            .unwrap_or(1);
+        let position_changed = current_position != position_before_event;
         let mut position_logic_needs_redraw = false;
 
-        if app_state.ui.show_form && !table_just_switched {
+        if let Page::Form(form_state) = &mut router.current {
+            if !table_just_switched {
                 if position_changed && !event_handler.is_edit_mode {
                     position_logic_needs_redraw = true;
 
+                    if let Some(form_state) = app_state.form_state_mut() {
                         if form_state.current_position > form_state.total_count {
                             form_state.reset_to_empty();
-                    event_handler.command_message = format!("New entry for {}.{}", form_state.profile_name, form_state.table_name);
+                            event_handler.command_message = format!(
+                                "New entry for {}.{}",
+                                form_state.profile_name,
+                                form_state.table_name
+                            );
                         } else {
-                    match UiService::load_table_data_by_position(&mut grpc_client, &mut form_state).await {
+                            match UiService::load_table_data_by_position(&mut grpc_client, form_state).await {
                                 Ok(load_message) => {
-                            if event_handler.command_message.is_empty() || !load_message.starts_with("Error") {
+                                    if event_handler.command_message.is_empty()
+                                        || !load_message.starts_with("Error")
+                                    {
                                         event_handler.command_message = load_message;
                                     }
                                 }
                                 Err(e) => {
-                            event_handler.command_message = format!("Error loading data: {}", e);
+                                    event_handler.command_message =
+                                        format!("Error loading data: {}", e);
                                 }
                             }
                         }
 
                         let current_input_after_load_str = form_state.get_current_input();
-                let current_input_len_after_load = current_input_after_load_str.chars().count();
+                        let current_input_len_after_load =
+                            current_input_after_load_str.chars().count();
                         let max_cursor_pos = if current_input_len_after_load > 0 {
                             current_input_len_after_load.saturating_sub(1)
                         } else {
                             0
                         };
-                form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-
+                        form_state.current_cursor_pos =
+                            event_handler.ideal_cursor_column.min(max_cursor_pos);
+                    }
                 } else if !position_changed && !event_handler.is_edit_mode {
+                    if let Some(form_state) = app_state.form_state_mut() {
                         let current_input_str = form_state.get_current_input();
                         let current_input_len = current_input_str.chars().count();
                         let max_cursor_pos = if current_input_len > 0 {
@@ -528,19 +590,26 @@ pub async fn run_ui() -> Result<()> {
                         } else {
                             0
                         };
-                form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+                        form_state.current_cursor_pos =
+                            event_handler.ideal_cursor_column.min(max_cursor_pos);
                     }
-        } else if app_state.ui.show_register {
-            if !event_handler.is_edit_mode {
-                let current_input = register_state.get_current_input();
-                let max_cursor_pos = if !current_input.is_empty() { current_input.len() - 1 } else { 0 };
-                register_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
                 }
-        } else if app_state.ui.show_login {
+            }
+        } else if let Page::Register(state) = &mut router.current {
             if !event_handler.is_edit_mode {
-                let current_input = login_state.get_current_input();
-                let max_cursor_pos = if !current_input.is_empty() { current_input.len() - 1 } else { 0 };
-                login_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+                let current_input = state.get_current_input();
+                let max_cursor_pos =
+                    if !current_input.is_empty() { current_input.len() - 1 } else { 0 };
+                state.current_cursor_pos =
+                    event_handler.ideal_cursor_column.min(max_cursor_pos);
+            }
+        } else if let Page::Login(state) = &mut router.current {
+            if !event_handler.is_edit_mode {
+                let current_input = state.get_current_input();
+                let max_cursor_pos =
+                    if !current_input.is_empty() { current_input.len() - 1 } else { 0 };
+                state.current_cursor_pos =
+                    event_handler.ideal_cursor_column.min(max_cursor_pos);
             }
         }
 
@@ -571,7 +640,7 @@ pub async fn run_ui() -> Result<()> {
         }
 
         if event_processed || needs_redraw || position_changed {
-            let current_mode = ModeManager::derive_mode(&app_state, &event_handler, &admin_state);
+            let current_mode = ModeManager::derive_mode(&app_state, &event_handler, &router);
             match current_mode {
                 AppMode::Edit => { terminal.show_cursor()?; }
                 AppMode::Highlight => { terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?; terminal.show_cursor()?; }
@@ -587,27 +656,37 @@ pub async fn run_ui() -> Result<()> {
                 AppMode::Command => { terminal.set_cursor_style(SetCursorStyle::SteadyUnderScore)?; terminal.show_cursor().context("Failed to show cursor in Command mode")?; }
             }
 
+            // Temporarily work around borrow checker by extracting needed values
+            let current_dir = app_state.current_dir.clone();
+            
+            // Since we can't borrow app_state both mutably and immutably,
+            // we'll need to either:
+            // 1. Modify render_ui to take just app_state and access form_state internally, OR
+            // 2. Extract the specific fields render_ui needs from app_state
+            
+            // For now, using approach where we temporarily clone what we need
+            let form_state_clone = app_state.form_state().unwrap().clone();
+            
             terminal.draw(|f| {
+                // Use a mutable clone for rendering
+                let mut temp_form_state = form_state_clone.clone();
                 render_ui(
                     f,
-                    &mut form_state,
-                    &mut auth_state,
-                    &login_state,
-                    &register_state,
-                    &intro_state,
-                    &mut admin_state,
+                    &mut router,
                     &buffer_state,
                     &theme,
                     event_handler.is_edit_mode,
-                    &event_handler.highlight_state,
                     &event_handler.command_input,
                     event_handler.command_mode,
                     &event_handler.command_message,
                     &event_handler.navigation_state,
-                    &app_state.current_dir,
+                    &current_dir,
                     current_fps,
                     &app_state,
                 );
+                
+                // If render_ui modified the form_state, we'd need to sync it back
+                // But typically render functions don't modify state, just read it
             }).context("Terminal draw call failed")?;
             needs_redraw = false;
         }

server/.gitignore

@@ -0,0 +1 @@
+docs-prod/

server/docs-prod/book.toml

@@ -1,14 +0,0 @@
-[book]
-authors = ["Priec"]
-language = "en"
-src = "src"
-title = "Server API Documentation"
-
-[output.html.search]
-enable = true
-limit-results = 30
-teaser-word-count = 30
-use-boolean-and = true
-boost-title = 2
-boost-hierarchy = 1
-boost-paragraph = 1

server/docs-prod/book/.nojekyll

@@ -1 +0,0 @@
-This file makes sure that Github Pages doesn't process mdBook's output.

server/docs-prod/book/404.html

@@ -1,216 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" class="light sidebar-visible" dir="ltr">
-    <head>
-        <!-- Book generated using mdBook -->
-        <meta charset="UTF-8">
-        <title>Page not found - Server API Documentation</title>
-        <base href="/">
-
-
-        <!-- Custom HTML head -->
-
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff">
-
-        <link rel="icon" href="favicon.svg">
-        <link rel="shortcut icon" href="favicon.png">
-        <link rel="stylesheet" href="css/variables.css">
-        <link rel="stylesheet" href="css/general.css">
-        <link rel="stylesheet" href="css/chrome.css">
-        <link rel="stylesheet" href="css/print.css" media="print">
-
-        <!-- Fonts -->
-        <link rel="stylesheet" href="FontAwesome/css/font-awesome.css">
-        <link rel="stylesheet" href="fonts/fonts.css">
-
-        <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" id="highlight-css" href="highlight.css">
-        <link rel="stylesheet" id="tomorrow-night-css" href="tomorrow-night.css">
-        <link rel="stylesheet" id="ayu-highlight-css" href="ayu-highlight.css">
-
-        <!-- Custom theme stylesheets -->
-
-
-        <!-- Provide site root and default themes to javascript -->
-        <script>
-            const path_to_root = "";
-            const default_light_theme = "light";
-            const default_dark_theme = "navy";
-        </script>
-        <!-- Start loading toc.js asap -->
-        <script src="toc.js"></script>
-    </head>
-    <body>
-    <div id="body-container">
-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script>
-            try {
-                let theme = localStorage.getItem('mdbook-theme');
-                let sidebar = localStorage.getItem('mdbook-sidebar');
-
-                if (theme.startsWith('"') && theme.endsWith('"')) {
-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
-                }
-
-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
-                }
-            } catch (e) { }
-        </script>
-
-        <!-- Set the theme before any content is loaded, prevents flash -->
-        <script>
-            const default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? default_dark_theme : default_light_theme;
-            let theme;
-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
-            if (theme === null || theme === undefined) { theme = default_theme; }
-            const html = document.documentElement;
-            html.classList.remove('light')
-            html.classList.add(theme);
-            html.classList.add("js");
-        </script>
-
-        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
-
-        <!-- Hide / unhide sidebar before it is displayed -->
-        <script>
-            let sidebar = null;
-            const sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
-            if (document.body.clientWidth >= 1080) {
-                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
-                sidebar = sidebar || 'visible';
-            } else {
-                sidebar = 'hidden';
-            }
-            sidebar_toggle.checked = sidebar === 'visible';
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
-        </script>
-
-        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-            <!-- populated by js -->
-            <mdbook-sidebar-scrollbox class="sidebar-scrollbox"></mdbook-sidebar-scrollbox>
-            <noscript>
-                <iframe class="sidebar-iframe-outer" src="toc.html"></iframe>
-            </noscript>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
-                <div class="sidebar-resize-indicator"></div>
-            </div>
-        </nav>
-
-        <div id="page-wrapper" class="page-wrapper">
-
-            <div class="page">
-                <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky">
-                    <div class="left-buttons">
-                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
-                            <i class="fa fa-bars"></i>
-                        </label>
-                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                            <i class="fa fa-paint-brush"></i>
-                        </button>
-                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="default_theme">Auto</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
-                        </ul>
-                        <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                            <i class="fa fa-search"></i>
-                        </button>
-                    </div>
-
-                    <h1 class="menu-title">Server API Documentation</h1>
-
-                    <div class="right-buttons">
-                        <a href="print.html" title="Print this book" aria-label="Print this book">
-                            <i id="print-button" class="fa fa-print"></i>
-                        </a>
-
-                    </div>
-                </div>
-
-                <div id="search-wrapper" class="hidden">
-                    <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
-                    </form>
-                    <div id="searchresults-outer" class="searchresults-outer hidden">
-                        <div id="searchresults-header" class="searchresults-header"></div>
-                        <ul id="searchresults">
-                        </ul>
-                    </div>
-                </div>
-
-                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script>
-                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
-                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
-                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
-                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
-                    });
-                </script>
-
-                <div id="content" class="content">
-                    <main>
-                        <h1 id="document-not-found-404"><a class="header" href="#document-not-found-404">Document not found (404)</a></h1>
-<p>This URL is invalid, sorry. Please use the navigation bar or search to continue.</p>
-
-                    </main>
-
-                    <nav class="nav-wrapper" aria-label="Page navigation">
-                        <!-- Mobile navigation buttons -->
-
-
-                        <div style="clear: both"></div>
-                    </nav>
-                </div>
-            </div>
-
-            <nav class="nav-wide-wrapper" aria-label="Page navigation">
-
-            </nav>
-
-        </div>
-
-        <!-- Livereload script (if served using the cli tool) -->
-        <script>
-            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const wsAddress = wsProtocol + "//" + location.host + "/" + "__livereload";
-            const socket = new WebSocket(wsAddress);
-            socket.onmessage = function (event) {
-                if (event.data === "reload") {
-                    socket.close();
-                    location.reload();
-                }
-            };
-
-            window.onbeforeunload = function() {
-                socket.close();
-            }
-        </script>
-
-
-
-        <script>
-            window.playground_copyable = true;
-        </script>
-
-
-        <script src="elasticlunr.min.js"></script>
-        <script src="mark.min.js"></script>
-        <script src="searcher.js"></script>
-
-        <script src="clipboard.min.js"></script>
-        <script src="highlight.js"></script>
-        <script src="book.js"></script>
-
-        <!-- Custom JS scripts -->
-
-
-    </div>
-    </body>
-</html>

server/docs-prod/book/ayu-highlight.css

@@ -1,78 +0,0 @@
-/*
-Based off of the Ayu theme
-Original by Dempfi (https://github.com/dempfi/ayu)
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: #191f26;
-  color: #e6e1cf;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #5c6773;
-  font-style: italic;
-}
-
-.hljs-variable,
-.hljs-template-variable,
-.hljs-attribute,
-.hljs-attr,
-.hljs-regexp,
-.hljs-link,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #ff7733;
-}
-
-.hljs-number,
-.hljs-meta,
-.hljs-builtin-name,
-.hljs-literal,
-.hljs-type,
-.hljs-params {
-  color: #ffee99;
-}
-
-.hljs-string,
-.hljs-bullet {
-  color: #b8cc52;
-}
-
-.hljs-title,
-.hljs-built_in,
-.hljs-section {
-  color: #ffb454;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-symbol {
-  color: #ff7733;
-}
-
-.hljs-name {
-    color: #36a3d9;
-}
-
-.hljs-tag {
-    color: #00568d;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-addition {
-  color: #91b362;
-}
-
-.hljs-deletion {
-  color: #d96c75;
-}

server/docs-prod/book/book.js

@@ -1,769 +0,0 @@
-'use strict';
-
-/* global default_theme, default_dark_theme, default_light_theme, hljs, ClipboardJS */
-
-// Fix back button cache problem
-window.onunload = function() { };
-
-// Global variable, shared between modules
-function playground_text(playground, hidden = true) {
-    const code_block = playground.querySelector('code');
-
-    if (window.ace && code_block.classList.contains('editable')) {
-        const editor = window.ace.edit(code_block);
-        return editor.getValue();
-    } else if (hidden) {
-        return code_block.textContent;
-    } else {
-        return code_block.innerText;
-    }
-}
-
-(function codeSnippets() {
-    function fetch_with_timeout(url, options, timeout = 6000) {
-        return Promise.race([
-            fetch(url, options),
-            new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout)),
-        ]);
-    }
-
-    const playgrounds = Array.from(document.querySelectorAll('.playground'));
-    if (playgrounds.length > 0) {
-        fetch_with_timeout('https://play.rust-lang.org/meta/crates', {
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            method: 'POST',
-            mode: 'cors',
-        })
-            .then(response => response.json())
-            .then(response => {
-            // get list of crates available in the rust playground
-                const playground_crates = response.crates.map(item => item['id']);
-                playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));
-            });
-    }
-
-    function handle_crate_list_update(playground_block, playground_crates) {
-        // update the play buttons after receiving the response
-        update_play_button(playground_block, playground_crates);
-
-        // and install on change listener to dynamically update ACE editors
-        if (window.ace) {
-            const code_block = playground_block.querySelector('code');
-            if (code_block.classList.contains('editable')) {
-                const editor = window.ace.edit(code_block);
-                editor.addEventListener('change', () => {
-                    update_play_button(playground_block, playground_crates);
-                });
-                // add Ctrl-Enter command to execute rust code
-                editor.commands.addCommand({
-                    name: 'run',
-                    bindKey: {
-                        win: 'Ctrl-Enter',
-                        mac: 'Ctrl-Enter',
-                    },
-                    exec: _editor => run_rust_code(playground_block),
-                });
-            }
-        }
-    }
-
-    // updates the visibility of play button based on `no_run` class and
-    // used crates vs ones available on https://play.rust-lang.org
-    function update_play_button(pre_block, playground_crates) {
-        const play_button = pre_block.querySelector('.play-button');
-
-        // skip if code is `no_run`
-        if (pre_block.querySelector('code').classList.contains('no_run')) {
-            play_button.classList.add('hidden');
-            return;
-        }
-
-        // get list of `extern crate`'s from snippet
-        const txt = playground_text(pre_block);
-        const re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;
-        const snippet_crates = [];
-        let item;
-        // eslint-disable-next-line no-cond-assign
-        while (item = re.exec(txt)) {
-            snippet_crates.push(item[1]);
-        }
-
-        // check if all used crates are available on play.rust-lang.org
-        const all_available = snippet_crates.every(function(elem) {
-            return playground_crates.indexOf(elem) > -1;
-        });
-
-        if (all_available) {
-            play_button.classList.remove('hidden');
-        } else {
-            play_button.classList.add('hidden');
-        }
-    }
-
-    function run_rust_code(code_block) {
-        let result_block = code_block.querySelector('.result');
-        if (!result_block) {
-            result_block = document.createElement('code');
-            result_block.className = 'result hljs language-bash';
-
-            code_block.append(result_block);
-        }
-
-        const text = playground_text(code_block);
-        const classes = code_block.querySelector('code').classList;
-        let edition = '2015';
-        classes.forEach(className => {
-            if (className.startsWith('edition')) {
-                edition = className.slice(7);
-            }
-        });
-        const params = {
-            version: 'stable',
-            optimize: '0',
-            code: text,
-            edition: edition,
-        };
-
-        if (text.indexOf('#![feature') !== -1) {
-            params.version = 'nightly';
-        }
-
-        result_block.innerText = 'Running...';
-
-        fetch_with_timeout('https://play.rust-lang.org/evaluate.json', {
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            method: 'POST',
-            mode: 'cors',
-            body: JSON.stringify(params),
-        })
-            .then(response => response.json())
-            .then(response => {
-                if (response.result.trim() === '') {
-                    result_block.innerText = 'No output';
-                    result_block.classList.add('result-no-output');
-                } else {
-                    result_block.innerText = response.result;
-                    result_block.classList.remove('result-no-output');
-                }
-            })
-            .catch(error => result_block.innerText = 'Playground Communication: ' + error.message);
-    }
-
-    // Syntax highlighting Configuration
-    hljs.configure({
-        tabReplace: '    ', // 4 spaces
-        languages: [], // Languages used for auto-detection
-    });
-
-    const code_nodes = Array
-        .from(document.querySelectorAll('code'))
-        // Don't highlight `inline code` blocks in headers.
-        .filter(function(node) {
-            return !node.parentElement.classList.contains('header');
-        });
-
-    if (window.ace) {
-        // language-rust class needs to be removed for editable
-        // blocks or highlightjs will capture events
-        code_nodes
-            .filter(function(node) {
-                return node.classList.contains('editable');
-            })
-            .forEach(function(block) {
-                block.classList.remove('language-rust');
-            });
-
-        code_nodes
-            .filter(function(node) {
-                return !node.classList.contains('editable');
-            })
-            .forEach(function(block) {
-                hljs.highlightBlock(block);
-            });
-    } else {
-        code_nodes.forEach(function(block) {
-            hljs.highlightBlock(block);
-        });
-    }
-
-    // Adding the hljs class gives code blocks the color css
-    // even if highlighting doesn't apply
-    code_nodes.forEach(function(block) {
-        block.classList.add('hljs');
-    });
-
-    Array.from(document.querySelectorAll('code.hljs')).forEach(function(block) {
-
-        const lines = Array.from(block.querySelectorAll('.boring'));
-        // If no lines were hidden, return
-        if (!lines.length) {
-            return;
-        }
-        block.classList.add('hide-boring');
-
-        const buttons = document.createElement('div');
-        buttons.className = 'buttons';
-        buttons.innerHTML = '<button class="fa fa-eye" title="Show hidden lines" \
-aria-label="Show hidden lines"></button>';
-
-        // add expand button
-        const pre_block = block.parentNode;
-        pre_block.insertBefore(buttons, pre_block.firstChild);
-
-        pre_block.querySelector('.buttons').addEventListener('click', function(e) {
-            if (e.target.classList.contains('fa-eye')) {
-                e.target.classList.remove('fa-eye');
-                e.target.classList.add('fa-eye-slash');
-                e.target.title = 'Hide lines';
-                e.target.setAttribute('aria-label', e.target.title);
-
-                block.classList.remove('hide-boring');
-            } else if (e.target.classList.contains('fa-eye-slash')) {
-                e.target.classList.remove('fa-eye-slash');
-                e.target.classList.add('fa-eye');
-                e.target.title = 'Show hidden lines';
-                e.target.setAttribute('aria-label', e.target.title);
-
-                block.classList.add('hide-boring');
-            }
-        });
-    });
-
-    if (window.playground_copyable) {
-        Array.from(document.querySelectorAll('pre code')).forEach(function(block) {
-            const pre_block = block.parentNode;
-            if (!pre_block.classList.contains('playground')) {
-                let buttons = pre_block.querySelector('.buttons');
-                if (!buttons) {
-                    buttons = document.createElement('div');
-                    buttons.className = 'buttons';
-                    pre_block.insertBefore(buttons, pre_block.firstChild);
-                }
-
-                const clipButton = document.createElement('button');
-                clipButton.className = 'clip-button';
-                clipButton.title = 'Copy to clipboard';
-                clipButton.setAttribute('aria-label', clipButton.title);
-                clipButton.innerHTML = '<i class="tooltiptext"></i>';
-
-                buttons.insertBefore(clipButton, buttons.firstChild);
-            }
-        });
-    }
-
-    // Process playground code blocks
-    Array.from(document.querySelectorAll('.playground')).forEach(function(pre_block) {
-        // Add play button
-        let buttons = pre_block.querySelector('.buttons');
-        if (!buttons) {
-            buttons = document.createElement('div');
-            buttons.className = 'buttons';
-            pre_block.insertBefore(buttons, pre_block.firstChild);
-        }
-
-        const runCodeButton = document.createElement('button');
-        runCodeButton.className = 'fa fa-play play-button';
-        runCodeButton.hidden = true;
-        runCodeButton.title = 'Run this code';
-        runCodeButton.setAttribute('aria-label', runCodeButton.title);
-
-        buttons.insertBefore(runCodeButton, buttons.firstChild);
-        runCodeButton.addEventListener('click', () => {
-            run_rust_code(pre_block);
-        });
-
-        if (window.playground_copyable) {
-            const copyCodeClipboardButton = document.createElement('button');
-            copyCodeClipboardButton.className = 'clip-button';
-            copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';
-            copyCodeClipboardButton.title = 'Copy to clipboard';
-            copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);
-
-            buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);
-        }
-
-        const code_block = pre_block.querySelector('code');
-        if (window.ace && code_block.classList.contains('editable')) {
-            const undoChangesButton = document.createElement('button');
-            undoChangesButton.className = 'fa fa-history reset-button';
-            undoChangesButton.title = 'Undo changes';
-            undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
-
-            buttons.insertBefore(undoChangesButton, buttons.firstChild);
-
-            undoChangesButton.addEventListener('click', function() {
-                const editor = window.ace.edit(code_block);
-                editor.setValue(editor.originalCode);
-                editor.clearSelection();
-            });
-        }
-    });
-})();
-
-(function themes() {
-    const html = document.querySelector('html');
-    const themeToggleButton = document.getElementById('theme-toggle');
-    const themePopup = document.getElementById('theme-list');
-    const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
-    const themeIds = [];
-    themePopup.querySelectorAll('button.theme').forEach(function(el) {
-        themeIds.push(el.id);
-    });
-    const stylesheets = {
-        ayuHighlight: document.querySelector('#ayu-highlight-css'),
-        tomorrowNight: document.querySelector('#tomorrow-night-css'),
-        highlight: document.querySelector('#highlight-css'),
-    };
-
-    function showThemes() {
-        themePopup.style.display = 'block';
-        themeToggleButton.setAttribute('aria-expanded', true);
-        themePopup.querySelector('button#' + get_theme()).focus();
-    }
-
-    function updateThemeSelected() {
-        themePopup.querySelectorAll('.theme-selected').forEach(function(el) {
-            el.classList.remove('theme-selected');
-        });
-        const selected = get_saved_theme() ?? 'default_theme';
-        let element = themePopup.querySelector('button#' + selected);
-        if (element === null) {
-            // Fall back in case there is no "Default" item.
-            element = themePopup.querySelector('button#' + get_theme());
-        }
-        element.classList.add('theme-selected');
-    }
-
-    function hideThemes() {
-        themePopup.style.display = 'none';
-        themeToggleButton.setAttribute('aria-expanded', false);
-        themeToggleButton.focus();
-    }
-
-    function get_saved_theme() {
-        let theme = null;
-        try {
-            theme = localStorage.getItem('mdbook-theme');
-        } catch (e) {
-            // ignore error.
-        }
-        return theme;
-    }
-
-    function delete_saved_theme() {
-        localStorage.removeItem('mdbook-theme');
-    }
-
-    function get_theme() {
-        const theme = get_saved_theme();
-        if (theme === null || theme === undefined || !themeIds.includes(theme)) {
-            if (typeof default_dark_theme === 'undefined') {
-                // A customized index.hbs might not define this, so fall back to
-                // old behavior of determining the default on page load.
-                return default_theme;
-            }
-            return window.matchMedia('(prefers-color-scheme: dark)').matches
-                ? default_dark_theme
-                : default_light_theme;
-        } else {
-            return theme;
-        }
-    }
-
-    let previousTheme = default_theme;
-    function set_theme(theme, store = true) {
-        let ace_theme;
-
-        if (theme === 'coal' || theme === 'navy') {
-            stylesheets.ayuHighlight.disabled = true;
-            stylesheets.tomorrowNight.disabled = false;
-            stylesheets.highlight.disabled = true;
-
-            ace_theme = 'ace/theme/tomorrow_night';
-        } else if (theme === 'ayu') {
-            stylesheets.ayuHighlight.disabled = false;
-            stylesheets.tomorrowNight.disabled = true;
-            stylesheets.highlight.disabled = true;
-            ace_theme = 'ace/theme/tomorrow_night';
-        } else {
-            stylesheets.ayuHighlight.disabled = true;
-            stylesheets.tomorrowNight.disabled = true;
-            stylesheets.highlight.disabled = false;
-            ace_theme = 'ace/theme/dawn';
-        }
-
-        setTimeout(function() {
-            themeColorMetaTag.content = getComputedStyle(document.documentElement).backgroundColor;
-        }, 1);
-
-        if (window.ace && window.editors) {
-            window.editors.forEach(function(editor) {
-                editor.setTheme(ace_theme);
-            });
-        }
-
-        if (store) {
-            try {
-                localStorage.setItem('mdbook-theme', theme);
-            } catch (e) {
-                // ignore error.
-            }
-        }
-
-        html.classList.remove(previousTheme);
-        html.classList.add(theme);
-        previousTheme = theme;
-        updateThemeSelected();
-    }
-
-    const query = window.matchMedia('(prefers-color-scheme: dark)');
-    query.onchange = function() {
-        set_theme(get_theme(), false);
-    };
-
-    // Set theme.
-    set_theme(get_theme(), false);
-
-    themeToggleButton.addEventListener('click', function() {
-        if (themePopup.style.display === 'block') {
-            hideThemes();
-        } else {
-            showThemes();
-        }
-    });
-
-    themePopup.addEventListener('click', function(e) {
-        let theme;
-        if (e.target.className === 'theme') {
-            theme = e.target.id;
-        } else if (e.target.parentElement.className === 'theme') {
-            theme = e.target.parentElement.id;
-        } else {
-            return;
-        }
-        if (theme === 'default_theme' || theme === null) {
-            delete_saved_theme();
-            set_theme(get_theme(), false);
-        } else {
-            set_theme(theme);
-        }
-    });
-
-    themePopup.addEventListener('focusout', function(e) {
-        // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)
-        if (!!e.relatedTarget &&
-            !themeToggleButton.contains(e.relatedTarget) &&
-            !themePopup.contains(e.relatedTarget)
-        ) {
-            hideThemes();
-        }
-    });
-
-    // Should not be needed, but it works around an issue on macOS & iOS:
-    // https://github.com/rust-lang/mdBook/issues/628
-    document.addEventListener('click', function(e) {
-        if (themePopup.style.display === 'block' &&
-            !themeToggleButton.contains(e.target) &&
-            !themePopup.contains(e.target)
-        ) {
-            hideThemes();
-        }
-    });
-
-    document.addEventListener('keydown', function(e) {
-        if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-            return;
-        }
-        if (!themePopup.contains(e.target)) {
-            return;
-        }
-
-        let li;
-        switch (e.key) {
-        case 'Escape':
-            e.preventDefault();
-            hideThemes();
-            break;
-        case 'ArrowUp':
-            e.preventDefault();
-            li = document.activeElement.parentElement;
-            if (li && li.previousElementSibling) {
-                li.previousElementSibling.querySelector('button').focus();
-            }
-            break;
-        case 'ArrowDown':
-            e.preventDefault();
-            li = document.activeElement.parentElement;
-            if (li && li.nextElementSibling) {
-                li.nextElementSibling.querySelector('button').focus();
-            }
-            break;
-        case 'Home':
-            e.preventDefault();
-            themePopup.querySelector('li:first-child button').focus();
-            break;
-        case 'End':
-            e.preventDefault();
-            themePopup.querySelector('li:last-child button').focus();
-            break;
-        }
-    });
-})();
-
-(function sidebar() {
-    const body = document.querySelector('body');
-    const sidebar = document.getElementById('sidebar');
-    const sidebarLinks = document.querySelectorAll('#sidebar a');
-    const sidebarToggleButton = document.getElementById('sidebar-toggle');
-    const sidebarToggleAnchor = document.getElementById('sidebar-toggle-anchor');
-    const sidebarResizeHandle = document.getElementById('sidebar-resize-handle');
-    let firstContact = null;
-
-    function showSidebar() {
-        body.classList.remove('sidebar-hidden');
-        body.classList.add('sidebar-visible');
-        Array.from(sidebarLinks).forEach(function(link) {
-            link.setAttribute('tabIndex', 0);
-        });
-        sidebarToggleButton.setAttribute('aria-expanded', true);
-        sidebar.setAttribute('aria-hidden', false);
-        try {
-            localStorage.setItem('mdbook-sidebar', 'visible');
-        } catch (e) {
-            // Ignore error.
-        }
-    }
-
-    function hideSidebar() {
-        body.classList.remove('sidebar-visible');
-        body.classList.add('sidebar-hidden');
-        Array.from(sidebarLinks).forEach(function(link) {
-            link.setAttribute('tabIndex', -1);
-        });
-        sidebarToggleButton.setAttribute('aria-expanded', false);
-        sidebar.setAttribute('aria-hidden', true);
-        try {
-            localStorage.setItem('mdbook-sidebar', 'hidden');
-        } catch (e) {
-            // Ignore error.
-        }
-    }
-
-    // Toggle sidebar
-    sidebarToggleAnchor.addEventListener('change', function sidebarToggle() {
-        if (sidebarToggleAnchor.checked) {
-            const current_width = parseInt(
-                document.documentElement.style.getPropertyValue('--sidebar-target-width'), 10);
-            if (current_width < 150) {
-                document.documentElement.style.setProperty('--sidebar-target-width', '150px');
-            }
-            showSidebar();
-        } else {
-            hideSidebar();
-        }
-    });
-
-    sidebarResizeHandle.addEventListener('mousedown', initResize, false);
-
-    function initResize() {
-        window.addEventListener('mousemove', resize, false);
-        window.addEventListener('mouseup', stopResize, false);
-        body.classList.add('sidebar-resizing');
-    }
-    function resize(e) {
-        let pos = e.clientX - sidebar.offsetLeft;
-        if (pos < 20) {
-            hideSidebar();
-        } else {
-            if (body.classList.contains('sidebar-hidden')) {
-                showSidebar();
-            }
-            pos = Math.min(pos, window.innerWidth - 100);
-            document.documentElement.style.setProperty('--sidebar-target-width', pos + 'px');
-        }
-    }
-    //on mouseup remove windows functions mousemove & mouseup
-    function stopResize() {
-        body.classList.remove('sidebar-resizing');
-        window.removeEventListener('mousemove', resize, false);
-        window.removeEventListener('mouseup', stopResize, false);
-    }
-
-    document.addEventListener('touchstart', function(e) {
-        firstContact = {
-            x: e.touches[0].clientX,
-            time: Date.now(),
-        };
-    }, { passive: true });
-
-    document.addEventListener('touchmove', function(e) {
-        if (!firstContact) {
-            return;
-        }
-
-        const curX = e.touches[0].clientX;
-        const xDiff = curX - firstContact.x,
-            tDiff = Date.now() - firstContact.time;
-
-        if (tDiff < 250 && Math.abs(xDiff) >= 150) {
-            if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300)) {
-                showSidebar();
-            } else if (xDiff < 0 && curX < 300) {
-                hideSidebar();
-            }
-
-            firstContact = null;
-        }
-    }, { passive: true });
-})();
-
-(function chapterNavigation() {
-    document.addEventListener('keydown', function(e) {
-        if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-            return;
-        }
-        if (window.search && window.search.hasFocus()) {
-            return;
-        }
-        const html = document.querySelector('html');
-
-        function next() {
-            const nextButton = document.querySelector('.nav-chapters.next');
-            if (nextButton) {
-                window.location.href = nextButton.href;
-            }
-        }
-        function prev() {
-            const previousButton = document.querySelector('.nav-chapters.previous');
-            if (previousButton) {
-                window.location.href = previousButton.href;
-            }
-        }
-        switch (e.key) {
-        case 'ArrowRight':
-            e.preventDefault();
-            if (html.dir === 'rtl') {
-                prev();
-            } else {
-                next();
-            }
-            break;
-        case 'ArrowLeft':
-            e.preventDefault();
-            if (html.dir === 'rtl') {
-                next();
-            } else {
-                prev();
-            }
-            break;
-        }
-    });
-})();
-
-(function clipboard() {
-    const clipButtons = document.querySelectorAll('.clip-button');
-
-    function hideTooltip(elem) {
-        elem.firstChild.innerText = '';
-        elem.className = 'clip-button';
-    }
-
-    function showTooltip(elem, msg) {
-        elem.firstChild.innerText = msg;
-        elem.className = 'clip-button tooltipped';
-    }
-
-    const clipboardSnippets = new ClipboardJS('.clip-button', {
-        text: function(trigger) {
-            hideTooltip(trigger);
-            const playground = trigger.closest('pre');
-            return playground_text(playground, false);
-        },
-    });
-
-    Array.from(clipButtons).forEach(function(clipButton) {
-        clipButton.addEventListener('mouseout', function(e) {
-            hideTooltip(e.currentTarget);
-        });
-    });
-
-    clipboardSnippets.on('success', function(e) {
-        e.clearSelection();
-        showTooltip(e.trigger, 'Copied!');
-    });
-
-    clipboardSnippets.on('error', function(e) {
-        showTooltip(e.trigger, 'Clipboard error!');
-    });
-})();
-
-(function scrollToTop() {
-    const menuTitle = document.querySelector('.menu-title');
-
-    menuTitle.addEventListener('click', function() {
-        document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });
-    });
-})();
-
-(function controllMenu() {
-    const menu = document.getElementById('menu-bar');
-
-    (function controllPosition() {
-        let scrollTop = document.scrollingElement.scrollTop;
-        let prevScrollTop = scrollTop;
-        const minMenuY = -menu.clientHeight - 50;
-        // When the script loads, the page can be at any scroll (e.g. if you reforesh it).
-        menu.style.top = scrollTop + 'px';
-        // Same as parseInt(menu.style.top.slice(0, -2), but faster
-        let topCache = menu.style.top.slice(0, -2);
-        menu.classList.remove('sticky');
-        let stickyCache = false; // Same as menu.classList.contains('sticky'), but faster
-        document.addEventListener('scroll', function() {
-            scrollTop = Math.max(document.scrollingElement.scrollTop, 0);
-            // `null` means that it doesn't need to be updated
-            let nextSticky = null;
-            let nextTop = null;
-            const scrollDown = scrollTop > prevScrollTop;
-            const menuPosAbsoluteY = topCache - scrollTop;
-            if (scrollDown) {
-                nextSticky = false;
-                if (menuPosAbsoluteY > 0) {
-                    nextTop = prevScrollTop;
-                }
-            } else {
-                if (menuPosAbsoluteY > 0) {
-                    nextSticky = true;
-                } else if (menuPosAbsoluteY < minMenuY) {
-                    nextTop = prevScrollTop + minMenuY;
-                }
-            }
-            if (nextSticky === true && stickyCache === false) {
-                menu.classList.add('sticky');
-                stickyCache = true;
-            } else if (nextSticky === false && stickyCache === true) {
-                menu.classList.remove('sticky');
-                stickyCache = false;
-            }
-            if (nextTop !== null) {
-                menu.style.top = nextTop + 'px';
-                topCache = nextTop;
-            }
-            prevScrollTop = scrollTop;
-        }, { passive: true });
-    })();
-    (function controllBorder() {
-        function updateBorder() {
-            if (menu.offsetTop === 0) {
-                menu.classList.remove('bordered');
-            } else {
-                menu.classList.add('bordered');
-            }
-        }
-        updateBorder();
-        document.addEventListener('scroll', updateBorder, { passive: true });
-    })();
-})();

server/docs-prod/book/chapter_1.html

@@ -1,214 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" class="light sidebar-visible" dir="ltr">
-    <head>
-        <!-- Book generated using mdBook -->
-        <meta charset="UTF-8">
-        <title>Chapter 1 - Server API Documentation</title>
-
-
-        <!-- Custom HTML head -->
-
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff">
-
-        <link rel="icon" href="favicon.svg">
-        <link rel="shortcut icon" href="favicon.png">
-        <link rel="stylesheet" href="css/variables.css">
-        <link rel="stylesheet" href="css/general.css">
-        <link rel="stylesheet" href="css/chrome.css">
-        <link rel="stylesheet" href="css/print.css" media="print">
-
-        <!-- Fonts -->
-        <link rel="stylesheet" href="FontAwesome/css/font-awesome.css">
-        <link rel="stylesheet" href="fonts/fonts.css">
-
-        <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" id="highlight-css" href="highlight.css">
-        <link rel="stylesheet" id="tomorrow-night-css" href="tomorrow-night.css">
-        <link rel="stylesheet" id="ayu-highlight-css" href="ayu-highlight.css">
-
-        <!-- Custom theme stylesheets -->
-
-
-        <!-- Provide site root and default themes to javascript -->
-        <script>
-            const path_to_root = "";
-            const default_light_theme = "light";
-            const default_dark_theme = "navy";
-        </script>
-        <!-- Start loading toc.js asap -->
-        <script src="toc.js"></script>
-    </head>
-    <body>
-    <div id="body-container">
-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script>
-            try {
-                let theme = localStorage.getItem('mdbook-theme');
-                let sidebar = localStorage.getItem('mdbook-sidebar');
-
-                if (theme.startsWith('"') && theme.endsWith('"')) {
-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
-                }
-
-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
-                }
-            } catch (e) { }
-        </script>
-
-        <!-- Set the theme before any content is loaded, prevents flash -->
-        <script>
-            const default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? default_dark_theme : default_light_theme;
-            let theme;
-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
-            if (theme === null || theme === undefined) { theme = default_theme; }
-            const html = document.documentElement;
-            html.classList.remove('light')
-            html.classList.add(theme);
-            html.classList.add("js");
-        </script>
-
-        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
-
-        <!-- Hide / unhide sidebar before it is displayed -->
-        <script>
-            let sidebar = null;
-            const sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
-            if (document.body.clientWidth >= 1080) {
-                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
-                sidebar = sidebar || 'visible';
-            } else {
-                sidebar = 'hidden';
-            }
-            sidebar_toggle.checked = sidebar === 'visible';
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
-        </script>
-
-        <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-            <!-- populated by js -->
-            <mdbook-sidebar-scrollbox class="sidebar-scrollbox"></mdbook-sidebar-scrollbox>
-            <noscript>
-                <iframe class="sidebar-iframe-outer" src="toc.html"></iframe>
-            </noscript>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
-                <div class="sidebar-resize-indicator"></div>
-            </div>
-        </nav>
-
-        <div id="page-wrapper" class="page-wrapper">
-
-            <div class="page">
-                <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky">
-                    <div class="left-buttons">
-                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
-                            <i class="fa fa-bars"></i>
-                        </label>
-                        <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                            <i class="fa fa-paint-brush"></i>
-                        </button>
-                        <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="default_theme">Auto</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
-                        </ul>
-                        <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                            <i class="fa fa-search"></i>
-                        </button>
-                    </div>
-
-                    <h1 class="menu-title">Server API Documentation</h1>
-
-                    <div class="right-buttons">
-                        <a href="print.html" title="Print this book" aria-label="Print this book">
-                            <i id="print-button" class="fa fa-print"></i>
-                        </a>
-
-                    </div>
-                </div>
-
-                <div id="search-wrapper" class="hidden">
-                    <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
-                    </form>
-                    <div id="searchresults-outer" class="searchresults-outer hidden">
-                        <div id="searchresults-header" class="searchresults-header"></div>
-                        <ul id="searchresults">
-                        </ul>
-                    </div>
-                </div>
-
-                <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script>
-                    document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
-                    document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
-                    Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
-                        link.setAttribute('tabIndex', sidebar === 'visible' ? 0 : -1);
-                    });
-                </script>
-
-                <div id="content" class="content">
-                    <main>
-                        <h1 id="chapter-1"><a class="header" href="#chapter-1">Chapter 1</a></h1>
-
-                    </main>
-
-                    <nav class="nav-wrapper" aria-label="Page navigation">
-                        <!-- Mobile navigation buttons -->
-
-
-                        <div style="clear: both"></div>
-                    </nav>
-                </div>
-            </div>
-
-            <nav class="nav-wide-wrapper" aria-label="Page navigation">
-
-            </nav>
-
-        </div>
-
-        <!-- Livereload script (if served using the cli tool) -->
-        <script>
-            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const wsAddress = wsProtocol + "//" + location.host + "/" + "__livereload";
-            const socket = new WebSocket(wsAddress);
-            socket.onmessage = function (event) {
-                if (event.data === "reload") {
-                    socket.close();
-                    location.reload();
-                }
-            };
-
-            window.onbeforeunload = function() {
-                socket.close();
-            }
-        </script>
-
-
-
-        <script>
-            window.playground_copyable = true;
-        </script>
-
-
-        <script src="elasticlunr.min.js"></script>
-        <script src="mark.min.js"></script>
-        <script src="searcher.js"></script>
-
-        <script src="clipboard.min.js"></script>
-        <script src="highlight.js"></script>
-        <script src="book.js"></script>
-
-        <!-- Custom JS scripts -->
-
-
-    </div>
-    </body>
-</html>

server/docs-prod/book/css/chrome.css

@@ -1,643 +0,0 @@
-/* CSS for UI elements (a.k.a. chrome) */
-
-html {
-    scrollbar-color: var(--scrollbar) var(--bg);
-}
-#searchresults a,
-.content a:link,
-a:visited,
-a > .hljs {
-    color: var(--links);
-}
-
-/*
-    body-container is necessary because mobile browsers don't seem to like
-    overflow-x on the body tag when there is a <meta name="viewport"> tag.
-*/
-#body-container {
-    /*
-        This is used when the sidebar pushes the body content off the side of
-        the screen on small screens. Without it, dragging on mobile Safari
-        will want to reposition the viewport in a weird way.
-    */
-    overflow-x: clip;
-}
-
-/* Menu Bar */
-
-#menu-bar,
-#menu-bar-hover-placeholder {
-    z-index: 101;
-    margin: auto calc(0px - var(--page-padding));
-}
-#menu-bar {
-    position: relative;
-    display: flex;
-    flex-wrap: wrap;
-    background-color: var(--bg);
-    border-block-end-color: var(--bg);
-    border-block-end-width: 1px;
-    border-block-end-style: solid;
-}
-#menu-bar.sticky,
-#menu-bar-hover-placeholder:hover + #menu-bar,
-#menu-bar:hover,
-html.sidebar-visible #menu-bar {
-    position: -webkit-sticky;
-    position: sticky;
-    top: 0 !important;
-}
-#menu-bar-hover-placeholder {
-    position: sticky;
-    position: -webkit-sticky;
-    top: 0;
-    height: var(--menu-bar-height);
-}
-#menu-bar.bordered {
-    border-block-end-color: var(--table-border-color);
-}
-#menu-bar i, #menu-bar .icon-button {
-    position: relative;
-    padding: 0 8px;
-    z-index: 10;
-    line-height: var(--menu-bar-height);
-    cursor: pointer;
-    transition: color 0.5s;
-}
-@media only screen and (max-width: 420px) {
-    #menu-bar i, #menu-bar .icon-button {
-        padding: 0 5px;
-    }
-}
-
-.icon-button {
-    border: none;
-    background: none;
-    padding: 0;
-    color: inherit;
-}
-.icon-button i {
-    margin: 0;
-}
-
-.right-buttons {
-    margin: 0 15px;
-}
-.right-buttons a {
-    text-decoration: none;
-}
-
-.left-buttons {
-    display: flex;
-    margin: 0 5px;
-}
-html:not(.js) .left-buttons button {
-    display: none;
-}
-
-.menu-title {
-    display: inline-block;
-    font-weight: 200;
-    font-size: 2.4rem;
-    line-height: var(--menu-bar-height);
-    text-align: center;
-    margin: 0;
-    flex: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.menu-title {
-    cursor: pointer;
-}
-
-.menu-bar,
-.menu-bar:visited,
-.nav-chapters,
-.nav-chapters:visited,
-.mobile-nav-chapters,
-.mobile-nav-chapters:visited,
-.menu-bar .icon-button,
-.menu-bar a i {
-    color: var(--icons);
-}
-
-.menu-bar i:hover,
-.menu-bar .icon-button:hover,
-.nav-chapters:hover,
-.mobile-nav-chapters i:hover {
-    color: var(--icons-hover);
-}
-
-/* Nav Icons */
-
-.nav-chapters {
-    font-size: 2.5em;
-    text-align: center;
-    text-decoration: none;
-
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    margin: 0;
-    max-width: 150px;
-    min-width: 90px;
-
-    display: flex;
-    justify-content: center;
-    align-content: center;
-    flex-direction: column;
-
-    transition: color 0.5s, background-color 0.5s;
-}
-
-.nav-chapters:hover {
-    text-decoration: none;
-    background-color: var(--theme-hover);
-    transition: background-color 0.15s, color 0.15s;
-}
-
-.nav-wrapper {
-    margin-block-start: 50px;
-    display: none;
-}
-
-.mobile-nav-chapters {
-    font-size: 2.5em;
-    text-align: center;
-    text-decoration: none;
-    width: 90px;
-    border-radius: 5px;
-    background-color: var(--sidebar-bg);
-}
-
-/* Only Firefox supports flow-relative values */
-.previous { float: left; }
-[dir=rtl] .previous { float: right; }
-
-/* Only Firefox supports flow-relative values */
-.next {
-    float: right;
-    right: var(--page-padding);
-}
-[dir=rtl] .next {
-    float: left;
-    right: unset;
-    left: var(--page-padding);
-}
-
-/* Use the correct buttons for RTL layouts*/
-[dir=rtl] .previous i.fa-angle-left:before {content:"\f105";}
-[dir=rtl] .next i.fa-angle-right:before { content:"\f104"; }
-
-@media only screen and (max-width: 1080px) {
-    .nav-wide-wrapper { display: none; }
-    .nav-wrapper { display: block; }
-}
-
-/* sidebar-visible */
-@media only screen and (max-width: 1380px) {
-    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wide-wrapper { display: none; }
-    #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wrapper { display: block; }
-}
-
-/* Inline code */
-
-:not(pre) > .hljs {
-    display: inline;
-    padding: 0.1em 0.3em;
-    border-radius: 3px;
-}
-
-:not(pre):not(a) > .hljs {
-    color: var(--inline-code-color);
-    overflow-x: initial;
-}
-
-a:hover > .hljs {
-    text-decoration: underline;
-}
-
-pre {
-    position: relative;
-}
-pre > .buttons {
-    position: absolute;
-    z-index: 100;
-    right: 0px;
-    top: 2px;
-    margin: 0px;
-    padding: 2px 0px;
-
-    color: var(--sidebar-fg);
-    cursor: pointer;
-    visibility: hidden;
-    opacity: 0;
-    transition: visibility 0.1s linear, opacity 0.1s linear;
-}
-pre:hover > .buttons {
-    visibility: visible;
-    opacity: 1
-}
-pre > .buttons :hover {
-    color: var(--sidebar-active);
-    border-color: var(--icons-hover);
-    background-color: var(--theme-hover);
-}
-pre > .buttons i {
-    margin-inline-start: 8px;
-}
-pre > .buttons button {
-    cursor: inherit;
-    margin: 0px 5px;
-    padding: 4px 4px 3px 5px;
-    font-size: 23px;
-
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 4px;
-    border-color: var(--icons);
-    background-color: var(--theme-popup-bg);
-    transition: 100ms;
-    transition-property: color,border-color,background-color;
-    color: var(--icons);
-}
-
-pre > .buttons button.clip-button {
-    padding: 2px 4px 0px 6px;
-}
-pre > .buttons button.clip-button::before {
-    /* clipboard image from octicons (https://github.com/primer/octicons/tree/v2.0.0) MIT license
-     */
-    content: url('data:image/svg+xml,<svg width="21" height="20" viewBox="0 0 24 25" \
-xmlns="http://www.w3.org/2000/svg" aria-label="Copy to clipboard">\
-<path d="M18 20h2v3c0 1-1 2-2 2H2c-.998 0-2-1-2-2V5c0-.911.755-1.667 1.667-1.667h5A3.323 3.323 0 \
-0110 0a3.323 3.323 0 013.333 3.333h5C19.245 3.333 20 4.09 20 5v8.333h-2V9H2v14h16v-3zM3 \
-7h14c0-.911-.793-1.667-1.75-1.667H13.5c-.957 0-1.75-.755-1.75-1.666C11.75 2.755 10.957 2 10 \
-2s-1.75.755-1.75 1.667c0 .911-.793 1.666-1.75 1.666H4.75C3.793 5.333 3 6.09 3 7z"/>\
-<path d="M4 19h6v2H4zM12 11H4v2h8zM4 17h4v-2H4zM15 15v-3l-4.5 4.5L15 21v-3l8.027-.032L23 15z"/>\
-</svg>');
-    filter: var(--copy-button-filter);
-}
-pre > .buttons button.clip-button:hover::before {
-    filter: var(--copy-button-filter-hover);
-}
-
-@media (pointer: coarse) {
-    pre > .buttons button {
-        /* On mobile, make it easier to tap buttons. */
-        padding: 0.3rem 1rem;
-    }
-
-    .sidebar-resize-indicator {
-        /* Hide resize indicator on devices with limited accuracy */
-        display: none;
-    }
-}
-pre > code {
-    display: block;
-    padding: 1rem;
-}
-
-/* FIXME: ACE editors overlap their buttons because ACE does absolute
-   positioning within the code block which breaks padding. The only solution I
-   can think of is to move the padding to the outer pre tag (or insert a div
-   wrapper), but that would require fixing a whole bunch of CSS rules.
-*/
-.hljs.ace_editor {
-  padding: 0rem 0rem;
-}
-
-pre > .result {
-    margin-block-start: 10px;
-}
-
-/* Search */
-
-#searchresults a {
-    text-decoration: none;
-}
-
-mark {
-    border-radius: 2px;
-    padding-block-start: 0;
-    padding-block-end: 1px;
-    padding-inline-start: 3px;
-    padding-inline-end: 3px;
-    margin-block-start: 0;
-    margin-block-end: -1px;
-    margin-inline-start: -3px;
-    margin-inline-end: -3px;
-    background-color: var(--search-mark-bg);
-    transition: background-color 300ms linear;
-    cursor: pointer;
-}
-
-mark.fade-out {
-    background-color: rgba(0,0,0,0) !important;
-    cursor: auto;
-}
-
-.searchbar-outer {
-    margin-inline-start: auto;
-    margin-inline-end: auto;
-    max-width: var(--content-max-width);
-}
-
-#searchbar {
-    width: 100%;
-    margin-block-start: 5px;
-    margin-block-end: 0;
-    margin-inline-start: auto;
-    margin-inline-end: auto;
-    padding: 10px 16px;
-    transition: box-shadow 300ms ease-in-out;
-    border: 1px solid var(--searchbar-border-color);
-    border-radius: 3px;
-    background-color: var(--searchbar-bg);
-    color: var(--searchbar-fg);
-}
-#searchbar:focus,
-#searchbar.active {
-    box-shadow: 0 0 3px var(--searchbar-shadow-color);
-}
-
-.searchresults-header {
-    font-weight: bold;
-    font-size: 1em;
-    padding-block-start: 18px;
-    padding-block-end: 0;
-    padding-inline-start: 5px;
-    padding-inline-end: 0;
-    color: var(--searchresults-header-fg);
-}
-
-.searchresults-outer {
-    margin-inline-start: auto;
-    margin-inline-end: auto;
-    max-width: var(--content-max-width);
-    border-block-end: 1px dashed var(--searchresults-border-color);
-}
-
-ul#searchresults {
-    list-style: none;
-    padding-inline-start: 20px;
-}
-ul#searchresults li {
-    margin: 10px 0px;
-    padding: 2px;
-    border-radius: 2px;
-}
-ul#searchresults li.focus {
-    background-color: var(--searchresults-li-bg);
-}
-ul#searchresults span.teaser {
-    display: block;
-    clear: both;
-    margin-block-start: 5px;
-    margin-block-end: 0;
-    margin-inline-start: 20px;
-    margin-inline-end: 0;
-    font-size: 0.8em;
-}
-ul#searchresults span.teaser em {
-    font-weight: bold;
-    font-style: normal;
-}
-
-/* Sidebar */
-
-.sidebar {
-    position: fixed;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    width: var(--sidebar-width);
-    font-size: 0.875em;
-    box-sizing: border-box;
-    -webkit-overflow-scrolling: touch;
-    overscroll-behavior-y: contain;
-    background-color: var(--sidebar-bg);
-    color: var(--sidebar-fg);
-}
-.sidebar-iframe-inner {
-    --padding: 10px;
-
-    background-color: var(--sidebar-bg);
-    padding: var(--padding);
-    margin: 0;
-    font-size: 1.4rem;
-    color: var(--sidebar-fg);
-    min-height: calc(100vh - var(--padding) * 2);
-}
-.sidebar-iframe-outer {
-    border: none;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-[dir=rtl] .sidebar { left: unset; right: 0; }
-.sidebar-resizing {
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-html:not(.sidebar-resizing) .sidebar {
-    transition: transform 0.3s; /* Animation: slide away */
-}
-.sidebar code {
-    line-height: 2em;
-}
-.sidebar .sidebar-scrollbox {
-    overflow-y: auto;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    padding: 10px 10px;
-}
-.sidebar .sidebar-resize-handle {
-    position: absolute;
-    cursor: col-resize;
-    width: 0;
-    right: calc(var(--sidebar-resize-indicator-width) * -1);
-    top: 0;
-    bottom: 0;
-    display: flex;
-    align-items: center;
-}
-
-.sidebar-resize-handle .sidebar-resize-indicator {
-    width: 100%;
-    height: 12px;
-    background-color: var(--icons);
-    margin-inline-start: var(--sidebar-resize-indicator-space);
-}
-
-[dir=rtl] .sidebar .sidebar-resize-handle {
-    left: calc(var(--sidebar-resize-indicator-width) * -1);
-    right: unset;
-}
-.js .sidebar .sidebar-resize-handle {
-    cursor: col-resize;
-    width: calc(var(--sidebar-resize-indicator-width) - var(--sidebar-resize-indicator-space));
-}
-/* sidebar-hidden */
-#sidebar-toggle-anchor:not(:checked) ~ .sidebar {
-    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
-    z-index: -1;
-}
-[dir=rtl] #sidebar-toggle-anchor:not(:checked) ~ .sidebar {
-    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
-}
-.sidebar::-webkit-scrollbar {
-    background: var(--sidebar-bg);
-}
-.sidebar::-webkit-scrollbar-thumb {
-    background: var(--scrollbar);
-}
-
-/* sidebar-visible */
-#sidebar-toggle-anchor:checked ~ .page-wrapper {
-    transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
-}
-[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
-    transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
-}
-@media only screen and (min-width: 620px) {
-    #sidebar-toggle-anchor:checked ~ .page-wrapper {
-        transform: none;
-        margin-inline-start: calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width));
-    }
-    [dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
-        transform: none;
-    }
-}
-
-.chapter {
-    list-style: none outside none;
-    padding-inline-start: 0;
-    line-height: 2.2em;
-}
-
-.chapter ol {
-    width: 100%;
-}
-
-.chapter li {
-    display: flex;
-    color: var(--sidebar-non-existant);
-}
-.chapter li a {
-    display: block;
-    padding: 0;
-    text-decoration: none;
-    color: var(--sidebar-fg);
-}
-
-.chapter li a:hover {
-    color: var(--sidebar-active);
-}
-
-.chapter li a.active {
-    color: var(--sidebar-active);
-}
-
-.chapter li > a.toggle {
-    cursor: pointer;
-    display: block;
-    margin-inline-start: auto;
-    padding: 0 10px;
-    user-select: none;
-    opacity: 0.68;
-}
-
-.chapter li > a.toggle div {
-    transition: transform 0.5s;
-}
-
-/* collapse the section */
-.chapter li:not(.expanded) + li > ol {
-    display: none;
-}
-
-.chapter li.chapter-item {
-    line-height: 1.5em;
-    margin-block-start: 0.6em;
-}
-
-.chapter li.expanded > a.toggle div {
-    transform: rotate(90deg);
-}
-
-.spacer {
-    width: 100%;
-    height: 3px;
-    margin: 5px 0px;
-}
-.chapter .spacer {
-    background-color: var(--sidebar-spacer);
-}
-
-@media (-moz-touch-enabled: 1), (pointer: coarse) {
-    .chapter li a { padding: 5px 0; }
-    .spacer { margin: 10px 0; }
-}
-
-.section {
-    list-style: none outside none;
-    padding-inline-start: 20px;
-    line-height: 1.9em;
-}
-
-/* Theme Menu Popup */
-
-.theme-popup {
-    position: absolute;
-    left: 10px;
-    top: var(--menu-bar-height);
-    z-index: 1000;
-    border-radius: 4px;
-    font-size: 0.7em;
-    color: var(--fg);
-    background: var(--theme-popup-bg);
-    border: 1px solid var(--theme-popup-border);
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    display: none;
-    /* Don't let the children's background extend past the rounded corners. */
-    overflow: hidden;
-}
-[dir=rtl] .theme-popup { left: unset;  right: 10px; }
-.theme-popup .default {
-    color: var(--icons);
-}
-.theme-popup .theme {
-    width: 100%;
-    border: 0;
-    margin: 0;
-    padding: 2px 20px;
-    line-height: 25px;
-    white-space: nowrap;
-    text-align: start;
-    cursor: pointer;
-    color: inherit;
-    background: inherit;
-    font-size: inherit;
-}
-.theme-popup .theme:hover {
-    background-color: var(--theme-hover);
-}
-
-.theme-selected::before {
-    display: inline-block;
-    content: "✓";
-    margin-inline-start: -14px;
-    width: 14px;
-}

server/docs-prod/book/css/general.css

@@ -1,279 +0,0 @@
-/* Base styles and content styles */
-
-:root {
-    /* Browser default font-size is 16px, this way 1 rem = 10px */
-    font-size: 62.5%;
-    color-scheme: var(--color-scheme);
-}
-
-html {
-    font-family: "Open Sans", sans-serif;
-    color: var(--fg);
-    background-color: var(--bg);
-    text-size-adjust: none;
-    -webkit-text-size-adjust: none;
-}
-
-body {
-    margin: 0;
-    font-size: 1.6rem;
-    overflow-x: hidden;
-}
-
-code {
-    font-family: var(--mono-font) !important;
-    font-size: var(--code-font-size);
-    direction: ltr !important;
-}
-
-/* make long words/inline code not x overflow */
-main {
-    overflow-wrap: break-word;
-}
-
-/* make wide tables scroll if they overflow */
-.table-wrapper {
-    overflow-x: auto;
-}
-
-/* Don't change font size in headers. */
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-    font-size: unset;
-}
-
-.left { float: left; }
-.right { float: right; }
-.boring { opacity: 0.6; }
-.hide-boring .boring { display: none; }
-.hidden { display: none !important; }
-
-h2, h3 { margin-block-start: 2.5em; }
-h4, h5 { margin-block-start: 2em; }
-
-.header + .header h3,
-.header + .header h4,
-.header + .header h5 {
-    margin-block-start: 1em;
-}
-
-h1:target::before,
-h2:target::before,
-h3:target::before,
-h4:target::before,
-h5:target::before,
-h6:target::before {
-    display: inline-block;
-    content: "»";
-    margin-inline-start: -30px;
-    width: 30px;
-}
-
-/* This is broken on Safari as of version 14, but is fixed
-   in Safari Technology Preview 117 which I think will be Safari 14.2.
-   https://bugs.webkit.org/show_bug.cgi?id=218076
-*/
-:target {
-    /* Safari does not support logical properties */
-    scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
-}
-
-.page {
-    outline: 0;
-    padding: 0 var(--page-padding);
-    margin-block-start: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
-}
-.page-wrapper {
-    box-sizing: border-box;
-    background-color: var(--bg);
-}
-.no-js .page-wrapper,
-.js:not(.sidebar-resizing) .page-wrapper {
-    transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
-}
-[dir=rtl] .js:not(.sidebar-resizing) .page-wrapper {
-    transition: margin-right 0.3s ease, transform 0.3s ease; /* Animation: slide away */
-}
-
-.content {
-    overflow-y: auto;
-    padding: 0 5px 50px 5px;
-}
-.content main {
-    margin-inline-start: auto;
-    margin-inline-end: auto;
-    max-width: var(--content-max-width);
-}
-.content p { line-height: 1.45em; }
-.content ol { line-height: 1.45em; }
-.content ul { line-height: 1.45em; }
-.content a { text-decoration: none; }
-.content a:hover { text-decoration: underline; }
-.content img, .content video { max-width: 100%; }
-.content .header:link,
-.content .header:visited {
-    color: var(--fg);
-}
-.content .header:link,
-.content .header:visited:hover {
-    text-decoration: none;
-}
-
-table {
-    margin: 0 auto;
-    border-collapse: collapse;
-}
-table td {
-    padding: 3px 20px;
-    border: 1px var(--table-border-color) solid;
-}
-table thead {
-    background: var(--table-header-bg);
-}
-table thead td {
-    font-weight: 700;
-    border: none;
-}
-table thead th {
-    padding: 3px 20px;
-}
-table thead tr {
-    border: 1px var(--table-header-bg) solid;
-}
-/* Alternate background colors for rows */
-table tbody tr:nth-child(2n) {
-    background: var(--table-alternate-bg);
-}
-
-
-blockquote {
-    margin: 20px 0;
-    padding: 0 20px;
-    color: var(--fg);
-    background-color: var(--quote-bg);
-    border-block-start: .1em solid var(--quote-border);
-    border-block-end: .1em solid var(--quote-border);
-}
-
-.warning {
-    margin: 20px;
-    padding: 0 20px;
-    border-inline-start: 2px solid var(--warning-border);
-}
-
-.warning:before {
-    position: absolute;
-    width: 3rem;
-    height: 3rem;
-    margin-inline-start: calc(-1.5rem - 21px);
-    content: "ⓘ";
-    text-align: center;
-    background-color: var(--bg);
-    color: var(--warning-border);
-    font-weight: bold;
-    font-size: 2rem;
-}
-
-blockquote .warning:before {
-    background-color: var(--quote-bg);
-}
-
-kbd {
-    background-color: var(--table-border-color);
-    border-radius: 4px;
-    border: solid 1px var(--theme-popup-border);
-    box-shadow: inset 0 -1px 0 var(--theme-hover);
-    display: inline-block;
-    font-size: var(--code-font-size);
-    font-family: var(--mono-font);
-    line-height: 10px;
-    padding: 4px 5px;
-    vertical-align: middle;
-}
-
-sup {
-    /* Set the line-height for superscript and footnote references so that there
-       isn't an awkward space appearing above lines that contain the footnote.
-
-       See https://github.com/rust-lang/mdBook/pull/2443#discussion_r1813773583
-       for an explanation.
-    */
-    line-height: 0;
-}
-
-.footnote-definition {
-    font-size: 0.9em;
-}
-/* The default spacing for a list is a little too large. */
-.footnote-definition ul,
-.footnote-definition ol {
-    padding-left: 20px;
-}
-.footnote-definition > li {
-    /* Required to position the ::before target */
-    position: relative;
-}
-.footnote-definition > li:target {
-    scroll-margin-top: 50vh;
-}
-.footnote-reference:target {
-    scroll-margin-top: 50vh;
-}
-/* Draws a border around the footnote (including the marker) when it is selected.
-   TODO: If there are multiple linkbacks, highlight which one you just came
-   from so you know which one to click.
-*/
-.footnote-definition > li:target::before {
-    border: 2px solid var(--footnote-highlight);
-    border-radius: 6px;
-    position: absolute;
-    top: -8px;
-    right: -8px;
-    bottom: -8px;
-    left: -32px;
-    pointer-events: none;
-    content: "";
-}
-/* Pulses the footnote reference so you can quickly see where you left off reading.
-   This could use some improvement.
-*/
-@media not (prefers-reduced-motion) {
-    .footnote-reference:target  {
-        animation: fn-highlight 0.8s;
-        border-radius: 2px;
-    }
-
-    @keyframes fn-highlight {
-        from {
-            background-color: var(--footnote-highlight);
-        }
-    }
-}
-
-.tooltiptext {
-    position: absolute;
-    visibility: hidden;
-    color: #fff;
-    background-color: #333;
-    transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */
-    left: -8px; /* Half of the width of the icon */
-    top: -35px;
-    font-size: 0.8em;
-    text-align: center;
-    border-radius: 6px;
-    padding: 5px 8px;
-    margin: 5px;
-    z-index: 1000;
-}
-.tooltipped .tooltiptext {
-    visibility: visible;
-}
-
-.chapter li.part-title {
-    color: var(--sidebar-fg);
-    margin: 5px 0px;
-    font-weight: bold;
-}
-
-.result-no-output {
-    font-style: italic;
-}

server/docs-prod/book/css/print.css

@@ -1,50 +0,0 @@
-
-#sidebar,
-#menu-bar,
-.nav-chapters,
-.mobile-nav-chapters {
-    display: none;
-}
-
-#page-wrapper.page-wrapper {
-    transform: none !important;
-    margin-inline-start: 0px;
-    overflow-y: initial;
-}
-
-#content {
-    max-width: none;
-    margin: 0;
-    padding: 0;
-}
-
-.page {
-    overflow-y: initial;
-}
-
-code {
-    direction: ltr !important;
-}
-
-pre > .buttons {
-    z-index: 2;
-}
-
-a, a:visited, a:active, a:hover {
-    color: #4183c4;
-    text-decoration: none;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    page-break-inside: avoid;
-    page-break-after: avoid;
-}
-
-pre, code {
-    page-break-inside: avoid;
-    white-space: pre-wrap;
-}
-
-.fa {
-    display: none !important;
-}

server/docs-prod/book/css/variables.css

@@ -1,320 +0,0 @@
-
-/* Globals */
-
-:root {
-    --sidebar-target-width: 300px;
-    --sidebar-width: min(var(--sidebar-target-width), 80vw);
-    --sidebar-resize-indicator-width: 8px;
-    --sidebar-resize-indicator-space: 2px;
-    --page-padding: 15px;
-    --content-max-width: 750px;
-    --menu-bar-height: 50px;
-    --mono-font: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
-    --code-font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
-}
-
-/* Themes */
-
-.ayu {
-    --bg: hsl(210, 25%, 8%);
-    --fg: #c5c5c5;
-
-    --sidebar-bg: #14191f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #5c6773;
-    --sidebar-active: #ffb454;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #0096cf;
-
-    --inline-code-color: #ffb454;
-
-    --theme-popup-bg: #14191f;
-    --theme-popup-border: #5c6773;
-    --theme-hover: #191f26;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --warning-border: #ff8e00;
-
-    --table-border-color: hsl(210, 25%, 13%);
-    --table-header-bg: hsl(210, 25%, 28%);
-    --table-alternate-bg: hsl(210, 25%, 11%);
-
-    --searchbar-border-color: #848484;
-    --searchbar-bg: #424242;
-    --searchbar-fg: #fff;
-    --searchbar-shadow-color: #d4c89f;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #252932;
-    --search-mark-bg: #e3b171;
-
-    --color-scheme: dark;
-
-    /* Same as `--icons` */
-    --copy-button-filter: invert(45%) sepia(6%) saturate(621%) hue-rotate(198deg) brightness(99%) contrast(85%);
-    /* Same as `--sidebar-active` */
-    --copy-button-filter-hover: invert(68%) sepia(55%) saturate(531%) hue-rotate(341deg) brightness(104%) contrast(101%);
-
-    --footnote-highlight: #2668a6;
-}
-
-.coal {
-    --bg: hsl(200, 7%, 8%);
-    --fg: #98a3ad;
-
-    --sidebar-bg: #292c2f;
-    --sidebar-fg: #a1adb8;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #3473ad;
-    --sidebar-spacer: #393939;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #43484d;
-    --icons-hover: #b3c0cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #141617;
-    --theme-popup-border: #43484d;
-    --theme-hover: #1f2124;
-
-    --quote-bg: hsl(234, 21%, 18%);
-    --quote-border: hsl(234, 21%, 23%);
-
-    --warning-border: #ff8e00;
-
-    --table-border-color: hsl(200, 7%, 13%);
-    --table-header-bg: hsl(200, 7%, 28%);
-    --table-alternate-bg: hsl(200, 7%, 11%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #b7b7b7;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #98a3ad;
-    --searchresults-li-bg: #2b2b2f;
-    --search-mark-bg: #355c7d;
-
-    --color-scheme: dark;
-
-    /* Same as `--icons` */
-    --copy-button-filter: invert(26%) sepia(8%) saturate(575%) hue-rotate(169deg) brightness(87%) contrast(82%);
-    /* Same as `--sidebar-active` */
-    --copy-button-filter-hover: invert(36%) sepia(70%) saturate(503%) hue-rotate(167deg) brightness(98%) contrast(89%);
-
-    --footnote-highlight: #4079ae;
-}
-
-.light, html:not(.js) {
-    --bg: hsl(0, 0%, 100%);
-    --fg: hsl(0, 0%, 0%);
-
-    --sidebar-bg: #fafafa;
-    --sidebar-fg: hsl(0, 0%, 0%);
-    --sidebar-non-existant: #aaaaaa;
-    --sidebar-active: #1f1fff;
-    --sidebar-spacer: #f4f4f4;
-
-    --scrollbar: #8F8F8F;
-
-    --icons: #747474;
-    --icons-hover: #000000;
-
-    --links: #20609f;
-
-    --inline-code-color: #301900;
-
-    --theme-popup-bg: #fafafa;
-    --theme-popup-border: #cccccc;
-    --theme-hover: #e6e6e6;
-
-    --quote-bg: hsl(197, 37%, 96%);
-    --quote-border: hsl(197, 37%, 91%);
-
-    --warning-border: #ff8e00;
-
-    --table-border-color: hsl(0, 0%, 95%);
-    --table-header-bg: hsl(0, 0%, 80%);
-    --table-alternate-bg: hsl(0, 0%, 97%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #e4f2fe;
-    --search-mark-bg: #a2cff5;
-
-    --color-scheme: light;
-
-    /* Same as `--icons` */
-    --copy-button-filter: invert(45.49%);
-    /* Same as `--sidebar-active` */
-    --copy-button-filter-hover: invert(14%) sepia(93%) saturate(4250%) hue-rotate(243deg) brightness(99%) contrast(130%);
-
-    --footnote-highlight: #7e7eff;
-}
-
-.navy {
-    --bg: hsl(226, 23%, 11%);
-    --fg: #bcbdd0;
-
-    --sidebar-bg: #282d3f;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505274;
-    --sidebar-active: #2b79a2;
-    --sidebar-spacer: #2d334f;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #b7b9cc;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #c5c8c6;
-
-    --theme-popup-bg: #161923;
-    --theme-popup-border: #737480;
-    --theme-hover: #282e40;
-
-    --quote-bg: hsl(226, 15%, 17%);
-    --quote-border: hsl(226, 15%, 22%);
-
-    --warning-border: #ff8e00;
-
-    --table-border-color: hsl(226, 23%, 16%);
-    --table-header-bg: hsl(226, 23%, 31%);
-    --table-alternate-bg: hsl(226, 23%, 14%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #aeaec6;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #5f5f71;
-    --searchresults-border-color: #5c5c68;
-    --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
-
-    --color-scheme: dark;
-
-    /* Same as `--icons` */
-    --copy-button-filter: invert(51%) sepia(10%) saturate(393%) hue-rotate(198deg) brightness(86%) contrast(87%);
-    /* Same as `--sidebar-active` */
-    --copy-button-filter-hover: invert(46%) sepia(20%) saturate(1537%) hue-rotate(156deg) brightness(85%) contrast(90%);
-
-    --footnote-highlight: #4079ae;
-}
-
-.rust {
-    --bg: hsl(60, 9%, 87%);
-    --fg: #262625;
-
-    --sidebar-bg: #3b2e2a;
-    --sidebar-fg: #c8c9db;
-    --sidebar-non-existant: #505254;
-    --sidebar-active: #e69f67;
-    --sidebar-spacer: #45373a;
-
-    --scrollbar: var(--sidebar-fg);
-
-    --icons: #737480;
-    --icons-hover: #262625;
-
-    --links: #2b79a2;
-
-    --inline-code-color: #6e6b5e;
-
-    --theme-popup-bg: #e1e1db;
-    --theme-popup-border: #b38f6b;
-    --theme-hover: #99908a;
-
-    --quote-bg: hsl(60, 5%, 75%);
-    --quote-border: hsl(60, 5%, 70%);
-
-    --warning-border: #ff8e00;
-
-    --table-border-color: hsl(60, 9%, 82%);
-    --table-header-bg: #b3a497;
-    --table-alternate-bg: hsl(60, 9%, 84%);
-
-    --searchbar-border-color: #aaa;
-    --searchbar-bg: #fafafa;
-    --searchbar-fg: #000;
-    --searchbar-shadow-color: #aaa;
-    --searchresults-header-fg: #666;
-    --searchresults-border-color: #888;
-    --searchresults-li-bg: #dec2a2;
-    --search-mark-bg: #e69f67;
-
-    /* Same as `--icons` */
-    --copy-button-filter: invert(51%) sepia(10%) saturate(393%) hue-rotate(198deg) brightness(86%) contrast(87%);
-    /* Same as `--sidebar-active` */
-    --copy-button-filter-hover: invert(77%) sepia(16%) saturate(1798%) hue-rotate(328deg) brightness(98%) contrast(83%);
-
-    --footnote-highlight: #d3a17a;
-}
-
-@media (prefers-color-scheme: dark) {
-    html:not(.js) {
-        --bg: hsl(200, 7%, 8%);
-        --fg: #98a3ad;
-
-        --sidebar-bg: #292c2f;
-        --sidebar-fg: #a1adb8;
-        --sidebar-non-existant: #505254;
-        --sidebar-active: #3473ad;
-        --sidebar-spacer: #393939;
-
-        --scrollbar: var(--sidebar-fg);
-
-        --icons: #43484d;
-        --icons-hover: #b3c0cc;
-
-        --links: #2b79a2;
-
-        --inline-code-color: #c5c8c6;
-
-        --theme-popup-bg: #141617;
-        --theme-popup-border: #43484d;
-        --theme-hover: #1f2124;
-
-        --quote-bg: hsl(234, 21%, 18%);
-        --quote-border: hsl(234, 21%, 23%);
-
-        --warning-border: #ff8e00;
-
-        --table-border-color: hsl(200, 7%, 13%);
-        --table-header-bg: hsl(200, 7%, 28%);
-        --table-alternate-bg: hsl(200, 7%, 11%);
-
-        --searchbar-border-color: #aaa;
-        --searchbar-bg: #b7b7b7;
-        --searchbar-fg: #000;
-        --searchbar-shadow-color: #aaa;
-        --searchresults-header-fg: #666;
-        --searchresults-border-color: #98a3ad;
-        --searchresults-li-bg: #2b2b2f;
-        --search-mark-bg: #355c7d;
-
-        --color-scheme: dark;
-
-        /* Same as `--icons` */
-        --copy-button-filter: invert(26%) sepia(8%) saturate(575%) hue-rotate(169deg) brightness(87%) contrast(82%);
-        /* Same as `--sidebar-active` */
-        --copy-button-filter-hover: invert(36%) sepia(70%) saturate(503%) hue-rotate(167deg) brightness(98%) contrast(89%);
-    }
-}