From 5233d8eb935db92c76de0366c241101e7b93741d Mon Sep 17 00:00:00 2001
From: Aaron Fenyes <aaron.fenyes@fareycircles.ooo>
Date: Tue, 22 Jul 2025 13:28:48 -0700
Subject: [PATCH] Move the components into their own module

This makes the module tree more reflective of module use patterns. In
particular, it restores the condition that every top-level module is
used in top-level code, which was broken by the addition of the
`test_assembly_chooser` module in commit 91e4e1f.
---
 app-proto/src/assembly.rs                        |  3 +--
 app-proto/src/components.rs                      |  5 +++++
 app-proto/src/{ => components}/add_remove.rs     |  4 ++--
 app-proto/src/{ => components}/diagnostics.rs    |  0
 app-proto/src/{ => components}/display.rs        |  0
 app-proto/src/{ => components}/identity.vert     |  0
 app-proto/src/{ => components}/outline.rs        |  0
 app-proto/src/{ => components}/point.frag        |  0
 app-proto/src/{ => components}/point.vert        |  0
 app-proto/src/{ => components}/spheres.frag      |  0
 .../{ => components}/test_assembly_chooser.rs    |  0
 app-proto/src/main.rs                            | 16 +++++++---------
 12 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 app-proto/src/components.rs
 rename app-proto/src/{ => components}/add_remove.rs (94%)
 rename app-proto/src/{ => components}/diagnostics.rs (100%)
 rename app-proto/src/{ => components}/display.rs (100%)
 rename app-proto/src/{ => components}/identity.vert (100%)
 rename app-proto/src/{ => components}/outline.rs (100%)
 rename app-proto/src/{ => components}/point.frag (100%)
 rename app-proto/src/{ => components}/point.vert (100%)
 rename app-proto/src/{ => components}/spheres.frag (100%)
 rename app-proto/src/{ => components}/test_assembly_chooser.rs (100%)

diff --git a/app-proto/src/assembly.rs b/app-proto/src/assembly.rs
index e696845..68fcd8b 100644
--- a/app-proto/src/assembly.rs
+++ b/app-proto/src/assembly.rs
@@ -13,7 +13,7 @@ use sycamore::prelude::*;
 use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
 
 use crate::{
-    display::DisplayItem,
+    components::{display::DisplayItem, outline::OutlineItem},
     engine::{
         Q,
         change_half_curvature,
@@ -29,7 +29,6 @@ use crate::{
         DescentHistory,
         Realization
     },
-    outline::OutlineItem,
     specified::SpecifiedValue
 };
 
diff --git a/app-proto/src/components.rs b/app-proto/src/components.rs
new file mode 100644
index 0000000..7387d58
--- /dev/null
+++ b/app-proto/src/components.rs
@@ -0,0 +1,5 @@
+pub mod add_remove;
+pub mod diagnostics;
+pub mod display;
+pub mod outline;
+pub mod test_assembly_chooser;
\ No newline at end of file
diff --git a/app-proto/src/add_remove.rs b/app-proto/src/components/add_remove.rs
similarity index 94%
rename from app-proto/src/add_remove.rs
rename to app-proto/src/components/add_remove.rs
index de9272e..3b0f9e0 100644
--- a/app-proto/src/add_remove.rs
+++ b/app-proto/src/components/add_remove.rs
@@ -1,10 +1,10 @@
 use std::rc::Rc;
 use sycamore::prelude::*;
 
+use super::test_assembly_chooser::TestAssemblyChooser;
 use crate::{
     AppState,
-    assembly::{InversiveDistanceRegulator, Point, Sphere},
-    test_assembly_chooser::TestAssemblyChooser
+    assembly::{InversiveDistanceRegulator, Point, Sphere}
 };
 
 #[component]
diff --git a/app-proto/src/diagnostics.rs b/app-proto/src/components/diagnostics.rs
similarity index 100%
rename from app-proto/src/diagnostics.rs
rename to app-proto/src/components/diagnostics.rs
diff --git a/app-proto/src/display.rs b/app-proto/src/components/display.rs
similarity index 100%
rename from app-proto/src/display.rs
rename to app-proto/src/components/display.rs
diff --git a/app-proto/src/identity.vert b/app-proto/src/components/identity.vert
similarity index 100%
rename from app-proto/src/identity.vert
rename to app-proto/src/components/identity.vert
diff --git a/app-proto/src/outline.rs b/app-proto/src/components/outline.rs
similarity index 100%
rename from app-proto/src/outline.rs
rename to app-proto/src/components/outline.rs
diff --git a/app-proto/src/point.frag b/app-proto/src/components/point.frag
similarity index 100%
rename from app-proto/src/point.frag
rename to app-proto/src/components/point.frag
diff --git a/app-proto/src/point.vert b/app-proto/src/components/point.vert
similarity index 100%
rename from app-proto/src/point.vert
rename to app-proto/src/components/point.vert
diff --git a/app-proto/src/spheres.frag b/app-proto/src/components/spheres.frag
similarity index 100%
rename from app-proto/src/spheres.frag
rename to app-proto/src/components/spheres.frag
diff --git a/app-proto/src/test_assembly_chooser.rs b/app-proto/src/components/test_assembly_chooser.rs
similarity index 100%
rename from app-proto/src/test_assembly_chooser.rs
rename to app-proto/src/components/test_assembly_chooser.rs
diff --git a/app-proto/src/main.rs b/app-proto/src/main.rs
index f5b7cef..152d11c 100644
--- a/app-proto/src/main.rs
+++ b/app-proto/src/main.rs
@@ -1,11 +1,7 @@
-mod add_remove;
 mod assembly;
-mod diagnostics;
-mod display;
+mod components;
 mod engine;
-mod outline;
 mod specified;
-mod test_assembly_chooser;
 
 #[cfg(test)]
 mod tests;
@@ -13,11 +9,13 @@ mod tests;
 use std::{collections::BTreeSet, rc::Rc};
 use sycamore::prelude::*;
 
-use add_remove::AddRemove;
 use assembly::{Assembly, Element};
-use diagnostics::Diagnostics;
-use display::Display;
-use outline::Outline;
+use components::{
+    add_remove::AddRemove,
+    diagnostics::Diagnostics,
+    display::Display,
+    outline::Outline
+};
 
 #[derive(Clone)]
 struct AppState {