From 16a7fa0bcc6ef2c4e20feeef8485df4faeab4096 Mon Sep 17 00:00:00 2001 From: filipriec Date: Sat, 22 Mar 2025 22:55:43 +0100 Subject: [PATCH] working change of the themes --- client/src/components/admin/admin_panel.rs | 2 +- client/src/components/common/background.rs | 2 +- client/src/components/common/command_line.rs | 2 +- client/src/components/common/status_line.rs | 2 +- client/src/components/handlers/canvas.rs | 2 +- client/src/components/handlers/form.rs | 2 +- client/src/components/handlers/sidebar.rs | 2 +- client/src/components/intro/intro.rs | 2 +- client/src/config/binds.rs | 4 ++++ client/src/config/{ => binds}/config.rs | 0 client/src/config/mod.rs | 1 - client/src/ui/handlers/form.rs | 2 +- client/src/ui/handlers/render.rs | 2 +- client/src/ui/handlers/ui.rs | 2 +- 14 files changed, 15 insertions(+), 12 deletions(-) rename client/src/config/{ => binds}/config.rs (100%) diff --git a/client/src/components/admin/admin_panel.rs b/client/src/components/admin/admin_panel.rs index 10986e7..5de7236 100644 --- a/client/src/components/admin/admin_panel.rs +++ b/client/src/components/admin/admin_panel.rs @@ -8,7 +8,7 @@ use ratatui::{ Frame, }; use common::proto::multieko2::table_definition::ProfileTreeResponse; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; pub struct AdminPanelState { pub list_state: ListState, diff --git a/client/src/components/common/background.rs b/client/src/components/common/background.rs index 902a6aa..d5610b7 100644 --- a/client/src/components/common/background.rs +++ b/client/src/components/common/background.rs @@ -5,7 +5,7 @@ use ratatui::{ style::Style, Frame, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; pub fn render_background(f: &mut Frame, area: Rect, theme: &Theme) { let background = Block::default() diff --git a/client/src/components/common/command_line.rs b/client/src/components/common/command_line.rs index 73e587f..c1a35cc 100644 --- a/client/src/components/common/command_line.rs +++ b/client/src/components/common/command_line.rs @@ -5,7 +5,7 @@ use ratatui::{ layout::Rect, Frame, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; pub fn render_command_line(f: &mut Frame, area: Rect, input: &str, active: bool, theme: &Theme, message: &str) { let prompt = if active { diff --git a/client/src/components/common/status_line.rs b/client/src/components/common/status_line.rs index efdc6f8..beffbf3 100644 --- a/client/src/components/common/status_line.rs +++ b/client/src/components/common/status_line.rs @@ -6,7 +6,7 @@ use ratatui::{ Frame, text::{Line, Span}, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use std::path::Path; pub fn render_status_line( diff --git a/client/src/components/handlers/canvas.rs b/client/src/components/handlers/canvas.rs index 29c3116..17f5225 100644 --- a/client/src/components/handlers/canvas.rs +++ b/client/src/components/handlers/canvas.rs @@ -7,7 +7,7 @@ use ratatui::{ Frame, prelude::Alignment, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use crate::ui::form::FormState; pub fn render_canvas( diff --git a/client/src/components/handlers/form.rs b/client/src/components/handlers/form.rs index ecbdad5..975b842 100644 --- a/client/src/components/handlers/form.rs +++ b/client/src/components/handlers/form.rs @@ -5,7 +5,7 @@ use ratatui::{ style::Style, Frame, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use crate::ui::form::FormState; use super::canvas::render_canvas; // Changed to canvas diff --git a/client/src/components/handlers/sidebar.rs b/client/src/components/handlers/sidebar.rs index bb4d266..4374972 100644 --- a/client/src/components/handlers/sidebar.rs +++ b/client/src/components/handlers/sidebar.rs @@ -5,7 +5,7 @@ use ratatui::{ style::Style, Frame, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use common::proto::multieko2::table_definition::{ProfileTreeResponse}; use ratatui::text::{Span, Line}; diff --git a/client/src/components/intro/intro.rs b/client/src/components/intro/intro.rs index 7ef768b..47ea142 100644 --- a/client/src/components/intro/intro.rs +++ b/client/src/components/intro/intro.rs @@ -7,7 +7,7 @@ use ratatui::{ prelude::Margin, Frame, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; pub struct IntroState { pub selected_option: usize, diff --git a/client/src/config/binds.rs b/client/src/config/binds.rs index 9339ee6..d122121 100644 --- a/client/src/config/binds.rs +++ b/client/src/config/binds.rs @@ -1 +1,5 @@ // src/config/binds.rs + +pub mod config; + +pub use config::*; diff --git a/client/src/config/config.rs b/client/src/config/binds/config.rs similarity index 100% rename from client/src/config/config.rs rename to client/src/config/binds/config.rs diff --git a/client/src/config/mod.rs b/client/src/config/mod.rs index d2f1712..d40f179 100644 --- a/client/src/config/mod.rs +++ b/client/src/config/mod.rs @@ -1,5 +1,4 @@ // src/config/mod.rs -pub mod config; pub mod key_sequences; pub mod binds; diff --git a/client/src/ui/handlers/form.rs b/client/src/ui/handlers/form.rs index adecdd3..b36d106 100644 --- a/client/src/ui/handlers/form.rs +++ b/client/src/ui/handlers/form.rs @@ -1,5 +1,5 @@ // src/client/ui/handlers/form.rs -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use ratatui::layout::Rect; use ratatui::Frame; diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs index 60f5107..11a8875 100644 --- a/client/src/ui/handlers/render.rs +++ b/client/src/ui/handlers/render.rs @@ -8,7 +8,7 @@ use crate::components::{ intro::{intro}, admin::{admin_panel::AdminPanelState}, }; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::Frame; use super::form::FormState; diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs index 0a01f34..a8ffd1e 100644 --- a/client/src/ui/handlers/ui.rs +++ b/client/src/ui/handlers/ui.rs @@ -4,7 +4,7 @@ use crate::tui::terminal::TerminalCore; use crate::tui::terminal::GrpcClient; use crate::tui::terminal::CommandHandler; use crate::tui::terminal::EventReader; -use crate::config::colors::Theme; +use crate::config::colors::themes::Theme; use crate::config::config::Config; use crate::ui::handlers::{form::FormState, render::render_ui}; use crate::modes::handlers::event::EventHandler;