From 9cf25afa52ef6926883a9ac789c381292d081d9f Mon Sep 17 00:00:00 2001 From: filipriec Date: Mon, 31 Mar 2025 07:08:51 +0200 Subject: [PATCH] moving grpc_client, needs import fixes --- client/src/lib.rs | 1 + client/src/modes/canvas/common.rs | 1 - client/src/modes/canvas/edit.rs | 3 --- client/src/modes/handlers/event.rs | 1 - client/src/{tui/terminal => services}/grpc_client.rs | 0 client/src/services/mod.rs | 5 +++++ client/src/tui/functions/form.rs | 2 +- client/src/tui/terminal.rs | 2 -- client/src/ui/handlers/ui.rs | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) rename client/src/{tui/terminal => services}/grpc_client.rs (100%) create mode 100644 client/src/services/mod.rs diff --git a/client/src/lib.rs b/client/src/lib.rs index 6a65abe..2568a0a 100644 --- a/client/src/lib.rs +++ b/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; diff --git a/client/src/modes/canvas/common.rs b/client/src/modes/canvas/common.rs index b329f28..c71b385 100644 --- a/client/src/modes/canvas/common.rs +++ b/client/src/modes/canvas/common.rs @@ -1,7 +1,6 @@ // 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; diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs index 6a15d11..e8a879c 100644 --- a/client/src/modes/canvas/edit.rs +++ b/client/src/modes/canvas/edit.rs @@ -2,9 +2,6 @@ // 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; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index 7c08d90..bb2ca40 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -3,7 +3,6 @@ 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::config::binds::config::Config; diff --git a/client/src/tui/terminal/grpc_client.rs b/client/src/services/grpc_client.rs similarity index 100% rename from client/src/tui/terminal/grpc_client.rs rename to client/src/services/grpc_client.rs diff --git a/client/src/services/mod.rs b/client/src/services/mod.rs new file mode 100644 index 0000000..6c00f7f --- /dev/null +++ b/client/src/services/mod.rs @@ -0,0 +1,5 @@ +// services/mod.rs + +mod grpc_client; + +pub use grpc_client::*; diff --git a/client/src/tui/functions/form.rs b/client/src/tui/functions/form.rs index d181d31..d4c6ad3 100644 --- a/client/src/tui/functions/form.rs +++ b/client/src/tui/functions/form.rs @@ -1,6 +1,6 @@ // src/tui/functions/form.rs use crate::state::pages::form::FormState; -use crate::tui::terminal::GrpcClient; +use crate::services::grpc_client::GrpcClient; use common::proto::multieko2::adresar::AdresarResponse; pub async fn handle_action( diff --git a/client/src/tui/terminal.rs b/client/src/tui/terminal.rs index 10e4939..e66b9a6 100644 --- a/client/src/tui/terminal.rs +++ b/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; diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index 015bfcc..d617807 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -1,7 +1,7 @@ // src/ui/handlers/ui.rs use crate::tui::terminal::TerminalCore; -use crate::tui::terminal::GrpcClient; +use crate::services::grpc_client::GrpcClient; use crate::tui::controls::CommandHandler; use crate::tui::terminal::EventReader; use crate::config::colors::themes::Theme;