- Add autoHtmx field / htmx partial support

- Add page_foot tag for scripts
- Add htmx to admin area
- Move create/permalink import to its own module
- Add htmx to tech-blog theme
- Move dashboard to admin/dashboard

src/MyWebLog/Handlers/Admin.fs

@@ -291,19 +291,11 @@ let saveSettings : HttpHandler = fun next ctx -> task {
     let! model  = ctx.BindFormAsync<SettingsModel> ()
     match! Data.WebLog.findById webLog.id conn with
     | Some webLog ->
-        let updated =
-            { webLog with
-                name         = model.name
-                subtitle     = if model.subtitle = "" then None else Some model.subtitle
-                defaultPage  = model.defaultPage
-                postsPerPage = model.postsPerPage
-                timeZone     = model.timeZone
-                themePath    = model.themePath
-            }
-        do! Data.WebLog.updateSettings updated conn
+        let webLog = model.update webLog
+        do! Data.WebLog.updateSettings webLog conn
 
         // Update cache
-        WebLogCache.set updated
+        WebLogCache.set webLog
     
         do! addMessage ctx { UserMessage.success with message = "Web log settings saved successfully" }
         return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin")) next ctx

src/MyWebLog/Handlers/Helpers.fs

@@ -79,6 +79,11 @@ let private deriveWebLogFromHash (hash : Hash) (ctx : HttpContext) =
     hash["web_log"] :?> WebLog
 
 open Giraffe
+open Giraffe.Htmx
+open Giraffe.ViewEngine
+
+/// htmx script tag
+let private htmxScript = RenderView.AsString.htmlNode Htmx.Script.minified
 
 /// Render a view for the specified theme, using the specified template, layout, and hash
 let viewForTheme theme template next ctx = fun (hash : Hash) -> task {
@@ -90,6 +95,7 @@ let viewForTheme theme template next ctx = fun (hash : Hash) -> task {
     hash.Add ("current_page", ctx.Request.Path.Value.Substring 1)
     hash.Add ("messages",     messages)
     hash.Add ("generator",    generator ctx)
+    hash.Add ("htmx_script",  htmxScript)
     
     do! commitSession ctx
     
@@ -101,7 +107,9 @@ let viewForTheme theme template next ctx = fun (hash : Hash) -> task {
     hash.Add ("content", contentTemplate.Render hash)
     
     // ...then render that content with its layout
-    let! layoutTemplate = TemplateCache.get theme "layout"
+    let  isHtmx         = ctx.Request.IsHtmx && not ctx.Request.IsHtmxRefresh
+    let  layout         = if isHtmx then "layout-partial" else "layout"
+    let! layoutTemplate = TemplateCache.get theme layout
     
     return! htmlString (layoutTemplate.Render hash) next ctx
 }

src/MyWebLog/Handlers/Routes.fs

@@ -95,11 +95,11 @@ let router : HttpHandler = choose [
     ]
     subRoute "/admin" (requireUser >=> choose [
         GET >=> choose [
-            route    "" >=> Admin.dashboard
             subRoute "/categor" (choose [
                 route  "ies"       >=> Admin.listCategories
                 routef "y/%s/edit"     Admin.editCategory
             ])
+            route    "/dashboard" >=> Admin.dashboard
             subRoute "/page" (choose [
                 route  "s"              >=> Admin.listPages 1
                 routef "s/page/%i"          Admin.listPages

src/MyWebLog/Handlers/User.fs

@@ -56,7 +56,8 @@ let doLogOn : HttpHandler = fun next ctx -> task {
             AuthenticationProperties (IssuedUtc = DateTimeOffset.UtcNow))
         do! addMessage ctx
                 { UserMessage.success with message = $"Logged on successfully | Welcome to {webLog.name}!" }
-        return! redirectToGet (defaultArg model.returnTo (WebLog.relativeUrl webLog (Permalink "admin"))) next ctx
+        return! redirectToGet (defaultArg model.returnTo (WebLog.relativeUrl webLog (Permalink "admin/dashboard")))
+                    next ctx
     | _ ->
         do! addMessage ctx { UserMessage.error with message = "Log on attempt unsuccessful" }
         return! logOn model.returnTo next ctx