From a0a473f96c2507d46938bcdb7cf1259d1f5efb61 Mon Sep 17 00:00:00 2001 From: Priec Date: Wed, 27 Aug 2025 12:14:09 +0200 Subject: [PATCH] admin page --- client/src/components/admin/admin_panel.rs | 2 +- client/src/components/admin/admin_panel_admin.rs | 2 +- .../src/functions/modes/navigation/add_logic_nav.rs | 2 +- client/src/functions/modes/navigation/admin_nav.rs | 2 +- client/src/modes/handlers/event.rs | 12 +++--------- client/src/pages/admin/main/mod.rs | 2 ++ .../pages/admin.rs => pages/admin/main/state.rs} | 2 +- client/src/pages/admin/mod.rs | 4 ++++ client/src/pages/mod.rs | 1 + client/src/pages/routing/router.rs | 2 +- client/src/state/pages.rs | 1 - client/src/tui/functions/admin.rs | 2 +- client/src/ui/handlers/ui.rs | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 client/src/pages/admin/main/mod.rs rename client/src/{state/pages/admin.rs => pages/admin/main/state.rs} (99%) create mode 100644 client/src/pages/admin/mod.rs diff --git a/client/src/components/admin/admin_panel.rs b/client/src/components/admin/admin_panel.rs index 25a3631..f3b5eff 100644 --- a/client/src/components/admin/admin_panel.rs +++ b/client/src/components/admin/admin_panel.rs @@ -3,7 +3,7 @@ use crate::config::colors::themes::Theme; use crate::state::pages::auth::AuthState; use crate::state::app::state::AppState; -use crate::state::pages::admin::AdminState; +use crate::pages::admin::AdminState; use common::proto::komp_ac::table_definition::ProfileTreeResponse; use ratatui::{ layout::{Constraint, Direction, Layout, Rect}, diff --git a/client/src/components/admin/admin_panel_admin.rs b/client/src/components/admin/admin_panel_admin.rs index 0328814..6e3d431 100644 --- a/client/src/components/admin/admin_panel_admin.rs +++ b/client/src/components/admin/admin_panel_admin.rs @@ -1,7 +1,7 @@ // src/components/admin/admin_panel_admin.rs use crate::config::colors::themes::Theme; -use crate::state::pages::admin::{AdminFocus, AdminState}; +use crate::pages::admin::{AdminFocus, AdminState}; use crate::state::app::state::AppState; use ratatui::{ layout::{Alignment, Constraint, Direction, Layout, Rect}, diff --git a/client/src/functions/modes/navigation/add_logic_nav.rs b/client/src/functions/modes/navigation/add_logic_nav.rs index 96a154a..fd63ec3 100644 --- a/client/src/functions/modes/navigation/add_logic_nav.rs +++ b/client/src/functions/modes/navigation/add_logic_nav.rs @@ -13,7 +13,7 @@ use anyhow::Result; use crate::components::common::text_editor::TextEditor; use crate::services::ui_service::UiService; use tui_textarea::CursorMove; -use crate::state::pages::admin::AdminState; +use crate::pages::admin::AdminState; use crate::pages::routing::{Router, Page}; pub type SaveLogicResultSender = mpsc::Sender>; diff --git a/client/src/functions/modes/navigation/admin_nav.rs b/client/src/functions/modes/navigation/admin_nav.rs index 0cba76e..cfecae4 100644 --- a/client/src/functions/modes/navigation/admin_nav.rs +++ b/client/src/functions/modes/navigation/admin_nav.rs @@ -1,5 +1,5 @@ // src/functions/modes/navigation/admin_nav.rs -use crate::state::pages::admin::{AdminFocus, AdminState}; +use crate::pages::admin::{AdminFocus, AdminState}; use crate::state::app::state::AppState; use crate::config::binds::config::Config; use crate::buffer::state::{BufferState, AppView}; diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs index a5844aa..56818a3 100644 --- a/client/src/modes/handlers/event.rs +++ b/client/src/modes/handlers/event.rs @@ -19,15 +19,9 @@ use crate::modes::{ use crate::services::auth::AuthClient; use crate::services::grpc_client::GrpcClient; use canvas::AppMode as CanvasMode; -use crate::state::{ - app::{ - state::AppState, - }, - pages::{ - admin::AdminState, - auth::AuthState, - }, -}; +use crate::state::app::state::AppState; +use crate::pages::admin::AdminState; +use crate::state::pages::auth::AuthState; use crate::pages::login::LoginState; use crate::pages::register::RegisterState; use crate::pages::intro::IntroState; diff --git a/client/src/pages/admin/main/mod.rs b/client/src/pages/admin/main/mod.rs new file mode 100644 index 0000000..21e8062 --- /dev/null +++ b/client/src/pages/admin/main/mod.rs @@ -0,0 +1,2 @@ +// src/pages/admin/main/mod.rs +pub mod state; diff --git a/client/src/state/pages/admin.rs b/client/src/pages/admin/main/state.rs similarity index 99% rename from client/src/state/pages/admin.rs rename to client/src/pages/admin/main/state.rs index d7628dc..57d44de 100644 --- a/client/src/state/pages/admin.rs +++ b/client/src/pages/admin/main/state.rs @@ -1,4 +1,4 @@ -// src/state/pages/admin.rs +// src/pages/admin/main/state.rs use ratatui::widgets::ListState; use crate::state::pages::add_table::AddTableState; diff --git a/client/src/pages/admin/mod.rs b/client/src/pages/admin/mod.rs new file mode 100644 index 0000000..e42d67d --- /dev/null +++ b/client/src/pages/admin/mod.rs @@ -0,0 +1,4 @@ +// src/pages/admin/mod.rs +pub mod main; + +pub use main::state::{AdminState, AdminFocus}; diff --git a/client/src/pages/mod.rs b/client/src/pages/mod.rs index 3767f66..4625b93 100644 --- a/client/src/pages/mod.rs +++ b/client/src/pages/mod.rs @@ -5,3 +5,4 @@ pub mod intro; pub mod login; pub mod register; pub mod forms; +pub mod admin; diff --git a/client/src/pages/routing/router.rs b/client/src/pages/routing/router.rs index 75208e8..4cf2c82 100644 --- a/client/src/pages/routing/router.rs +++ b/client/src/pages/routing/router.rs @@ -1,10 +1,10 @@ // src/pages/routing/router.rs use crate::state::pages::{ - admin::AdminState, auth::AuthState, add_logic::AddLogicState, add_table::AddTableState, }; +use crate::pages::admin::AdminState; use crate::pages::forms::FormState; use crate::pages::login::LoginState; use crate::pages::register::RegisterState; diff --git a/client/src/state/pages.rs b/client/src/state/pages.rs index 6744c71..280b94e 100644 --- a/client/src/state/pages.rs +++ b/client/src/state/pages.rs @@ -1,6 +1,5 @@ // src/state/pages.rs pub mod auth; -pub mod admin; pub mod add_table; pub mod add_logic; diff --git a/client/src/tui/functions/admin.rs b/client/src/tui/functions/admin.rs index b0de0fd..dfffcf0 100644 --- a/client/src/tui/functions/admin.rs +++ b/client/src/tui/functions/admin.rs @@ -1,5 +1,5 @@ use crate::state::app::state::AppState; -use crate::state::pages::admin::AdminState; +use crate::pages::admin::AdminState; pub fn handle_admin_selection(app_state: &mut AppState, admin_state: &AdminState) { let profiles = &app_state.profile_tree.profiles; diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index ad78403..8a6f6ad 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -10,8 +10,8 @@ use crate::modes::handlers::event::{EventHandler, EventOutcome}; use crate::modes::handlers::mode_manager::{AppMode, ModeManager}; 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::pages::admin::AdminState; +use crate::pages::admin::AdminFocus; use crate::pages::intro::IntroState; use crate::pages::forms::{FormState, FieldDefinition}; use crate::pages::routing::{Router, Page};