Use <ol> for homepage (#343)

ordinals · Aug 18, 2022 · 1558046 · 1558046
1 parent ad0f641
commit 1558046
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/src/subcommand/server.rs b/src/subcommand/server.rs
@@ -243,7 +243,7 @@ impl Server {
 
   async fn home(index: extract::Extension<Arc<Index>>) -> impl IntoResponse {
     match index.blocks(100) {
-      Ok(blocks) => HomeHtml { blocks }.page().into_response(),
+      Ok(blocks) => HomeHtml::new(blocks).page().into_response(),
       Err(err) => {
         eprintln!("Error getting blocks: {err}");
         (

diff --git a/src/subcommand/server/templates/home.rs b/src/subcommand/server/templates/home.rs
@@ -2,7 +2,21 @@ use super::*;
 
 #[derive(Display)]
 pub(crate) struct HomeHtml {
-  pub(crate) blocks: Vec<(u64, BlockHash)>,
+  last: u64,
+  hashes: Vec<BlockHash>,
+}
+
+impl HomeHtml {
+  pub(crate) fn new(blocks: Vec<(u64, BlockHash)>) -> Self {
+    Self {
+      last: blocks
+        .get(0)
+        .map(|(height, _)| height)
+        .cloned()
+        .unwrap_or(0),
+      hashes: blocks.into_iter().map(|(_, hash)| hash).collect(),
+    }
+  }
 }
 
 impl Content for HomeHtml {
@@ -32,25 +46,29 @@ mod tests {
   #[test]
   fn home_html() {
     assert_regex_match!(
-"<h1>Ordinals</h1>
+      "<h1>Ordinals</h1>
 <nav>.*</nav>
 <h2>Recent Blocks</h2>
-<ul>
-  <li>1 - <a href=/block/1111111111111111111111111111111111111111111111111111111111111111>1111111111111111111111111111111111111111111111111111111111111111</a></li>
-  <li>0 - <a href=/block/0000000000000000000000000000000000000000000000000000000000000000>0000000000000000000000000000000000000000000000000000000000000000</a></li>
-</ul>
+<ol start=1 reversed>
+  <li><a href=/block/1{64}>1{64}</a></li>
+  <li><a href=/block/0{64}>0{64}</a></li>
+</ol>
 ",
-      &HomeHtml {
-        blocks: vec![
-          (
-            1,
-            "1111111111111111111111111111111111111111111111111111111111111111".parse().unwrap()
-          ),
-          (
-            0,
-            "0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()
-          )
-        ],
-      }.to_string());
+      &HomeHtml::new(vec![
+        (
+          1,
+          "1111111111111111111111111111111111111111111111111111111111111111"
+            .parse()
+            .unwrap()
+        ),
+        (
+          0,
+          "0000000000000000000000000000000000000000000000000000000000000000"
+            .parse()
+            .unwrap()
+        )
+      ],)
+      .to_string()
+    );
   }
 }
diff --git a/templates/home.html b/templates/home.html
@@ -8,8 +8,8 @@ <h1>Ordinals</h1>
   <a href=https://discord.gg/87cjuz4FYg>Discord</a>
 </nav>
 <h2>Recent Blocks</h2>
-<ul>
-%% for block in &self.blocks {
-  <li>{{block.0}} - <a href=/block/{{block.1}}>{{block.1}}</a></li>
+<ol start={{self.last}} reversed>
+%% for hash in &self.hashes {
+  <li><a href=/block/{{hash}}>{{hash}}</a></li>
 %% }
-</ul>
+</ol>
diff --git a/tests/server.rs b/tests/server.rs
@@ -159,10 +159,10 @@ fn home() {
     ".*<title>Ordinals</title>.*<h1>Ordinals</h1>
 <nav>.*</nav>
 <h2>Recent Blocks</h2>
-<ul>
-  <li>1 - <a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>
-  <li>0 - <a href=/block/0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206>0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206</a></li>
-</ul>.*",
+<ol start=1 reversed>
+  <li><a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>
+  <li><a href=/block/0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206>0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206</a></li>
+</ol>.*",
   );
 }
 
@@ -175,7 +175,7 @@ fn home_block_limit() {
   state.request_regex(
     "/",
     200,
-    ".*<ul>\n(  <li>[[:digit:]]{3} - <a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){100}</ul>.*"
+    ".*<ol start=200 reversed>\n(  <li><a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){100}</ol>.*"
   );
 }