From 1a7bbdc541b2bcfc30c66e0f97e1e1dd6c365bd4 Mon Sep 17 00:00:00 2001 From: filipriec Date: Fri, 4 Apr 2025 20:37:02 +0200 Subject: [PATCH] moving back to tui nonmode functions for now --- client/src/functions/common.rs | 4 ---- client/src/functions/modes/edit/form_e.rs | 2 +- client/src/modes/canvas/common.rs | 2 +- client/src/modes/common/command_mode.rs | 2 +- client/src/tui/functions/common.rs | 6 ++++++ client/src/{ => tui}/functions/common/form.rs | 0 client/src/{ => tui}/functions/common/login.rs | 0 7 files changed, 9 insertions(+), 7 deletions(-) rename client/src/{ => tui}/functions/common/form.rs (100%) rename client/src/{ => tui}/functions/common/login.rs (100%) diff --git a/client/src/functions/common.rs b/client/src/functions/common.rs index fdfe480..5cafcb8 100644 --- a/client/src/functions/common.rs +++ b/client/src/functions/common.rs @@ -1,9 +1,5 @@ // src/functions/common.rs -pub mod login; pub mod commands; -pub mod form; -pub use login::{revert as login_revert, save as login_save}; pub use commands::*; -pub use form::{revert as form_revert, save as form_save}; diff --git a/client/src/functions/modes/edit/form_e.rs b/client/src/functions/modes/edit/form_e.rs index 6e4c730..33dfb5c 100644 --- a/client/src/functions/modes/edit/form_e.rs +++ b/client/src/functions/modes/edit/form_e.rs @@ -4,7 +4,7 @@ use crate::config::binds::config::Config; use crate::services::grpc_client::GrpcClient; use crate::state::canvas_state::CanvasState; use crate::state::pages::form::FormState; -use crate::functions::common::form::{revert, save}; +use crate::tui::functions::common::form::{revert, save}; use crossterm::event::{KeyCode, KeyEvent}; use std::any::Any; diff --git a/client/src/modes/canvas/common.rs b/client/src/modes/canvas/common.rs index 9ca2e62..985bbfd 100644 --- a/client/src/modes/canvas/common.rs +++ b/client/src/modes/canvas/common.rs @@ -5,7 +5,7 @@ use crate::state::pages::{form::FormState, auth::AuthState}; use crate::state::state::AppState; use crate::services::grpc_client::GrpcClient; use crate::services::auth::AuthClient; -use crate::functions::common::{ +use crate::tui::functions::common::{ form::{save as form_save, revert as form_revert}, login::{save as login_save, revert as login_revert} }; diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs index 549b638..82c4765 100644 --- a/client/src/modes/common/command_mode.rs +++ b/client/src/modes/common/command_mode.rs @@ -6,7 +6,7 @@ use crate::services::grpc_client::GrpcClient; use crate::state::pages::form::FormState; use crate::functions::common::commands::CommandHandler; use crate::tui::terminal::core::TerminalCore; -use crate::functions::common::form::{save, revert}; +use crate::tui::functions::common::form::{save, revert}; pub async fn handle_command_event( key: KeyEvent, diff --git a/client/src/tui/functions/common.rs b/client/src/tui/functions/common.rs index b72142c..0fff862 100644 --- a/client/src/tui/functions/common.rs +++ b/client/src/tui/functions/common.rs @@ -1 +1,7 @@ // src/tui/functions/common.rs + +pub mod form; +pub mod login; + +pub use form::*; +pub use login::*; diff --git a/client/src/functions/common/form.rs b/client/src/tui/functions/common/form.rs similarity index 100% rename from client/src/functions/common/form.rs rename to client/src/tui/functions/common/form.rs diff --git a/client/src/functions/common/login.rs b/client/src/tui/functions/common/login.rs similarity index 100% rename from client/src/functions/common/login.rs rename to client/src/tui/functions/common/login.rs