moved canvasstate to the pages folder

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::{

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(

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;
 

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};

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;

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;
 

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)]

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;

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;

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;
 

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;
 

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};

client/src/state/mod.rs

@@ -1,4 +1,3 @@
 // src/state/mod.rs
 pub mod state;
 pub mod pages;
-pub mod canvas_state;

client/src/state/pages.rs

@@ -2,3 +2,4 @@
 
 pub mod form;
 pub mod auth;
+pub mod canvas_state;

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! {

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,

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.

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,
 };

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,

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;