From 1927d1fa4db2a9f37f60c74f91a7bc8317a8e285 Mon Sep 17 00:00:00 2001 From: filipriec Date: Sun, 13 Apr 2025 22:52:15 +0200 Subject: [PATCH] appstate moved to its folder also --- client/src/components/auth/login.rs | 2 +- client/src/components/auth/register.rs | 2 +- client/src/functions/modes/read_only/auth_ro.rs | 2 +- client/src/modes/canvas/common_mode.rs | 2 +- client/src/modes/canvas/edit.rs | 2 +- client/src/modes/canvas/read_only.rs | 2 +- client/src/modes/common/command_mode.rs | 2 +- client/src/modes/common/commands.rs | 2 +- client/src/modes/general/dialog.rs | 2 +- client/src/modes/general/navigation.rs | 2 +- client/src/modes/handlers/event.rs | 3 ++- client/src/modes/handlers/mode_manager.rs | 2 +- client/src/services/ui_service.rs | 2 +- client/src/state/app.rs | 3 +++ client/src/state/{ => app}/state.rs | 0 client/src/state/mod.rs | 2 +- client/src/tui/functions/admin.rs | 2 +- client/src/tui/functions/common/login.rs | 2 +- client/src/tui/functions/common/register.rs | 2 +- client/src/tui/functions/intro.rs | 2 +- client/src/ui/handlers/rat_state.rs | 2 +- client/src/ui/handlers/render.rs | 2 +- client/src/ui/handlers/ui.rs | 2 +- 23 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 client/src/state/app.rs rename client/src/state/{ => app}/state.rs (100%) diff --git a/client/src/components/auth/login.rs b/client/src/components/auth/login.rs index 0d91ba4..f2bb19a 100644 --- a/client/src/components/auth/login.rs +++ b/client/src/components/auth/login.rs @@ -4,7 +4,7 @@ use crate::{ config::colors::themes::Theme, state::pages::auth::LoginState, components::common::dialog, - state::state::AppState, + state::app::state::AppState, }; use ratatui::{ layout::{Alignment, Constraint, Direction, Layout, Rect, Margin}, diff --git a/client/src/components/auth/register.rs b/client/src/components/auth/register.rs index 46d4004..af4beae 100644 --- a/client/src/components/auth/register.rs +++ b/client/src/components/auth/register.rs @@ -4,7 +4,7 @@ use crate::{ config::colors::themes::Theme, state::pages::auth::RegisterState, // Use RegisterState components::common::{dialog, autocomplete}, - state::state::AppState, + state::app::state::AppState, state::pages::canvas_state::CanvasState, modes::handlers::mode_manager::AppMode, }; diff --git a/client/src/functions/modes/read_only/auth_ro.rs b/client/src/functions/modes/read_only/auth_ro.rs index cc0941c..b181399 100644 --- a/client/src/functions/modes/read_only/auth_ro.rs +++ b/client/src/functions/modes/read_only/auth_ro.rs @@ -2,7 +2,7 @@ use crate::config::binds::key_sequences::KeySequenceTracker; use crate::state::pages::canvas_state::CanvasState; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use std::error::Error; #[derive(PartialEq)] diff --git a/client/src/modes/canvas/common_mode.rs b/client/src/modes/canvas/common_mode.rs index 1087f29..1cf57f7 100644 --- a/client/src/modes/canvas/common_mode.rs +++ b/client/src/modes/canvas/common_mode.rs @@ -2,7 +2,7 @@ use crate::tui::terminal::core::TerminalCore; use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState, auth::AuthState}; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::services::grpc_client::GrpcClient; use crate::services::auth::AuthClient; use crate::modes::handlers::event::EventOutcome; diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs index f805f4e..13af474 100644 --- a/client/src/modes/canvas/edit.rs +++ b/client/src/modes/canvas/edit.rs @@ -7,7 +7,7 @@ use crate::state::pages::canvas_state::CanvasState; use crate::state::pages::form::FormState; use crate::functions::modes::edit::{auth_e, form_e}; use crate::modes::handlers::event::EventOutcome; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; pub async fn handle_edit_event( diff --git a/client/src/modes/canvas/read_only.rs b/client/src/modes/canvas/read_only.rs index edb32d3..a168d67 100644 --- a/client/src/modes/canvas/read_only.rs +++ b/client/src/modes/canvas/read_only.rs @@ -7,7 +7,7 @@ use crate::state::pages::{canvas_state::CanvasState, auth::RegisterState}; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; use crate::state::pages::form::FormState; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::functions::modes::read_only::{auth_ro, form_ro}; use crossterm::event::KeyEvent; diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs index 4e0eca6..926fcac 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::state::{state::AppState, pages::auth::LoginState, pages::auth::RegisterState}; +use crate::state::{app::state::AppState, pages::auth::LoginState, pages::auth::RegisterState}; use crate::modes::common::commands::CommandHandler; use crate::tui::terminal::core::TerminalCore; use crate::tui::functions::common::form::{save, revert}; diff --git a/client/src/modes/common/commands.rs b/client/src/modes/common/commands.rs index 1489758..17ffe23 100644 --- a/client/src/modes/common/commands.rs +++ b/client/src/modes/common/commands.rs @@ -1,6 +1,6 @@ // src/modes/common/commands.rs use crate::tui::terminal::core::TerminalCore; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState}; use crate::state::pages::canvas_state::CanvasState; diff --git a/client/src/modes/general/dialog.rs b/client/src/modes/general/dialog.rs index 1a52849..6775dd9 100644 --- a/client/src/modes/general/dialog.rs +++ b/client/src/modes/general/dialog.rs @@ -3,7 +3,7 @@ use crossterm::event::{Event, KeyCode}; use crate::config::binds::config::Config; use crate::ui::handlers::context::DialogPurpose; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; diff --git a/client/src/modes/general/navigation.rs b/client/src/modes/general/navigation.rs index f43a5ef..3f1afbb 100644 --- a/client/src/modes/general/navigation.rs +++ b/client/src/modes/general/navigation.rs @@ -2,7 +2,7 @@ use crossterm::event::KeyEvent; use crate::config::binds::config::Config; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::state::pages::form::FormState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index e735fc7..5f092de 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -10,6 +10,7 @@ use crate::state::pages::form::FormState; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; +use crate::state::app::state::AppState; use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::rat_state::UiStateHandler; use crate::ui::handlers::context::UiContext; @@ -68,7 +69,7 @@ impl EventHandler { auth_state: &mut AuthState, login_state: &mut LoginState, register_state: &mut RegisterState, - app_state: &mut crate::state::state::AppState, + app_state: &mut AppState, total_count: u64, current_position: &mut u64, ) -> Result> { diff --git a/client/src/modes/handlers/mode_manager.rs b/client/src/modes/handlers/mode_manager.rs index 9c334bd..b601b06 100644 --- a/client/src/modes/handlers/mode_manager.rs +++ b/client/src/modes/handlers/mode_manager.rs @@ -1,5 +1,5 @@ // src/modes/handlers/mode_manager.rs -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::modes::handlers::event::EventHandler; #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/client/src/services/ui_service.rs b/client/src/services/ui_service.rs index 999bf84..707f7e4 100644 --- a/client/src/services/ui_service.rs +++ b/client/src/services/ui_service.rs @@ -3,7 +3,7 @@ use crate::services::grpc_client::GrpcClient; use crate::state::pages::form::FormState; use crate::tui::functions::common::form::SaveOutcome; -use crate::state::state::AppState; +use crate::state::app::state::AppState; pub struct UiService; diff --git a/client/src/state/app.rs b/client/src/state/app.rs new file mode 100644 index 0000000..2551055 --- /dev/null +++ b/client/src/state/app.rs @@ -0,0 +1,3 @@ +// src/state/app.rs + +pub mod state; diff --git a/client/src/state/state.rs b/client/src/state/app/state.rs similarity index 100% rename from client/src/state/state.rs rename to client/src/state/app/state.rs diff --git a/client/src/state/mod.rs b/client/src/state/mod.rs index 6dc5624..e70cddc 100644 --- a/client/src/state/mod.rs +++ b/client/src/state/mod.rs @@ -1,3 +1,3 @@ // src/state/mod.rs -pub mod state; +pub mod app; pub mod pages; diff --git a/client/src/tui/functions/admin.rs b/client/src/tui/functions/admin.rs index 91966cb..bc38954 100644 --- a/client/src/tui/functions/admin.rs +++ b/client/src/tui/functions/admin.rs @@ -1,4 +1,4 @@ -use crate::state::state::AppState; +use crate::state::app::state::AppState; pub fn handle_admin_selection(app_state: &mut AppState) { let profiles = &app_state.profile_tree.profiles; diff --git a/client/src/tui/functions/common/login.rs b/client/src/tui/functions/common/login.rs index 1515d50..f207e0e 100644 --- a/client/src/tui/functions/common/login.rs +++ b/client/src/tui/functions/common/login.rs @@ -3,7 +3,7 @@ use crate::services::auth::AuthClient; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; -use crate::state::state::AppState; +use crate::state::app::state::AppState; use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::context::DialogPurpose; diff --git a/client/src/tui/functions/common/register.rs b/client/src/tui/functions/common/register.rs index 1d1bb4d..6913158 100644 --- a/client/src/tui/functions/common/register.rs +++ b/client/src/tui/functions/common/register.rs @@ -4,7 +4,7 @@ use crate::{ services::auth::AuthClient, state::{ pages::auth::RegisterState, - state::AppState, + app::state::AppState, pages::canvas_state::CanvasState, }, ui::handlers::context::DialogPurpose, diff --git a/client/src/tui/functions/intro.rs b/client/src/tui/functions/intro.rs index 4f90a69..da7468f 100644 --- a/client/src/tui/functions/intro.rs +++ b/client/src/tui/functions/intro.rs @@ -1,4 +1,4 @@ -use crate::state::state::AppState; +use crate::state::app::state::AppState; pub fn handle_intro_selection(app_state: &mut AppState, index: usize) { // Add index parameter match index { // Use index directly diff --git a/client/src/ui/handlers/rat_state.rs b/client/src/ui/handlers/rat_state.rs index 886b32c..e969f73 100644 --- a/client/src/ui/handlers/rat_state.rs +++ b/client/src/ui/handlers/rat_state.rs @@ -1,7 +1,7 @@ // src/ui/handlers/rat_state.rs use crossterm::event::{KeyCode, KeyModifiers}; use crate::config::binds::config::Config; -use crate::state::state::UiState; +use crate::state::app::state::UiState; pub struct UiStateHandler; diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs index d2beaaa..de31958 100644 --- a/client/src/ui/handlers/render.rs +++ b/client/src/ui/handlers/render.rs @@ -16,7 +16,7 @@ use crate::state::pages::form::FormState; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; -use crate::state::state::AppState; +use crate::state::app::state::AppState; pub fn render_ui( f: &mut Frame, diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index abb514e..3a50497 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -12,7 +12,7 @@ use crate::state::pages::form::FormState; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; -use crate::state::state::AppState; +use crate::state::app::state::AppState; // Import SaveOutcome use crate::tui::terminal::{EventReader, TerminalCore}; use crate::ui::handlers::render::render_ui;