split config in modes/canvas is fixed and working properly well

client/src/components/auth/login.rs

@@ -1,14 +1,16 @@
 // src/components/auth/login.rs
+
 use crate::{
-    components::form::form::render_generic_form,
     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::{Color, Style},
+    style::{Style, Modifier, Color},  // Removed unused Color import
     widgets::{Block, BorderType, Borders, Paragraph},
-    Frame,
+    Frame,  // Removed unused Span import
 };
 
 pub fn render_login(
@@ -16,11 +18,13 @@ pub fn render_login(
     area: Rect,
     theme: &Theme,
     state: &AuthState,
+    app_state: &AppState,  // Add AppState parameter
+    is_edit_mode: bool,
 ) {
-    // Main login block with plain borders (matches main form style)
+    // Main container
     let block = Block::default()
         .borders(Borders::ALL)
-        .border_type(BorderType::Plain) // Matches main form style
+        .border_type(BorderType::Plain)
         .border_style(Style::default().fg(theme.border))
         .title(" Login ")
         .style(Style::default().bg(theme.bg));
@@ -32,49 +36,57 @@ pub fn render_login(
         vertical: 1,
     });
 
-    // Define field names
-    let fields = &["Username/Email", "Password"];
-
-    // Split layout for form and buttons
+    // Layout chunks
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .constraints([
-            Constraint::Min(3),  // Form area
-            Constraint::Length(1), // Error message area
-            Constraint::Length(3), // Buttons area
+            Constraint::Length(4),  // Form (2 fields + padding)
+            Constraint::Length(1),  // Error message
+            Constraint::Length(3),  // Buttons
         ])
         .split(inner_area);
 
-    // Render form with plaintext display
-    render_generic_form(
+    // --- 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,
-        chunks[0],
-        "Login",
+        input_area,  // Use the pre-calculated area
         state,
-        fields,
+        &["Username/Email", "Password"],
+        &state.current_field,
+        &[&state.username, &state.password],
         theme,
-        !state.return_selected, // is_edit_mode
+        is_edit_mode,
     );
 
-    // Render buttons
+    // --- 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_style = if !state.return_selected {
-        Style::default()
-            .fg(theme.highlight)
-            .add_modifier(ratatui::style::Modifier::BOLD)
-    } else {
-        Style::default().fg(theme.fg)
-    };
-    let login_border_style = if !state.return_selected {
-        Style::default().fg(theme.accent)
-    } else {
-        Style::default().fg(theme.border)
-    };
+    // 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")
@@ -84,24 +96,19 @@ pub fn render_login(
                 Block::default()
                     .borders(Borders::ALL)
                     .border_type(BorderType::Plain)
-                    .border_style(login_border_style),
+                    .border_style(login_border),
             ),
         button_chunks[0],
     );
 
-    // Return button
-    let return_style = if state.return_selected {
-        Style::default()
-            .fg(theme.highlight)
-            .add_modifier(ratatui::style::Modifier::BOLD)
-    } else {
-        Style::default().fg(theme.fg)
-    };
-    let return_border_style = if state.return_selected {
-        Style::default().fg(theme.accent)
-    } else {
-        Style::default().fg(theme.border)
-    };
+    // 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")
@@ -111,16 +118,29 @@ pub fn render_login(
                 Block::default()
                     .borders(Borders::ALL)
                     .border_type(BorderType::Plain)
-                    .border_style(return_border_style),
+                    .border_style(return_border),
             ),
         button_chunks[1],
     );
 
