From 87cdb8048dead5748e4624b417f5963a59ad6c18 Mon Sep 17 00:00:00 2001
From: filipriec <filippriec@gmail.com>
Date: Mon, 31 Mar 2025 12:07:01 +0200
Subject: [PATCH] we compiled fully, time to move grpc calls now

---
 client/src/components/form/form.rs                        | 1 -
 client/src/modes/canvas/read_only.rs                      | 6 ------
 client/src/modes/common/command_mode.rs                   | 2 +-
 client/src/modes/handlers/event.rs                        | 2 +-
 client/src/services/auth.rs                               | 3 +--
 client/src/tui/functions.rs                               | 2 ++
 client/src/tui/{controls.rs => functions/common.rs}       | 3 +--
 client/src/tui/{controls => functions/common}/commands.rs | 0
 client/src/tui/mod.rs                                     | 2 +-
 client/src/ui/handlers/ui.rs                              | 2 +-
 10 files changed, 8 insertions(+), 15 deletions(-)
 rename client/src/tui/{controls.rs => functions/common.rs} (56%)
 rename client/src/tui/{controls => functions/common}/commands.rs (100%)

diff --git a/client/src/components/form/form.rs b/client/src/components/form/form.rs
index 08f9ea2..db7aba6 100644
--- a/client/src/components/form/form.rs
+++ b/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,
diff --git a/client/src/modes/canvas/read_only.rs b/client/src/modes/canvas/read_only.rs
index 578733f..8161abb 100644
--- a/client/src/modes/canvas/read_only.rs
+++ b/client/src/modes/canvas/read_only.rs
@@ -1,4 +1,3 @@
-        
 // src/modes/canvas/read_only.rs
 
 use crossterm::event::{KeyEvent};
@@ -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);
diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs
index e00d4d2..58a9b83 100644
--- a/client/src/modes/common/command_mode.rs
+++ b/client/src/modes/common/command_mode.rs
@@ -4,7 +4,7 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::tui::controls::commands::CommandHandler;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
 use crate::modes::{
     canvas::{common},
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 81e6749..12824f8 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -5,7 +5,7 @@ use crate::tui::terminal::{
     core::TerminalCore,
 };
 use crate::services::grpc_client::GrpcClient;
-use crate::tui::controls::commands::CommandHandler;
+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;
diff --git a/client/src/services/auth.rs b/client/src/services/auth.rs
index 7e30d9b..01138d2 100644
--- a/client/src/services/auth.rs
+++ b/client/src/services/auth.rs
@@ -1,5 +1,4 @@
-// src/services/login.rs
-
+// src/services/auth.rs
 use tonic::transport::Channel;
 use common::proto::multieko2::auth::{
     auth_service_client::AuthServiceClient,
diff --git a/client/src/tui/functions.rs b/client/src/tui/functions.rs
index 42dc1ec..893d754 100644
--- a/client/src/tui/functions.rs
+++ b/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::*;
diff --git a/client/src/tui/controls.rs b/client/src/tui/functions/common.rs
similarity index 56%
rename from client/src/tui/controls.rs
rename to client/src/tui/functions/common.rs
index 74b87f8..98b0ff7 100644
--- a/client/src/tui/controls.rs
+++ b/client/src/tui/functions/common.rs
@@ -1,5 +1,4 @@
-// src/tui/controls.rs
-
+// src/tui/functions/common.rs
 pub mod commands;
 
 pub use commands::*;
diff --git a/client/src/tui/controls/commands.rs b/client/src/tui/functions/common/commands.rs
similarity index 100%
rename from client/src/tui/controls/commands.rs
rename to client/src/tui/functions/common/commands.rs
diff --git a/client/src/tui/mod.rs b/client/src/tui/mod.rs
index 546ed51..5ee3836 100644
--- a/client/src/tui/mod.rs
+++ b/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::*;
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 2a5a89e..e3e7226 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -3,8 +3,8 @@
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::ui_service::UiService;  // Add this import
-use crate::tui::controls::CommandHandler;
 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;