From 0810fcd92b98595fe0679c3a909c543ca30e40a5 Mon Sep 17 00:00:00 2001 From: filipriec Date: Wed, 26 Feb 2025 17:00:14 +0100 Subject: [PATCH] working moved event to modes --- client/src/components1/handlers.rs | 2 +- client/src/components1/mod.rs | 2 +- client/src/lib.rs | 1 + client/src/modes/handlers.rs | 2 ++ client/src/modes/handlers/edit.rs | 0 client/src/{ui => modes}/handlers/event.rs | 2 +- client/src/modes/handlers/highlight.rs | 0 client/src/modes/handlers/read_only.rs | 0 client/src/modes/mod.rs | 4 ++++ client/src/ui/handlers.rs | 1 - client/src/ui/handlers/ui.rs | 3 ++- 11 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 client/src/modes/handlers.rs create mode 100644 client/src/modes/handlers/edit.rs rename client/src/{ui => modes}/handlers/event.rs (99%) create mode 100644 client/src/modes/handlers/highlight.rs create mode 100644 client/src/modes/handlers/read_only.rs create mode 100644 client/src/modes/mod.rs diff --git a/client/src/components1/handlers.rs b/client/src/components1/handlers.rs index 8d9c7dd..db0803e 100644 --- a/client/src/components1/handlers.rs +++ b/client/src/components1/handlers.rs @@ -1,4 +1,4 @@ -// src/client/components/mod.rs +// src/components/handlers.rs pub mod form; pub mod preview_card; pub mod command_line; diff --git a/client/src/components1/mod.rs b/client/src/components1/mod.rs index 4792633..194f5cc 100644 --- a/client/src/components1/mod.rs +++ b/client/src/components1/mod.rs @@ -1,4 +1,4 @@ -// src/client/components1/mod.rs +// src/components1/mod.rs pub mod models; pub mod handlers; diff --git a/client/src/lib.rs b/client/src/lib.rs index 9af36e5..6b5e822 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -4,6 +4,7 @@ pub mod tui; pub mod config; pub mod state; pub mod components1; +pub mod modes; pub use ui::run_ui; diff --git a/client/src/modes/handlers.rs b/client/src/modes/handlers.rs new file mode 100644 index 0000000..09942a9 --- /dev/null +++ b/client/src/modes/handlers.rs @@ -0,0 +1,2 @@ +// src/client/modes/handlers.rs +pub mod event; diff --git a/client/src/modes/handlers/edit.rs b/client/src/modes/handlers/edit.rs new file mode 100644 index 0000000..e69de29 diff --git a/client/src/ui/handlers/event.rs b/client/src/modes/handlers/event.rs similarity index 99% rename from client/src/ui/handlers/event.rs rename to client/src/modes/handlers/event.rs index cf2e358..69127e6 100644 --- a/client/src/ui/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -5,7 +5,7 @@ use crossterm::cursor::{SetCursorStyle}; use crate::tui::terminal::AppTerminal; use crate::config::config::Config; use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest}; -use super::form::FormState; +use crate::ui::handlers::form::FormState; pub struct EventHandler { pub command_mode: bool, diff --git a/client/src/modes/handlers/highlight.rs b/client/src/modes/handlers/highlight.rs new file mode 100644 index 0000000..e69de29 diff --git a/client/src/modes/handlers/read_only.rs b/client/src/modes/handlers/read_only.rs new file mode 100644 index 0000000..e69de29 diff --git a/client/src/modes/mod.rs b/client/src/modes/mod.rs new file mode 100644 index 0000000..ef19ed6 --- /dev/null +++ b/client/src/modes/mod.rs @@ -0,0 +1,4 @@ +// src/client/modes/mod.rs +pub mod handlers; + +pub use handlers::*; diff --git a/client/src/ui/handlers.rs b/client/src/ui/handlers.rs index 4d9988c..a84185e 100644 --- a/client/src/ui/handlers.rs +++ b/client/src/ui/handlers.rs @@ -2,7 +2,6 @@ pub mod ui; pub mod form; -pub mod event; pub mod render; pub use ui::run_ui; diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index 3a22fe6..0ddff53 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -3,7 +3,8 @@ use crate::tui::terminal::AppTerminal; use crate::config::colors::Theme; use crate::config::config::Config; -use crate::ui::handlers::{event::EventHandler, form::FormState, render::render_ui}; +use crate::ui::handlers::{form::FormState, render::render_ui}; +use crate::modes::handlers::event::EventHandler; use crate::state::state::AppState;