From dd3bba8310c2d5266b8720501146c55846185f22 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Thu, 2 Jun 2022 07:37:11 -0400
Subject: [PATCH] Fix /page/x/ URLs

- Make log on push URL to history
- Fix dashboard post links
---
 src/MyWebLog/Handlers/Post.fs              | 4 ++++
 src/MyWebLog/Handlers/Routes.fs            | 1 +
 src/MyWebLog/appsettings.json              | 2 +-
 src/MyWebLog/themes/admin/dashboard.liquid | 4 ++--
 src/MyWebLog/themes/admin/log-on.liquid    | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/MyWebLog/Handlers/Post.fs b/src/MyWebLog/Handlers/Post.fs
index 7f6da60..faa7aff 100644
--- a/src/MyWebLog/Handlers/Post.fs
+++ b/src/MyWebLog/Handlers/Post.fs
@@ -111,6 +111,10 @@ let pageOfPosts pageNbr : HttpHandler = fun next ctx -> task {
     return! themedView "index" next ctx hash
 }
 
+// GET /page/{pageNbr}/
+let redirectToPageOfPosts (pageNbr : int) : HttpHandler = fun next ctx ->
+    redirectTo true (WebLog.relativeUrl ctx.WebLog (Permalink $"page/{pageNbr}")) next ctx
+
 // GET /category/{slug}/
 // GET /category/{slug}/page/{pageNbr}
 let pageOfCategorizedPosts slugAndPage : HttpHandler = fun next ctx -> task {
diff --git a/src/MyWebLog/Handlers/Routes.fs b/src/MyWebLog/Handlers/Routes.fs
index 75ac4c3..f67d24b 100644
--- a/src/MyWebLog/Handlers/Routes.fs
+++ b/src/MyWebLog/Handlers/Routes.fs
@@ -160,6 +160,7 @@ let router : HttpHandler = choose [
     ])
     GET >=> routexp "/category/(.*)"  Post.pageOfCategorizedPosts
     GET >=> routef  "/page/%i"        Post.pageOfPosts
+    GET >=> routef  "/page/%i/"       Post.redirectToPageOfPosts       
     GET >=> routexp "/tag/(.*)"       Post.pageOfTaggedPosts
     subRoute "/user" (choose [
         GET >=> choose [
diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json
index 29f11b0..e2577c7 100644
--- a/src/MyWebLog/appsettings.json
+++ b/src/MyWebLog/appsettings.json
@@ -3,7 +3,7 @@
     "hostname": "data02.bitbadger.solutions",
     "database": "myWebLog_dev"
   },
-  "Generator": "myWebLog 2.0-alpha26",
+  "Generator": "myWebLog 2.0-alpha27",
   "Logging": {
     "LogLevel": {
       "MyWebLog.Handlers": "Debug"
diff --git a/src/MyWebLog/themes/admin/dashboard.liquid b/src/MyWebLog/themes/admin/dashboard.liquid
index fb0ece6..c7046ea 100644
--- a/src/MyWebLog/themes/admin/dashboard.liquid
+++ b/src/MyWebLog/themes/admin/dashboard.liquid
@@ -9,8 +9,8 @@
             Published <span class="badge rounded-pill bg-secondary">{{ model.posts }}</span>
             &nbsp; Drafts <span class="badge rounded-pill bg-secondary">{{ model.drafts }}</span>
           </h6>
-          <a href="{{ "admin/posts" | relative_permalink }}" class="btn btn-secondary me-2">View All</a>
-          <a href="{{ "admin/post/new/edit" | relative_permalink }}" class="btn btn-primary">Write a New Post</a>
+          <a href="{{ "admin/posts" | relative_link }}" class="btn btn-secondary me-2">View All</a>
+          <a href="{{ "admin/post/new/edit" | relative_link }}" class="btn btn-primary">Write a New Post</a>
         </div>
       </div>
     </section>
diff --git a/src/MyWebLog/themes/admin/log-on.liquid b/src/MyWebLog/themes/admin/log-on.liquid
index 5452859..ef5960a 100644
--- a/src/MyWebLog/themes/admin/log-on.liquid
+++ b/src/MyWebLog/themes/admin/log-on.liquid
@@ -1,6 +1,6 @@
 <h2 class="my-3">Log On to {{ web_log.name }}</h2>
 <article class="py-3">
-  <form action="{{ "user/log-on" | relative_link }}" method="post">
+  <form action="{{ "user/log-on" | relative_link }}" method="post" hx-push-url="true">
     <input type="hidden" name="{{ csrf.form_field_name }}" value="{{ csrf.request_token }}">
     {% if model.return_to %}
       <input type="hidden" name="returnTo" value="{{ model.return_to.value }}">