-    // Render error message if present
+    // Error message
     if let Some(err) = &state.error_message {
-        let err_block = Paragraph::new(err.as_str())
+        f.render_widget(
+            Paragraph::new(err.as_str())
                 .style(Style::default().fg(Color::Red))
-            .alignment(Alignment::Center);
-        f.render_widget(err_block, chunks[1]);
+                .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/form.rs

@@ -9,7 +9,6 @@ use crate::config::colors::themes::Theme;
 use crate::state::canvas_state::CanvasState;
 use crate::components::handlers::canvas::render_canvas;
 
-// Original form renderer (keep for backward compatibility)
 pub fn render_form(
     f: &mut Frame,
     area: Rect,
@@ -65,47 +64,3 @@ pub fn render_form(
         is_edit_mode,
     );
 }
-
-// New generic form renderer
-pub fn render_generic_form(
-    f: &mut Frame,
-    area: Rect,
-    title: &str,
-    state: &impl CanvasState,
-    fields: &[&str],
-    theme: &Theme,
-    is_edit_mode: bool,
-) {
-    // Create form card
-    let form_card = Block::default()
-        .borders(Borders::ALL)
-        .border_style(Style::default().fg(theme.border))
-        .title(format!(" {} ", title))
-        .style(Style::default().bg(theme.bg).fg(theme.fg));
-
-    f.render_widget(form_card, area);
-
-    // Define inner area
-    let inner_area = area.inner(Margin {
-        horizontal: 1,
-        vertical: 1,
-    });
-
-    // Create main layout
-    let main_layout = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([Constraint::Min(1)])
-        .split(inner_area);
-
-    // Delegate to render_canvas
-    render_canvas(
-        f,
-        main_layout[0],
-        state,
-        fields,
-        &state.current_field(),
-        &state.inputs(),
-        theme,
-        is_edit_mode,
-    );
-}

client/src/components/intro/intro.rs

@@ -32,9 +32,9 @@ impl IntroState {
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .constraints([
-                Constraint::Percentage(35),
-                Constraint::Length(7), // Increased to accommodate 3 buttons
-                Constraint::Percentage(35),
+                Constraint::Percentage(40),
+                Constraint::Length(5), // Increased to accommodate 3 buttons
+                Constraint::Percentage(40),
             ])
             .split(inner_area);
 

client/src/lib.rs

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

client/src/modes/canvas/common.rs

@@ -1,11 +1,10 @@
 // src/modes/canvas/common.rs
 
-use crate::config::binds::config::Config;
-use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::tui::terminal::core::TerminalCore;
 use crate::state::pages::form::FormState;
 use crate::state::state::AppState;
-use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
+use crate::services::grpc_client::GrpcClient;
+use crate::tui::functions::common::form::{save, revert};
 
 /// Main handler for common core actions
 pub async fn handle_core_action(
@@ -52,127 +51,6 @@ pub async fn handle_core_action(
             ).await?;
             Ok((false, message))
         },
-        // We should never hit this case with proper filtering
         _ => Ok((false, format!("Core action not handled: {}", action))),
     }
 }
-
-/// Helper function to check if a key event should trigger a core action
-pub fn is_core_action(config: &Config, key_code: crossterm::event::KeyCode, modifiers: crossterm::event::KeyModifiers) -> Option<String> {
-    // 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 Some(action.to_string())
-            },
-            _ => {} // Other actions are handled by their respective mode handlers
-        }
-    }
-    None
-}
-
-/// Shared logic for saving the current form state
-pub async fn save(
-    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>> {
-    let is_new = *current_position == total_count + 1;
-
-    let message = 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 response = grpc_client.post_adresar(post_request).await?;
-        let new_total = grpc_client.get_adresar_count().await?;
-        *current_position = new_total;
-        form_state.id = response.into_inner().id;
-        "New entry created".to_string()
-    } 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?;
-        "Entry updated".to_string()
-    };
-
-    *is_saved = true;
-    form_state.has_unsaved_changes = false;
-    Ok(message)
-}
-
-/// Discard changes since last save
-pub async fn revert(
-    form_state: &mut FormState,
-    grpc_client: &mut GrpcClient,
-    current_position: &mut u64,
-    total_count: u64,
-) -> Result<String, Box<dyn std::error::Error>> {
-    let is_new = *current_position == total_count + 1;
-
-    if is_new {
-        // Clear all fields for new entries
-        form_state.values.iter_mut().for_each(|v| *v = String::new());
-        form_state.has_unsaved_changes = false;
-        return Ok("New entry cleared".to_string());
-    }
-
-    let data = grpc_client.get_adresar_by_position(*current_position).await?;
-
-    // Update form fields with saved values
-    form_state.values = vec![
-        data.firma,
-        data.kz,
-        data.drc,
-        data.ulica,
-        data.psc,
-        data.mesto,
-        data.stat,
-        data.banka,
-        data.ucet,
-        data.skladm,
-        data.ico,
-        data.kontakt,
-        data.telefon,
-        data.skladu,
-        data.fax,
-    ];
-
-    form_state.has_unsaved_changes = false;
-    Ok("Changes discarded, reloaded last saved version".to_string())
-}

client/src/modes/canvas/edit.rs

