Move templates into root module (#1090)

ordinals · Dec 26, 2022 · 88fc7a2 · 88fc7a2
1 parent 751d9bd
commit 88fc7a2
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 9 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -25,8 +25,9 @@ use {
     rarity::Rarity,
     sat::Sat,
     sat_point::SatPoint,
-    subcommand::{server::templates::ContentHtml, Subcommand},
+    subcommand::Subcommand,
     tally::Tally,
+    templates::ContentHtml,
   },
   anyhow::{anyhow, bail, Context, Error},
   bitcoin::{
@@ -90,6 +91,7 @@ mod sat;
 mod sat_point;
 mod subcommand;
 mod tally;
+mod templates;
 
 type Result<T = (), E = Error> = std::result::Result<T, E>;
 

diff --git a/src/subcommand.rs b/src/subcommand.rs
@@ -6,7 +6,7 @@ mod index;
 mod info;
 mod list;
 mod parse;
-pub(crate) mod server;
+mod server;
 mod subsidy;
 mod supply;
 mod traits;

diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -1,12 +1,10 @@
 use super::*;
 
 use {
-  self::{
-    deserialize_from_str::DeserializeFromStr,
-    templates::{
-      BlockHtml, ClockSvg, HomeHtml, InputHtml, InscriptionHtml, InscriptionsHtml, OutputHtml,
-      PageContent, PageHtml, RangeHtml, RareTxt, SatHtml, TransactionHtml,
-    },
+  self::deserialize_from_str::DeserializeFromStr,
+  crate::templates::{
+    BlockHtml, ClockSvg, HomeHtml, InputHtml, InscriptionHtml, InscriptionsHtml, OutputHtml,
+    PageContent, PageHtml, RangeHtml, RareTxt, SatHtml, TransactionHtml,
   },
   axum::{
     body,
@@ -30,7 +28,6 @@ use {
 };
 
 mod deserialize_from_str;
-pub(crate) mod templates;
 
 enum BlockQuery {
   Height(u64),

diff --git a/src/subcommand/server/templates.rs → src/templates.rs b/src/subcommand/server/templates.rs → src/templates.rs
diff --git a/src/subcommand/server/templates/block.rs → src/templates/block.rs b/src/subcommand/server/templates/block.rs → src/templates/block.rs
diff --git a/src/subcommand/server/templates/clock.rs → src/templates/clock.rs b/src/subcommand/server/templates/clock.rs → src/templates/clock.rs
diff --git a/src/subcommand/server/templates/content.rs → src/templates/content.rs b/src/subcommand/server/templates/content.rs → src/templates/content.rs
diff --git a/src/subcommand/server/templates/home.rs → src/templates/home.rs b/src/subcommand/server/templates/home.rs → src/templates/home.rs
diff --git a/src/subcommand/server/templates/input.rs → src/templates/input.rs b/src/subcommand/server/templates/input.rs → src/templates/input.rs
diff --git a/...ubcommand/server/templates/inscription.rs → src/templates/inscription.rs b/...ubcommand/server/templates/inscription.rs → src/templates/inscription.rs
diff --git a/...bcommand/server/templates/inscriptions.rs → src/templates/inscriptions.rs b/...bcommand/server/templates/inscriptions.rs → src/templates/inscriptions.rs
diff --git a/src/subcommand/server/templates/output.rs → src/templates/output.rs b/src/subcommand/server/templates/output.rs → src/templates/output.rs
diff --git a/src/subcommand/server/templates/range.rs → src/templates/range.rs b/src/subcommand/server/templates/range.rs → src/templates/range.rs
diff --git a/src/subcommand/server/templates/rare.rs → src/templates/rare.rs b/src/subcommand/server/templates/rare.rs → src/templates/rare.rs
diff --git a/src/subcommand/server/templates/sat.rs → src/templates/sat.rs b/src/subcommand/server/templates/sat.rs → src/templates/sat.rs
diff --git a/...ubcommand/server/templates/transaction.rs → src/templates/transaction.rs b/...ubcommand/server/templates/transaction.rs → src/templates/transaction.rs