Update deps; prepare for 3.1 release

src/MyPrayerJournal/Handlers.fs

@@ -177,7 +177,7 @@ module private Helpers =
             ||> match ctx.CurrentUser with
                 | Some _ ->
                     match Messages.pop ctx.UserId with
-                    | Some (msg, url) -> setHttpHeader "X-Toast" msg >=> withHxPush url >=> writeView view
+                    | Some (msg, url) -> setHttpHeader "X-Toast" msg >=> withHxPushUrl url >=> writeView view
                     | None -> writeView view
                 | None -> writeView view
     }

src/MyPrayerJournal/MyPrayerJournal.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.0.0</Version>
+    <Version>3.1.0</Version>
     <NoWarn>3391</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -17,13 +17,13 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.4" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="0.19.13" />
     <PackageReference Include="FunctionalCuid" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="5.0.0" />
+    <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.6.1" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.6.1" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
-    <PackageReference Include="LiteDB" Version="5.0.11" />
+    <PackageReference Include="LiteDB" Version="5.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.7" />
     <PackageReference Include="NodaTime" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>

src/MyPrayerJournal/Views/Helpers.fs

@@ -2,6 +2,7 @@
 [<AutoOpen>]
 module private MyPrayerJournal.Views.Helpers
   
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Htmx
 open MyPrayerJournal
@@ -10,7 +11,7 @@ open NodaTime
 /// Create a link that targets the `#top` element and pushes a URL to history
 let pageLink href attrs =
     attrs
-    |> List.append [ _href href; _hxBoost; _hxTarget "#top"; _hxSwap HxSwap.InnerHtml; _hxPushUrl ]
+    |> List.append [ _href href; _hxBoost; _hxTarget "#top"; _hxSwap HxSwap.InnerHtml; _hxPushUrl "true" ]
     |> a
 
 /// Create a Material icon

src/MyPrayerJournal/Views/Journal.fs

@@ -1,6 +1,7 @@
 /// Views for journal pages and components
 module MyPrayerJournal.Views.Journal
 
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Accessibility
 open Giraffe.ViewEngine.Htmx

src/MyPrayerJournal/Views/Layout.fs

@@ -77,9 +77,9 @@ let htmlHead ctx =
         meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
         meta [ _name "description"; _content "Online prayer journal - free w/Google or Microsoft account" ]
         titleTag ctx
-        link [ _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+        link [ _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css"
                _rel         "stylesheet"
-               _integrity   "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+               _integrity   "sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx"
                _crossorigin "anonymous" ]
         link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
         link [ _href "/style/style.css"; _rel "stylesheet" ]
@@ -95,7 +95,7 @@ let toaster =
 let htmlFoot =
     footer [ _class "container-fluid" ] [
         p [ _class "text-muted text-end" ] [
-            str "myPrayerJournal v3"
+            str "myPrayerJournal v3.1"
             br []
             em [] [
                 small [] [
@@ -115,11 +115,11 @@ let htmlFoot =
         ]
         Htmx.Script.minified
         script [] [
-            rawText "if (!htmx) document.write('<script src=\"/script/htmx-1.5.0.min.js\"><\/script>')"
+            rawText "if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')"
         ]
         script [ _async
-                 _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
+                 _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
-                 _integrity   "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
+                 _integrity   "sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
                  _crossorigin "anonymous" ] []
         script [] [
             rawText "setTimeout(function () { "

src/MyPrayerJournal/Views/Request.fs

@@ -1,6 +1,7 @@
 /// Views for request pages and components
 module MyPrayerJournal.Views.Request
 
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Htmx
 open MyPrayerJournal
@@ -151,8 +152,8 @@ let edit (req : JournalRequest) returnTo isNew =
     article [ _class "container" ] [
         h2 [ _class "pb-3" ] [ (match isNew with true -> "Add" | false -> "Edit") |> strf "%s Prayer Request" ]
         form [ _hxBoost
-               _hxTarget "#top"
+               _hxTarget  "#top"
-               _hxPushUrl
+               _hxPushUrl "true"
                "/request" |> match isNew with true -> _hxPost | false -> _hxPatch ] [
             input [ _type  "hidden"
                     _name  "requestId"