From bb47eb82a4069796f0c1c8ef4522af9224c790cf Mon Sep 17 00:00:00 2001
From: swag <swaggboi@slackware.uk>
Date: Tue, 20 Sep 2022 21:16:42 -0400
Subject: [PATCH] Some clean-up

---
 t/post.t                      |  2 +-
 t/remark.t                    |  2 +-
 t/thread.t                    |  2 +-
 templates/list_page.html.ep   | 10 +++++++---
 templates/remark_id.html.ep   | 10 +++++-----
 templates/thread_id.html.ep   |  8 ++++----
 templates/thread_page.html.ep | 20 ++++++++++----------
 7 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/t/post.t b/t/post.t
index 7b066c6..6e7b1c5 100644
--- a/t/post.t
+++ b/t/post.t
@@ -70,7 +70,7 @@ $t->post_ok('/post/1')->status_is(200)
     ->text_like(h2 => qr/New Remark/);
 
 $t->post_ok('/post/1', form => \%valid_remark)->status_is(200)
-    ->text_like(h2 => qr/Thread - #1/);
+    ->text_like(h2 => qr/Thread #1/);
 $t->post_ok('/post/1', form => \%invalid_remark)->status_is(400)
     ->text_like(h2 => qr/New Remark/);
 
diff --git a/t/remark.t b/t/remark.t
index 0f40a6a..40e2708 100644
--- a/t/remark.t
+++ b/t/remark.t
@@ -9,6 +9,6 @@ use Test::Mojo;
 my $script = curfile->dirname->sibling('PostText.pl');
 my $t      = Test::Mojo->new($script);
 
-$t->get_ok('/remark/1')->status_is(200)->text_like(h2 => qr/Remark - #1/);
+$t->get_ok('/remark/1')->status_is(200)->text_like(h2 => qr/Remark #1/);
 
 done_testing();
diff --git a/t/thread.t b/t/thread.t
index 8af894b..4527d76 100644
--- a/t/thread.t
+++ b/t/thread.t
@@ -9,6 +9,6 @@ use Test::Mojo;
 my $script = curfile->dirname->sibling('PostText.pl');
 my $t      = Test::Mojo->new($script);
 
-$t->get_ok('/thread/1')->status_is(200)->text_like(h2 => qr/Thread - #1/);
+$t->get_ok('/thread/1')->status_is(200)->text_like(h2 => qr/Thread #1/);
 
 done_testing();
diff --git a/templates/list_page.html.ep b/templates/list_page.html.ep
index 8da123b..2eca410 100644
--- a/templates/list_page.html.ep
+++ b/templates/list_page.html.ep
@@ -5,15 +5,19 @@
   <% for my $thread (@{$threads}) { =%>
     <article class="thread">
       <span class="id">
-        <%= link_to "Thread #$thread->{'id'}",
+        <%= link_to "#$thread->{'id'}",
           thread_page => {thread_id => $thread->{'id'}} %>
       </span>
       <h3 class="title"><%= $thread->{'title'} %></h3>
       <h4 class="date"><%= $thread->{'date'} %></h4>
       <h5 class="author"><%= $thread->{'author'} %></h5>
       <p class="body"><%= $thread->{'body'} %></p>
-      <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}}  %>
-      <footer><%= $thread->{'remark_count'} %> remarks</footer>
+      <span class="remarks">
+        <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}} %>
+        <%= link_to thread_page => {thread_id => $thread->{'id'}}, begin %>
+          (<%= $thread->{'remark_count'} %> remarks)
+        <% end %>
+      </span>
     </article>
   <% } =%>
 </div>
diff --git a/templates/remark_id.html.ep b/templates/remark_id.html.ep
index 46b3898..a117979 100644
--- a/templates/remark_id.html.ep
+++ b/templates/remark_id.html.ep
@@ -1,12 +1,12 @@
 % layout 'main';
-% title "Remark - #$remark->{'id'}";
+% title "Remark #$remark->{'id'}";
 <h2><%= title %></h2>
 <div class="remarks">
   <article class="remark">
-    <span class="id">#<%= %$remark{'id'} %></span>
-    <h4 class="date"><%= %$remark{'date'} %></h4>
-    <h5 class="author"><%= %$remark{'author'} %></h5>
-    <p class="body"><%= %$remark{'body'} %></p>
+    <span class="id">#<%= $remark->{'id'} %></span>
+    <h4 class="date"><%= $remark->{'date'} %></h4>
+    <h5 class="author"><%= $remark->{'author'} %></h5>
+    <p class="body"><%= $remark->{'body'} %></p>
   </article>
 </div>
 <nav>
diff --git a/templates/thread_id.html.ep b/templates/thread_id.html.ep
index 4f5a582..d593ac3 100644
--- a/templates/thread_id.html.ep
+++ b/templates/thread_id.html.ep
@@ -34,10 +34,10 @@
       <%= link_to "#$thread->{'id'}",
         thread_page => {thread_id => $thread->{'id'}} %>
     </span>
-    <h3 class="title"><%= %$thread{'title'} %></h3>
-    <h4 class="date"><%= %$thread{'date'} %></h4>
-    <h5 class="author"><%= %$thread{'author'} %></h5>
-    <p class="body"><%= %$thread{'body'} %></p>
+    <h3 class="title"><%= $thread->{'title'} %></h3>
+    <h4 class="date"><%= $thread->{'date'} %></h4>
+    <h5 class="author"><%= $thread->{'author'} %></h5>
+    <p class="body"><%= $thread->{'body'} %></p>
   </article>
 </div>
 <% if (my $last_remark_id = $last_remark->{'id'}) { =%>
diff --git a/templates/thread_page.html.ep b/templates/thread_page.html.ep
index 9289aaf..5245120 100644
--- a/templates/thread_page.html.ep
+++ b/templates/thread_page.html.ep
@@ -1,29 +1,29 @@
 % layout 'main';
-% title "Thread - #$thread->{'id'}";
+% title "Thread #$thread->{'id'}";
 <h2><%= title %></h2>
 <div class="threads">
   <article class="thread">
-    <h3 class="title"><%= %$thread{'title'} %></h3>
-    <h4 class="date"><%= %$thread{'date'} %></h4>
-    <h5 class="author"><%= %$thread{'author'} %></h5>
-    <p class="body"><%= %$thread{'body'} %></p>
+    <h3 class="title"><%= $thread->{'title'} %></h3>
+    <h4 class="date"><%= $thread->{'date'} %></h4>
+    <h5 class="author"><%= $thread->{'author'} %></h5>
+    <p class="body"><%= $thread->{'body'} %></p>
   </article>
 </div>
 <nav>
   <%= link_to Remark => thread_id => {thread_id => $thread->{'id'}}  %>
 </nav>
-<% if (my $first_remark = @$remarks[0]) { =%>
+<% if (my $first_remark = $remarks->[0]) { =%>
 <div class="remarks">
   <h3>Remarks</h3>
-  <% for my $remark (@$remarks) { =%>
+  <% for my $remark (@{$remarks}) { =%>
   <article class="remark">
     <span class="id">
       <%= link_to "#$remark->{'id'}",
         remark_id => {remark_id => $remark->{'id'}} %>
     </span>
-    <h4 class="date"><%= %$remark{'date'} %></h4>
-    <h5 class="author"><%= %$remark{'author'} %></h5>
-    <p class="body"><%= %$remark{'body'} %></p>
+    <h4 class="date"><%= $remark->{'date'} %></h4>
+    <h5 class="author"><%= $remark->{'author'} %></h5>
+    <p class="body"><%= $remark->{'body'} %></p>
   </article>
   <% } =%>
 </div>