From d995fab0e4a1da9fe49da9bf5aaef643fb700b64 Mon Sep 17 00:00:00 2001 From: filipriec Date: Sun, 13 Apr 2025 22:45:26 +0200 Subject: [PATCH] moved canvasstate to the pages folder --- client/src/components/auth/register.rs | 2 +- client/src/components/form/form.rs | 2 +- client/src/components/handlers/canvas.rs | 2 +- client/src/functions/modes/edit/auth_e.rs | 2 +- client/src/functions/modes/edit/form_e.rs | 2 +- client/src/functions/modes/read_only/auth_ro.rs | 2 +- client/src/functions/modes/read_only/form_ro.rs | 2 +- client/src/modes/canvas/edit.rs | 2 +- client/src/modes/canvas/read_only.rs | 2 +- client/src/modes/common/commands.rs | 2 +- client/src/modes/general/navigation.rs | 2 +- client/src/modes/handlers/event.rs | 2 +- client/src/state/mod.rs | 1 - client/src/state/pages.rs | 1 + client/src/state/pages/auth.rs | 2 +- client/src/state/{ => pages}/canvas_state.rs | 0 client/src/state/pages/form.rs | 2 +- client/src/tui/functions/common/login.rs | 2 +- client/src/tui/functions/common/register.rs | 2 +- client/src/tui/functions/form.rs | 2 +- client/src/ui/handlers/ui.rs | 2 +- 21 files changed, 19 insertions(+), 19 deletions(-) rename client/src/state/{ => pages}/canvas_state.rs (100%) diff --git a/client/src/components/auth/register.rs b/client/src/components/auth/register.rs index 881fc0b..46d4004 100644 --- a/client/src/components/auth/register.rs +++ b/client/src/components/auth/register.rs @@ -5,7 +5,7 @@ use crate::{ state::pages::auth::RegisterState, // Use RegisterState components::common::{dialog, autocomplete}, state::state::AppState, - state::canvas_state::CanvasState, + state::pages::canvas_state::CanvasState, modes::handlers::mode_manager::AppMode, }; use ratatui::{ diff --git a/client/src/components/form/form.rs b/client/src/components/form/form.rs index db7aba6..d14b72c 100644 --- a/client/src/components/form/form.rs +++ b/client/src/components/form/form.rs @@ -6,7 +6,7 @@ use ratatui::{ Frame, }; use crate::config::colors::themes::Theme; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::components::handlers::canvas::render_canvas; pub fn render_form( diff --git a/client/src/components/handlers/canvas.rs b/client/src/components/handlers/canvas.rs index 785e844..59675d8 100644 --- a/client/src/components/handlers/canvas.rs +++ b/client/src/components/handlers/canvas.rs @@ -8,7 +8,7 @@ use ratatui::{ prelude::Alignment, }; use crate::config::colors::themes::Theme; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::components::common::autocomplete; use crate::components::render_autocomplete_dropdown; diff --git a/client/src/functions/modes/edit/auth_e.rs b/client/src/functions/modes/edit/auth_e.rs index 6f54ecf..7dd2d60 100644 --- a/client/src/functions/modes/edit/auth_e.rs +++ b/client/src/functions/modes/edit/auth_e.rs @@ -1,7 +1,7 @@ // src/functions/modes/edit/auth_e.rs use crate::services::grpc_client::GrpcClient; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::state::pages::form::FormState; use crate::state::pages::auth::RegisterState; use crate::tui::functions::common::form::{revert, save}; diff --git a/client/src/functions/modes/edit/form_e.rs b/client/src/functions/modes/edit/form_e.rs index bd9dc48..23d7cf7 100644 --- a/client/src/functions/modes/edit/form_e.rs +++ b/client/src/functions/modes/edit/form_e.rs @@ -1,7 +1,7 @@ // src/functions/modes/edit/form_e.rs use crate::services::grpc_client::GrpcClient; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::state::pages::form::FormState; use crate::tui::functions::common::form::{revert, save}; use crate::tui::functions::common::form::SaveOutcome; diff --git a/client/src/functions/modes/read_only/auth_ro.rs b/client/src/functions/modes/read_only/auth_ro.rs index b54348e..cc0941c 100644 --- a/client/src/functions/modes/read_only/auth_ro.rs +++ b/client/src/functions/modes/read_only/auth_ro.rs @@ -1,7 +1,7 @@ // src/functions/modes/read_only/auth_ro.rs use crate::config::binds::key_sequences::KeySequenceTracker; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::state::state::AppState; use std::error::Error; diff --git a/client/src/functions/modes/read_only/form_ro.rs b/client/src/functions/modes/read_only/form_ro.rs index 1a9b217..cb237ae 100644 --- a/client/src/functions/modes/read_only/form_ro.rs +++ b/client/src/functions/modes/read_only/form_ro.rs @@ -1,7 +1,7 @@ // src/functions/modes/read_only/form_ro.rs use crate::config::binds::key_sequences::KeySequenceTracker; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use std::error::Error; #[derive(PartialEq)] diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs index 27fdf1b..f805f4e 100644 --- a/client/src/modes/canvas/edit.rs +++ b/client/src/modes/canvas/edit.rs @@ -3,7 +3,7 @@ use crate::config::binds::config::Config; use crate::services::grpc_client::GrpcClient; use crate::state::pages::{auth::{LoginState, RegisterState}}; -use crate::state::canvas_state::CanvasState; +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; diff --git a/client/src/modes/canvas/read_only.rs b/client/src/modes/canvas/read_only.rs index b60e732..edb32d3 100644 --- a/client/src/modes/canvas/read_only.rs +++ b/client/src/modes/canvas/read_only.rs @@ -3,7 +3,7 @@ use crate::config::binds::config::Config; use crate::config::binds::key_sequences::KeySequenceTracker; use crate::services::grpc_client::GrpcClient; -use crate::state::{canvas_state::CanvasState, pages::auth::RegisterState}; +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; diff --git a/client/src/modes/common/commands.rs b/client/src/modes/common/commands.rs index c900220..1489758 100644 --- a/client/src/modes/common/commands.rs +++ b/client/src/modes/common/commands.rs @@ -2,7 +2,7 @@ use crate::tui::terminal::core::TerminalCore; use crate::state::state::AppState; use crate::state::pages::{form::FormState, auth::LoginState, auth::RegisterState}; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; pub struct CommandHandler; diff --git a/client/src/modes/general/navigation.rs b/client/src/modes/general/navigation.rs index 0651ae8..f43a5ef 100644 --- a/client/src/modes/general/navigation.rs +++ b/client/src/modes/general/navigation.rs @@ -6,7 +6,7 @@ use crate::state::state::AppState; use crate::state::pages::form::FormState; use crate::state::pages::auth::LoginState; use crate::state::pages::auth::RegisterState; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::context::UiContext; use crate::modes::handlers::event::EventOutcome; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index 9dccd0a..e735fc7 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -10,7 +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::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::rat_state::UiStateHandler; use crate::ui::handlers::context::UiContext; use crate::tui::functions::{intro, admin}; diff --git a/client/src/state/mod.rs b/client/src/state/mod.rs index 9e15dce..6dc5624 100644 --- a/client/src/state/mod.rs +++ b/client/src/state/mod.rs @@ -1,4 +1,3 @@ // src/state/mod.rs pub mod state; pub mod pages; -pub mod canvas_state; diff --git a/client/src/state/pages.rs b/client/src/state/pages.rs index b888164..2138407 100644 --- a/client/src/state/pages.rs +++ b/client/src/state/pages.rs @@ -2,3 +2,4 @@ pub mod form; pub mod auth; +pub mod canvas_state; diff --git a/client/src/state/pages/auth.rs b/client/src/state/pages/auth.rs index 682417e..bfca109 100644 --- a/client/src/state/pages/auth.rs +++ b/client/src/state/pages/auth.rs @@ -1,5 +1,5 @@ // src/state/pages/auth.rs -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use lazy_static::lazy_static; lazy_static! { diff --git a/client/src/state/canvas_state.rs b/client/src/state/pages/canvas_state.rs similarity index 100% rename from client/src/state/canvas_state.rs rename to client/src/state/pages/canvas_state.rs diff --git a/client/src/state/pages/form.rs b/client/src/state/pages/form.rs index 776df45..49531d0 100644 --- a/client/src/state/pages/form.rs +++ b/client/src/state/pages/form.rs @@ -2,7 +2,7 @@ use crate::config::colors::themes::Theme; use ratatui::layout::Rect; use ratatui::Frame; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; pub struct FormState { pub id: i64, diff --git a/client/src/tui/functions/common/login.rs b/client/src/tui/functions/common/login.rs index 57cb38e..1515d50 100644 --- a/client/src/tui/functions/common/login.rs +++ b/client/src/tui/functions/common/login.rs @@ -4,7 +4,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::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::ui::handlers::context::DialogPurpose; /// Attempts to log the user in using the provided credentials via gRPC. diff --git a/client/src/tui/functions/common/register.rs b/client/src/tui/functions/common/register.rs index 07f2f45..1d1bb4d 100644 --- a/client/src/tui/functions/common/register.rs +++ b/client/src/tui/functions/common/register.rs @@ -5,7 +5,7 @@ use crate::{ state::{ pages::auth::RegisterState, state::AppState, - canvas_state::CanvasState, + pages::canvas_state::CanvasState, }, ui::handlers::context::DialogPurpose, }; diff --git a/client/src/tui/functions/form.rs b/client/src/tui/functions/form.rs index cd894c2..3c20eb4 100644 --- a/client/src/tui/functions/form.rs +++ b/client/src/tui/functions/form.rs @@ -1,7 +1,7 @@ // src/tui/functions/form.rs use crate::state::pages::form::FormState; use crate::services::grpc_client::GrpcClient; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; pub async fn handle_action( action: &str, diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index 411ebd6..abb514e 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -7,7 +7,7 @@ use crate::modes::handlers::event::{EventHandler, EventOutcome}; // Import Event use crate::modes::handlers::mode_manager::{AppMode, ModeManager}; use crate::services::grpc_client::GrpcClient; use crate::services::ui_service::UiService; -use crate::state::canvas_state::CanvasState; +use crate::state::pages::canvas_state::CanvasState; use crate::state::pages::form::FormState; use crate::state::pages::auth::AuthState; use crate::state::pages::auth::LoginState;