@@ -2,12 +2,10 @@
 
 // TODO THIS is freaking bloated with functions it never uses REFACTOR 200 LOC can be gone
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
-use crate::tui::terminal::{
-    grpc_client::GrpcClient,
-};
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
-use crate::modes::canvas::common;
+use crate::services::grpc_client::GrpcClient;
+use crate::tui::functions::common::form::{save, revert};
 
 pub async fn handle_edit_event_internal(
     key: KeyEvent,
@@ -69,7 +67,7 @@ async fn execute_common_action(
 ) -> Result<String, Box<dyn std::error::Error>> {
     match action {
         "save" => {
-            common::save(
+            save(
                 form_state,
                 grpc_client,
                 is_saved,
@@ -78,7 +76,7 @@ async fn execute_common_action(
             ).await
         },
         "revert" => {
-            common::revert(
+            revert(
                 form_state,
                 grpc_client,
                 current_position,
@@ -179,7 +177,7 @@ async fn execute_edit_action(
 ) -> Result<String, Box<dyn std::error::Error>> {
     match action {
         "save" => {
-            common::save(
+            save(
                 form_state,
                 grpc_client,  // Changed from AppTerminal
                 is_saved,

client/src/modes/canvas/read_only.rs

@@ -1,12 +1,11 @@
-        
 // src/modes/canvas/read_only.rs
 
 use crossterm::event::{KeyEvent};
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::services::grpc_client::GrpcClient;
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use crate::tui::terminal::grpc_client::GrpcClient;
 
 #[derive(PartialEq)]
 enum CharType {
@@ -187,11 +186,6 @@ async fn execute_action(
             command_message.clear();
             Ok("".to_string())
         }
-        "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);

client/src/modes/common/command_mode.rs

@@ -1,14 +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::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::tui::controls::commands::CommandHandler;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
-use crate::modes::{
-    canvas::{common},
-};
+use crate::tui::functions::common::form::{save, revert};
 
 pub async fn handle_command_event(
     key: KeyEvent,
@@ -97,7 +95,7 @@ async fn process_command(
             Ok((should_exit, message, true))
         },
         "save" => {
-            let message = common::save(
+            let message = save(
                 form_state,
                 grpc_client,
                 &mut command_handler.is_saved,
@@ -108,7 +106,7 @@ async fn process_command(
             return Ok((false, message, true));
         },
         "revert" => {
-            let message = common::revert(
+            let message = revert(
                 form_state,
                 grpc_client,
                 current_position,

client/src/modes/handlers/event.rs

@@ -3,9 +3,9 @@ use crossterm::event::Event;
 use crossterm::cursor::SetCursorStyle;
 use crate::tui::terminal::{
     core::TerminalCore,
-    grpc_client::GrpcClient,
 };
-use crate::tui::controls::commands::CommandHandler;
+use crate::services::grpc_client::GrpcClient;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;

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

@@ -9,6 +9,7 @@ pub trait CanvasState {
     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>;
 }
 
 // Implement for FormState (keep existing form.rs code and add this)
@@ -41,4 +42,8 @@ impl CanvasState for FormState {
             .get_mut(self.current_field)
             .expect("Invalid current_field index")
     }
+
+    fn fields(&self) -> Vec<&str> {
+        self.fields.iter().map(|s| s.as_str()).collect()
+    }
 }

client/src/state/pages/auth.rs

@@ -9,6 +9,9 @@ pub struct AuthState {
     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>,
 }
 
 impl AuthState {
@@ -20,6 +23,9 @@ impl AuthState {
             error_message: None,
             current_field: 0,
             current_cursor_pos: 0,
+            auth_token: None,
+            user_id: None,
+            role: None,
         }
     }
 }
@@ -57,4 +63,8 @@ impl CanvasState for AuthState {
             _ => panic!("Invalid current_field index in AuthState"),
         }
     }
+
+    fn fields(&self) -> Vec<&str> {
+        vec!["Username/Email", "Password"]
+    }
 }

client/src/state/state.rs

@@ -5,6 +5,14 @@ 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,
@@ -13,6 +21,7 @@ pub struct UiState {
     pub show_form: bool,
     pub show_login: bool,
     pub intro_state: IntroState,
+    pub dialog: DialogState,  // Add dialog state here
 }
 
 pub struct GeneralState {
@@ -66,6 +75,24 @@ impl AppState {
     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 {
@@ -78,6 +105,7 @@ impl Default for UiState {
             show_form: false,
             show_login: false,
             intro_state: IntroState::new(),
+            dialog: DialogState::default(),
         }
     }
 }

client/src/tui/controls.rs

@@ -1,5 +0,0 @@
-// src/tui/controls.rs
-
-pub mod commands;
-
-pub use commands::*;

client/src/tui/functions.rs

@@ -4,7 +4,9 @@ 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/common.rs

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

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

@@ -0,0 +1,107 @@
+// src/tui/functions/common/form.rs
+
+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
+pub async fn save(
+    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>> {
+    let is_new = *current_position == total_count + 1;
+
+    let message = 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 response = grpc_client.post_adresar(post_request).await?;
+        let new_total = grpc_client.get_adresar_count().await?;
+        *current_position = new_total;
+        form_state.id = response.into_inner().id;
+        "New entry created".to_string()
+    } 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?;
+        "Entry updated".to_string()
+    };
+
+    *is_saved = true;
+    form_state.has_unsaved_changes = false;
+    Ok(message)
+}
+
+/// Discard changes since last save
+pub async fn revert(
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    let is_new = *current_position == total_count + 1;
+
+    if is_new {
+        // Clear all fields for new entries
+        form_state.values.iter_mut().for_each(|v| *v = String::new());
+        form_state.has_unsaved_changes = false;
+        return Ok("New entry cleared".to_string());
+    }
+
+    let data = grpc_client.get_adresar_by_position(*current_position).await?;
+
+    // Update form fields with saved values
+    form_state.values = vec![
+        data.firma,
+        data.kz,
+        data.drc,
+        data.ulica,
+        data.psc,
+        data.mesto,
+        data.stat,
+        data.banka,
+        data.ucet,
+        data.skladm,
+        data.ico,
+        data.kontakt,
+        data.telefon,
+        data.skladu,
+        data.fax,
+    ];
+
+    form_state.has_unsaved_changes = false;
+    Ok("Changes discarded, reloaded last saved version".to_string())
+}

client/src/tui/functions/form.rs

@@ -1,7 +1,6 @@
 // src/tui/functions/form.rs
 use crate::state::pages::form::FormState;
-use crate::tui::terminal::GrpcClient;
-use common::proto::multieko2::adresar::AdresarResponse;
+use crate::services::grpc_client::GrpcClient;
 
 pub async fn handle_action(
     action: &str,

client/src/tui/functions/login.rs

@@ -10,49 +10,55 @@ pub async fn handle_action(
     match action {
         "move_up" => {
             if auth_state.return_selected {
-                // Coming from return button to fields
+                // From Return button to last field (password)
                 auth_state.return_selected = false;
-                auth_state.current_field = 1; // Focus on password field
+                auth_state.current_field = 1;
             } else if auth_state.current_field == 1 {
-                // Moving from password to username/email
+                // Password -> Username
                 auth_state.current_field = 0;
             } else if auth_state.current_field == 0 {
-                // Wrap around to buttons
-                auth_state.return_selected = false; // Select Login button
+                // Username -> Password (wrap around fields only)
+                auth_state.current_field = 1;
+            } else if auth_state.current_field == 2 {
+                // From Login button to Password field
+                auth_state.current_field = 1;
             }
 
-            // Update cursor position when in a field
-            if !auth_state.return_selected {
+            // Update cursor position only when in a field
+            if auth_state.current_field < 2 {
                 let current_input = auth_state.get_current_input();
                 let max_cursor_pos = current_input.len();
                 auth_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
             }
 
             Ok(format!("Navigation 'up' from functions/login"))
-        },
+        }
         "move_down" => {
             if auth_state.return_selected {
-                // Coming from return button to fields
+                // From Return button to first field (username)
                 auth_state.return_selected = false;
-                auth_state.current_field = 0; // Focus on username field
+                auth_state.current_field = 0;
             } else if auth_state.current_field == 0 {
-                // Moving from username/email to password
+                // Username -> Password
                 auth_state.current_field = 1;
             } else if auth_state.current_field == 1 {
-                // Moving from password to buttons
-                auth_state.return_selected = false; // Select Login button
+                // Password -> Login button
+                auth_state.current_field = 2;
+                auth_state.return_selected = false;
+            } else if auth_state.current_field == 2 {
+                // Login button -> Return button
+                auth_state.return_selected = true;
             }
 
-            // Update cursor position when in a field
-            if !auth_state.return_selected {
+            // Update cursor position only when in a field
+            if auth_state.current_field < 2 {
                 let current_input = auth_state.get_current_input();
                 let max_cursor_pos = current_input.len();
                 auth_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
             }
 
             Ok(format!("Navigation 'down' from functions/login"))
-        },
+        }
         _ => Err("Unknown login action".into())
     }
 }
-

client/src/tui/mod.rs

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

client/src/tui/terminal.rs

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

client/src/ui/handlers/render.rs

@@ -47,7 +47,14 @@ pub fn render_ui(
         // 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);
+        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(

client/src/ui/handlers/ui.rs

@@ -1,9 +1,10 @@
 // src/ui/handlers/ui.rs
 
 use crate::tui::terminal::TerminalCore;
-use crate::tui::terminal::GrpcClient;
-use crate::tui::controls::CommandHandler;
+use crate::services::grpc_client::GrpcClient;
+use crate::services::ui_service::UiService;  // Add this import
 use crate::tui::terminal::EventReader;
+use crate::tui::functions::common::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;
@@ -23,19 +24,8 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     // 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;
-
-    // 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);
@@ -45,14 +35,11 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     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?;
 
         terminal.draw(|f| {
             render_ui(
@@ -109,29 +96,13 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                 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_position = app_state.current_position;
+                let message = UiService::load_adresar_by_position(
+                    &mut grpc_client,
+                    &mut app_state,
+                    &mut form_state,
+                    current_position
+                ).await?;                
 
                 let current_input = form_state.get_current_input();
                 let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
@@ -140,13 +111,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
                     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);
-                    }
-                }
+                event_handler.command_message = message;
             } else {
                 // Invalid position - reset to first entry
                 app_state.current_position = 1;
@@ -159,3 +124,4 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 }
+