From e6851e1fe473109db0fc97fcb9eb4c471d25e782 Mon Sep 17 00:00:00 2001 From: filipriec Date: Mon, 24 Mar 2025 17:14:12 +0100 Subject: [PATCH] small error to fix --- client/src/modes/canvas/common.rs | 2 +- client/src/modes/handlers/event.rs | 2 +- client/src/tui/controls.rs | 5 +++++ .../src/tui/{terminal => controls}/commands.rs | 18 +++++++++++++----- client/src/tui/mod.rs | 2 ++ client/src/tui/terminal.rs | 2 -- client/src/ui/handlers/ui.rs | 2 +- 7 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 client/src/tui/controls.rs rename client/src/tui/{terminal => controls}/commands.rs (69%) diff --git a/client/src/modes/canvas/common.rs b/client/src/modes/canvas/common.rs index a4466d8..0ac3c24 100644 --- a/client/src/modes/canvas/common.rs +++ b/client/src/modes/canvas/common.rs @@ -4,7 +4,7 @@ use crossterm::event::{KeyEvent}; use crate::config::binds::config::Config; use crate::tui::terminal::grpc_client::GrpcClient; use crate::tui::terminal::core::TerminalCore; -use crate::tui::terminal::commands::CommandHandler; +use crate::tui::controls::commands::CommandHandler; use crate::ui::handlers::form::FormState; use crate::state::state::AppState; use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest}; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index 581919d..4a4a06e 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -4,8 +4,8 @@ use crossterm::cursor::SetCursorStyle; use crate::tui::terminal::{ core::TerminalCore, grpc_client::GrpcClient, - commands::CommandHandler, }; +use crate::tui::controls::commands::CommandHandler; use crate::config::binds::config::Config; use crate::ui::handlers::form::FormState; use crate::ui::handlers::rat_state::UiStateHandler; diff --git a/client/src/tui/controls.rs b/client/src/tui/controls.rs new file mode 100644 index 0000000..74b87f8 --- /dev/null +++ b/client/src/tui/controls.rs @@ -0,0 +1,5 @@ +// src/tui/controls.rs + +pub mod commands; + +pub use commands::*; diff --git a/client/src/tui/terminal/commands.rs b/client/src/tui/controls/commands.rs similarity index 69% rename from client/src/tui/terminal/commands.rs rename to client/src/tui/controls/commands.rs index 57e554e..672e046 100644 --- a/client/src/tui/terminal/commands.rs +++ b/client/src/tui/controls/commands.rs @@ -1,5 +1,4 @@ -// src/tui/terminal/commands.rs - +// src/tui/controls/commands.rs use crate::tui::terminal::core::TerminalCore; pub struct CommandHandler { @@ -24,7 +23,10 @@ impl CommandHandler { } } - async fn handle_quit(&self, terminal: &mut TerminalCore) -> Result<(bool, String), Box> { + async fn handle_quit( + &self, + terminal: &mut TerminalCore, + ) -> Result<(bool, String), Box> { 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> { + async fn handle_force_quit( + &self, + terminal: &mut TerminalCore, + ) -> Result<(bool, String), Box> { terminal.cleanup()?; Ok((true, "Force exiting without saving.".into())) } - async fn handle_save_quit(&mut self, terminal: &mut TerminalCore) -> Result<(bool, String), Box> { + async fn handle_save_quit( + &mut self, + terminal: &mut TerminalCore, + ) -> Result<(bool, String), Box> { self.is_saved = true; terminal.cleanup()?; Ok((true, "State saved. Exiting.".into())) diff --git a/client/src/tui/mod.rs b/client/src/tui/mod.rs index 03d0055..fe59c76 100644 --- a/client/src/tui/mod.rs +++ b/client/src/tui/mod.rs @@ -1,2 +1,4 @@ // src/tui/mod.rs pub mod terminal; +pub mod controls; + diff --git a/client/src/tui/terminal.rs b/client/src/tui/terminal.rs index 9da680c..10e4939 100644 --- a/client/src/tui/terminal.rs +++ b/client/src/tui/terminal.rs @@ -2,10 +2,8 @@ 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; diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index cd46e45..3ef737c 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -2,7 +2,7 @@ use crate::tui::terminal::TerminalCore; use crate::tui::terminal::GrpcClient; -use crate::tui::terminal::CommandHandler; +use crate::tui::controls::CommandHandler; use crate::tui::terminal::EventReader; use crate::config::colors::themes::Theme; use crate::config::binds::config::Config;