0.0.1-beta-30 - move widgets to ui and cleanup help text

Author: SeanCannon

modules/wasteland/knowledge_survival/config.yml

@@ -1,10 +1,8 @@
-name: "Survival Guide"
-module_type: knowledge
-bus_topic: knowledge_survival
-template: ""  # Empty template = won't show in dashboard
-
-# Optional metadata
 bindings:
-  description: "Emergency survival procedures and protocols"
-  version: "2.1"
-  last_updated: "2024-01-15"
+  description: Emergency survival procedures and protocols
+  last_updated: 2024-01-15
+  version: '2.1'
+bus_topic: knowledge_survival
+module_type: knowledge
+name: Survival Guide
+template: ''

modules/wasteland/water_level/config.yml

@@ -1,32 +1,19 @@
-name: "Water Level"
-module_type: "monitoring"
-bus_topic: "a01"  # ← Same topic as a01 for demo!
-template: "chart_card"
-
 bindings:
-  a: 0  # Will receive same temperature data from a01
-  b: 0
-  c: 0
-
-  device_id: "w01"
-  device_type: "water_sensor"
-  firmware_version: "1.0.0"
-
-  display_name: "Water Level"
-  unit_of_measure_label: "cm"
-
-  # Chart-specific settings
-  chart_type: "sparkline"  # ← Sparkline display
-
-  max_value: 100.0
-  warn_threshold: 50.0
-  danger_threshold: 20.0
-
+  a: 0.0
+  b: 0.0
+  c: 0.0
+  chart_type: sparkline
+  danger_threshold: 80.0
+  device_id: w01
+  device_type: water_sensor
+  display_name: Water Level
+  firmware_version: 1.0.0
   is_blinkable: false
   is_connected: true
-
-  # Internal state (managed by template)
-  _chart_history: []
-
-# NOTE: In production, this would monitor actual water level
-# For demo, it shows temperature data as sparkline
+  max_value: 100.0
+  unit_of_measure_label: cm
+  warn_threshold: 50.0
+bus_topic: a01
+module_type: monitoring
+name: Water Level
+template: chart_card

src/app.rs

@@ -33,7 +33,7 @@ use crate::modules::{
     ModuleManagerView
 };
 
