From 88a4b2d69ca92190814682f09ccc66c9fd31de4a Mon Sep 17 00:00:00 2001 From: filipriec Date: Sat, 23 Aug 2025 21:58:29 +0200 Subject: [PATCH] intro is now separated --- client/src/components/intro.rs | 4 ---- client/src/components/mod.rs | 3 +-- client/src/modes/handlers/event.rs | 6 +++--- .../src/{tui/functions/intro.rs => pages/intro/logic.rs} | 0 client/src/pages/intro/mod.rs | 9 +++++++++ .../src/{state/pages/intro.rs => pages/intro/state.rs} | 0 .../src/{components/intro/intro.rs => pages/intro/ui.rs} | 4 ++-- client/src/pages/mod.rs | 3 ++- client/src/pages/routing/router.rs | 2 +- client/src/state/pages.rs | 1 - client/src/tui/functions.rs | 2 -- client/src/ui/handlers/render.rs | 2 +- client/src/ui/handlers/ui.rs | 2 +- 13 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 client/src/components/intro.rs rename client/src/{tui/functions/intro.rs => pages/intro/logic.rs} (100%) create mode 100644 client/src/pages/intro/mod.rs rename client/src/{state/pages/intro.rs => pages/intro/state.rs} (100%) rename client/src/{components/intro/intro.rs => pages/intro/ui.rs} (97%) diff --git a/client/src/components/intro.rs b/client/src/components/intro.rs deleted file mode 100644 index ebac46c..0000000 --- a/client/src/components/intro.rs +++ /dev/null @@ -1,4 +0,0 @@ -// src/components/intro.rs -pub mod intro; - -pub use intro::*; diff --git a/client/src/components/mod.rs b/client/src/components/mod.rs index 2a84361..d2c38d6 100644 --- a/client/src/components/mod.rs +++ b/client/src/components/mod.rs @@ -1,10 +1,9 @@ // src/components/mod.rs -pub mod intro; + pub mod admin; pub mod common; pub mod utils; -pub use intro::*; pub use admin::*; pub use common::*; pub use utils::*; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index 3ba7343..9533bf3 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -26,14 +26,14 @@ use crate::state::{ pages::{ admin::AdminState, auth::AuthState, - intro::IntroState, }, }; use crate::pages::login::LoginState; use crate::pages::register::RegisterState; +use crate::pages::intro::IntroState; use crate::pages::login; use crate::pages::register; -// use crate::pages::login::logic; +use crate::pages::intro; use crate::pages::login::logic::LoginResult; use crate::pages::register::RegisterResult; use crate::pages::routing::{Router, Page}; @@ -43,7 +43,7 @@ use crate::pages::forms::logic::{save, revert, SaveOutcome}; use crate::search::state::SearchState; use crate::tui::{ terminal::core::TerminalCore, - {admin, intro}, + admin, }; use crate::ui::handlers::context::UiContext; use canvas::KeyEventOutcome; diff --git a/client/src/tui/functions/intro.rs b/client/src/pages/intro/logic.rs similarity index 100% rename from client/src/tui/functions/intro.rs rename to client/src/pages/intro/logic.rs diff --git a/client/src/pages/intro/mod.rs b/client/src/pages/intro/mod.rs new file mode 100644 index 0000000..38142d8 --- /dev/null +++ b/client/src/pages/intro/mod.rs @@ -0,0 +1,9 @@ +// src/pages/intro/mod.rs + +pub mod state; +pub mod ui; +pub mod logic; + +pub use state::*; +pub use ui::render_intro; +pub use logic::*; diff --git a/client/src/state/pages/intro.rs b/client/src/pages/intro/state.rs similarity index 100% rename from client/src/state/pages/intro.rs rename to client/src/pages/intro/state.rs diff --git a/client/src/components/intro/intro.rs b/client/src/pages/intro/ui.rs similarity index 97% rename from client/src/components/intro/intro.rs rename to client/src/pages/intro/ui.rs index cd6ae3f..4ada9ea 100644 --- a/client/src/components/intro/intro.rs +++ b/client/src/pages/intro/ui.rs @@ -1,4 +1,4 @@ -// src/components/intro/intro.rs +// src/pages/intro/ui.rs use ratatui::{ layout::{Alignment, Constraint, Direction, Layout, Rect}, style::Style, @@ -8,7 +8,7 @@ use ratatui::{ Frame, }; use crate::config::colors::themes::Theme; -use crate::state::pages::intro::IntroState; +use crate::pages::intro::IntroState; pub fn render_intro(f: &mut Frame, intro_state: &IntroState, area: Rect, theme: &Theme) { let block = Block::default() diff --git a/client/src/pages/mod.rs b/client/src/pages/mod.rs index 789a120..3767f66 100644 --- a/client/src/pages/mod.rs +++ b/client/src/pages/mod.rs @@ -1,6 +1,7 @@ // src/pages/mod.rs pub mod routing; -pub mod forms; +pub mod intro; pub mod login; pub mod register; +pub mod forms; diff --git a/client/src/pages/routing/router.rs b/client/src/pages/routing/router.rs index ae0d887..75208e8 100644 --- a/client/src/pages/routing/router.rs +++ b/client/src/pages/routing/router.rs @@ -2,13 +2,13 @@ use crate::state::pages::{ admin::AdminState, auth::AuthState, - intro::IntroState, add_logic::AddLogicState, add_table::AddTableState, }; use crate::pages::forms::FormState; use crate::pages::login::LoginState; use crate::pages::register::RegisterState; +use crate::pages::intro::IntroState; #[derive(Debug)] pub enum Page { diff --git a/client/src/state/pages.rs b/client/src/state/pages.rs index 517796e..6744c71 100644 --- a/client/src/state/pages.rs +++ b/client/src/state/pages.rs @@ -2,6 +2,5 @@ pub mod auth; pub mod admin; -pub mod intro; pub mod add_table; pub mod add_logic; diff --git a/client/src/tui/functions.rs b/client/src/tui/functions.rs index 6fa5bf2..ddfd58c 100644 --- a/client/src/tui/functions.rs +++ b/client/src/tui/functions.rs @@ -1,8 +1,6 @@ // src/tui/functions.rs pub mod admin; -pub mod intro; pub mod common; pub use admin::*; -pub use intro::*; diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs index dcbe000..93ad8ae 100644 --- a/client/src/ui/handlers/render.rs +++ b/client/src/ui/handlers/render.rs @@ -3,11 +3,11 @@ use crate::components::{ admin::add_logic::render_add_logic, admin::render_add_table, - intro::intro::render_intro, render_background, }; use crate::pages::login::render_login; use crate::pages::register::render_register; +use crate::pages::intro::render_intro; use crate::bottom_panel::{ command_line::render_command_line, status_line::render_status_line, diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index fdd3dd3..7af117d 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -12,7 +12,7 @@ use crate::state::pages::auth::AuthState; use crate::pages::register::RegisterState; use crate::state::pages::admin::AdminState; use crate::state::pages::admin::AdminFocus; -use crate::state::pages::intro::IntroState; +use crate::pages::intro::IntroState; use crate::pages::forms::{FormState, FieldDefinition}; use crate::pages::routing::{Router, Page}; use crate::buffer::state::BufferState;