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

gRPC implementation of a registration working

Browse Source
This commit is contained in:
filipriec
2025-04-10 21:14:32 +02:00
parent dfb6f5b375
commit d36348b84f
6 changed files with 193 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,12 +2,13 @@
use crossterm::event::{Event, KeyCode};
use crate::config::binds::config::Config;
use crate::state::state::AppState;
use crate::ui::handlers::context::DialogPurpose;
use crate::state::state::AppState;
use crate::state::pages::auth::AuthState;
use crate::state::pages::auth::RegisterState;
use crate::services::auth::AuthClient;
use crate::modes::handlers::event::EventOutcome;
use crate::tui::functions::common::login;
use crate::tui::functions::common::{login, register};
/// Handles key events specifically when a dialog is active.
/// Returns Some(Result<EventOutcome, Error>) if the event was handled (consumed),
@@ -17,6 +18,7 @@ pub async fn handle_dialog_event(
config: &Config,
app_state: &mut AppState,
auth_state: &mut AuthState,
register_state: &mut RegisterState,
auth_client: &mut AuthClient,
) -> Option<Result<EventOutcome, Box<dyn std::error::Error>>> {
if let Event::Key(key) = event {
@@ -85,7 +87,32 @@ pub async fn handle_dialog_event(
}
}
}
// Add cases for other DialogPurpose variants here if needed
DialogPurpose::RegisterSuccess => { // Add this arm
match selected_index {
0 => { // "OK" button for RegisterSuccess
app_state.hide_dialog();
// Go back to intro after successful registration dialog
let message = register::back_to_main(register_state, app_state).await;
return Some(Ok(EventOutcome::Ok(message)));
}
_ => { // Default for RegisterSuccess
app_state.hide_dialog();
return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
}
}
}
DialogPurpose::RegisterFailed => { // Add this arm
match selected_index {
0 => { // "OK" button for RegisterFailed
app_state.hide_dialog(); // Just dismiss
return Some(Ok(EventOutcome::Ok("Register failed dialog dismissed".to_string())));
}
_ => { // Default for RegisterFailed
app_state.hide_dialog();
return Some(Ok(EventOutcome::Ok("Unknown dialog button selected".to_string())));
}
}
}
}
}
_ => {} // Ignore other general actions when dialog is shown

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

@@ -60,6 +60,8 @@ pub async fn handle_navigation_event(
(UiContext::Intro, app_state.ui.intro_state.selected_option)
} else if app_state.ui.show_login && app_state.ui.focus_outside_canvas {
(UiContext::Login, app_state.general.selected_item)
} else if app_state.ui.show_register && app_state.ui.focus_outside_canvas {
(UiContext::Register, app_state.general.selected_item)
} else if app_state.ui.show_admin {
(UiContext::Admin, app_state.general.selected_item)
} else if app_state.ui.dialog.dialog_show {

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

@@ -13,7 +13,7 @@ use crate::state::canvas_state::CanvasState;
use crate::ui::handlers::rat_state::UiStateHandler;
use crate::ui::handlers::context::UiContext;
use crate::tui::functions::{intro, admin};
use crate::tui::functions::common::login;
use crate::tui::functions::common::{login, register};
use crate::modes::{
common::command_mode,
canvas::{edit, read_only, common_mode},
@@ -76,7 +76,7 @@ impl EventHandler {
// --- DIALOG MODALITY ---
if app_state.ui.dialog.dialog_show {
if let Some(dialog_result) = dialog::handle_dialog_event(
&event, config, app_state, auth_state, &mut self.auth_client
&event, config, app_state, auth_state, register_state, &mut self.auth_client
).await {
return dialog_result;
}
@@ -122,6 +122,13 @@ impl EventHandler {
_ => "Invalid Login Option".to_string(),
};
}
UiContext::Register => {
message = match index {
0 => register::save(register_state, &mut self.auth_client, app_state).await?,
1 => register::back_to_main(register_state, app_state).await,
_ => "Invalid Login Option".to_string(),
};
}
UiContext::Admin => {
// Assuming handle_admin_selection uses app_state.general.selected_item
admin::handle_admin_selection(app_state);