Use boilerplate 0.2.0 (#531)

ordinals · Sep 18, 2022 · b0221b3 · b0221b3
1 parent cd3b38a
commit b0221b3
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,14 +13,15 @@ axum-server = "0.4.0"
 bdk = { version = "0.22.0", features = ["rpc", "keys-bip39", "sqlite"] }
 bitcoin = "0.28.1"
 bitcoincore-rpc = "0.15.0"
-boilerplate = { version = "0.0.2", features = ["axum"] }
+boilerplate = { version = "0.2.0", features = ["axum"] }
 chrono = "0.4.19"
 clap = { version = "3.1.0", features = ["derive"] }
 ctrlc = "3.2.1"
 derive_more = "0.99.17"
 dirs = "4.0.0"
 env_logger = "0.9.0"
 futures = "0.3.21"
+html-escaper = "0.2.0"
 http = "0.2.6"
 log = "0.4.14"
 mime_guess = "2.0.4"

diff --git a/src/subcommand/server/templates.rs b/src/subcommand/server/templates.rs
@@ -1,4 +1,8 @@
-use {super::*, boilerplate::Display};
+use {
+  super::*,
+  boilerplate::Boilerplate,
+  html_escaper::{Escape, Trusted},
+};
 
 pub(crate) mod block;
 pub(crate) mod clock;
@@ -8,7 +12,7 @@ pub(crate) mod output;
 pub(crate) mod range;
 pub(crate) mod transaction;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct PageHtml {
   content: Box<dyn Content>,
 }

diff --git a/src/subcommand/server/templates/block.rs b/src/subcommand/server/templates/block.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct BlockHtml {
   hash: BlockHash,
   txids: Vec<Txid>,

diff --git a/src/subcommand/server/templates/clock.rs b/src/subcommand/server/templates/clock.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct ClockSvg {
   height: Height,
   hour: f64,

diff --git a/src/subcommand/server/templates/home.rs b/src/subcommand/server/templates/home.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct HomeHtml {
   last: u64,
   blocks: Vec<(Rarity, BlockHash)>,

diff --git a/src/subcommand/server/templates/ordinal.rs b/src/subcommand/server/templates/ordinal.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct OrdinalHtml {
   pub(crate) ordinal: Ordinal,
   pub(crate) blocktime: Blocktime,

diff --git a/src/subcommand/server/templates/output.rs b/src/subcommand/server/templates/output.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct OutputHtml {
   pub(crate) outpoint: OutPoint,
   pub(crate) list: List,

diff --git a/src/subcommand/server/templates/range.rs b/src/subcommand/server/templates/range.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct RangeHtml {
   pub(crate) start: Ordinal,
   pub(crate) end: Ordinal,

diff --git a/src/subcommand/server/templates/transaction.rs b/src/subcommand/server/templates/transaction.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Display)]
+#[derive(Boilerplate)]
 pub(crate) struct TransactionHtml {
   txid: Txid,
   outputs: Vec<OutPoint>,

diff --git a/templates/page.html b/templates/page.html
@@ -9,6 +9,6 @@
     <link href=/static/modern-normalize.css rel=stylesheet>
   </head>
   <body>
-$$ self.content
+$$ Trusted(&self.content)
   </body>
 </html>