-use crate::widgets::{
+use crate::ui::widgets::{
     jukebox::{
         actor::JukeboxActor,
         widget::JukeboxWidget,

src/main.rs

@@ -4,7 +4,6 @@ pub mod app;
 pub mod ui;
 pub mod modules;
 pub mod util;
-pub mod widgets;
 
 #[tokio::main]
 async fn main() -> color_eyre::Result<()> {

src/modules/overseer/config_editor.rs

@@ -924,11 +924,11 @@ impl ConfigEditor {
         } else {
             // Show abbreviated help at bottom
             let help = if self.is_new_module && self.fields.len() == 2 {
-                "↑/↓: Select | ←/→: Change Type | Enter: Continue | Esc: Cancel"
+                "←/→: Change Type | Esc: Cancel"
             } else if self.is_editing {
                 "Enter: Save | Esc: Cancel"
             } else {
-                "↑/↓: Select | Enter: Edit | ←/→: Toggle | s: Save | Esc: Close"
+                " ←/→: Toggle | s: Save | Esc: Close"
             };
 
             buf.set_string(

src/modules/overseer/handler/new.rs

@@ -64,7 +64,7 @@ impl OverseerHandler {
         // Now do async refresh for things that need network/async ops
         handler.refresh_async_data_only();
 
-        handler.status_message = Some("Ready - Press 's' to scan for devices".to_string());
+        handler.status_message = Some("Ready - Press '[s]' to scan for devices".to_string());
 
         handler
     }

src/ui/mod.rs

@@ -2,15 +2,19 @@ pub mod document;
 pub mod template;
 pub mod screens;
 pub mod style;
+pub mod widgets;
+
 mod components;
 
 use ratatui::{
     buffer::Buffer,
-    layout::{Constraint, Direction, Layout, Rect},
+    layout::Rect,
     widgets::Widget,
 };
-use crate::app::{App, AppMode};
-use crate::ui::screens::overview::render_overview;
+use crate::{
+    app::{App, AppMode},
+    ui::screens::overview::render_overview
+};
 
 impl Widget for &mut App {
     fn render(self, area: Rect, buf: &mut Buffer) {
@@ -21,23 +25,3 @@ impl Widget for &mut App {
         }
     }
 }
-
-fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
-    let popup_layout = Layout::default()
-        .direction(Direction::Vertical)
-        .constraints([
-            Constraint::Percentage((100 - percent_y) / 2),
-            Constraint::Percentage(percent_y),
-            Constraint::Percentage((100 - percent_y) / 2),
-        ])
-        .split(r);
-
-    Layout::default()
-        .direction(Direction::Horizontal)
-        .constraints([
-            Constraint::Percentage((100 - percent_x) / 2),
-            Constraint::Percentage(percent_x),
-            Constraint::Percentage((100 - percent_x) / 2),
-        ])
-        .split(popup_layout[1])[1]
-}

src/ui/screens/overview/mod.rs

@@ -49,7 +49,7 @@ pub fn render_overview(app: &mut App, area: Rect, buf: &mut Buffer) {
 
     let is_none_focused = matches!(app.overview_focus, OverviewFocus::None);
     let is_jukebox_focused = matches!(app.overview_focus, OverviewFocus::Jukebox);
-    let is_wasteland_modules_list_focused = matches!(app.overview_focus, OverviewFocus::WastelandModules);
+        let is_wasteland_modules_list_focused = matches!(app.overview_focus, OverviewFocus::WastelandModules);
     let is_wasteland_modules_list_view = matches!(app.wasteland_module_manager.current_view, ModuleManagerView::ModuleListView);
     let is_core_modules_list_focused = matches!(app.overview_focus, OverviewFocus::CoreModules);
     let is_core_modules_list_view = matches!(app.core_module_manager.current_view, ModuleManagerView::ModuleListView);
@@ -87,7 +87,7 @@ pub fn render_overview(app: &mut App, area: Rect, buf: &mut Buffer) {
     // Render wasteland modules
     let mut needs_redraw = false;
     {
-        let is_focused: Option<bool> = if is_wasteland_modules_list_focused {
+            let is_focused: Option<bool> = if is_wasteland_modules_list_focused {
             Some(true)
         } else if is_none_focused {
             None
@@ -194,29 +194,29 @@ pub fn render_overview(app: &mut App, area: Rect, buf: &mut Buffer) {
         if app.wasteland_module_manager.get_modules().is_empty() {
             "No wasteland modules found."
         } else if is_wasteland_modules_list_view {
-            "←/→: Navigate Wasteland Modules"
+            "[←]/[→] Navigate Wasteland Modules"
         } else {
-            "Esc: Back to List"
+            "[Esc] Back to List"
         }
     };
 
     let core_help_text: &str = {
         if is_core_modules_list_view {
-            "←/→: Navigate Core Modules"
+            "[←]/[→] Navigate Core Modules"
         } else {
-            "Esc: Back to List"
+            "[Esc] Back to List"
         }
     };
 
     let focus_hint = match app.overview_focus {
-        OverviewFocus::None => "Tab: Focus Wasteland Modules".to_string(),
-        OverviewFocus::WastelandModules => format!("{} • Tab: Focus Messages", wasteland_help_text),
-        OverviewFocus::Messages => "↑/↓: Scroll Messages • Tab: Focus Core Modules".to_string(),
-        OverviewFocus::CoreModules => format!("{} • Tab: Remove Overview Focus", core_help_text),
-        OverviewFocus::Jukebox => "Space: Play/Pause • ←/→: Skip • +/-: Volume • m: Library • Tab: Focus Next".to_string(),
+        OverviewFocus::None => "[Tab] Focus Wasteland Modules".to_string(),
+        OverviewFocus::WastelandModules => format!("{} [Tab] Focus Messages", wasteland_help_text),
+        OverviewFocus::Messages => "[↑]/[↓] Scroll  [Tab] Focus Core Modules".to_string(),
+        OverviewFocus::CoreModules => format!("{}  [Tab] Focus Jukebox", core_help_text),
+        OverviewFocus::Jukebox => "[   ] ⏯  [←]/[→] ⏮/⏭  [+]/[-] 🔈  [m] Library  [Tab] Remove Overview Focus".to_string(),
     };
 
-    let help_text = format!("{} • Enter: Select • 'r': Refresh • 'q': Quit", focus_hint);
+    let help_text = format!("{}  [Enter] Select  [r] Refresh  [q] Quit", focus_hint);
 
     let help = Paragraph::new(help_text)
         .block(