more renaming and shuffling

16 files changed, 21 insertions, 12 deletions

diff --git a/src/canvas.rs b/src/canvas.rs
index 3915edf2..38194f04 100644
--- a/src/canvas.rs
+++ b/src/canvas.rs
@@ -1,7 +1,7 @@
+pub mod components;
 mod dialogs;
 mod drawing_utils;
 pub mod styling;
-pub mod components;
 mod widgets;
 
 use std::str::FromStr;
diff --git a/src/canvas/components.rs b/src/canvas/components.rs
index 3493dfb1..523af6f8 100644
--- a/src/canvas/components.rs
+++ b/src/canvas/components.rs
@@ -1,7 +1,10 @@
-//! Cstom ratatui widgets used by the rest of bottom as lower-level components.
+//! Lower-level components used throughout bottom.
 
+pub mod column;
 pub mod data_table;
-pub mod pipe_gauge;
-pub mod time_chart;
+pub mod row;
 pub mod time_graph;
+mod tui;
 pub mod widget_carousel;
+
+pub use tui::*;
diff --git a/src/canvas/components/column.rs b/src/canvas/components/column.rs
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/src/canvas/components/column.rs
@@ -0,0 +1 @@
+
diff --git a/src/canvas/components/row.rs b/src/canvas/components/row.rs
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/src/canvas/components/row.rs
@@ -0,0 +1 @@
+
diff --git a/src/canvas/components/time_graph.rs b/src/canvas/components/time_graph.rs
index 2bbcd652..bd19be74 100644
--- a/src/canvas/components/time_graph.rs
+++ b/src/canvas/components/time_graph.rs
@@ -183,7 +183,7 @@ mod test {
     };
 
     use super::TimeGraph;
-    use crate::canvas::tui_widgets::time_chart::Axis;
+    use crate::canvas::components::time_chart::Axis;
 
     const Y_LABELS: [Cow<'static, str>; 3] = [
         Cow::Borrowed("0%"),
diff --git a/src/canvas/components/tui.rs b/src/canvas/components/tui.rs
new file mode 100644
index 00000000..c9dc772f
--- /dev/null
+++ b/src/canvas/components/tui.rs
@@ -0,0 +1,4 @@
+//! Components derived from ratatui widgets.
+
+pub mod pipe_gauge;
+pub mod time_chart;
diff --git a/src/canvas/components/pipe_gauge.rs b/src/canvas/components/tui/pipe_gauge.rs
index 08aa4ca2..08aa4ca2 100644
--- a/src/canvas/components/pipe_gauge.rs
+++ b/src/canvas/components/tui/pipe_gauge.rs
diff --git a/src/canvas/components/time_chart.rs b/src/canvas/components/tui/time_chart.rs
index 747c2ae3..747c2ae3 100644
--- a/src/canvas/components/time_chart.rs
+++ b/src/canvas/components/tui/time_chart.rs
diff --git a/src/canvas/components/time_chart/canvas.rs b/src/canvas/components/tui/time_chart/canvas.rs
index b6cc41c1..b6cc41c1 100644
--- a/src/canvas/components/time_chart/canvas.rs
+++ b/src/canvas/components/tui/time_chart/canvas.rs
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs
index 36acf8ed..b5027bc6 100644
--- a/src/canvas/widgets/cpu_graph.rs
+++ b/src/canvas/widgets/cpu_graph.rs
@@ -9,11 +9,11 @@ use tui::{
 use crate::{
     app::{layout_manager::WidgetDirection, App},
     canvas::{
-        drawing_utils::should_hide_x_label,
         components::{
             data_table::{DrawInfo, SelectionState},
             time_graph::{GraphData, TimeGraph},
         },
+        drawing_utils::should_hide_x_label,
         Painter,
     },
     data_conversion::CpuWidgetData,
diff --git a/src/canvas/widgets/mem_graph.rs b/src/canvas/widgets/mem_graph.rs
index 62b0da49..b9782e5a 100644
--- a/src/canvas/widgets/mem_graph.rs
+++ b/src/canvas/widgets/mem_graph.rs
@@ -9,8 +9,8 @@ use tui::{
 use crate::{
     app::App,
     canvas::{
-        drawing_utils::should_hide_x_label,
         components::time_graph::{GraphData, TimeGraph},
+        drawing_utils::should_hide_x_label,
         Painter,
     },
 };
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
index 29a94dfd..1b0d4d3a 100644
--- a/src/canvas/widgets/network_graph.rs
+++ b/src/canvas/widgets/network_graph.rs
@@ -9,11 +9,11 @@ use tui::{
 use crate::{
     app::{App, AxisScaling},
     canvas::{
-        drawing_utils::should_hide_x_label,
         components::{
             time_chart::Point,
             time_graph::{GraphData, TimeGraph},
         },
+        drawing_utils::should_hide_x_label,
         Painter,
     },
     utils::{data_prefixes::*, data_units::DataUnit, general::partial_ordering},
diff --git a/src/widgets/cpu_graph.rs b/src/widgets/cpu_graph.rs
index bd7edf3d..96873b27 100644
--- a/src/widgets/cpu_graph.rs
+++ b/src/widgets/cpu_graph.rs
@@ -6,11 +6,11 @@ use tui::{style::Style, text::Text, widgets::Row};
 use crate::{
     app::AppConfigFields,
     canvas::{
-        styling::CanvasStyling,
         components::data_table::{
             Column, ColumnHeader, DataTable, DataTableColumn, DataTableProps, DataTableStyling,
             DataToCell,
         },
+        styling::CanvasStyling,
         Painter,
     },
     data_collection::cpu::CpuDataType,
diff --git a/src/widgets/disk_table.rs b/src/widgets/disk_table.rs
index 5f72a6fe..30b3b132 100644
--- a/src/widgets/disk_table.rs
+++ b/src/widgets/disk_table.rs
@@ -6,11 +6,11 @@ use tui::text::Text;
 use crate::{
     app::AppConfigFields,
     canvas::{
-        styling::CanvasStyling,
         components::data_table::{
             ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell,
             SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
         },
+        styling::CanvasStyling,
     },
     utils::general::{get_decimal_bytes, sort_partial_fn, truncate_to_text},
 };
diff --git a/src/widgets/process_table.rs b/src/widgets/process_table.rs
index da55fe8b..5db722bd 100644
--- a/src/widgets/process_table.rs
+++ b/src/widgets/process_table.rs
@@ -19,11 +19,11 @@ use crate::{
         AppConfigFields, AppSearchState,
     },
     canvas::{
-        styling::CanvasStyling,
         components::data_table::{
             Column, ColumnHeader, ColumnWidthBounds, DataTable, DataTableColumn, DataTableProps,
             DataTableStyling, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
         },
+        styling::CanvasStyling,
     },
     data_collection::processes::ProcessHarvest,
     Pid,
diff --git a/src/widgets/temperature_table.rs b/src/widgets/temperature_table.rs
index 37d06d15..c7d19702 100644
--- a/src/widgets/temperature_table.rs
+++ b/src/widgets/temperature_table.rs
@@ -7,11 +7,11 @@ use tui::text::Text;
 use crate::{
     app::AppConfigFields,
     canvas::{
-        styling::CanvasStyling,
         components::data_table::{
             ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell,
             SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
         },
+        styling::CanvasStyling,
     },
     data_collection::temperature::TemperatureType,
     utils::general::{sort_partial_fn, truncate_to_text},