filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appstate moved to its folder also

Browse Source
This commit is contained in:
filipriec
2025-04-13 22:52:15 +02:00
parent d995fab0e4
commit 1927d1fa4d
23 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/auth/login.rs
View File

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

2
client/src/components/auth/register.rs
View File

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

2
client/src/functions/modes/read_only/auth_ro.rs
View File

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

2
client/src/modes/canvas/common_mode.rs
View File

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

2
client/src/modes/canvas/edit.rs
View File

@@ -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(

2
client/src/modes/canvas/read_only.rs
View File

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

2
client/src/modes/common/command_mode.rs
View File

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

2
client/src/modes/common/commands.rs
View File

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

2
client/src/modes/general/dialog.rs
View File

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

2
client/src/modes/general/navigation.rs
View File

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

3
client/src/modes/handlers/event.rs
View File

@@ -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<EventOutcome, Box<dyn std::error::Error>> {

2
client/src/modes/handlers/mode_manager.rs
View File

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

2
client/src/services/ui_service.rs
View File

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

3
client/src/state/app.rs Normal file
View File

@@ -0,0 +1,3 @@
// src/state/app.rs
pub mod state;

0
client/src/state/state.rs → client/src/state/app/state.rs
View File

2
client/src/state/mod.rs
View File

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

2
client/src/tui/functions/admin.rs
View File

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

2
client/src/tui/functions/common/login.rs
View File

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

2
client/src/tui/functions/common/register.rs
View File

@@ -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,

2
client/src/tui/functions/intro.rs
View File

@@ -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

2
client/src/ui/handlers/rat_state.rs
View File

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

2
client/src/ui/handlers/render.rs
View File

@@ -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,

2
client/src/ui/handlers/ui.rs
View File

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