working inputting characters

.env_template

@@ -4,3 +4,5 @@ RUST_DB_USER=multi_psql_dev
 RUST_DB_PASSWORD=3
 RUST_DB_HOST=localhost
 RUST_DB_PORT=5432
+
+JWT_SECRET=<YOUR-JWT-HERE>

Cargo.lock

@@ -170,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -274,6 +274,19 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "bcrypt"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92758ad6077e4c76a6cadbce5005f666df70d4f13b19976b1a8062eef880040f"
+dependencies = [
+ "base64",
+ "blowfish",
+ "getrandom 0.3.1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "bigdecimal"
 version = "0.4.7"
@@ -323,6 +336,16 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blowfish"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
+dependencies = [
+ "byteorder",
+ "cipher",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.17.0"
@@ -387,9 +410,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "client"
-version = "0.1.0"
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "client"
+version = "0.2.5"
+dependencies = [
+ "async-trait",
  "common",
  "crossterm",
  "dirs 6.0.0",
@@ -424,7 +458,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.1.0"
+version = "0.2.5"
 dependencies = [
  "prost",
  "serde",
@@ -782,7 +816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -991,8 +1025,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1452,6 +1488,15 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "instability"
 version = "0.3.7"
@@ -1499,6 +1544,21 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+dependencies = [
+ "base64",
+ "js-sys",
+ "pem",
+ "ring",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "lasso"
 version = "0.7.3"
@@ -1886,6 +1946,16 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pem"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+dependencies = [
+ "base64",
+ "serde",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -2030,6 +2100,28 @@ dependencies = [
  "toml_edit",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.94"
@@ -2281,6 +2373,20 @@ dependencies = [
  "tstr",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rsa"
 version = "0.9.7"
@@ -2356,7 +2462,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2369,7 +2475,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.2",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2483,12 +2589,14 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.1.0"
+version = "0.2.5"
 dependencies = [
+ "bcrypt",
  "chrono",
  "common",
  "dashmap",
  "dotenvy",
+ "jsonwebtoken",
  "lazy_static",
  "prost",
  "regex",
@@ -2504,6 +2612,8 @@ dependencies = [
  "tonic",
  "tonic-reflection",
  "tracing",
+ "uuid",
+ "validator",
 ]
 
 [[package]]
@@ -2574,6 +2684,18 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simple_asn1"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror 2.0.12",
+ "time",
+]
+
 [[package]]
 name = "sized-chunks"
 version = "0.6.5"
@@ -2678,6 +2800,7 @@ dependencies = [
  "tokio-stream",
  "tracing",
  "url",
+ "uuid",
 ]
 
 [[package]]
@@ -2760,6 +2883,7 @@ dependencies = [
  "thiserror 2.0.12",
  "time",
  "tracing",
+ "uuid",
  "whoami",
 ]
 
@@ -2799,6 +2923,7 @@ dependencies = [
  "thiserror 2.0.12",
  "time",
  "tracing",
+ "uuid",
  "whoami",
 ]
 
@@ -2825,6 +2950,7 @@ dependencies = [
  "time",
  "tracing",
  "url",
+ "uuid",
 ]
 
 [[package]]
@@ -3029,7 +3155,7 @@ dependencies = [
  "getrandom 0.3.1",
  "once_cell",
  "rustix 1.0.1",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3450,6 +3576,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -3473,6 +3605,46 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "uuid"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+dependencies = [
+ "getrandom 0.3.1",
+ "serde",
+]
+
+[[package]]
+name = "validator"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43fb22e1a008ece370ce08a3e9e4447a910e92621bb49b85d6e48a45397e7cfa"
+dependencies = [
+ "idna",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "url",
+ "validator_derive",
+]
+
+[[package]]
+name = "validator_derive"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7df16e474ef958526d1205f6dda359fdfab79d9aa6d54bafcb92dcd07673dca"
+dependencies = [
+ "darling",
+ "once_cell",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3623,7 +3795,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

Cargo.toml

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

client/Cargo.toml

@@ -5,6 +5,7 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
+async-trait = "0.1.88"
 common = { path = "../common" }
 
 crossterm = "0.28.1"

client/src/components/auth.rs

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

client/src/components/auth/login.rs

@@ -0,0 +1,146 @@
+// src/components/auth/login.rs
+
+use crate::{
+    config::colors::themes::Theme,
+    state::pages::auth::AuthState,
+    components::common::dialog,
+    state::state::AppState,  // Add this import
+};
+use ratatui::{
+    layout::{Alignment, Constraint, Direction, Layout, Rect, Margin},
+    style::{Style, Modifier, Color},  // Removed unused Color import
+    widgets::{Block, BorderType, Borders, Paragraph},
+    Frame,  // Removed unused Span import
+};
+
+pub fn render_login(
+    f: &mut Frame,
+    area: Rect,
+    theme: &Theme,
+    state: &AuthState,
+    app_state: &AppState,  // Add AppState parameter
+    is_edit_mode: bool,
+) {
+    // Main container
+    let block = Block::default()
+        .borders(Borders::ALL)
+        .border_type(BorderType::Plain)
+        .border_style(Style::default().fg(theme.border))
+        .title(" Login ")
+        .style(Style::default().bg(theme.bg));
+
+    f.render_widget(block, area);
+
+    let inner_area = area.inner(Margin {
+        horizontal: 1,
+        vertical: 1,
+    });
+
+    // Layout chunks
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Length(4),  // Form (2 fields + padding)
+            Constraint::Length(1),  // Error message
+            Constraint::Length(3),  // Buttons
+        ])
+        .split(inner_area);
+
+    // --- FORM RENDERING ---
+    let input_block = Block::default()
+        .borders(Borders::ALL)
+        .border_style(if is_edit_mode {
+            Style::default().fg(theme.accent)
+        } else {
+            Style::default().fg(theme.border)
+        })
+        .style(Style::default().bg(theme.bg));
+
+    // Calculate inner area BEFORE rendering
+    let input_area = input_block.inner(chunks[0]);
+    
+    f.render_widget(input_block, chunks[0]);
+
+    // Use the canvas renderer for fields
+    crate::components::handlers::canvas::render_canvas(
+        f,
+        input_area,  // Use the pre-calculated area
+        state,
+        &["Username/Email", "Password"],
+        &state.current_field,
+        &[&state.username, &state.password],
+        theme,
+        is_edit_mode,
+    );
+
+    // --- BUTTONS --- (Keep this unchanged)
+    let button_chunks = Layout::default()
+        .direction(Direction::Horizontal)
+        .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
+        .split(chunks[2]);
+
+    // Login Button
+    let login_active = !state.return_selected;
+    let mut login_style = Style::default().fg(theme.fg);
+    let mut login_border = Style::default().fg(theme.border);
+    if login_active {
+        login_style = login_style.fg(theme.highlight).add_modifier(Modifier::BOLD);
+        login_border = login_border.fg(theme.accent);
+    }
+
+    f.render_widget(
+        Paragraph::new("Login")
+            .style(login_style)
+            .alignment(Alignment::Center)
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .border_type(BorderType::Plain)
+                    .border_style(login_border),
+            ),
+        button_chunks[0],
+    );
+
+    // Return Button
+    let return_active = state.return_selected;
+    let mut return_style = Style::default().fg(theme.fg);
+    let mut return_border = Style::default().fg(theme.border);
+    if return_active {
+        return_style = return_style.fg(theme.highlight).add_modifier(Modifier::BOLD);
+        return_border = return_border.fg(theme.accent);
+    }
+
+    f.render_widget(
+        Paragraph::new("Return")
+            .style(return_style)
+            .alignment(Alignment::Center)
+            .block(
+                Block::default()
+                    .borders(Borders::ALL)
+                    .border_type(BorderType::Plain)
+                    .border_style(return_border),
+            ),
+        button_chunks[1],
+    );
+
+    // Error message
+    if let Some(err) = &state.error_message {
+        f.render_widget(
+            Paragraph::new(err.as_str())
+                .style(Style::default().fg(Color::Red))
+                .alignment(Alignment::Center),
+            chunks[1],
+        );
+    }
+
+    if app_state.ui.dialog.show_dialog {
+        dialog::render_dialog(
+            f,
+            f.area(), // Use area() instead of deprecated size()
+            theme,
+            &app_state.ui.dialog.dialog_title,
+            &app_state.ui.dialog.dialog_message,
+            app_state.ui.dialog.dialog_button_active,
+        );
+    }
+}

client/src/components/common.rs

@@ -2,7 +2,9 @@
 pub mod command_line;
 pub mod status_line;
 pub mod background;
+pub mod dialog;
 
 pub use command_line::*;
 pub use status_line::*;
 pub use background::*;
+pub use dialog::*;

client/src/components/common/dialog.rs

@@ -0,0 +1,101 @@
+// src/components/common/dialog.rs
+use ratatui::{
+    layout::{Constraint, Direction, Layout, Rect, Margin},
+    style::{Modifier, Style},
+    widgets::{Block, BorderType, Borders, Paragraph},
+    Frame,
+    text::{Text, Line, Span}
+};
+use ratatui::prelude::Alignment;
+use crate::config::colors::themes::Theme;
+
+pub fn render_dialog(
+    f: &mut Frame,
+    area: Rect,
+    theme: &Theme,
+    title: &str,
+    message: &str,
+    is_active: bool,
+) {
+    // Create a centered rect for the dialog
+    let dialog_area = centered_rect(60, 25, area);
+
+    // Main dialog container
+    let block = Block::default()
+        .borders(Borders::ALL)
+        .border_type(BorderType::Rounded)
+        .border_style(Style::default().fg(theme.accent))
+        .title(title)
+        .style(Style::default().bg(theme.bg));
+
+    f.render_widget(&block, dialog_area);
+
+    // Inner content area
+    let inner_area = block.inner(dialog_area).inner(Margin {
+        horizontal: 2,
+        vertical: 1,
+    });
+
+    // Split into message and button areas
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Min(3),  // Message content
+            Constraint::Length(3),  // Button
+        ])
+        .split(inner_area);
+
+    // Message text
+    let message_text = Text::from(message.lines().map(|l| Line::from(Span::styled(
+        l,
+        Style::default().fg(theme.fg)
+    ))).collect::<Vec<_>>());
+    
+    let message_paragraph = Paragraph::new(message_text)
+        .alignment(Alignment::Center);
+    f.render_widget(message_paragraph, chunks[0]);
+
+    // OK Button
+    let button_style = if is_active {
+        Style::default()
+            .fg(theme.highlight)
+            .add_modifier(Modifier::BOLD)
+    } else {
+        Style::default().fg(theme.fg)
+    };
+
+    let button_block = Block::default()
+        .borders(Borders::ALL)
+        .border_type(BorderType::Plain)
+        .border_style(Style::default().fg(theme.accent))
+        .style(Style::default().bg(theme.bg));
+
+    f.render_widget(
+        Paragraph::new("OK")
+            .block(button_block)
+            .style(button_style)
+            .alignment(Alignment::Center),
+        chunks[1],
+    );
+}
+
+/// Helper function to center a rect with given percentage values
+fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
+    let popup_layout = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Percentage((100 - percent_y) / 2),
+            Constraint::Percentage(percent_y),
+            Constraint::Percentage((100 - percent_y) / 2),
+        ])
+        .split(r);
+
+    Layout::default()
+        .direction(Direction::Horizontal)
+        .constraints([
+            Constraint::Percentage((100 - percent_x) / 2),
+            Constraint::Percentage(percent_x),
+            Constraint::Percentage((100 - percent_x) / 2),
+        ])
+        .split(popup_layout[1])[1]
+}

client/src/components/form.rs

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

client/src/components/form/form.rs

@@ -1,4 +1,4 @@
-// src/components/handlers/form.rs
+// src/components/form/form.rs
 use ratatui::{
     widgets::{Paragraph, Block, Borders},
     layout::{Layout, Constraint, Direction, Rect, Margin, Alignment},
@@ -6,13 +6,13 @@ use ratatui::{
     Frame,
 };
 use crate::config::colors::themes::Theme;
-use crate::ui::form::FormState;
-use super::canvas::render_canvas;  // Changed to canvas
+use crate::state::canvas_state::CanvasState;
+use crate::components::handlers::canvas::render_canvas;
 
 pub fn render_form(
     f: &mut Frame,
     area: Rect,
-    form_state: &FormState,
+    form_state: &impl CanvasState,
     fields: &[&str],
     current_field: &usize,
     inputs: &[&String],

client/src/components/handlers.rs

@@ -1,8 +1,6 @@
 // src/components/handlers.rs
-pub mod form;
 pub mod canvas;
 pub mod sidebar;
 
-pub use form::*;
 pub use canvas::*;
 pub use sidebar::*;

client/src/components/handlers/canvas.rs

@@ -8,12 +8,12 @@ use ratatui::{
     prelude::Alignment,
 };
 use crate::config::colors::themes::Theme;
-use crate::ui::form::FormState;
+use crate::state::canvas_state::CanvasState;
 
 pub fn render_canvas(
     f: &mut Frame,
     area: Rect,
-    form_state: &FormState,
+    form_state: &impl CanvasState,
     fields: &[&str],
     current_field: &usize,
     inputs: &[&String],
@@ -30,7 +30,7 @@ pub fn render_canvas(
     let input_container = Block::default()
         .borders(Borders::ALL)
         .border_style(if is_edit_mode {
-            form_state.has_unsaved_changes.then(|| theme.warning).unwrap_or(theme.accent)
+            form_state.has_unsaved_changes().then(|| theme.warning).unwrap_or(theme.accent)
         } else {
             theme.secondary
         })
@@ -81,7 +81,7 @@ pub fn render_canvas(
         f.render_widget(input_display, input_rows[i]);
 
         if is_active {
-            let cursor_x = input_rows[i].x + form_state.current_cursor_pos as u16;
+            let cursor_x = input_rows[i].x + form_state.current_cursor_pos() as u16;
             let cursor_y = input_rows[i].y;
             f.set_cursor_position((cursor_x, cursor_y));
         }

client/src/components/handlers/sidebar.rs

@@ -9,7 +9,8 @@ use crate::config::colors::themes::Theme;
 use common::proto::multieko2::table_definition::{ProfileTreeResponse};
 use ratatui::text::{Span, Line};
 
-const SIDEBAR_WIDTH: u16 = 16;
+// Reduced sidebar width
+const SIDEBAR_WIDTH: u16 = 12;
 
 pub fn calculate_sidebar_layout(show_sidebar: bool, main_content_area: Rect) -> (Option<Rect>, Rect) {
     if show_sidebar {
@@ -37,46 +38,72 @@ pub fn render_sidebar(
     let mut items = Vec::new();
 
     if let Some(profile_name) = selected_profile {
-        if let Some(profile) = profile_tree.profiles.iter()
-            .find(|p| &p.name == profile_name)
-        {
-            // Profile header
+        // Existing code for when a profile is selected...
+    } else {
+        // Show full profile tree when no profile is selected (compact version)
+        for (profile_idx, profile) in profile_tree.profiles.iter().enumerate() {
+            // Profile header - more compact
             items.push(ListItem::new(Line::from(vec![
-                Span::styled("📁 ", Style::default().fg(theme.accent)),
+                Span::styled("◆", Style::default().fg(theme.accent)),
                 Span::styled(&profile.name, Style::default().fg(theme.highlight)),
             ])));
 
-            // Tables
+            // Tables with compact prefixes
             for (table_idx, table) in profile.tables.iter().enumerate() {
-                let is_last = table_idx == profile.tables.len() - 1;
-                let prefix = if is_last { "└─ " } else { "├─ " };
+                let is_last_table = table_idx == profile.tables.len() - 1;
+                let is_last_profile = profile_idx == profile_tree.profiles.len() - 1;
+
+                // Shorter prefix characters
+                let prefix = match (is_last_profile, is_last_table) {
+                    (true, true) => " └",
+                    (true, false) => " ├",
+                    (false, true) => "│└",
+                    (false, false) => "│├",
+                };
+
+                // Get table name without year prefix to save space
+                let display_name = if table.name.starts_with("2025_") {
+                    &table.name[5..] // Skip "2025_" prefix
+                } else {
+                    &table.name
+                };
 
                 let mut line = vec![
-                    Span::styled(format!("  {}", prefix), Style::default().fg(theme.fg)),
-                    Span::styled(&table.name, Style::default().fg(theme.fg)),
+                    Span::styled(prefix, Style::default().fg(theme.fg)),
+                    Span::styled(display_name, Style::default().fg(theme.fg)),
                 ];
 
+                // Show a simple indicator for dependencies instead of listing them
                 if !table.depends_on.is_empty() {
                     line.push(Span::styled(
-                        format!(" → {}", table.depends_on.join(", ")),
+                        "→",
                         Style::default().fg(theme.secondary)
                     ));
                 }
 
                 items.push(ListItem::new(Line::from(line)));
             }
+
+            // Compact separator between profiles
+            if profile_idx < profile_tree.profiles.len() - 1 {
+                items.push(ListItem::new(Line::from(
+                    Span::styled("│", Style::default().fg(theme.secondary))
+                )));
+            }
+        }
+
+        if profile_tree.profiles.is_empty() {
+            items.push(ListItem::new(Span::styled(
+                "No profiles",
+                Style::default().fg(theme.secondary)
+            )));
         }
-    } else {
-        items.push(ListItem::new(Span::styled(
-            "No profile selected",
-            Style::default().fg(theme.secondary)
-        )));
     }
 
     let list = List::new(items)
         .block(sidebar_block)
         .highlight_style(Style::default().fg(theme.highlight))
-        .highlight_symbol(">>");
+        .highlight_symbol(">");
 
     f.render_widget(list, area);
 }

client/src/components/intro/intro.rs

@@ -1,4 +1,4 @@
-// src/components/handlers/intro.rs
+// src/components/intro/intro.rs
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::Style,
@@ -32,9 +32,9 @@ impl IntroState {
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .constraints([
-                Constraint::Percentage(35),
-                Constraint::Length(5),
-                Constraint::Percentage(35),
+                Constraint::Percentage(40),
+                Constraint::Length(5), // Increased to accommodate 3 buttons
+                Constraint::Percentage(40),
             ])
             .split(inner_area);
 
@@ -48,10 +48,14 @@ impl IntroState {
             .alignment(Alignment::Center);
         f.render_widget(title_para, chunks[1]);
 
-        // Buttons
+        // Buttons - now with 3 options
         let button_area = Layout::default()
             .direction(Direction::Horizontal)
-            .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
+            .constraints([
+                Constraint::Percentage(33),
+                Constraint::Percentage(33),
+                Constraint::Percentage(33),
+            ])
             .split(chunks[1].inner(Margin {
                 horizontal: 1,
                 vertical: 1
@@ -71,6 +75,13 @@ impl IntroState {
             self.selected_option == 1,
             theme,
         );
+        self.render_button(
+            f,
+            button_area[2],
+            "Login",
+            self.selected_option == 2,
+            theme,
+        );
     }
 
     fn render_button(&self, f: &mut Frame, area: Rect, text: &str, selected: bool, theme: &Theme) {
@@ -100,11 +111,11 @@ impl IntroState {
         f.render_widget(button, area);
     }
 
-    pub fn next_option(&mut self) {
-        self.selected_option = (self.selected_option + 1) % 2;
+ pub fn next_option(&mut self) {
+        self.selected_option = (self.selected_option + 1) % 3;
     }
 
     pub fn previous_option(&mut self) {
-        self.selected_option = if self.selected_option == 0 { 1 } else { 0 };
+        self.selected_option = if self.selected_option == 0 { 2 } else { self.selected_option - 1 };
     }
 }

client/src/components/mod.rs

@@ -3,8 +3,12 @@ pub mod handlers;
 pub mod intro;
 pub mod admin;
 pub mod common;
+pub mod form;
+pub mod auth;
 
 pub use handlers::*;
 pub use intro::*;
 pub use admin::*;
 pub use common::*;
+pub use form::*;
+pub use auth::*;

client/src/functions/common.rs

@@ -0,0 +1,2 @@
+// src/functions/common.rs
+

client/src/functions/mod.rs

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

client/src/functions/modes.rs

@@ -0,0 +1,8 @@
+// src/functions/modes.rs
+
+pub mod read_only;
+pub mod edit;
+
+
+pub use read_only::*;
+pub use edit::*;

client/src/functions/modes/edit.rs

@@ -0,0 +1,4 @@
+// src/functions/modes/edit.rs
+
+pub mod form_e;
+pub mod auth_e;

client/src/functions/modes/edit/auth_e.rs

@@ -0,0 +1,431 @@
+// src/functions/modes/edit/auth_e.rs
+
+use crate::config::binds::config::Config;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::common::form::{revert, save};
+use crossterm::event::{KeyCode, KeyEvent};
+use std::any::Any;
+
+pub async fn execute_common_action<S: CanvasState + Any>(
+    action: &str,
+    state: &mut S,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" | "revert" => {
+            if !state.has_unsaved_changes() {
+                return Ok("No changes to save or revert.".to_string());
+            }
+            if let Some(form_state) =
+                (state as &mut dyn Any).downcast_mut::<FormState>()
+            {
+                match action {
+                    "save" => {
+                        save(
+                            form_state,
+                            grpc_client,
+                            is_saved,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    "revert" => {
+                        revert(
+                            form_state,
+                            grpc_client,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    _ => unreachable!(),
+                }
+            } else {
+                Ok(format!(
+                    "Action '{}' not implemented for this state type.",
+                    action
+                ))
+            }
+        }
+        _ => Ok(format!("Common action '{}' not handled here.", action)),
+    }
+}
+
+pub async fn execute_edit_action<S: CanvasState>(
+    action: &str,
+    key: KeyEvent,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    _grpc_client: &mut GrpcClient,
+    _is_saved: &mut bool,
+    _current_position: &mut u64,
+    _total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "insert_char" => {
+            if let KeyCode::Char(c) = key.code {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.insert(cursor_pos, c);
+                    *field_value = chars.into_iter().collect();
+                    state.set_current_cursor_pos(cursor_pos + 1);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = state.current_cursor_pos();
+                }
+            } else {
+                return Ok("Error: insert_char called without a char key."
+                    .to_string());
+            }
+            Ok("working?".to_string())
+        }
+
+        "delete_char_backward" => {
+            if state.current_cursor_pos() > 0 {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.remove(cursor_pos - 1);
+                    *field_value = chars.into_iter().collect();
+                    let new_pos = cursor_pos - 1;
+                    state.set_current_cursor_pos(new_pos);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = new_pos;
+                }
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_forward" => {
+            let cursor_pos = state.current_cursor_pos();
+            let field_value = state.get_current_input_mut();
+            let mut chars: Vec<char> = field_value.chars().collect();
+            if cursor_pos < chars.len() {
+                chars.remove(cursor_pos);
+                *field_value = chars.into_iter().collect();
+                state.set_has_unsaved_changes(true);
+                *ideal_cursor_column = cursor_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "next_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = (current_field + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "prev_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_left" => {
+            let new_pos = state.current_cursor_pos().saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if current_pos < current_input.len() {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_up" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_down" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = (state.current_field() + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            let new_pos = current_input.len();
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_first_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to first field".to_string())
+        }
+
+        "move_last_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = num_fields - 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to last field".to_string())
+        }
+
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_next_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                let final_pos = new_pos.min(current_input.len());
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos == current_pos {
+                    find_word_end(current_input, new_pos + 1)
+                } else {
+                    new_pos
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos >= len {
+        return len;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < len && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < len && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+
+    if get_char_type(chars[pos]) == CharType::Whitespace {
+        pos = find_next_word_start(text, pos);
+    }
+
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    pos
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+    if pos == 0 && get_char_type(chars[pos]) != CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/functions/modes/edit/form_e.rs

@@ -0,0 +1,431 @@
+// src/functions/modes/edit/form_e.rs
+
+use crate::config::binds::config::Config;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::common::form::{revert, save};
+use crossterm::event::{KeyCode, KeyEvent};
+use std::any::Any;
+
+pub async fn execute_common_action<S: CanvasState + Any>(
+    action: &str,
+    state: &mut S,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" | "revert" => {
+            if !state.has_unsaved_changes() {
+                return Ok("No changes to save or revert.".to_string());
+            }
+            if let Some(form_state) =
+                (state as &mut dyn Any).downcast_mut::<FormState>()
+            {
+                match action {
+                    "save" => {
+                        save(
+                            form_state,
+                            grpc_client,
+                            is_saved,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    "revert" => {
+                        revert(
+                            form_state,
+                            grpc_client,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    _ => unreachable!(),
+                }
+            } else {
+                Ok(format!(
+                    "Action '{}' not implemented for this state type.",
+                    action
+                ))
+            }
+        }
+        _ => Ok(format!("Common action '{}' not handled here.", action)),
+    }
+}
+
+pub async fn execute_edit_action<S: CanvasState>(
+    action: &str,
+    key: KeyEvent,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    _grpc_client: &mut GrpcClient,
+    _is_saved: &mut bool,
+    _current_position: &mut u64,
+    _total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "insert_char" => {
+            if let KeyCode::Char(c) = key.code {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.insert(cursor_pos, c);
+                    *field_value = chars.into_iter().collect();
+                    state.set_current_cursor_pos(cursor_pos + 1);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = state.current_cursor_pos();
+                }
+            } else {
+                return Ok("Error: insert_char called without a char key."
+                    .to_string());
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_backward" => {
+            if state.current_cursor_pos() > 0 {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.remove(cursor_pos - 1);
+                    *field_value = chars.into_iter().collect();
+                    let new_pos = cursor_pos - 1;
+                    state.set_current_cursor_pos(new_pos);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = new_pos;
+                }
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_forward" => {
+            let cursor_pos = state.current_cursor_pos();
+            let field_value = state.get_current_input_mut();
+            let mut chars: Vec<char> = field_value.chars().collect();
+            if cursor_pos < chars.len() {
+                chars.remove(cursor_pos);
+                *field_value = chars.into_iter().collect();
+                state.set_has_unsaved_changes(true);
+                *ideal_cursor_column = cursor_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "next_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = (current_field + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "prev_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_left" => {
+            let new_pos = state.current_cursor_pos().saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if current_pos < current_input.len() {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_up" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_down" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = (state.current_field() + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            let new_pos = current_input.len();
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_first_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to first field".to_string())
+        }
+
+        "move_last_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = num_fields - 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to last field".to_string())
+        }
+
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_next_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                let final_pos = new_pos.min(current_input.len());
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos == current_pos {
+                    find_word_end(current_input, new_pos + 1)
+                } else {
+                    new_pos
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos >= len {
+        return len;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < len && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < len && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+
+    if get_char_type(chars[pos]) == CharType::Whitespace {
+        pos = find_next_word_start(text, pos);
+    }
+
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    pos
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+    if pos == 0 && get_char_type(chars[pos]) != CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/functions/modes/read_only.rs

@@ -0,0 +1,4 @@
+// src/functions/modes/read_only.rs
+
+pub mod auth_ro;
+pub mod form_ro;

client/src/functions/modes/read_only/auth_ro.rs

@@ -0,0 +1,358 @@
+// src/functions/modes/read_only/auth_ro.rs
+
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::state::canvas_state::CanvasState;
+use std::error::Error;
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+pub async fn execute_action<S: CanvasState>(
+    action: &str,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    key_sequence_tracker: &mut KeySequenceTracker,
+    command_message: &mut String,
+) -> Result<String, Box<dyn Error>> {
+    match action {
+        "previous_entry" | "next_entry" => {
+            key_sequence_tracker.reset();
+            Ok(format!(
+                "Action '{}' should be handled by context-specific logic",
+                action
+            ))
+        }
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = if current_field == 0 {
+                num_fields - 1
+            } else {
+                current_field - 1
+            };
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+
+            Ok("move up from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = (current_field + 1) % num_fields;
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("move down from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            state.set_current_field(0);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            let last_field_index = num_fields - 1;
+            state.set_current_field(last_field_index);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "exit_edit_mode" => {
+            key_sequence_tracker.reset();
+            command_message.clear();
+            Ok("".to_string())
+        }
+        "move_left" => {
+            let current_pos = state.current_cursor_pos();
+            let new_pos = current_pos.saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if !current_input.is_empty()
+                && current_pos < current_input.len().saturating_sub(1)
+            {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos =
+                    find_next_word_start(current_input, state.current_cursor_pos());
+                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos != current_pos {
+                    new_pos
+                } else {
+                    find_word_end(current_input, new_pos + 1)
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = current_input.len().saturating_sub(1);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            } else {
+                state.set_current_cursor_pos(0);
+                *ideal_cursor_column = 0;
+            }
+            Ok("".to_string())
+        }
+        _ => {
+             key_sequence_tracker.reset();
+             Ok(format!("Unknown read-only action: {}", action))
+        },
+    }
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+    let current_pos = current_pos.min(chars.len());
+
+    if current_pos == chars.len() {
+        return current_pos;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_next_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+
+    let next_start = find_next_word_start(text, current_pos);
+
+    if next_start >= chars.len() {
+        return chars.len().saturating_sub(1);
+    }
+
+    let mut pos = next_start;
+    let word_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+    let original_pos = pos;
+
+    let current_type = get_char_type(chars[pos]);
+    if current_type != CharType::Whitespace {
+        while pos < len && get_char_type(chars[pos]) == current_type {
+            pos += 1;
+        }
+        return pos.saturating_sub(1);
+    }
+
+    pos = find_next_word_start(text, pos);
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if get_char_type(chars[pos]) != CharType::Whitespace {
+        let word_type = get_char_type(chars[pos]);
+        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+            pos -= 1;
+        }
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+         0
+    } else {
+        pos
+    }
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+     let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+        return 0;
+    }
+     if pos == 0 && get_char_type(chars[0]) != CharType::Whitespace {
+         return 0;
+     }
+
+    let word_type = get_char_type(chars[pos]);
+     while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/functions/modes/read_only/form_ro.rs

@@ -0,0 +1,357 @@
+// src/functions/modes/read_only/form_ro.rs
+
+use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::state::canvas_state::CanvasState;
+use std::error::Error;
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+pub async fn execute_action<S: CanvasState>(
+    action: &str,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    key_sequence_tracker: &mut KeySequenceTracker,
+    command_message: &mut String,
+) -> Result<String, Box<dyn Error>> {
+    match action {
+        "previous_entry" | "next_entry" => {
+            key_sequence_tracker.reset();
+            Ok(format!(
+                "Action '{}' should be handled by context-specific logic",
+                action
+            ))
+        }
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = if current_field == 0 {
+                num_fields - 1
+            } else {
+                current_field - 1
+            };
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = (current_field + 1) % num_fields;
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            state.set_current_field(0);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            let last_field_index = num_fields - 1;
+            state.set_current_field(last_field_index);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "exit_edit_mode" => {
+            key_sequence_tracker.reset();
+            command_message.clear();
+            Ok("".to_string())
+        }
+        "move_left" => {
+            let current_pos = state.current_cursor_pos();
+            let new_pos = current_pos.saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if !current_input.is_empty()
+                && current_pos < current_input.len().saturating_sub(1)
+            {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos =
+                    find_next_word_start(current_input, state.current_cursor_pos());
+                let final_pos = new_pos.min(current_input.len().saturating_sub(1));
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos != current_pos {
+                    new_pos
+                } else {
+                    find_word_end(current_input, new_pos + 1)
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = current_input.len().saturating_sub(1);
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            } else {
+                state.set_current_cursor_pos(0);
+                *ideal_cursor_column = 0;
+            }
+            Ok("".to_string())
+        }
+        _ => {
+             key_sequence_tracker.reset();
+             Ok(format!("Unknown read-only action: {}", action))
+        },
+    }
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+    let current_pos = current_pos.min(chars.len());
+
+    if current_pos == chars.len() {
+        return current_pos;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_next_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() {
+        return 0;
+    }
+
+    let next_start = find_next_word_start(text, current_pos);
+
+    if next_start >= chars.len() {
+        return chars.len().saturating_sub(1);
+    }
+
+    let mut pos = next_start;
+    let word_type = get_char_type(chars[pos]);
+
+    while pos < chars.len() && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(chars.len().saturating_sub(1))
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+    let original_pos = pos;
+
+    let current_type = get_char_type(chars[pos]);
+    if current_type != CharType::Whitespace {
+        while pos < len && get_char_type(chars[pos]) == current_type {
+            pos += 1;
+        }
+        return pos.saturating_sub(1);
+    }
+
+    pos = find_next_word_start(text, pos);
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if get_char_type(chars[pos]) != CharType::Whitespace {
+        let word_type = get_char_type(chars[pos]);
+        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+            pos -= 1;
+        }
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+         0
+    } else {
+        pos
+    }
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+     let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[0]) == CharType::Whitespace {
+        return 0;
+    }
+     if pos == 0 && get_char_type(chars[0]) != CharType::Whitespace {
+         return 0;
+     }
+
+    let word_type = get_char_type(chars[pos]);
+     while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/lib.rs

@@ -5,6 +5,8 @@ pub mod config;
 pub mod state;
 pub mod components;
 pub mod modes;
+pub mod functions;
+pub mod services;
 
 pub use ui::run_ui;
 

client/src/modes/canvas.rs

@@ -1,4 +1,4 @@
 // src/client/modes/canvas.rs
 pub mod edit;
-pub mod common;
+pub mod common_mode;
 pub mod read_only;

client/src/modes/canvas/common_mode.rs

@@ -0,0 +1,75 @@
+// src/modes/canvas/common.rs
+
+use crate::tui::terminal::core::TerminalCore;
+use crate::state::pages::{form::FormState, auth::AuthState};
+use crate::state::state::AppState;
+use crate::services::grpc_client::GrpcClient;
+use crate::services::auth::AuthClient;
+use crate::tui::functions::common::{
+    form::{save as form_save, revert as form_revert},
+    login::{save as login_save, revert as login_revert}
+};
+
+pub async fn handle_core_action(
+    action: &str,
+    form_state: &mut FormState,
+    auth_state: &mut AuthState,
+    grpc_client: &mut GrpcClient,
+    auth_client: &mut AuthClient,
+    terminal: &mut TerminalCore,
+    app_state: &mut AppState,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    match action {
+        "save" => {
+            if app_state.ui.show_login {
+                let message = login_save(auth_state, auth_client, app_state).await?;
+                Ok((false, message))
+            } else {
+                let message = form_save(
+                    form_state,
+                    grpc_client,
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            }
+        },
+        "force_quit" => {
+            terminal.cleanup()?;
+            Ok((true, "Force exiting without saving.".to_string()))
+        },
+        "save_and_quit" => {
+            let message = if app_state.ui.show_login {
+                login_save(auth_state, auth_client, app_state).await?
+            } else {
+                form_save(
+                    form_state,
+                    grpc_client,
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                ).await?
+            };
+            terminal.cleanup()?;
+            Ok((true, format!("{}. Exiting application.", message)))
+        },
+        "revert" => {
+            if app_state.ui.show_login {
+                let message = login_revert(auth_state, app_state).await;
+                Ok((false, message))
+            } else {
+                let message = form_revert(
+                    form_state,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                ).await?;
+                Ok((false, message))
+            }
+        },
+        _ => Ok((false, format!("Core action not handled: {}", action))),
+    }
+}

client/src/modes/canvas/edit.rs

@@ -1,17 +1,18 @@
 // src/modes/canvas/edit.rs
 
-use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
-use crate::tui::terminal::{
-    grpc_client::GrpcClient,
-};
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
-use crate::modes::canvas::common;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::{auth::AuthState, form::FormState};
+use crate::state::state::AppState;
+use crate::functions::modes::edit::{auth_e, form_e};
+use crossterm::event::{KeyCode, KeyEvent};
 
-pub async fn handle_edit_event_internal(
+pub async fn handle_edit_event(
+    is_auth_context: bool,
     key: KeyEvent,
     config: &Config,
     form_state: &mut FormState,
+    auth_state: &mut AuthState,
     ideal_cursor_column: &mut usize,
     command_message: &mut String,
     is_saved: &mut bool,
@@ -19,455 +20,99 @@ pub async fn handle_edit_event_internal(
     total_count: u64,
     grpc_client: &mut GrpcClient,
 ) -> Result<String, Box<dyn std::error::Error>> {
-    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(&config.keybindings.global, key.code, key.modifiers) {
-        // Ignore in edit mode and process as normal input
-        handle_edit_specific_input(key, form_state, ideal_cursor_column);
+
+    // Global command mode check
+    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(
+        &config.keybindings.global,
+        key.code,
+        key.modifiers
+    ) {
+        *command_message = "Switching to Command Mode...".to_string();
         return Ok(command_message.clone());
     }
 
-    // Check common actions first
-    if let Some(action) = config.get_action_for_key_in_mode(&config.keybindings.common, key.code, key.modifiers) {
-        return execute_common_action(
-            action,
-            form_state,
-            grpc_client,
-            is_saved,
-            current_position,
-            total_count,
-        ).await;
+    // Common actions (save/revert)
+    if let Some(action) = config.get_action_for_key_in_mode(
+        &config.keybindings.common,
+        key.code,
+        key.modifiers
+    ) {
+        if matches!(action, "save" | "revert") {
+            return if is_auth_context {
+                auth_e::execute_common_action(
+                    action,
+                    auth_state,  // Concrete AuthState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            } else {
+                form_e::execute_common_action(
+                    action,
+                    form_state,  // Concrete FormState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            };
+        }
     }
 
+    // Edit-specific actions
     if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
-        return execute_edit_action(
-            action,
-            form_state,
-            ideal_cursor_column,
-            grpc_client,  // Changed from AppTerminal
-            is_saved,
-            current_position,
-            total_count,
-        ).await;
+        return if is_auth_context {
+            auth_e::execute_edit_action(
+                action,
+                key,
+                auth_state,  // Full access to AuthState fields
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        } else {
+            form_e::execute_edit_action(
+                action,
+                key,
+                form_state,  // Full access to FormState fields
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
     }
 
-    handle_edit_specific_input(
-        key,
-        form_state,
-        ideal_cursor_column,
-    );
+    // Character insertion
+    if let KeyCode::Char(_) = key.code {
+        return if is_auth_context {
+            auth_e::execute_edit_action(
+                "insert_char",
+                key,
+                auth_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        } else {
+            form_e::execute_edit_action(
+                "insert_char",
+                key,
+                form_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
+    }
 
     Ok(command_message.clone())
 }
-
-async fn execute_common_action(
-    action: &str,
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        "save" => {
-            common::save(
-                form_state,
-                grpc_client,
-                is_saved,
-                current_position,
-                total_count,
-            ).await
-        },
-        "revert" => {
-            common::revert(
-                form_state,
-                grpc_client,
-                current_position,
-                total_count,
-            ).await
-        },
-        "move_up" | "move_down" => {
-            // Reuse edit mode's existing logic
-            execute_edit_action(
-                action,
-                form_state,
-                &mut 0, // Dummy ideal_cursor_column (not used here)
-                grpc_client,
-                is_saved,
-                current_position,
-                total_count,
-            ).await
-        },
-        _ => Ok(format!("Common action not handled: {}", action)),
-    }
-}
-
-fn handle_edit_specific_input(
-    key: KeyEvent,
-    form_state: &mut FormState,
-    ideal_cursor_column: &mut usize,
-) {
-    match key.code {
-        KeyCode::Char(c) => {
-            let cursor_pos = form_state.current_cursor_pos;
-            let field_value = form_state.get_current_input_mut();
-            let mut chars: Vec<char> = field_value.chars().collect();
-            if cursor_pos <= chars.len() {
-                chars.insert(cursor_pos, c);
-                *field_value = chars.into_iter().collect();
-                form_state.current_cursor_pos = cursor_pos + 1;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-                form_state.has_unsaved_changes = true;
-            }
-        }
-        KeyCode::Backspace => {
-            if form_state.current_cursor_pos > 0 {
-                let cursor_pos = form_state.current_cursor_pos;
-                let field_value = form_state.get_current_input_mut();
-                let mut chars: Vec<char> = field_value.chars().collect();
-                if cursor_pos <= chars.len() && cursor_pos > 0 {
-                    chars.remove(cursor_pos - 1);
-                    *field_value = chars.into_iter().collect();
-                    form_state.current_cursor_pos = cursor_pos - 1;
-                    *ideal_cursor_column = form_state.current_cursor_pos;
-                    form_state.has_unsaved_changes = true;
-                }
-            }
-        }
-        KeyCode::Delete => {
-            let cursor_pos = form_state.current_cursor_pos;
-            let field_value = form_state.get_current_input_mut();
-            let chars: Vec<char> = field_value.chars().collect();
-            if cursor_pos < chars.len() {
-                let mut new_chars = chars.clone();
-                new_chars.remove(cursor_pos);
-                *field_value = new_chars.into_iter().collect();
-                form_state.has_unsaved_changes = true;
-            }
-        }
-        KeyCode::Tab => {
-            if key.modifiers.contains(KeyModifiers::SHIFT) {
-                if form_state.current_field == 0 {
-                    form_state.current_field = form_state.fields.len() - 1;
-                } else {
-                    form_state.current_field = form_state.current_field.saturating_sub(1);
-                }
-            } else {
-                form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-            }
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-        }
-        KeyCode::Enter => {
-            form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-        }
-        _ => {}
-    }
-}
-
-async fn execute_edit_action(
-    action: &str,
-    form_state: &mut FormState,
-    ideal_cursor_column: &mut usize,
-    grpc_client: &mut GrpcClient,  // Changed from AppTerminal
-    is_saved: &mut bool,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        "save" => {
-            common::save(
-                form_state,
-                grpc_client,  // Changed from AppTerminal
-                is_saved,
-                current_position,
-                total_count,
-            ).await
-        },
-        "move_left" => {
-            form_state.current_cursor_pos = form_state.current_cursor_pos.saturating_sub(1);
-            *ideal_cursor_column = form_state.current_cursor_pos;
-            Ok("".to_string())
-        }
-        "move_right" => {
-            let current_input = form_state.get_current_input();
-            if form_state.current_cursor_pos < current_input.len() {
-                form_state.current_cursor_pos += 1;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_up" => {
-            if form_state.current_field == 0 {
-                form_state.current_field = form_state.fields.len() - 1;
-            } else {
-                form_state.current_field = form_state.current_field.saturating_sub(1);
-            }
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "move_down" => {
-            form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "move_line_start" => {
-            form_state.current_cursor_pos = 0;
-            *ideal_cursor_column = form_state.current_cursor_pos;
-            Ok("".to_string())
-        }
-        "move_line_end" => {
-            let current_input = form_state.get_current_input();
-            form_state.current_cursor_pos = current_input.len();
-            *ideal_cursor_column = form_state.current_cursor_pos;
-            Ok("".to_string())
-        }
-        "move_first_line" => {
-            form_state.current_field = 0;
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("Moved to first line".to_string())
-        }
-        "move_last_line" => {
-            form_state.current_field = form_state.fields.len() - 1;
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("Moved to last line".to_string())
-        }
-        // Word movement actions
-        "move_word_next" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_next_word_start(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos.min(current_input.len());
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_word_end(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos.min(current_input.len());
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_prev" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_start(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end_prev" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_end(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        // Edit-specific actions that can be bound to keys
-        "delete_char_forward" => {
-            let cursor_pos = form_state.current_cursor_pos;
-            let field_value = form_state.get_current_input_mut();
-            let chars: Vec<char> = field_value.chars().collect();
-            if cursor_pos < chars.len() {
-                let mut new_chars = chars.clone();
-                new_chars.remove(cursor_pos);
-                *field_value = new_chars.into_iter().collect();
-                form_state.has_unsaved_changes = true;
-            }
-            Ok("".to_string())
-        }
-        "delete_char_backward" => {
-            if form_state.current_cursor_pos > 0 {
-                let cursor_pos = form_state.current_cursor_pos;
-                let field_value = form_state.get_current_input_mut();
-                let mut chars: Vec<char> = field_value.chars().collect();
-                if cursor_pos <= chars.len() && cursor_pos > 0 {
-                    chars.remove(cursor_pos - 1);
-                    *field_value = chars.into_iter().collect();
-                    form_state.current_cursor_pos = cursor_pos - 1;
-                    *ideal_cursor_column = form_state.current_cursor_pos;
-                    form_state.has_unsaved_changes = true;
-                }
-            }
-            Ok("".to_string())
-        }
-        "insert_char" => {
-            // This could be expanded to allow configurable character insertion
-            // For now, it's a placeholder that would need additional parameters
-            Ok("Character insertion requires configuration".to_string())
-        }
-        "next_field" => {
-            form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "prev_field" => {
-            if form_state.current_field == 0 {
-                form_state.current_field = form_state.fields.len() - 1;
-            } else {
-                form_state.current_field = form_state.current_field.saturating_sub(1);
-            }
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = current_input.len();
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        // Fallback for unrecognized actions
-        _ => Ok(format!("Unknown action: {}", action)),
-    }
-}
-
-// Reuse these character and word navigation helper functions
-#[derive(PartialEq)]
-enum CharType {
-    Whitespace,
-    Alphanumeric,
-    Punctuation,
-}
-
-fn get_char_type(c: char) -> CharType {
-    if c.is_whitespace() {
-        CharType::Whitespace
-    } else if c.is_alphanumeric() {
-        CharType::Alphanumeric
-    } else {
-        CharType::Punctuation
-    }
-}
-
-fn find_next_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos >= chars.len() {
-        return current_pos;
-    }
-
-    let mut pos = current_pos;
-    let initial_type = get_char_type(chars[pos]);
-    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
-        pos += 1;
-    }
-
-    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-
-    if current_pos >= chars.len() - 1 {
-        return chars.len() - 1;
-    }
-
-    let mut pos = current_pos;
-
-    if get_char_type(chars[pos]) == CharType::Whitespace {
-        while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-            pos += 1;
-        }
-    } else {
-        let current_type = get_char_type(chars[pos]);
-        if pos + 1 < chars.len() && get_char_type(chars[pos + 1]) != current_type {
-            pos += 1;
-            while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-                pos += 1;
-            }
-        }
-    }
-
-    if pos >= chars.len() {
-        return chars.len() - 1;
-    }
-
-    let word_type = get_char_type(chars[pos]);
-    while pos + 1 < chars.len() && get_char_type(chars[pos + 1]) == word_type {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos == 0 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-    }
-
-    pos
-}
-
-fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos <= 1 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if pos > 0 && get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
-            pos -= 1;
-        }
-
-        if pos > 0 {
-            pos -= 1;
-            let prev_word_type = get_char_type(chars[pos]);
-            while pos > 0 && get_char_type(chars[pos - 1]) == prev_word_type {
-                pos -= 1;
-            }
-
-            while pos < chars.len() - 1 &&
-                  get_char_type(chars[pos + 1]) == prev_word_type {
-                pos += 1;
-            }
-        }
-    }
-
-    pos
-}

client/src/modes/canvas/read_only.rs

@@ -1,22 +1,20 @@
-// src/modes/handlers/read_only.rs
+// src/modes/canvas/read_only.rs
 
-use crossterm::event::{KeyEvent};
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::tui::terminal::grpc_client::GrpcClient;
-
-#[derive(PartialEq)]
-enum CharType {
-    Whitespace,
-    Alphanumeric,
-    Punctuation,
-}
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::auth::AuthState;
+use crate::state::pages::form::FormState;
+use crate::functions::modes::read_only::{auth_ro, form_ro};
+use crossterm::event::KeyEvent;
 
 pub async fn handle_read_only_event(
+    app_state: &crate::state::state::AppState,
     key: KeyEvent,
     config: &Config,
     form_state: &mut FormState,
+    auth_state: &mut AuthState,
     key_sequence_tracker: &mut KeySequenceTracker,
     current_position: &mut u64,
     total_count: u64,
@@ -25,7 +23,6 @@ pub async fn handle_read_only_event(
     edit_mode_cooldown: &mut bool,
     ideal_cursor_column: &mut usize,
 ) -> Result<(bool, String), Box<dyn std::error::Error>> {
-    // Check for entering Edit mode from Read-Only mode
     if config.is_enter_edit_mode_before(key.code, key.modifiers) {
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode".to_string();
@@ -33,426 +30,190 @@ pub async fn handle_read_only_event(
     }
 
     if config.is_enter_edit_mode_after(key.code, key.modifiers) {
-        let current_input = form_state.get_current_input();
-        if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
-            form_state.current_cursor_pos += 1;
-            *ideal_cursor_column = form_state.current_cursor_pos;
+        let (current_input, current_pos) = if app_state.ui.show_login {
+            (
+                auth_state.get_current_input(),
+                auth_state.current_cursor_pos(),
+            )
+        } else {
+            (
+                form_state.get_current_input(),
+                form_state.current_cursor_pos(),
+            )
+        };
+
+        if !current_input.is_empty() && current_pos < current_input.len() {
+            if app_state.ui.show_login {
+                auth_state.set_current_cursor_pos(current_pos + 1);
+                *ideal_cursor_column = auth_state.current_cursor_pos();
+            } else {
+                form_state.set_current_cursor_pos(current_pos + 1);
+                *ideal_cursor_column = form_state.current_cursor_pos();
+            }
         }
         *edit_mode_cooldown = true;
         *command_message = "Entering Edit mode (after cursor)".to_string();
         return Ok((false, command_message.clone()));
     }
 
-    // Handle Read-Only mode keybindings
+    const CONTEXT_ACTIONS_FORM: &[&str] = &[
+        "previous_entry",
+        "next_entry",
+    ];
+    const CONTEXT_ACTIONS_LOGIN: &[&str] = &[
+        "previous_entry",
+        "next_entry",
+    ];
+
     if key.modifiers.is_empty() {
         key_sequence_tracker.add_key(key.code);
         let sequence = key_sequence_tracker.get_sequence();
 
-        // Try to match the current sequence against Read-Only mode bindings
         if let Some(action) = config.matches_key_sequence_generalized(&sequence) {
-            let result = execute_action(
-                action,
-                form_state,
-                ideal_cursor_column,
-                key_sequence_tracker,
-                command_message,
-                current_position,
-                total_count,
-                grpc_client,
-            ).await?;
-            key_sequence_tracker.reset();
-            return Ok((false, result));
-        }
-
-        // Check if this might be a prefix of a longer sequence
-        if config.is_key_sequence_prefix(&sequence) {
-            return Ok((false, command_message.clone()));
-        }
-
-        // Since it's not part of a multi-key sequence, check for a direct action
-        if sequence.len() == 1 && !config.is_key_sequence_prefix(&sequence) {
-            if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
-                let result = execute_action(
+            let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
+                crate::tui::functions::form::handle_action(
+                    action,
+                    form_state,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
+                crate::tui::functions::login::handle_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_login {
+                auth_ro::execute_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
+            } else {
+                form_ro::execute_action(
                     action,
                     form_state,
                     ideal_cursor_column,
                     key_sequence_tracker,
                     command_message,
-                    current_position,
-                    total_count,
-                    grpc_client,
-                ).await?;
+                )
+                .await?
+            };
+            key_sequence_tracker.reset();
+            return Ok((false, result));
+        }
+
+        if config.is_key_sequence_prefix(&sequence) {
+            return Ok((false, command_message.clone()));
+        }
+
+        if sequence.len() == 1 && !config.is_key_sequence_prefix(&sequence) {
+            if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
+                let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
+                    crate::tui::functions::form::handle_action(
+                        action,
+                        form_state,
+                        grpc_client,
+                        current_position,
+                        total_count,
+                        ideal_cursor_column,
+                    )
+                    .await?
+                } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
+                    crate::tui::functions::login::handle_action(
+                        action,
+                        auth_state,
+                        ideal_cursor_column,
+                    )
+                    .await?
+                } else if app_state.ui.show_login {
+                    auth_ro::execute_action(
+                        action,
+                        auth_state,
+                        ideal_cursor_column,
+                        key_sequence_tracker,
+                        command_message,
+                    )
+                    .await?
+                } else {
+                    form_ro::execute_action(
+                        action,
+                        form_state,
+                        ideal_cursor_column,
+                        key_sequence_tracker,
+                        command_message,
+                    )
+                    .await?
+                };
                 key_sequence_tracker.reset();
                 return Ok((false, result));
             }
         }
+        key_sequence_tracker.reset();
     } else {
-        // If modifiers are pressed, check for direct key bindings
         key_sequence_tracker.reset();
 
         if let Some(action) = config.get_read_only_action_for_key(key.code, key.modifiers) {
-            let result = execute_action(
-                action,
-                form_state,
-                ideal_cursor_column,
-                key_sequence_tracker,
-                command_message,
-                current_position,
-                total_count,
-                grpc_client,
-            ).await?;
+            let result = if app_state.ui.show_form && CONTEXT_ACTIONS_FORM.contains(&action) {
+                crate::tui::functions::form::handle_action(
+                    action,
+                    form_state,
+                    grpc_client,
+                    current_position,
+                    total_count,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_login && CONTEXT_ACTIONS_LOGIN.contains(&action) {
+                crate::tui::functions::login::handle_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                )
+                .await?
+            } else if app_state.ui.show_login {
+                auth_ro::execute_action(
+                    action,
+                    auth_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
+            } else {
+                form_ro::execute_action(
+                    action,
+                    form_state,
+                    ideal_cursor_column,
+                    key_sequence_tracker,
+                    command_message,
+                )
+                .await?
+            };
             return Ok((false, result));
         }
     }
 
-    // Show a helpful message when no binding was found
     if !*edit_mode_cooldown {
         let default_key = "i".to_string();
-        let edit_key = config.keybindings.read_only.get("enter_edit_mode_before")
+        let edit_key = config
+            .keybindings
+            .read_only
+            .get("enter_edit_mode_before")
             .and_then(|keys| keys.first())
-            .unwrap_or(&default_key);
+            .map(|k| k.to_string())
+            .unwrap_or(default_key);
         *command_message = format!("Read-only mode - press {} to edit", edit_key);
     }
 
+    *edit_mode_cooldown = false;
+
     Ok((false, command_message.clone()))
 }
-
-async fn execute_action(
-    action: &str,
-    form_state: &mut FormState,
-    ideal_cursor_column: &mut usize,
-    key_sequence_tracker: &mut KeySequenceTracker,
-    command_message: &mut String,
-    current_position: &mut u64,
-    total_count: u64,
-    grpc_client: &mut GrpcClient,
-) -> Result<String, Box<dyn std::error::Error>> {
-    match action {
-        "previous_entry" => {
-            let new_position = current_position.saturating_sub(1);
-            if new_position >= 1 {
-                *current_position = new_position;
-                match grpc_client.get_adresar_by_position(*current_position).await {
-                    Ok(response) => {
-                        form_state.id = response.id;
-                        form_state.values = vec![
-                            response.firma, response.kz, response.drc,
-                            response.ulica, response.psc, response.mesto,
-                            response.stat, response.banka, response.ucet,
-                            response.skladm, response.ico, response.kontakt,
-                            response.telefon, response.skladu, response.fax,
-                        ];
-                        let current_input = form_state.get_current_input();
-                        let max_cursor_pos = if !current_input.is_empty() {
-                            current_input.len() - 1
-                        } else { 0 };
-                        form_state.current_cursor_pos = std::cmp::min(*ideal_cursor_column, max_cursor_pos);
-                        form_state.has_unsaved_changes = false;
-                        *command_message = format!("Loaded entry {}", *current_position);
-                    }
-                    Err(e) => {
-                        *command_message = format!("Error loading entry: {}", e);
-                    }
-                }
-                key_sequence_tracker.reset();
-            }
-            Ok(command_message.clone())
-        }
-        "next_entry" => {
-            if *current_position <= total_count {
-                *current_position += 1;
-                if *current_position <= total_count {
-                    match grpc_client.get_adresar_by_position(*current_position).await {
-                        Ok(response) => {
-                            form_state.id = response.id;
-                            form_state.values = vec![
-                                response.firma, response.kz, response.drc,
-                                response.ulica, response.psc, response.mesto,
-                                response.stat, response.banka, response.ucet,
-                                response.skladm, response.ico, response.kontakt,
-                                response.telefon, response.skladu, response.fax,
-                            ];
-                            let current_input = form_state.get_current_input();
-                            let max_cursor_pos = if !current_input.is_empty() {
-                                current_input.len() - 1
-                            } else { 0 };
-                            form_state.current_cursor_pos = std::cmp::min(*ideal_cursor_column, max_cursor_pos);
-                            form_state.has_unsaved_changes = false;
-                            *command_message = format!("Loaded entry {}", *current_position);
-                        }
-                        Err(e) => {
-                            *command_message = format!("Error loading entry: {}", e);
-                        }
-                    }
-                } else {
-                    form_state.reset_to_empty();
-                    form_state.current_field = 0;
-                    form_state.current_cursor_pos = 0;
-                    *ideal_cursor_column = 0;
-                    *command_message = "New entry mode".to_string();
-                }
-                key_sequence_tracker.reset();
-            }
-            Ok(command_message.clone())
-        }
-        "exit_edit_mode" => {
-            key_sequence_tracker.reset();
-            command_message.clear();
-            Ok("".to_string())
-        }
-        "move_left" => {
-            let current_pos = form_state.current_cursor_pos;
-            form_state.current_cursor_pos = current_pos.saturating_sub(1);
-            *ideal_cursor_column = form_state.current_cursor_pos;
-            Ok("".to_string())
-        }
-        "move_right" => {
-            let current_input = form_state.get_current_input();
-            let current_pos = form_state.current_cursor_pos;
-            if !current_input.is_empty() && current_pos < current_input.len() - 1 {
-                form_state.current_cursor_pos += 1;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_up" => {
-            // Change field first
-            if form_state.current_field == 0 {
-                form_state.current_field = form_state.fields.len() - 1;
-            } else {
-                form_state.current_field = form_state.current_field.saturating_sub(1);
-            }
-
-            // Get current input AFTER changing field
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1
-            } else {
-                0
-            };
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "move_down" => {
-            // Change field first
-            form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-
-            // Get current input AFTER changing field
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1
-            } else {
-                0
-            };
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("".to_string())
-        }
-        "move_word_next" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_next_word_start(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos.min(current_input.len().saturating_sub(1));
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_word_end(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos.min(current_input.len().saturating_sub(1));
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_prev" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_start(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_word_end_prev" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                let new_pos = find_prev_word_end(current_input, form_state.current_cursor_pos);
-                form_state.current_cursor_pos = new_pos;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("Moved to previous word end".to_string())
-        }
-        "move_line_start" => {
-            form_state.current_cursor_pos = 0;
-            *ideal_cursor_column = form_state.current_cursor_pos;
-            Ok("".to_string())
-        }
-        "move_line_end" => {
-            let current_input = form_state.get_current_input();
-            if !current_input.is_empty() {
-                form_state.current_cursor_pos = current_input.len() - 1;
-                *ideal_cursor_column = form_state.current_cursor_pos;
-            }
-            Ok("".to_string())
-        }
-        "move_first_line" => {
-            // Change field first
-            form_state.current_field = 0;
-
-            // Get current input AFTER changing field
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1
-            } else {
-                current_input.len()
-            };
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("Moved to first line".to_string())
-        }
-        "move_last_line" => {
-            // Change field first
-            form_state.current_field = form_state.fields.len() - 1;
-
-            // Get current input AFTER changing field
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1
-            } else {
-                current_input.len()
-            };
-            form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
-            Ok("Moved to last line".to_string())
-        }
-        _ => Ok(format!("Unknown action: {}", action)),
-    }
-}
-
-fn get_char_type(c: char) -> CharType {
-    if c.is_whitespace() {
-        CharType::Whitespace
-    } else if c.is_alphanumeric() {
-        CharType::Alphanumeric
-    } else {
-        CharType::Punctuation
-    }
-}
-
-fn find_next_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos >= chars.len() {
-        return current_pos;
-    }
-
-    let mut pos = current_pos;
-    let initial_type = get_char_type(chars[pos]);
-    while pos < chars.len() && get_char_type(chars[pos]) == initial_type {
-        pos += 1;
-    }
-
-    while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() {
-        return 0;
-    }
-
-    if current_pos >= chars.len() - 1 {
-        return chars.len() - 1;
-    }
-
-    let mut pos = current_pos;
-
-    if get_char_type(chars[pos]) == CharType::Whitespace {
-        while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-            pos += 1;
-        }
-    } else {
-        let current_type = get_char_type(chars[pos]);
-        if pos + 1 < chars.len() && get_char_type(chars[pos + 1]) != current_type {
-            pos += 1;
-            while pos < chars.len() && get_char_type(chars[pos]) == CharType::Whitespace {
-                pos += 1;
-            }
-        }
-    }
-
-    if pos >= chars.len() {
-        return chars.len() - 1;
-    }
-
-    let word_type = get_char_type(chars[pos]);
-    while pos + 1 < chars.len() && get_char_type(chars[pos + 1]) == word_type {
-        pos += 1;
-    }
-
-    pos
-}
-
-fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos == 0 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-    }
-
-    pos
-}
-
-fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
-    let chars: Vec<char> = text.chars().collect();
-    if chars.is_empty() || current_pos <= 1 {
-        return 0;
-    }
-
-    let mut pos = current_pos.saturating_sub(1);
-
-    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
-        pos -= 1;
-    }
-
-    if pos > 0 && get_char_type(chars[pos]) != CharType::Whitespace {
-        let word_type = get_char_type(chars[pos]);
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
-            pos -= 1;
-        }
-
-        while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
-            pos -= 1;
-        }
-
-        if pos > 0 {
-            pos -= 1;
-            let prev_word_type = get_char_type(chars[pos]);
-            while pos > 0 && get_char_type(chars[pos - 1]) == prev_word_type {
-                pos -= 1;
-            }
-
-            while pos < chars.len() - 1 &&
-                  get_char_type(chars[pos + 1]) == prev_word_type {
-                pos += 1;
-            }
-        }
-    }
-
-    pos
-}

client/src/modes/common.rs

@@ -0,0 +1,6 @@
+// src/client/modes/common.rs
+pub mod command_mode;
+pub mod highlight;
+pub mod commands;
+
+pub use commands::*;

client/src/modes/common/command_mode.rs

@@ -1,12 +1,12 @@
 // src/modes/handlers/command_mode.rs
 
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
-use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
-use crate::modes::{
-    canvas::{common},
-};
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::form::FormState;
+use crate::modes::common::commands::CommandHandler;
+use crate::tui::terminal::core::TerminalCore;
+use crate::tui::functions::common::form::{save, revert};
 
 pub async fn handle_command_event(
     key: KeyEvent,
@@ -15,7 +15,8 @@ pub async fn handle_command_event(
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
+    command_handler: &mut CommandHandler,
+    terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<(bool, String, bool), Box<dyn std::error::Error>> {
@@ -37,7 +38,8 @@ pub async fn handle_command_event(
             command_input,
             command_message,
             grpc_client,
-            is_saved,
+            command_handler,
+            terminal,
             current_position,
             total_count,
         ).await;
@@ -68,7 +70,8 @@ async fn process_command(
     command_input: &mut String,
     command_message: &mut String,
     grpc_client: &mut GrpcClient,
-    is_saved: &mut bool,
+    command_handler: &mut CommandHandler,
+    terminal: &mut TerminalCore,
     current_position: &mut u64,
     total_count: u64,
 ) -> Result<(bool, String, bool), Box<dyn std::error::Error>> {
@@ -84,34 +87,26 @@ async fn process_command(
         .unwrap_or("unknown");
 
     match action {
+        "force_quit" | "save_and_quit" | "quit" => {
+            let (should_exit, message) = command_handler
+                .handle_command(action, terminal)
+                .await?;
+            command_input.clear();
+            Ok((should_exit, message, true))
+        },
         "save" => {
-            let message = common::save(
+            let message = save(
                 form_state,
                 grpc_client,
-                is_saved,
+                &mut command_handler.is_saved,
                 current_position,
                 total_count,
             ).await?;
             command_input.clear();
             return Ok((false, message, true));
         },
-        "force_quit" => {
-            let (should_exit, message) = common::force_quit();
-            command_input.clear();
-            return Ok((should_exit, message, true));
-        },
-        "save_and_quit" => {
-            let (should_exit, message) = common::save_and_quit(
-                form_state,
-                grpc_client,
-                current_position,
-                total_count,
-            ).await?;
-            command_input.clear();
-            return Ok((should_exit, message, true));
-        },
         "revert" => {
-            let message = common::revert(
+            let message = revert(
                 form_state,
                 grpc_client,
                 current_position,

client/src/modes/common/commands.rs

@@ -1,9 +1,8 @@
-// src/tui/terminal/commands.rs
-
+// src/tui/controls/commands.rs
 use crate::tui::terminal::core::TerminalCore;
 
 pub struct CommandHandler {
-    is_saved: bool,
+    pub is_saved: bool,
 }
 
 impl CommandHandler {
@@ -24,7 +23,10 @@ impl CommandHandler {
         }
     }
 
-    async fn handle_quit(&self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_quit(
+        &self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         if self.is_saved {
             terminal.cleanup()?;
             Ok((true, "Exiting.".into()))
@@ -33,12 +35,18 @@ impl CommandHandler {
         }
     }
 
-    async fn handle_force_quit(&self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_force_quit(
+        &self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         terminal.cleanup()?;
         Ok((true, "Force exiting without saving.".into()))
     }
 
-    async fn handle_save_quit(&mut self, terminal: &mut TerminalCore) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    async fn handle_save_quit(
+        &mut self,
+        terminal: &mut TerminalCore,
+    ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         self.is_saved = true;
         terminal.cleanup()?;
         Ok((true, "State saved. Exiting.".into()))

client/src/modes/general/navigation.rs

@@ -0,0 +1,156 @@
+// src/modes/general/navigation.rs
+
+use crossterm::event::KeyEvent;
+use crate::config::binds::config::Config;
+use crate::state::state::AppState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::{intro, admin};
+
+pub async fn handle_navigation_event(
+    key: KeyEvent,
+    config: &Config,
+    form_state: &mut FormState,
+    app_state: &mut AppState,
+    command_mode: &mut bool,
+    command_input: &mut String,
+    command_message: &mut String,
+) -> Result<(bool, String), Box<dyn std::error::Error>> {
+    if let Some(action) = config.get_general_action(key.code, key.modifiers) {
+        match action {
+            "move_up" => {
+                move_up(app_state);
+                return Ok((false, String::new()));
+            }
+            "move_down" => {
+                move_down(app_state);
+                return Ok((false, String::new()));
+            }
+            "next_option" => {
+                next_option(app_state); // Intro has 2 options
+                return Ok((false, String::new()));
+            }
+            "previous_option" => {
+                previous_option(app_state);
+                return Ok((false, String::new()));
+            }
+            "select" => {
+                select(app_state);
+                return Ok((false, "Selected".to_string()));
+            }
+            "toggle_sidebar" => {
+                toggle_sidebar(app_state);
+                return Ok((false, format!("Sidebar {}",
+                    if app_state.ui.show_sidebar { "shown" } else { "hidden" }
+                )));
+            }
+            "next_field" => {
+                next_field(form_state);
+                return Ok((false, String::new()));
+            }
+            "prev_field" => {
+                prev_field(form_state);
+                return Ok((false, String::new()));
+            }
+            "enter_command_mode" => {
+                handle_enter_command_mode(command_mode, command_input, command_message);
+                return Ok((false, String::new()));
+            }
+            _ => {}
+        }
+    }
+    Ok((false, String::new()))
+}
+
+pub fn move_up(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.previous_option();
+    } else if app_state.ui.show_admin {
+        // Assuming profile_tree.profiles is the list we're navigating
+        let profile_count = app_state.profile_tree.profiles.len();
+        if profile_count == 0 {
+            return;
+        }
+
+        // Use general state for tracking selection in admin panel
+        if app_state.general.selected_item == 0 {
+            app_state.general.selected_item = profile_count - 1;
+        } else {
+            app_state.general.selected_item = app_state.general.selected_item.saturating_sub(1);
+        }
+    }
+}
+
+pub fn move_down(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.next_option();
+    } else if app_state.ui.show_admin {
+        // Assuming profile_tree.profiles is the list we're navigating
+        let profile_count = app_state.profile_tree.profiles.len();
+        if profile_count == 0 {
+            return;
+        }
+
+        app_state.general.selected_item = (app_state.general.selected_item + 1) % profile_count;
+    }
+}
+
+pub fn next_option(app_state: &mut AppState) {  // Remove option_count parameter
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.next_option();
+    } else {
+        // Get option count from state instead of parameter
+        let option_count = app_state.profile_tree.profiles.len();
+        app_state.general.current_option = (app_state.general.current_option + 1) % option_count;
+    }
+}
+
+pub fn previous_option(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        app_state.ui.intro_state.previous_option();
+    } else {
+        let option_count = app_state.profile_tree.profiles.len();
+        app_state.general.current_option = if app_state.general.current_option == 0 {
+            option_count.saturating_sub(1)  // Wrap to last option
+        } else {
+            app_state.general.current_option - 1
+        };
+    }
+}
+
+pub fn select(app_state: &mut AppState) {
+    if app_state.ui.show_intro {
+        intro::handle_intro_selection(app_state);
+    } else if app_state.ui.show_admin {
+        admin::handle_admin_selection(app_state);
+    }
+}
+
+pub fn toggle_sidebar(app_state: &mut AppState) {
+    app_state.ui.show_sidebar = !app_state.ui.show_sidebar;
+}
+
+pub fn next_field(form_state: &mut FormState) {
+    if !form_state.fields.is_empty() {
+        form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
+    }
+}
+
+pub fn prev_field(form_state: &mut FormState) {
+    if !form_state.fields.is_empty() {
+        if form_state.current_field == 0 {
+            form_state.current_field = form_state.fields.len() - 1;
+        } else {
+            form_state.current_field -= 1;
+        }
+    }
+}
+
+pub fn handle_enter_command_mode(
+    command_mode: &mut bool,
+    command_input: &mut String,
+    command_message: &mut String
+) {
+    *command_mode = true;
+    command_input.clear();
+    command_message.clear();
+}

client/src/modes/handlers.rs

@@ -1,3 +1,3 @@
 // src/client/modes/handlers.rs
 pub mod event;
-pub mod command_mode;
+pub mod mode_manager;

client/src/modes/handlers/event.rs

@@ -3,17 +3,22 @@ use crossterm::event::Event;
 use crossterm::cursor::SetCursorStyle;
 use crate::tui::terminal::{
     core::TerminalCore,
-    grpc_client::GrpcClient,
-    commands::CommandHandler,
 };
+use crate::services::grpc_client::GrpcClient;
+use crate::services::auth::AuthClient;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::form::FormState;
+use crate::state::pages::form::FormState;
+use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::modes::{
-    handlers::{command_mode},
-    canvas::{edit, read_only, common},
+    common::{command_mode},
+    canvas::{edit, read_only, common_mode},
+    general::navigation,
 };
 use crate::config::binds::key_sequences::KeySequenceTracker;
+use crate::modes::handlers::mode_manager::{ModeManager, AppMode};
 
 pub struct EventHandler {
     pub command_mode: bool,
@@ -23,11 +28,13 @@ pub struct EventHandler {
     pub edit_mode_cooldown: bool,
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
+    // pub auth_state: AuthState, // Removed
+    pub auth_client: AuthClient,
 }
 
 impl EventHandler {
-    pub fn new() -> Self {
-        EventHandler {
+    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
+        Ok(EventHandler {
             command_mode: false,
             command_input: String::new(),
             command_message: String::new(),
@@ -35,7 +42,9 @@ impl EventHandler {
             edit_mode_cooldown: false,
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
-        }
+            // auth_state: AuthState::new(), // Removed
+            auth_client: AuthClient::new().await?,
+        })
     }
 
     pub async fn handle_event(
@@ -46,106 +55,141 @@ impl EventHandler {
         grpc_client: &mut GrpcClient,
         command_handler: &mut CommandHandler,
         form_state: &mut FormState,
+        auth_state: &mut AuthState, // Added
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
+        // Determine current mode based on app state and event handler state
+        let current_mode = ModeManager::derive_mode(app_state, self);
+        app_state.update_mode(current_mode);
+
         if let Event::Key(key) = event {
             let key_code = key.code;
             let modifiers = key.modifiers;
 
-            // Handle general mode (replaces intro and admin)
-            if app_state.ui.show_intro || app_state.ui.show_admin {
-                if let Some(action) = config.get_general_action(key_code, modifiers) {
-                    match action {
-                        "move_up" => {
-                            app_state.general.selected_item = app_state.general.selected_item.saturating_sub(1);
-                            return Ok((false, String::new()));
-                        }
-                        "move_down" => {
-                            app_state.general.selected_item = app_state.general.selected_item.saturating_add(1);
-                            return Ok((false, String::new()));
-                        }
-                        "next_option" => {
-                            app_state.general.current_option = app_state.general.current_option.saturating_add(1);
-                            return Ok((false, String::new()));
-                        }
-                        "previous_option" => {
-                            app_state.general.current_option = app_state.general.current_option.saturating_sub(1);
-                            return Ok((false, String::new()));
-                        }
-                        "select" => {
-                            if app_state.ui.show_intro {
-                                app_state.ui.show_intro = false;
-                            } else if app_state.ui.show_admin {
-                                app_state.ui.show_admin = false;
-                            }
-                            return Ok((false, "Selected".to_string()));
-                        }
-                        "toggle_sidebar" => {
-                            app_state.ui.show_sidebar = !app_state.ui.show_sidebar;
-                            return Ok((false, format!("Sidebar {}",
-                                if app_state.ui.show_sidebar { "shown" } else { "hidden" }
-                            )));
-                        }
-                        "next_field" => {
-                            // Increment field navigation
-                            if form_state.fields.len() > 0 {
-                                form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
-                            }
-                            return Ok((false, String::new()));
-                        }
-                        "prev_field" => {
-                            // Decrement field navigation
-                            if form_state.fields.len() > 0 {
-                                form_state.current_field = if form_state.current_field == 0 {
-                                    form_state.fields.len() - 1
-                                } else {
-                                    form_state.current_field - 1
-                                };
-                            }
-                            return Ok((false, String::new()));
-                        }
-                        "enter_command_mode" => {
-                            self.command_mode = true;
-                            self.command_input.clear();
-                            self.command_message.clear();
-                            return Ok((false, String::new()));
-                        }
-                        _ => {}
-                    }
-                }
-
-                if let Some("enter_command_mode") = config.get_action_for_key_in_mode(
-                    &config.keybindings.global,
-                    key_code,
-                    modifiers
-                ) {
-                    self.command_mode = true;
-                    return Ok((false, String::new()));
-                }
-                
-                // If no general action matched, return to stay in general mode
-                return Ok((false, String::new()));
-            }
-            
-            // The rest of the function handles other modes as before
-            // Handle toggling sidebar which is common across modes
-            if UiStateHandler::toggle_sidebar(
-                &mut app_state.ui,
-                config,
-                key_code,
-                modifiers,
-            ) {
+            // Handle common actions across all modes
+            if UiStateHandler::toggle_sidebar(&mut app_state.ui, config, key_code, modifiers) {
                 return Ok((false, format!("Sidebar {}",
                     if app_state.ui.show_sidebar { "shown" } else { "hidden" }
                 )));
             }
 
-                // Handle edit mode first to allow normal character input
-                if self.is_edit_mode {
+            // Mode-specific handling
+            match current_mode {
+                AppMode::General => {
+                    return navigation::handle_navigation_event(
+                        key,
+                        config,
+                        form_state,
+                        app_state,
+                        &mut self.command_mode,
+                        &mut self.command_input,
+                        &mut self.command_message,
+                    ).await;
+                },
+
+                AppMode::ReadOnly => {
+                    // Check for mode transitions first
+                    if config.is_enter_edit_mode_before(key_code, modifiers) &&
+                       ModeManager::can_enter_edit_mode(current_mode) {
+                        self.is_edit_mode = true;
+                        self.edit_mode_cooldown = true;
+                        self.command_message = "Edit mode".to_string();
+                        terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                        return Ok((false, self.command_message.clone()));
+                    }
+
+                    if config.is_enter_edit_mode_after(key_code, modifiers) &&
+                       ModeManager::can_enter_edit_mode(current_mode) {
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos < current_input.len() {
+                             if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
+                        }
+                        self.is_edit_mode = true;
+                        self.edit_mode_cooldown = true;
+                        self.command_message = "Edit mode (after cursor)".to_string();
+                        terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                        return Ok((false, self.command_message.clone()));
+                    }
+
+                    // Check for entering command mode
+                    if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
+                        if action == "enter_command_mode" && ModeManager::can_enter_command_mode(current_mode) {
+                            self.command_mode = true;
+                            self.command_input.clear();
+                            self.command_message.clear();
+                            return Ok((false, String::new()));
+                        }
+                    }
+
+                    // Check for core application actions (save, quit, etc.)
+                    if let Some(action) = config.get_action_for_key_in_mode(
+                        &config.keybindings.common,
+                        key_code,
+                        modifiers
+                    ) {
+                        match action {
+                            "save" | "force_quit" | "save_and_quit" | "revert" => {
+                                return common_mode::handle_core_action(
+                                    action,
+                                    form_state,
+                                    auth_state, // Changed
+                                    grpc_client,
+                                    &mut self.auth_client,
+                                    terminal,
+                                    app_state,
+                                    current_position,
+                                    total_count,
+                                ).await;
+                            },
+                            _ => {}
+                        }
+                    }
+
+                    // Let read_only mode handle its own actions
+                    return read_only::handle_read_only_event(
+                        &app_state,
+                        key,
+                        config,
+                        form_state,
+                        auth_state, // Changed
+                        &mut self.key_sequence_tracker,
+                        current_position,
+                        total_count,
+                        grpc_client,
+                        &mut self.command_message,
+                        &mut self.edit_mode_cooldown,
+                        &mut self.ideal_cursor_column,
+                    ).await;
+                },
+
+                AppMode::Edit => {
+                    // Check for exiting edit mode
                     if config.is_exit_edit_mode(key_code, modifiers) {
-                        if form_state.has_unsaved_changes {
+                        let has_changes = if app_state.ui.show_login {
+                            auth_state.has_unsaved_changes()
+                        } else {
+                            form_state.has_unsaved_changes()
+                        };
+
+                        if has_changes {
                             self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
                             return Ok((false, self.command_message.clone()));
                         }
@@ -154,18 +198,61 @@ impl EventHandler {
                         self.command_message = "Read-only mode".to_string();
                         terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
 
-                        let current_input = form_state.get_current_input();
-                        if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
-                            form_state.current_cursor_pos = current_input.len() - 1;
-                            self.ideal_cursor_column = form_state.current_cursor_pos;
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos >= current_input.len() {
+                            let new_pos = current_input.len() - 1;
+                            if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
                         }
                         return Ok((false, self.command_message.clone()));
                     }
 
-                    let result = edit::handle_edit_event_internal(
+                    // Check for core application actions (save, quit, etc.)
+                    if let Some(action) = config.get_action_for_key_in_mode(
+                        &config.keybindings.common,
+                        key_code,
+                        modifiers
+                    ) {
+                        match action {
+                            "save" | "force_quit" | "save_and_quit" | "revert" => {
+                                return common_mode::handle_core_action(
+                                    action,
+                                    form_state,
+                                    auth_state, // Changed
+                                    grpc_client,
+                                    &mut self.auth_client,
+                                    terminal,
+                                    app_state,
+                                    current_position,
+                                    total_count,
+                                ).await;
+                            },
+                            _ => {}
+                        }
+                    }
+
+                    // Let edit mode handle its own actions
+                    let result = edit::handle_edit_event(
+                        app_state.ui.show_login,
                         key,
                         config,
                         form_state,
+                        auth_state, // Changed
                         &mut self.ideal_cursor_column,
                         &mut self.command_message,
                         &mut app_state.ui.is_saved,
@@ -176,64 +263,9 @@ impl EventHandler {
 
                     self.key_sequence_tracker.reset();
                     return Ok((false, result));
-                }
+                },
 
-                // Global command mode activation
-                let context_action = config.get_action_for_current_context(
-                    self.is_edit_mode,
-                    self.command_mode,
-                    key_code,
-                    modifiers
-                );
-
-                // Block command mode entry from edit mode
-                if let Some("enter_command_mode") = context_action {
-                    if !self.is_edit_mode {
-                        self.command_mode = true;
-                        self.command_input.clear();
-                        self.command_message.clear();
-                        return Ok((false, String::new()));
-                    }
-                }
-
-                if let Some(action) = config.get_action_for_key_in_mode(
-                    &config.keybindings.common,
-                    key_code,
-                    modifiers
-                ) {
-                    match action {
-                        "save" => {
-                            let message = common::save(
-                                form_state,
-                                grpc_client,
-                                &mut app_state.ui.is_saved,
-                                current_position,
-                                total_count,
-                            ).await?;
-                            return Ok((false, message));
-                        },
-                        "force_quit" => {
-                            let (should_exit, message) = command_handler.handle_command("force_quit", terminal).await?;
-                            return Ok((should_exit, message));
-                        },
-                        "save_and_quit" => {
-                            let (should_exit, message) = command_handler.handle_command("save_and_quit", terminal).await?;
-                            return Ok((should_exit, message));
-                        },
-                        "revert" => {
-                            let message = common::revert(
-                                form_state,
-                                grpc_client,
-                                current_position,
-                                total_count,
-                            ).await?;
-                            return Ok((false, message));
-                        },
-                        _ => {}
-                    }
-                }
-
-                if self.command_mode {
+                AppMode::Command => {
                     let (should_exit, message, exit_command_mode) = command_mode::handle_command_event(
                         key,
                         config,
@@ -241,7 +273,8 @@ impl EventHandler {
                         &mut self.command_input,
                         &mut self.command_message,
                         grpc_client,
-                        &mut app_state.ui.is_saved,
+                        command_handler,
+                        terminal,
                         current_position,
                         total_count,
                     ).await?;
@@ -252,52 +285,12 @@ impl EventHandler {
 
                     return Ok((should_exit, message));
                 }
-
-                if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
-                    if action == "enter_command_mode" {
-                        self.command_mode = true;
-                        self.command_input.clear();
-                        self.command_message.clear();
-                        return Ok((false, String::new()));
-                    }
-                }
-
-                if config.is_enter_edit_mode_before(key_code, modifiers) {
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
-
-                if config.is_enter_edit_mode_after(key_code, modifiers) {
-                    let current_input = form_state.get_current_input();
-                    if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
-                        form_state.current_cursor_pos += 1;
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
-                    }
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode (after cursor)".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
-
-                return read_only::handle_read_only_event(
-                    key,
-                    config,
-                    form_state,
-                    &mut self.key_sequence_tracker,
-                    current_position,
-                    total_count,
-                    grpc_client,
-                    &mut self.command_message,
-                    &mut self.edit_mode_cooldown,
-                    &mut self.ideal_cursor_column,
-                ).await;
             }
+        }
 
+        // Non-key events or if no specific handler was matched
         self.edit_mode_cooldown = false;
         Ok((false, self.command_message.clone()))
     }
 }
+

client/src/modes/handlers/mode_manager.rs

@@ -0,0 +1,51 @@
+// src/modes/handlers/mode_manager.rs
+use crate::state::state::AppState;
+use crate::modes::handlers::event::EventHandler;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum AppMode {
+    General,   // For intro and admin screens
+    ReadOnly,  // Canvas read-only mode
+    Edit,      // Canvas edit mode
+    Command,   // Command mode overlay
+}
+
+pub struct ModeManager;
+
+impl ModeManager {
+    // Determine current mode based on app state
+    pub fn derive_mode(app_state: &AppState, event_handler: &EventHandler) -> AppMode {
+        if event_handler.command_mode {
+            return AppMode::Command;
+        }
+
+        if app_state.ui.show_login {
+            if event_handler.is_edit_mode {
+                AppMode::Edit
+            } else {
+                AppMode::ReadOnly
+            }
+        } else if app_state.ui.show_form {
+            if event_handler.is_edit_mode {
+                AppMode::Edit
+            } else {
+                AppMode::ReadOnly
+            }
+        } else {
+            AppMode::General
+        }
+    }
+
+    // Mode transition rules
+    pub fn can_enter_command_mode(current_mode: AppMode) -> bool {
+        !matches!(current_mode, AppMode::Edit)  // Can't enter from Edit mode
+    }
+    
+    pub fn can_enter_edit_mode(current_mode: AppMode) -> bool {
+        matches!(current_mode, AppMode::ReadOnly)  // Only from ReadOnly
+    }
+    
+    pub fn can_enter_read_only_mode(current_mode: AppMode) -> bool {
+        matches!(current_mode, AppMode::Edit | AppMode::Command)
+    }
+}

client/src/modes/mod.rs

@@ -2,7 +2,9 @@
 pub mod handlers;
 pub mod canvas;
 pub mod general;
+pub mod common;
 
 pub use handlers::*;
 pub use canvas::*;
 pub use general::*;
+pub use common::*;

client/src/services/auth.rs

@@ -0,0 +1,23 @@
+// src/services/auth.rs
+use tonic::transport::Channel;
+use common::proto::multieko2::auth::{
+    auth_service_client::AuthServiceClient,
+    LoginRequest, LoginResponse
+};
+
+pub struct AuthClient {
+    client: AuthServiceClient<Channel>,
+}
+
+impl AuthClient {
+    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
+        let client = AuthServiceClient::connect("http://[::1]:50051").await?;
+        Ok(Self { client })
+    }
+
+    pub async fn login(&mut self, identifier: String, password: String) -> Result<LoginResponse, Box<dyn std::error::Error>> {
+        let request = tonic::Request::new(LoginRequest { identifier, password });
+        let response = self.client.login(request).await?.into_inner();
+        Ok(response)
+    }
+}

client/src/services/grpc_client.rs

@@ -1,4 +1,4 @@
-// src/tui/terminal/grpc_client.rs
+// src/services/grpc_client.rs
 
 use tonic::transport::Channel;
 use common::proto::multieko2::adresar::adresar_client::AdresarClient;
@@ -11,6 +11,7 @@ use common::proto::multieko2::table_definition::{
     ProfileTreeResponse
 };
 
+#[derive(Clone)]
 pub struct GrpcClient {
     adresar_client: AdresarClient<Channel>,
     table_structure_client: TableStructureServiceClient<Channel>,

client/src/services/mod.rs

@@ -0,0 +1,9 @@
+// services/mod.rs
+
+pub mod grpc_client;
+pub mod auth;
+pub mod ui_service;
+
+pub use grpc_client::*;
+pub use ui_service::*;
+pub use auth::*;

client/src/services/ui_service.rs

@@ -0,0 +1,89 @@
+// src/services/ui_service.rs
+
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::form::FormState;
+use crate::state::state::AppState;
+
+pub struct UiService;
+
+impl UiService {
+    pub async fn initialize_app_state(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+    ) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+        // Fetch profile tree
+        let profile_tree = grpc_client.get_profile_tree().await?;
+        app_state.profile_tree = profile_tree;
+
+        // Fetch table structure
+        let table_structure = grpc_client.get_table_structure().await?;
+
+        // Extract the column names from the response
+        let column_names: Vec<String> = table_structure
+            .columns
+            .iter()
+            .map(|col| col.name.clone())
+            .collect();
+
+        Ok(column_names)
+    }
+
+    pub async fn initialize_adresar_count(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let total_count = grpc_client.get_adresar_count().await?;
+        app_state.update_total_count(total_count);
+        app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
+        Ok(())
+    }
+
+    pub async fn update_adresar_count(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let total_count = grpc_client.get_adresar_count().await?;
+        app_state.update_total_count(total_count);
+        Ok(())
+    }
+
+    pub async fn load_adresar_by_position(
+        grpc_client: &mut GrpcClient,
+        app_state: &mut AppState,
+        form_state: &mut FormState,
+        position: u64,
+    ) -> Result<String, Box<dyn std::error::Error>> {
+        match grpc_client.get_adresar_by_position(position).await {
+            Ok(response) => {
+                // Set the ID properly
+                form_state.id = response.id;
+
+                // Update form values dynamically
+                form_state.values = vec![
+                    response.firma,
+                    response.kz,
+                    response.drc,
+                    response.ulica,
+                    response.psc,
+                    response.mesto,
+                    response.stat,
+                    response.banka,
+                    response.ucet,
+                    response.skladm,
+                    response.ico,
+                    response.kontakt,
+                    response.telefon,
+                    response.skladu,
+                    response.fax,
+                ];
+
+                form_state.has_unsaved_changes = false;
+                Ok(format!("Loaded entry {}", position))
+            }
+            Err(e) => {
+                Ok(format!("Error loading entry: {}", e))
+            }
+        }
+    }
+}
+

client/src/state/canvas_state.rs

@@ -0,0 +1,17 @@
+// src/state/canvas_state.rs
+
+use crate::state::pages::form::FormState;
+
+pub trait CanvasState {
+    fn current_field(&self) -> usize;
+    fn current_cursor_pos(&self) -> usize;
+    fn has_unsaved_changes(&self) -> bool;
+    fn inputs(&self) -> Vec<&String>;
+    fn get_current_input(&self) -> &str;
+    fn get_current_input_mut(&mut self) -> &mut String;
+    fn fields(&self) -> Vec<&str>;
+
+    fn set_current_field(&mut self, index: usize);
+    fn set_current_cursor_pos(&mut self, pos: usize);
+    fn set_has_unsaved_changes(&mut self, changed: bool);
+}

client/src/state/mod.rs

@@ -1,2 +1,4 @@
 // src/state/mod.rs
 pub mod state;
+pub mod pages;
+pub mod canvas_state;

client/src/state/pages.rs

@@ -0,0 +1,4 @@
+// src/state/pages.rs
+
+pub mod form;
+pub mod auth;

client/src/state/pages/auth.rs

@@ -0,0 +1,104 @@
+// src/state/pages/auth.rs
+use crate::state::canvas_state::CanvasState;
+
+#[derive(Default)]
+pub struct AuthState {
+    pub return_selected: bool,
+    pub username: String,
+    pub password: String,
+    pub error_message: Option<String>,
+    pub current_field: usize,
+    pub current_cursor_pos: usize,
+    pub auth_token: Option<String>,
+    pub user_id: Option<String>,
+    pub role: Option<String>,
+    pub has_unsaved_changes: bool,
+}
+
+impl AuthState {
+    pub fn new() -> Self {
+        Self {
+            return_selected: false,
+            username: String::new(),
+            password: String::new(),
+            error_message: None,
+            current_field: 0,
+            current_cursor_pos: 0,
+            auth_token: None,
+            user_id: None,
+            role: None,
+            has_unsaved_changes: false,
+        }
+    }
+}
+
+impl CanvasState for AuthState {
+    fn current_field(&self) -> usize {
+        self.current_field
+    }
+
+    fn current_cursor_pos(&self) -> usize {
+        let len = match self.current_field {
+            0 => self.username.len(),
+            1 => self.password.len(),
+            _ => 0,
+        };
+        self.current_cursor_pos.min(len)
+    }
+
+    fn has_unsaved_changes(&self) -> bool {
+        self.has_unsaved_changes
+    }
+
+    fn inputs(&self) -> Vec<&String> {
+        vec![&self.username, &self.password]
+    }
+
+    fn get_current_input(&self) -> &str {
+        match self.current_field {
+            0 => &self.username,
+            1 => &self.password,
+            _ => "",
+        }
+    }
+
+    fn get_current_input_mut(&mut self) -> &mut String {
+        match self.current_field {
+            0 => &mut self.username,
+            1 => &mut self.password,
+            _ => panic!("Invalid current_field index in AuthState"),
+        }
+    }
+
+    fn fields(&self) -> Vec<&str> {
+        vec!["Username/Email", "Password"]
+    }
+
+    fn set_current_field(&mut self, index: usize) {
+        if index < 2 { // AuthState only has 2 fields
+            self.current_field = index;
+            // IMPORTANT: Clamp cursor position to the length of the NEW field
+            let len = match self.current_field {
+               0 => self.username.len(),
+               1 => self.password.len(),
+               _ => 0,
+            };
+            self.current_cursor_pos = self.current_cursor_pos.min(len);
+        }
+    }
+
+    fn set_current_cursor_pos(&mut self, pos: usize) {
+        let len = match self.current_field {
+           0 => self.username.len(),
+           1 => self.password.len(),
+           _ => 0,
+        };
+        // Ensure stored position is always valid
+        self.current_cursor_pos = pos.min(len);
+    }
+
+    fn set_has_unsaved_changes(&mut self, changed: bool) {
+        // Allow the generic handler to signal changes
+        self.has_unsaved_changes = changed;
+    }
+}

client/src/state/pages/form.rs

@@ -1,7 +1,8 @@
-// src/client/ui/handlers/form.rs
+// src/state/pages/form.rs
 use crate::config::colors::themes::Theme;
 use ratatui::layout::Rect;
 use ratatui::Frame;
+use crate::state::canvas_state::CanvasState;
 
 pub struct FormState {
     pub id: i64,
@@ -38,7 +39,7 @@ impl FormState {
         let fields: Vec<&str> = self.fields.iter().map(|s| s.as_str()).collect();
         let values: Vec<&String> = self.values.iter().collect();
 
-        crate::components::handlers::form::render_form(
+        crate::components::form::form::render_form(
             f,
             area,
             self,
@@ -70,4 +71,66 @@ impl FormState {
             .get_mut(self.current_field)
             .expect("Invalid current_field index")
     }
+
+    pub fn update_from_response(&mut self, response: common::proto::multieko2::adresar::AdresarResponse) {
+        self.id = response.id;
+        self.values = vec![
+            response.firma, response.kz, response.drc,
+            response.ulica, response.psc, response.mesto,
+            response.stat, response.banka, response.ucet,
+            response.skladm, response.ico, response.kontakt,
+            response.telefon, response.skladu, response.fax,
+        ];
+    }
+}
+
+impl CanvasState for FormState {
+    fn current_field(&self) -> usize {
+        self.current_field
+    }
+
+    fn current_cursor_pos(&self) -> usize {
+        self.current_cursor_pos
+    }
+
+    fn has_unsaved_changes(&self) -> bool {
+        self.has_unsaved_changes
+    }
+
+    fn inputs(&self) -> Vec<&String> {
+        self.values.iter().collect()
+    }
+
+    fn get_current_input(&self) -> &str {
+        self.values
+            .get(self.current_field)
+            .map(|s| s.as_str())
+            .unwrap_or("")
+    }
+
+    fn get_current_input_mut(&mut self) -> &mut String {
+        self.values
+            .get_mut(self.current_field)
+            .expect("Invalid current_field index")
+    }
+
+    fn fields(&self) -> Vec<&str> {
+        self.fields.iter().map(|s| s.as_str()).collect()
+    }
+
+    // --- Implement the setter methods ---
+    fn set_current_field(&mut self, index: usize) {
+        if index < self.fields.len() { // Basic bounds check
+            self.current_field = index;
+        }
+    }
+
+    fn set_current_cursor_pos(&mut self, pos: usize) {
+        // Optional: Add validation based on current input length if needed
+        self.current_cursor_pos = pos;
+    }
+
+    fn set_has_unsaved_changes(&mut self, changed: bool) {
+        self.has_unsaved_changes = changed;
+    }
 }

client/src/state/state.rs

@@ -2,12 +2,26 @@
 
 use std::env;
 use common::proto::multieko2::table_definition::ProfileTreeResponse;
+use crate::components::IntroState;
+use crate::modes::handlers::mode_manager::AppMode;
+
+#[derive(Default)]
+pub struct DialogState {
+    pub show_dialog: bool,
+    pub dialog_title: String,
+    pub dialog_message: String,
+    pub dialog_button_active: bool,
+}
 
 pub struct UiState {
     pub show_sidebar: bool,
     pub is_saved: bool,
     pub show_intro: bool,
     pub show_admin: bool,
+    pub show_form: bool,
+    pub show_login: bool,
+    pub intro_state: IntroState,
+    pub dialog: DialogState,  // Add dialog state here
 }
 
 pub struct GeneralState {
@@ -22,6 +36,7 @@ pub struct AppState {
     pub current_position: u64,
     pub profile_tree: ProfileTreeResponse,
     pub selected_profile: Option<String>,
+    pub current_mode: AppMode,
 
     // UI preferences
     pub ui: UiState,
@@ -39,6 +54,7 @@ impl AppState {
             current_position: 0,
             profile_tree: ProfileTreeResponse::default(),
             selected_profile: None,
+            current_mode: AppMode::General,
             ui: UiState::default(),
             general: GeneralState {
                 selected_item: 0,
@@ -55,6 +71,28 @@ impl AppState {
     pub fn update_current_position(&mut self, current_position: u64) {
         self.current_position = current_position;
     }
+
+    pub fn update_mode(&mut self, mode: AppMode) {
+        self.current_mode = mode;
+    }
+
+    // Add dialog helper methods
+    pub fn show_dialog(&mut self, title: &str, message: &str) {
+        self.ui.dialog.show_dialog = true;
+        self.ui.dialog.dialog_title = title.to_string();
+        self.ui.dialog.dialog_message = message.to_string();
+        self.ui.dialog.dialog_button_active = true;
+    }
+
+    pub fn hide_dialog(&mut self) {
+        self.ui.dialog.show_dialog = false;
+        self.ui.dialog.dialog_title.clear();
+        self.ui.dialog.dialog_message.clear();
+    }
+
+    pub fn set_dialog_button_active(&mut self, active: bool) {
+        self.ui.dialog.dialog_button_active = active;
+    }
 }
 
 impl Default for UiState {
@@ -64,6 +102,10 @@ impl Default for UiState {
             is_saved: false,
             show_intro: true,
             show_admin: false,
+            show_form: false,
+            show_login: false,
+            intro_state: IntroState::new(),
+            dialog: DialogState::default(),
         }
     }
 }

client/src/tui/functions.rs

@@ -0,0 +1,12 @@
+// src/tui/functions.rs
+
+pub mod admin;
+pub mod intro;
+pub mod login;
+pub mod form;
+pub mod common;
+
+pub use admin::*;
+pub use intro::*;
+pub use form::*;
+pub use common::*;

client/src/tui/functions/admin.rs

@@ -0,0 +1,8 @@
+use crate::state::state::AppState;
+
+pub fn handle_admin_selection(app_state: &mut AppState) {
+    let profiles = &app_state.profile_tree.profiles;
+    if !profiles.is_empty() && app_state.general.selected_item < profiles.len() {
+        app_state.selected_profile = Some(profiles[app_state.general.selected_item].name.clone());
+    }
+}

client/src/tui/functions/common.rs

@@ -0,0 +1,7 @@
+// src/tui/functions/common.rs
+
+pub mod form;
+pub mod login;
+
+pub use form::*;
+pub use login::*;

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

@@ -1,7 +1,7 @@
-// src/modes/canvas/common.rs
+// src/tui/functions/common/form.rs
 
-use crate::tui::terminal::grpc_client::GrpcClient;
-use crate::ui::handlers::form::FormState;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::pages::form::FormState;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
 
 /// Shared logic for saving the current form state
@@ -65,64 +65,6 @@ pub async fn save(
     Ok(message)
 }
 
-/// Shared logic for force quitting the application
-pub fn force_quit() -> (bool, String) {
-    (true, "Force quitting application".to_string())
-}
-
-/// Shared logic for saving and quitting
-pub async fn save_and_quit(
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<(bool, String), Box<dyn std::error::Error>> {
-    let is_new = *current_position == total_count + 1;
-
-    if is_new {
-        let post_request = PostAdresarRequest {
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let _ = grpc_client.post_adresar(post_request).await?;
-    } else {
-        let put_request = PutAdresarRequest {
-            id: form_state.id,
-            firma: form_state.values[0].clone(),
-            kz: form_state.values[1].clone(),
-            drc: form_state.values[2].clone(),
-            ulica: form_state.values[3].clone(),
-            psc: form_state.values[4].clone(),
-            mesto: form_state.values[5].clone(),
-            stat: form_state.values[6].clone(),
-            banka: form_state.values[7].clone(),
-            ucet: form_state.values[8].clone(),
-            skladm: form_state.values[9].clone(),
-            ico: form_state.values[10].clone(),
-            kontakt: form_state.values[11].clone(),
-            telefon: form_state.values[12].clone(),
-            skladu: form_state.values[13].clone(),
-            fax: form_state.values[14].clone(),
-        };
-        let _ = grpc_client.put_adresar(put_request).await?;
-    }
-
-    Ok((true, "Saved and exiting application".to_string()))
-}
-
 /// Discard changes since last save
 pub async fn revert(
     form_state: &mut FormState,

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

@@ -0,0 +1,62 @@
+// src/tui/functions/common/login.rs
+use crate::services::auth::AuthClient;
+use crate::state::pages::auth::AuthState;
+use crate::state::state::AppState;
+use crate::state::canvas_state::CanvasState;
+
+/// Attempts to log the user in using the provided credentials via gRPC.
+/// Updates AuthState and AppState on success or failure.
+pub async fn save(
+    auth_state: &mut AuthState,
+    auth_client: &mut AuthClient,
+    app_state: &mut AppState,
+) -> Result<String, Box<dyn std::error::Error>> {
+    let identifier = auth_state.username.clone();
+    let password = auth_state.password.clone();
+
+    // Call the gRPC login method
+    match auth_client.login(identifier, password).await {
+        Ok(response) => {
+            // Store authentication details on success
+            auth_state.auth_token = Some(response.access_token);
+            auth_state.user_id = Some(response.user_id);
+            auth_state.role = Some(response.role);
+            auth_state.error_message = None;
+            auth_state.set_has_unsaved_changes(false); // Mark as "saved"
+
+            // Update app state to transition from login to the main form view
+            app_state.ui.show_login = false;
+            app_state.ui.show_form = true; // Assuming form is the next view
+
+            Ok("Login successful!".to_string())
+        }
+        Err(e) => {
+            // Store error message on failure
+            let error_message = format!("Login failed: {}", e);
+            auth_state.error_message = Some(error_message.clone());
+            // Keep unsaved changes true if login fails, allowing retry/revert
+            auth_state.set_has_unsaved_changes(true);
+            Ok(error_message) // Return error message to display
+        }
+    }
+}
+
+/// Reverts the login form fields to empty and returns to the previous screen (Intro).
+/// This function is now named 'revert' to match the 'form' counterpart.
+pub async fn revert(
+    auth_state: &mut AuthState,
+    app_state: &mut AppState,
+) -> String {
+    // Clear the input fields
+    auth_state.username.clear();
+    auth_state.password.clear();
+    auth_state.error_message = None; // Clear any previous error
+    auth_state.set_has_unsaved_changes(false); // Fields are cleared, no unsaved changes
+
+    // Update app state to hide login and show the previous screen (Intro)
+    app_state.ui.show_login = false;
+    app_state.ui.show_intro = true; // Assuming Intro is the screen before login
+
+    "Login reverted".to_string()
+}
+

client/src/tui/functions/form.rs

@@ -0,0 +1,80 @@
+// src/tui/functions/form.rs
+use crate::state::pages::form::FormState;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+
+pub async fn handle_action(
+    action: &str,
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    current_position: &mut u64,
+    total_count: u64,
+    ideal_cursor_column: &mut usize,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "previous_entry" => {
+            let new_position = current_position.saturating_sub(1);
+            if new_position >= 1 {
+                *current_position = new_position;
+                let response = grpc_client.get_adresar_by_position(*current_position).await?;
+                
+                // Direct field assignments
+                form_state.id = response.id;
+                form_state.values = vec![
+                    response.firma, response.kz, response.drc,
+                    response.ulica, response.psc, response.mesto,
+                    response.stat, response.banka, response.ucet,
+                    response.skladm, response.ico, response.kontakt,
+                    response.telefon, response.skladu, response.fax,
+                ];
+                
+                let current_input = form_state.get_current_input();
+                let max_cursor_pos = if !current_input.is_empty() {
+                    current_input.len() - 1
+                } else { 0 };
+                form_state.current_cursor_pos = std::cmp::min(*ideal_cursor_column, max_cursor_pos);
+                form_state.has_unsaved_changes = false;
+                
+                Ok(format!("Loaded form entry {}", *current_position))
+            } else {
+                Ok("Already at first form entry".into())
+            }
+        }
+        "next_entry" => {
+            if *current_position <= total_count {
+                *current_position += 1;
+                if *current_position <= total_count {
+                    let response = grpc_client.get_adresar_by_position(*current_position).await?;
+                    
+                    // Direct field assignments
+                    form_state.id = response.id;
+                    form_state.values = vec![
+                        response.firma, response.kz, response.drc,
+                        response.ulica, response.psc, response.mesto,
+                        response.stat, response.banka, response.ucet,
+                        response.skladm, response.ico, response.kontakt,
+                        response.telefon, response.skladu, response.fax,
+                    ];
+                    
+                    let current_input = form_state.get_current_input();
+                    let max_cursor_pos = if !current_input.is_empty() {
+                        current_input.len() - 1
+                    } else { 0 };
+                    form_state.current_cursor_pos = std::cmp::min(*ideal_cursor_column, max_cursor_pos);
+                    form_state.has_unsaved_changes = false;
+                    
+                    Ok(format!("Loaded form entry {}", *current_position))
+                } else {
+                    form_state.reset_to_empty();
+                    form_state.current_field = 0;
+                    form_state.current_cursor_pos = 0;
+                    *ideal_cursor_column = 0;
+                    Ok("New form entry mode".into())
+                }
+            } else {
+                Ok("Already at last entry".into())
+            }
+        }
+        _ => Err("Unknown form action".into())
+    }
+}

client/src/tui/functions/intro.rs

@@ -0,0 +1,23 @@
+use crate::state::state::AppState;
+
+pub fn handle_intro_selection(app_state: &mut AppState) {
+    match app_state.ui.intro_state.selected_option {
+        0 => { // Continue
+            app_state.ui.show_form = true;
+            app_state.ui.show_admin = false;
+            app_state.ui.show_login = false;
+        }
+        1 => { // Admin
+            app_state.ui.show_form = false;
+            app_state.ui.show_admin = true;
+            app_state.ui.show_login = false;
+        }
+        2 => { // Login
+            app_state.ui.show_form = false;
+            app_state.ui.show_admin = false;
+            app_state.ui.show_login = true;
+        }
+        _ => {}
+    }
+    app_state.ui.show_intro = false;
+}

client/src/tui/functions/login.rs

@@ -0,0 +1,19 @@
+// src/tui/functions/login.rs
+use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
+
+pub async fn handle_action(
+    action: &str,
+    auth_state: &mut AuthState,
+    ideal_cursor_column: &mut usize,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "previous_entry" => {
+            Ok("Previous entry at tui/functions/login.rs not implemented".into())
+        }
+        "next_entry" => {
+            Ok("Next entry at tui/functions/login.rs not implemented".into())
+        }
+        _ => Err("Unknown login action".into())
+    }
+}

client/src/tui/mod.rs

@@ -1,2 +1,5 @@
 // src/tui/mod.rs
 pub mod terminal;
+pub mod functions;
+
+pub use functions::*;

client/src/tui/terminal.rs

@@ -1,11 +1,7 @@
 // src/tui/terminal.rs
 
 pub mod core;
-pub mod grpc_client;
-pub mod commands;
 pub mod event_reader;
 
 pub use core::TerminalCore;
-pub use grpc_client::GrpcClient;
-pub use commands::CommandHandler;
 pub use event_reader::EventReader;

client/src/ui/handlers.rs

@@ -1,7 +1,6 @@
 // src/client/ui/handlers.rs
 
 pub mod ui;
-pub mod form;
 pub mod render;
 pub mod rat_state;
 

client/src/ui/handlers/render.rs

@@ -4,19 +4,22 @@ use crate::components::{
     render_background,
     render_command_line,
     render_status_line,
-    handlers::{sidebar::{self, calculate_sidebar_layout}, form::render_form},
-    intro::{intro},
+    handlers::sidebar::{self, calculate_sidebar_layout},
+    form::form::render_form,
     admin::{admin_panel::AdminPanelState},
+    auth::login::render_login,
 };
 use crate::config::colors::themes::Theme;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
-use super::form::FormState;
+use crate::state::pages::form::FormState;
+use crate::state::pages::auth::AuthState;
 use crate::state::state::AppState;
 
 pub fn render_ui(
     f: &mut Frame,
     form_state: &mut FormState,
+    auth_state: &mut AuthState,
     theme: &Theme,
     is_edit_mode: bool,
     total_count: u64,
@@ -26,7 +29,7 @@ pub fn render_ui(
     command_mode: bool,
     command_message: &str,
     app_state: &AppState,
-    intro_state: &intro::IntroState,
+    // intro_state parameter removed
 ) {
     render_background(f, f.area(), theme);
 
@@ -41,34 +44,43 @@ pub fn render_ui(
 
     let main_content_area = root[0];
     if app_state.ui.show_intro {
-        intro_state.render(f, main_content_area, theme);
+        // Use app_state's intro_state directly
+        app_state.ui.intro_state.render(f, main_content_area, theme);
+    }else if app_state.ui.show_login {
+        render_login(
+            f, 
+            main_content_area, 
+            theme, 
+            auth_state,
+            app_state,  // Add AppState reference here
+            auth_state.current_field < 2
+        );
     } else if app_state.ui.show_admin {
         // Create temporary AdminPanelState for rendering
         let mut admin_state = AdminPanelState::new(
-            if app_state.profile_tree.profiles.is_empty() {
-                // Fallback if admin_profiles is empty
-                app_state.profile_tree.profiles
-                    .iter()
-                    .map(|p| p.name.clone())
-                    .collect()
-            } else {
-                app_state.profile_tree.profiles.iter().map(|p| p.name.clone()).collect()
-            }
+            app_state.profile_tree.profiles
+                .iter()
+                .map(|p| p.name.clone())
+                .collect()
         );
 
-        // Set the selected item
+        // Set the selected item - FIXED
         if !admin_state.profiles.is_empty() {
-            app_state.general.selected_item.min(admin_state.profiles.len().saturating_sub(1));
+            let selected_index = std::cmp::min(
+                app_state.general.selected_item,
+                admin_state.profiles.len() - 1
+            );
+            admin_state.list_state.select(Some(selected_index));
         }
 
         admin_state.render(
             f,
             main_content_area,
             theme,
-            &app_state.profile_tree, 
+            &app_state.profile_tree,
             &app_state.selected_profile,
         );
-    } else {
+    } else if app_state.ui.show_form {
         let (sidebar_area, form_area) = calculate_sidebar_layout(
             app_state.ui.show_sidebar,
             main_content_area
@@ -76,11 +88,11 @@ pub fn render_ui(
 
         if let Some(sidebar_rect) = sidebar_area {
             sidebar::render_sidebar(
-                f, 
-                sidebar_rect, 
-                theme, 
-                &app_state.profile_tree, 
-                &app_state.selected_profile  // Remove trailing comma
+                f,
+                sidebar_rect,
+                theme,
+                &app_state.profile_tree,
+                &app_state.selected_profile
             );
         }
 
@@ -124,6 +136,8 @@ pub fn render_ui(
             total_count,
             current_position,
         );
+    } else{
+
     }
 
     render_status_line(f, root[1], current_dir, theme, is_edit_mode);

client/src/ui/handlers/ui.rs

@@ -1,72 +1,59 @@
 // src/ui/handlers/ui.rs
 
 use crate::tui::terminal::TerminalCore;
-use crate::tui::terminal::GrpcClient;
-use crate::tui::terminal::CommandHandler;
+use crate::services::grpc_client::GrpcClient;
+use crate::services::auth::AuthClient;
+use crate::services::ui_service::UiService;
 use crate::tui::terminal::EventReader;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
-use crate::ui::handlers::{form::FormState, render::render_ui};
+use crate::ui::handlers::render::render_ui;
+use crate::state::pages::form::FormState;
+use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
-use crate::components::admin::{admin_panel::AdminPanelState};
-use crate::components::intro::{intro::IntroState};
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
     let mut terminal = TerminalCore::new()?;
     let mut grpc_client = GrpcClient::new().await?;
+    // let auth_client = AuthClient::new().await?; // AuthClient is now inside EventHandler
     let mut command_handler = CommandHandler::new();
     let theme = Theme::from_str(&config.colors.theme);
-    let mut intro_state = IntroState::new();
+    let mut auth_state = AuthState::default(); // The single source of truth for AuthState
 
     // Initialize app_state first
     let mut app_state = AppState::new()?;
 
-    // Fetch profile tree and table structure
-    let profile_tree = grpc_client.get_profile_tree().await?;
-    app_state.profile_tree = profile_tree;
-
-    // Now create admin panel with profiles from app_state
-    if intro_state.selected_option == 1 {
-        app_state.ui.show_admin = true;
-        app_state.general.selected_item = 0;
-        app_state.general.current_option = 0;
-    }
-
-    // Fetch table structure at startup (one-time)
-    let table_structure = grpc_client.get_table_structure().await?;
-
-    // Extract the column names from the response
-    let column_names: Vec<String> = table_structure
-        .columns
-        .iter()
-        .map(|col| col.name.clone())
-        .collect();
+    // Initialize app state with profile tree and table structure
+    let column_names = UiService::initialize_app_state(&mut grpc_client, &mut app_state).await?;
 
     // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
-    // The rest of your UI initialization remains the same
-    let mut event_handler = EventHandler::new();
+    // Initialize EventHandler (which now contains AuthClient)
+    let mut event_handler = EventHandler::new().await?;
     let event_reader = EventReader::new();
 
     // Fetch the total count of Adresar entries
-    let total_count = grpc_client.get_adresar_count().await?;
-    app_state.update_total_count(total_count);
-    app_state.update_current_position(total_count.saturating_add(1)); // Start in new entry mode
+    UiService::initialize_adresar_count(&mut grpc_client, &mut app_state).await?;
     form_state.reset_to_empty();
 
     loop {
-        let total_count = grpc_client.get_adresar_count().await?;
-        app_state.update_total_count(total_count);
+        UiService::update_adresar_count(&mut grpc_client, &mut app_state).await?;
+
+        // Determine edit mode based on EventHandler state
+        let is_edit_mode = event_handler.is_edit_mode;
 
         terminal.draw(|f| {
             render_ui(
                 f,
                 &mut form_state,
+                &mut auth_state, // Pass the single AuthState instance
                 &theme,
-                event_handler.is_edit_mode,
+                is_edit_mode, // Use determined edit mode
                 app_state.total_count,
                 app_state.current_position,
                 &app_state.current_dir,
@@ -74,7 +61,6 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 event_handler.command_mode,
                 &event_handler.command_message,
                 &app_state,
-                &intro_state,
             );
         })?;
 
@@ -89,6 +75,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             &mut grpc_client,
             &mut command_handler,
             &mut form_state,
+            &mut auth_state, // Pass the single AuthState instance here too
             &mut app_state,
             total_count,
             &mut current_position,
@@ -96,73 +83,77 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
 
         app_state.current_position = current_position;
 
-        // Handle position changes and update form state
-        if !event_handler.is_edit_mode {
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1  // Limit to last character in readonly mode
-            } else {
-                0
-            };
-            form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+        // Handle position changes and update form state (Only when form is shown)
+        if app_state.ui.show_form { // Added check
+            if !event_handler.is_edit_mode {
+                let current_input = form_state.get_current_input();
+                let max_cursor_pos = if !current_input.is_empty() {
+                    current_input.len() - 1  // Limit to last character in readonly mode
+                } else {
+                    0
+                };
+                form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
 
-            // Ensure position never exceeds total_count + 1
-            if app_state.current_position > total_count + 1 {
-                app_state.current_position = total_count + 1;
-            }
-            if app_state.current_position > total_count {
-                // New entry - reset form
-                form_state.reset_to_empty();
-                form_state.current_field = 0;
-            } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
-                // Existing entry - load data
-                match grpc_client.get_adresar_by_position(app_state.current_position).await {
-                    Ok(response) => {
-                        // Set the ID properly
-                        form_state.id = response.id;
-
-                        // Update form values dynamically
-                        form_state.values = vec![
-                            response.firma,
-                            response.kz,
-                            response.drc,
-                            response.ulica,
-                            response.psc,
-                            response.mesto,
-                            response.stat,
-                            response.banka,
-                            response.ucet,
-                            response.skladm,
-                            response.ico,
-                            response.kontakt,
-                            response.telefon,
-                            response.skladu,
-                            response.fax,
-                        ];
-
-                        let current_input = form_state.get_current_input();
-                        let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
-                            current_input.len() - 1  // In readonly mode, limit to last character
-                        } else {
-                            current_input.len()
-                        };
-                        form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                        form_state.has_unsaved_changes = false;
-                        event_handler.command_message = format!("Loaded entry {}", app_state.current_position);
-                    }
-                    Err(e) => {
-                        event_handler.command_message = format!("Error loading entry: {}", e);
-                    }
+                // Ensure position never exceeds total_count + 1
+                if app_state.current_position > total_count + 1 {
+                    app_state.current_position = total_count + 1;
+                }
+                if app_state.current_position > total_count {
+                    // New entry - reset form
+                    form_state.reset_to_empty();
+                    form_state.current_field = 0;
+                } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
+                    // Existing entry - load data
+                    let current_position_to_load = app_state.current_position; // Use a copy
+                    let load_message = UiService::load_adresar_by_position(
+                        &mut grpc_client,
+                        &mut app_state, // Pass app_state mutably if needed by the service
+                        &mut form_state,
+                        current_position_to_load
+                    ).await?;
+
+                    let current_input = form_state.get_current_input();
+                    let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
+                        current_input.len() - 1  // In readonly mode, limit to last character
+                    } else {
+                        current_input.len()
+                    };
+                    form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+                    // Don't overwrite message from handle_event if load_message is simple success
+                    if !load_message.starts_with("Loaded entry") || message.is_empty() {
+                         event_handler.command_message = load_message;
+                    }
+                } else {
+                    // Invalid position (e.g., 0) - reset to first entry or new entry mode
+                    app_state.current_position = 1.min(total_count + 1); // Go to 1 or new entry if empty
+                     if app_state.current_position > total_count {
+                         form_state.reset_to_empty();
+                         form_state.current_field = 0;
+                     }
                 }
-            } else {
-                // Invalid position - reset to first entry
-                app_state.current_position = 1;
             }
+        } else if app_state.ui.show_login {
+             // Handle cursor updates for AuthState if needed, similar to FormState
+             if !event_handler.is_edit_mode {
+                 let current_input = auth_state.get_current_input();
+                 let max_cursor_pos = if !current_input.is_empty() {
+                     current_input.len() - 1
+                 } else {
+                     0
+                 };
+                 auth_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+             }
+        }
+
+
+        // Only update command message if handle_event provided one
+        if !message.is_empty() {
+            event_handler.command_message = message;
         }
 
-        event_handler.command_message = message;
         if should_exit {
             return Ok(());
         }
     }
 }
+

common/build.rs

@@ -8,6 +8,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             &[
                 "proto/common.proto",
                 "proto/adresar.proto",
+                "proto/auth.proto",
                 "proto/uctovnictvo.proto",
                 "proto/table_structure.proto",
                 "proto/table_definition.proto",

common/proto/auth.proto

@@ -0,0 +1,37 @@
+// proto/auth.proto
+syntax = "proto3";
+package multieko2.auth;
+
+import "common.proto";
+
+service AuthService {
+    rpc Register(RegisterRequest) returns (AuthResponse);
+    rpc Login(LoginRequest) returns (LoginResponse);
+}
+
+message RegisterRequest {
+    string username = 1;
+    string email = 2;
+    string password = 3;
+    string password_confirmation = 4;
+}
+
+message AuthResponse {
+    string id = 1;           // UUID in string format
+    string username = 2;     // Registered username
+    string email = 3;        // Registered email (if provided)
+    string role = 4;         // Default role: 'accountant'
+}
+
+message LoginRequest {
+    string identifier = 1;   // Can be username or email
+    string password = 2;
+}
+
+message LoginResponse {
+    string access_token = 1;   // JWT token
+    string token_type = 2;     // Usually "Bearer"
+    int32 expires_in = 3;      // Expiration in seconds (86400 for 24 hours)
+    string user_id = 4;        // User's UUID in string format
+    string role = 5;           // User's role
+}

common/src/lib.rs

@@ -4,6 +4,9 @@ pub mod proto {
         pub mod adresar {
             include!("proto/multieko2.adresar.rs");
         }
+        pub mod auth {
+            include!("proto/multieko2.auth.rs");
+        }
         pub mod common {
             include!("proto/multieko2.common.rs");
         }

common/src/proto/multieko2.auth.rs

@@ -0,0 +1,412 @@
+// This file is @generated by prost-build.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct RegisterRequest {
+    #[prost(string, tag = "1")]
+    pub username: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub email: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub password: ::prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub password_confirmation: ::prost::alloc::string::String,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AuthResponse {
+    /// UUID in string format
+    #[prost(string, tag = "1")]
+    pub id: ::prost::alloc::string::String,
+    /// Registered username
+    #[prost(string, tag = "2")]
+    pub username: ::prost::alloc::string::String,
+    /// Registered email (if provided)
+    #[prost(string, tag = "3")]
+    pub email: ::prost::alloc::string::String,
+    /// Default role: 'accountant'
+    #[prost(string, tag = "4")]
+    pub role: ::prost::alloc::string::String,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct LoginRequest {
+    /// Can be username or email
+    #[prost(string, tag = "1")]
+    pub identifier: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub password: ::prost::alloc::string::String,
+}
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct LoginResponse {
+    /// JWT token
+    #[prost(string, tag = "1")]
+    pub access_token: ::prost::alloc::string::String,
+    /// Usually "Bearer"
+    #[prost(string, tag = "2")]
+    pub token_type: ::prost::alloc::string::String,
+    /// Expiration in seconds (86400 for 24 hours)
+    #[prost(int32, tag = "3")]
+    pub expires_in: i32,
+    /// User's UUID in string format
+    #[prost(string, tag = "4")]
+    pub user_id: ::prost::alloc::string::String,
+    /// User's role
+    #[prost(string, tag = "5")]
+    pub role: ::prost::alloc::string::String,
+}
+/// Generated client implementations.
+pub mod auth_service_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct AuthServiceClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl AuthServiceClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> AuthServiceClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::BoxBody>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> AuthServiceClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::BoxBody>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::BoxBody>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            AuthServiceClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        pub async fn register(
+            &mut self,
+            request: impl tonic::IntoRequest<super::RegisterRequest>,
+        ) -> std::result::Result<tonic::Response<super::AuthResponse>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/multieko2.auth.AuthService/Register",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("multieko2.auth.AuthService", "Register"));
+            self.inner.unary(req, path, codec).await
+        }
+        pub async fn login(
+            &mut self,
+            request: impl tonic::IntoRequest<super::LoginRequest>,
+        ) -> std::result::Result<tonic::Response<super::LoginResponse>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/multieko2.auth.AuthService/Login",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("multieko2.auth.AuthService", "Login"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated server implementations.
+pub mod auth_service_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with AuthServiceServer.
+    #[async_trait]
+    pub trait AuthService: std::marker::Send + std::marker::Sync + 'static {
+        async fn register(
+            &self,
+            request: tonic::Request<super::RegisterRequest>,
+        ) -> std::result::Result<tonic::Response<super::AuthResponse>, tonic::Status>;
+        async fn login(
+            &self,
+            request: tonic::Request<super::LoginRequest>,
+        ) -> std::result::Result<tonic::Response<super::LoginResponse>, tonic::Status>;
+    }
+    #[derive(Debug)]
+    pub struct AuthServiceServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> AuthServiceServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for AuthServiceServer<T>
+    where
+        T: AuthService,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::BoxBody>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/multieko2.auth.AuthService/Register" => {
+                    #[allow(non_camel_case_types)]
+                    struct RegisterSvc<T: AuthService>(pub Arc<T>);
+                    impl<
+                        T: AuthService,
+                    > tonic::server::UnaryService<super::RegisterRequest>
+                    for RegisterSvc<T> {
+                        type Response = super::AuthResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::RegisterRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AuthService>::register(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = RegisterSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                "/multieko2.auth.AuthService/Login" => {
+                    #[allow(non_camel_case_types)]
+                    struct LoginSvc<T: AuthService>(pub Arc<T>);
+                    impl<T: AuthService> tonic::server::UnaryService<super::LoginRequest>
+                    for LoginSvc<T> {
+                        type Response = super::LoginResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::LoginRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AuthService>::login(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = LoginSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => {
+                    Box::pin(async move {
+                        let mut response = http::Response::new(empty_body());
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
+                    })
+                }
+            }
+        }
+    }
+    impl<T> Clone for AuthServiceServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "multieko2.auth.AuthService";
+    impl<T> tonic::server::NamedService for AuthServiceServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}

server/.sqlx/query-468bb5bb4fdaefcb4b280761d7880a556d40c172568ad3a1ed13156fbef72776.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT ltd.table_name\n        FROM table_definition_links tdl\n        JOIN table_definitions ltd ON tdl.linked_table_id = ltd.id\n        WHERE tdl.source_table_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "table_name",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "468bb5bb4fdaefcb4b280761d7880a556d40c172568ad3a1ed13156fbef72776"
+}

server/.sqlx/query-48d0a6d393dac121bfa4230830a105aede2179b07395f97750ab2fa1970afacd.json

@@ -0,0 +1,42 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO users (username, email, password_hash, role)\n        VALUES ($1, $2, $3, 'accountant')\n        RETURNING id, username, email, role\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "username",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "email",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "role",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "48d0a6d393dac121bfa4230830a105aede2179b07395f97750ab2fa1970afacd"
+}

server/.sqlx/query-6be0bb23ad1ba85add309f6e4f55495a5d248901fb0d23fea908815747a0bd50.json

@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT id, password_hash, role\n        FROM users\n        WHERE username = $1 OR email = $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "password_hash",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "role",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "6be0bb23ad1ba85add309f6e4f55495a5d248901fb0d23fea908815747a0bd50"
+}

server/.sqlx/query-80f0f7f9ab12a8fe07ea71b548d27bcd6253b598ac4486b72b3d960f03df47f3.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT table_name FROM table_definitions\n               WHERE profile_id = $1 AND table_name LIKE $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "table_name",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "80f0f7f9ab12a8fe07ea71b548d27bcd6253b598ac4486b72b3d960f03df47f3"
+}

server/.sqlx/query-b097f30f98490b979939759d85327a20ca7ade4866052a5cfdb0451fb76fbf15.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT ltd.table_name \n        FROM table_definition_links tdl\n        JOIN table_definitions ltd ON tdl.linked_table_id = ltd.id\n        WHERE tdl.source_table_id = $1 AND tdl.is_required = true",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "table_name",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "b097f30f98490b979939759d85327a20ca7ade4866052a5cfdb0451fb76fbf15"
-}

server/.sqlx/query-c07a8511e5f32bf230240b28cb292d40f862b6ec58883f21ee8e1937860585d6.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO table_scripts\n        (table_definitions_id, target_column, target_column_type, script, description)\n        VALUES ($1, $2, $3, $4, $5)\n        RETURNING id",
+  "query": "INSERT INTO table_scripts\n        (table_definitions_id, target_table, target_column,\n         target_column_type, script, description, profile_id)\n        VALUES ($1, $2, $3, $4, $5, $6, $7)\n        RETURNING id",
   "describe": {
     "columns": [
       {
@@ -15,12 +15,14 @@
         "Text",
         "Text",
         "Text",
-        "Text"
+        "Text",
+        "Text",
+        "Int8"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "4cd5de4d3332ca35a9975ffb32728041978435e14f97c559e2ffec4a82d567ae"
+  "hash": "c07a8511e5f32bf230240b28cb292d40f862b6ec58883f21ee8e1937860585d6"
 }

server/Cargo.toml

@@ -12,7 +12,7 @@ dotenvy = "0.15.7"
 prost = "0.13.5"
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = "1.0.140"
-sqlx = { version = "0.8.3", features = ["chrono", "postgres", "runtime-tokio", "runtime-tokio-native-tls", "time"] }
+sqlx = { version = "0.8.3", features = ["chrono", "postgres", "runtime-tokio", "runtime-tokio-native-tls", "time", "uuid"] }
 tokio = { version = "1.43.0", features = ["full", "macros"] }
 tonic = "0.12.3"
 tonic-reflection = "0.12.3"
@@ -24,6 +24,10 @@ thiserror = "2.0.12"
 dashmap = "6.1.0"
 lazy_static = "1.5.0"
 regex = "1.11.1"
+bcrypt = "0.17.0"
+validator = { version = "0.20.0", features = ["derive"] }
+uuid = { version = "1.16.0", features = ["serde", "v4"] }
+jsonwebtoken = "9.3.1"
 
 [lib]
 name = "server"

server/migrations/20250324192805_auth.sql

@@ -0,0 +1,38 @@
+-- Add migration script here
+
+CREATE TABLE IF NOT EXISTS users (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    username VARCHAR(255) NOT NULL UNIQUE,
+    email VARCHAR(255) UNIQUE,
+    password_hash VARCHAR(255),
+    role VARCHAR(20) NOT NULL DEFAULT 'accountant',
+    created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Add an index for faster lookups
+CREATE INDEX idx_users_email_username ON users(email, username);
+
+ALTER TABLE users
+ADD CONSTRAINT valid_roles CHECK (role IN (
+    'admin',
+    'moderator',
+    'accountant',
+    'viewer'
+));
+
+-- Create JWT sessions table
+CREATE TABLE user_sessions (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    jwt_token TEXT NOT NULL UNIQUE,
+    expires_at TIMESTAMPTZ NOT NULL,
+    revoked BOOLEAN NOT NULL DEFAULT false,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Add indexes
+CREATE INDEX idx_sessions_user ON user_sessions(user_id);
+CREATE INDEX idx_sessions_expires ON user_sessions(expires_at);
+
+
+

server/src/auth/docs/first_reg.txt

@@ -0,0 +1,10 @@
+❯ grpcurl -plaintext -d '{
+  "username": "testuser2",
+  "email": "test2@example.com"
+}' localhost:50051 multieko2.auth.AuthService/Register
+{
+  "id": "5fa9bbce-85e0-4b06-8364-b561770c2fdd",
+  "username": "testuser2",
+  "email": "test2@example.com",
+  "role": "accountant"
+}

server/src/auth/docs/reg_log.txt

@@ -0,0 +1,51 @@
+❯ grpcurl -plaintext -d '{
+  "username": "testuser3",
+  "email": "test3@example.com",
+  "password": "your_password",
+  "password_confirmation": "your_password"
+}' localhost:50051 multieko2.auth.AuthService/Register
+{
+  "id": "96d2fd35-b39d-4c05-916a-66134453d34c",
+  "username": "testuser3",
+  "email": "test3@example.com",
+  "role": "accountant"
+}
+❯ grpcurl -plaintext -d '{
+  "identifier": "testuser3"
+}' localhost:50051 multieko2.auth.AuthService/Login
+ERROR:
+  Code: Unauthenticated
+  Message: Invalid credentials
+❯ grpcurl -plaintext -d '{
+  "identifier": "testuser3",
+  "password": "your_password"
+}' localhost:50051 multieko2.auth.AuthService/Login
+{
+  "accessToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI5NmQyZmQzNS1iMzlkLTRjMDUtOTE2YS02NjEzNDQ1M2QzNGMiLCJleHAiOjE3NDI5ODE2MTAsInJvbGUiOiJhY2NvdW50YW50In0.78VIR3X4QZohzeI5x3xmkmqcICTusOC6PELPohMV-k8",
+  "tokenType": "Bearer",
+  "expiresIn": 86400,
+  "userId": "96d2fd35-b39d-4c05-916a-66134453d34c",
+  "role": "accountant"
+}
+❯ grpcurl -plaintext -d '{
+  "username": "testuser4",
+  "email": "test4@example.com"
+}' localhost:50051 multieko2.auth.AuthService/Register
+{
+  "id": "413d7ecc-f231-48af-8c5a-566b1dc2bf0b",
+  "username": "testuser4",
+  "email": "test4@example.com",
+  "role": "accountant"
+}
+❯ grpcurl -plaintext -d '{
+  "identifier": "test4@example.com"
+}' localhost:50051 multieko2.auth.AuthService/Login
+{
+  "accessToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0MTNkN2VjYy1mMjMxLTQ4YWYtOGM1YS01NjZiMWRjMmJmMGIiLCJleHAiOjE3NDI5ODE3MDEsInJvbGUiOiJhY2NvdW50YW50In0.4Hzu3tTZRNGHnBSgeCbGy2tFTl8EzpPdXBhcW8kuIc8",
+  "tokenType": "Bearer",
+  "expiresIn": 86400,
+  "userId": "413d7ecc-f231-48af-8c5a-566b1dc2bf0b",
+  "role": "accountant"
+}
+╭─     ~/Doc/pr/multieko2/server     auth ······ ✔
+╰─

server/src/auth/handlers.rs

@@ -0,0 +1,7 @@
+// src/auth/handlers.rs
+
+pub mod register;
+pub mod login;
+
+pub use register::*;
+pub use login::*;

server/src/auth/handlers/login.rs

@@ -0,0 +1,46 @@
+// src/auth/handlers/login.rs
+use bcrypt::verify;
+use tonic::{Request, Response, Status};
+use crate::db::PgPool;
+use crate::auth::{models::AuthError, logic::jwt}; // Fixed import path
+use common::proto::multieko2::auth::{LoginRequest, LoginResponse};
+
+pub async fn login(
+    pool: &PgPool,
+    request: LoginRequest,
+) -> Result<Response<LoginResponse>, Status> {
+    let user = sqlx::query!(
+        r#"
+        SELECT id, password_hash, role
+        FROM users
+        WHERE username = $1 OR email = $1
+        "#,
+        request.identifier
+    )
+    .fetch_optional(pool)
+    .await
+    .map_err(|e| Status::internal(e.to_string()))?
+    .ok_or_else(|| Status::unauthenticated("Invalid credentials"))?;
+
+    // Handle the optional password_hash
+    let password_hash = user.password_hash
+        .ok_or_else(|| Status::internal("User account has no password set"))?;
+
+    // Verify the password
+    if !verify(&request.password, &password_hash)
+        .map_err(|e| Status::internal(e.to_string()))?
+    {
+        return Err(Status::unauthenticated("Invalid credentials"));
+    }
+
+    let token = jwt::generate_token(user.id, &user.role)
+        .map_err(|e| Status::internal(e.to_string()))?;
+
+    Ok(Response::new(LoginResponse {
+        access_token: token,
+        token_type: "Bearer".to_string(),
+        expires_in: 86400, // 24 hours
+        user_id: user.id.to_string(),
+        role: user.role,
+    }))
+}

server/src/auth/handlers/register.rs

@@ -0,0 +1,48 @@
+// src/auth/handlers/register.rs
+use bcrypt::{hash, DEFAULT_COST};
+use tonic::{Response, Status};
+use common::proto::multieko2::auth::{RegisterRequest, AuthResponse};
+use crate::db::PgPool;
+use crate::auth::models::AuthError;
+
+pub async fn register(
+    pool: &PgPool,
+    payload: RegisterRequest,
+) -> Result<Response<AuthResponse>, Status> {
+    // Validate passwords match
+    if payload.password != payload.password_confirmation {
+        return Err(Status::invalid_argument(AuthError::PasswordMismatch.to_string()));
+    }
+
+    // Hash password
+    let password_hash = hash(payload.password, DEFAULT_COST)
+        .map_err(|e| Status::internal(AuthError::HashingError(e.to_string()).to_string()))?;
+
+    // Insert user
+    let user = sqlx::query!(
+        r#"
+        INSERT INTO users (username, email, password_hash, role)
+        VALUES ($1, $2, $3, 'accountant')
+        RETURNING id, username, email, role
+        "#,
+        payload.username,
+        payload.email,
+        password_hash
+    )
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        if e.to_string().contains("duplicate key") {
+            Status::already_exists(AuthError::UserExists.to_string())
+        } else {
+            Status::internal(AuthError::DatabaseError(e.to_string()).to_string())
+        }
+    })?;
+
+    Ok(Response::new(AuthResponse {
+        id: user.id.to_string(),
+        username: user.username,
+        email: user.email.unwrap_or_default(),
+        role: user.role,
+    }))
+}

server/src/auth/logic.rs

@@ -0,0 +1,9 @@
+// src/auth/logic.rs
+
+pub mod jwt;
+pub mod middleware;
+// TODO implement RBAC on all of the endpoints
+// pub mod rbac;
+
+pub use jwt::*;
+pub use middleware::*;

server/src/auth/logic/jwt.rs

@@ -0,0 +1,55 @@
+// src/auth/jwt.rs
+use jsonwebtoken::{encode, decode, Header, EncodingKey, DecodingKey, Validation};
+use serde::{Deserialize, Serialize};
+use time::{Duration, OffsetDateTime};
+use uuid::Uuid;
+use std::sync::OnceLock;
+use crate::auth::models::AuthError;
+
+static KEYS: OnceLock<Keys> = OnceLock::new();
+
+struct Keys {
+    encoding: EncodingKey,
+    decoding: DecodingKey,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Claims {
+    pub sub: Uuid,    // User ID
+    pub exp: i64,     // Expiration time
+    pub role: String, // User role
+}
+
+pub fn init_jwt() -> Result<(), AuthError> {
+    let secret = std::env::var("JWT_SECRET")
+        .map_err(|_| AuthError::ConfigError("JWT_SECRET must be set".to_string()))?;
+
+    KEYS.set(Keys {
+        encoding: EncodingKey::from_secret(secret.as_bytes()),
+        decoding: DecodingKey::from_secret(secret.as_bytes()),
+    }).map_err(|_| AuthError::ConfigError("Failed to initialize JWT keys".to_string()))?;
+
+    Ok(())
+}
+
+pub fn generate_token(user_id: Uuid, role: &str) -> Result<String, AuthError> {
+    let keys = KEYS.get().ok_or(AuthError::ConfigError("JWT not initialized".to_string()))?;
+    
+    let exp = OffsetDateTime::now_utc() + Duration::days(365000);
+    let claims = Claims {
+        sub: user_id,
+        exp: exp.unix_timestamp(),
+        role: role.to_string(),
+    };
+
+    encode(&Header::default(), &claims, &keys.encoding)
+        .map_err(|e| AuthError::JwtError(e.to_string()))
+}
+
+pub fn validate_token(token: &str) -> Result<Claims, AuthError> {
+    let keys = KEYS.get().ok_or(AuthError::ConfigError("JWT not initialized".to_string()))?;
+    
+    decode::<Claims>(token, &keys.decoding, &Validation::default())
+        .map(|data| data.claims)
+        .map_err(|e| AuthError::JwtError(e.to_string()))
+}

server/src/auth/logic/middleware.rs

@@ -0,0 +1,22 @@
+// src/auth/middleware.rs
+use tonic::{metadata::MetadataValue, service::Interceptor, Status};
+use crate::auth::{logic::jwt, models::AuthError};
+
+pub struct AuthInterceptor;
+
+impl Interceptor for AuthInterceptor {
+    fn call(&mut self, mut request: tonic::Request<()>) -> Result<tonic::Request<()>, Status> {
+        let metadata = request.metadata();
+        let token = metadata.get("authorization")
+            .and_then(|v| v.to_str().ok())
+            .and_then(|s| s.strip_prefix("Bearer "))
+            .ok_or(Status::unauthenticated("Missing authorization header"))?;
+
+        let claims = jwt::validate_token(token)
+            .map_err(|e| Status::unauthenticated(e.to_string()))?;
+
+        // Store claims in request extensions
+        request.extensions_mut().insert(claims);
+        Ok(request)
+    }
+}

server/src/auth/logic/rbac.rs

@@ -0,0 +1,36 @@
+// src/auth/logic/rbac.rs
+
+use tower::ServiceBuilder;
+use crate::auth::logic::rbac;
+
+pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {
+    // ... existing setup code ...
+
+    // Create service layers
+    let adresar_layer = ServiceBuilder::new()
+        .layer(rbac::create_adresar_layer())
+        .into_inner();
+
+    let uctovnictvo_layer = ServiceBuilder::new()
+        .layer(rbac::create_uctovnictvo_layer())
+        .into_inner();
+
+    // Create services with layers
+    let adresar_service = AdresarServer::new(AdresarService { db_pool: db_pool.clone() })
+        .layer(adresar_layer);
+
+    let uctovnictvo_service = UctovnictvoServer::new(UctovnictvoService { db_pool: db_pool.clone() })
+        .layer(uctovnictvo_layer);
+
+    // ... repeat for other services ...
+
+    Server::builder()
+        .add_service(auth_server)
+        .add_service(adresar_service)
+        .add_service(uctovnictvo_service)
+        // ... other services ...
+        .serve(addr)
+        .await?;
+
+    Ok(())
+}

server/src/auth/mod.rs

@@ -0,0 +1,6 @@
+// src/auth/mod.rs
+
+pub mod models;
+pub mod logic;
+pub mod handlers;
+

server/src/auth/models.rs

@@ -0,0 +1,41 @@
+// src/auth/models.rs
+
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+#[derive(Debug, Validate, Deserialize)]
+pub struct RegisterRequest {
+    #[validate(length(min = 1, max = 30))]
+    pub username: String,
+    #[validate(email)]
+    pub email: String,
+    #[validate(length(min = 1))]
+    pub password: String,
+    pub password_confirmation: String,
+}
+
+#[derive(Debug, Validate, Deserialize)]
+pub struct LoginRequest {
+    #[validate(length(min = 1))]
+    pub identifier: String,
+    #[validate(length(min = 1))]
+    pub password: String,
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum AuthError {
+    #[error("Passwords do not match")]
+    PasswordMismatch,
+    #[error("User already exists")]
+    UserExists,
+    #[error("Database error: {0}")]
+    DatabaseError(String),
+    #[error("Hashing error: {0}")]
+    HashingError(String),
+    #[error("Invalid credentials")]
+    InvalidCredentials,
+    #[error("JWT error: {0}")]
+    JwtError(String),
+    #[error("Configuration error: {0}")]
+    ConfigError(String),
+}

server/src/db.rs

@@ -1,5 +1,7 @@
 // src/db.rs
-use sqlx::postgres::{PgPool, PgPoolOptions};
+
+use sqlx::postgres::PgPoolOptions;
+pub use sqlx::postgres::PgPool;
 use std::time::Duration;
 use tracing::info;
 

server/src/lib.rs

@@ -1,5 +1,6 @@
 // src/lib.rs
 pub mod db;
+pub mod auth;
 pub mod server;
 pub mod adresar;
 pub mod uctovnictvo;

server/src/server/run.rs

@@ -10,15 +10,22 @@ use crate::server::services::{
     TableDefinitionService,
     TablesDataService,
     TableScriptService,
+    AuthServiceImpl
+};
+use common::proto::multieko2::{
+    adresar::adresar_server::AdresarServer,
+    uctovnictvo::uctovnictvo_server::UctovnictvoServer,
+    table_structure::table_structure_service_server::TableStructureServiceServer,
+    table_definition::table_definition_server::TableDefinitionServer,
+    tables_data::tables_data_server::TablesDataServer,
+    table_script::table_script_server::TableScriptServer,
+    auth::auth_service_server::AuthServiceServer
 };
-use common::proto::multieko2::adresar::adresar_server::AdresarServer;
-use common::proto::multieko2::uctovnictvo::uctovnictvo_server::UctovnictvoServer;
-use common::proto::multieko2::table_structure::table_structure_service_server::TableStructureServiceServer;
-use common::proto::multieko2::table_definition::table_definition_server::TableDefinitionServer;
-use common::proto::multieko2::tables_data::tables_data_server::TablesDataServer;
-use common::proto::multieko2::table_script::table_script_server::TableScriptServer;
 
 pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error::Error>> {
+    // Initialize JWT for authentication
+    crate::auth::logic::jwt::init_jwt()?;
+    
     let addr = "[::1]:50051".parse()?;
 
     let reflection_service = ReflectionBuilder::configure()
@@ -27,8 +34,9 @@ pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error:
 
     // Initialize services
     let table_definition_service = TableDefinitionService { db_pool: db_pool.clone() };
-    let tables_data_service = TablesDataService { db_pool: db_pool.clone() }; // Add this
+    let tables_data_service = TablesDataService { db_pool: db_pool.clone() };
     let table_script_service = TableScriptService { db_pool: db_pool.clone() };
+    let auth_service = AuthServiceImpl { db_pool: db_pool.clone() };
 
     Server::builder()
         .add_service(AdresarServer::new(AdresarService { db_pool: db_pool.clone() }))
@@ -37,6 +45,7 @@ pub async fn run_server(db_pool: sqlx::PgPool) -> Result<(), Box<dyn std::error:
         .add_service(TableDefinitionServer::new(table_definition_service))
         .add_service(TablesDataServer::new(tables_data_service))
         .add_service(TableScriptServer::new(table_script_service))
+        .add_service(AuthServiceServer::new(auth_service))
         .add_service(reflection_service)
         .serve(addr)
         .await?;

server/src/server/services/auth_service.rs

@@ -0,0 +1,36 @@
+// src/server/services/auth_service.rs
+use tonic::{Request, Response, Status};
+use common::proto::multieko2::auth::{
+    auth_service_server::AuthService,
+    RegisterRequest, AuthResponse,
+    LoginRequest, LoginResponse
+};
+use crate::auth::handlers::{
+    login::login,
+    register::register
+};
+use sqlx::PgPool;
+
+#[derive(Debug)]
+pub struct AuthServiceImpl {
+    pub db_pool: PgPool,
+}
+
+#[tonic::async_trait]
+impl AuthService for AuthServiceImpl {
+    async fn register(
+        &self,
+        request: Request<RegisterRequest>,
+    ) -> Result<Response<AuthResponse>, Status> {
+        let response = register(&self.db_pool, request.into_inner()).await?;
+        Ok(response)
+    }
+
+    async fn login(
+        &self,
+        request: Request<LoginRequest>,
+    ) -> Result<Response<LoginResponse>, Status> {
+        let response = login(&self.db_pool, request.into_inner()).await?;
+        Ok(response)
+    }
+}

server/src/server/services/mod.rs

@@ -6,6 +6,7 @@ pub mod uctovnictvo_service;
 pub mod table_definition_service;
 pub mod tables_data_service;
 pub mod table_script_service;
+pub mod auth_service;
 
 pub use adresar_service::AdresarService;
 pub use table_structure_service::TableStructureHandler;
@@ -13,3 +14,4 @@ pub use uctovnictvo_service::UctovnictvoService;
 pub use table_definition_service::TableDefinitionService;
 pub use tables_data_service::TablesDataService;
 pub use table_script_service::TableScriptService;
+pub use auth_service::AuthServiceImpl;