Merge pull request 'Version 3.4' (#78) from 3.4 into main

Reviewed-on: #78

.gitignore

@@ -254,3 +254,5 @@ paket-files/
 
 # Ionide VSCode extension
 .ionide
+
+src/environment.txt

README.md

@@ -6,6 +6,11 @@ Journaling has a long history; it helps people remember what happened, and the a
 
 myPrayerJournal was borne of out of a personal desire [Daniel](https://github.com/danieljsummers) had to have something that would help him with his prayer life. When it's time to pray, it's not really time to use an app, so the design goal here is to keep it simple and unobtrusive. It will also help eliminate some of the downsides to a paper prayer journal, like not remembering whether you've prayed for a request, or running out of room to write another update on one.
 
-## Futher Reading
+## Further Reading
 
 The documentation for the site is at <https://bit-badger.github.io/myPrayerJournal/>.
+
+---
+_Thanks to [JetBrains](https://jb.gg/OpenSource) for licensing their awesome toolset to this project._
+
+[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo" width="100" height="100">](https://jb.gg/OpenSource)

publish.ps1

@@ -1,3 +1,3 @@
 #!/snap/bin/pwsh
 Set-Location src/MyPrayerJournal
-dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained false
+dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained false --nologo

src/Dockerfile

@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+WORKDIR /mpj
+COPY ./MyPrayerJournal/MyPrayerJournal.fsproj ./
+RUN dotnet restore
+
+COPY ./MyPrayerJournal ./
+RUN dotnet publish -c Release -r linux-x64
+RUN rm bin/Release/net8.0/linux-x64/publish/appsettings.*.json || true
+
+FROM  mcr.microsoft.com/dotnet/aspnet:8.0-alpine as final
+WORKDIR /app
+RUN apk add --no-cache icu-libs
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
+COPY --from=build /mpj/bin/Release/net8.0/linux-x64/publish/ ./
+
+EXPOSE 80
+CMD [ "dotnet", "/app/MyPrayerJournal.dll" ]

src/MyPrayerJournal.Migrate/Migrate.fsproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FSharp.Data" Version="4.2.3" />
-    <PackageReference Include="LiteDB" Version="5.0.11" />
-    <PackageReference Include="NodaTime" Version="3.0.9" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MyPrayerJournal\MyPrayerJournal.fsproj" />
-  </ItemGroup>
-
-</Project>

src/MyPrayerJournal.Migrate/Program.fs

@@ -1,57 +0,0 @@
-open FSharp.Data
-open FSharp.Data.CsvExtensions
-open LiteDB
-open MyPrayerJournal.Domain
-open NodaTime
-
-module Subdocs =
-  
-  open FSharp.Data.JsonExtensions
-
-  let history json =
-    match JsonValue.Parse json with
-    | JsonValue.Array hist ->
-      hist
-      |> Array.map (fun h ->
-          { asOf   = (h?asOf.AsInteger64 >> Instant.FromUnixTimeMilliseconds) ()
-            status = h?status.AsString () |> RequestAction.ofString
-            text   = match h?text.AsString () with "" -> None | txt -> Some txt
-            })
-      |> List.ofArray
-    | _ -> []
-  
-  let notes json =
-    match JsonValue.Parse json with
-    | JsonValue.Array notes ->
-        notes
-        |> Array.map (fun n ->
-            { asOf = (n?asOf.AsInteger64 >> Instant.FromUnixTimeMilliseconds) ()
-              notes = n?notes.AsString ()
-              })
-        |> List.ofArray
-    | _ -> []
-
-let oldData = CsvFile.Load("data.csv")
-
-let db = new LiteDatabase("Filename=./mpj.db")
-
-MyPrayerJournal.Data.Startup.ensureDb db
-
-let migrated =
-  oldData.Rows
-  |> Seq.map (fun r ->
-      { id           = r["@id"].Replace ("Requests/", "") |> RequestId.ofString
-        enteredOn    = (r?enteredOn.AsInteger64 >> Instant.FromUnixTimeMilliseconds) ()
-        userId       = UserId r?userId
-        snoozedUntil = (r?snoozedUntil.AsInteger64 >> Instant.FromUnixTimeMilliseconds) ()
-        showAfter    = (r?showAfter.AsInteger64 >> Instant.FromUnixTimeMilliseconds) ()
-        recurType    = r?recurType |> Recurrence.ofString
-        recurCount   = (r?recurCount.AsInteger >> int16) ()
-        history      = Subdocs.history r?history
-        notes        = Subdocs.notes r?notes
-      })
-  |> db.GetCollection<Request>("request").Insert
-
-db.Checkpoint ()
-
-printfn $"Migrated {migrated} requests"

src/MyPrayerJournal.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MyPrayerJournal", "MyPrayerJournal\MyPrayerJournal.fsproj", "{6BD5A3C8-F859-42A0-ACD7-A5819385E828}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6BD5A3C8-F859-42A0-ACD7-A5819385E828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD5A3C8-F859-42A0-ACD7-A5819385E828}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD5A3C8-F859-42A0-ACD7-A5819385E828}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BD5A3C8-F859-42A0-ACD7-A5819385E828}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72B57736-8721-4636-A309-49FA4222416E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72B57736-8721-4636-A309-49FA4222416E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72B57736-8721-4636-A309-49FA4222416E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72B57736-8721-4636-A309-49FA4222416E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

src/MyPrayerJournal/.gitignore

@@ -1,5 +1,2 @@
-## LiteDB database file
-*.db
-
 ## Development settings
 appsettings.Development.json

src/MyPrayerJournal/Data.fs

@@ -1,209 +1,202 @@
-module MyPrayerJournal.Data
+module MyPrayerJournal.Data
 
-open LiteDB
+/// Table(!) used by myPrayerJournal
-open NodaTime
+module Table =
-open System
-open System.Threading.Tasks
 
-// fsharplint:disable MemberNames
+    /// Requests
-
+    [<Literal>]
-/// LiteDB extensions
+    let Request = "mpj.request"
-[<AutoOpen>]
-module Extensions =
-  
-  /// Extensions on the LiteDatabase class
-  type LiteDatabase with
-    /// The Request collection
-    member this.requests
-      with get () = this.GetCollection<Request> "request"
-    /// Async version of the checkpoint command (flushes log)
-    member this.saveChanges () =
-      this.Checkpoint ()
-      Task.CompletedTask
 
 
-/// Map domain to LiteDB
+/// JSON serialization customizations
-//  It does mapping, but since we're so DU-heavy, this gives us control over the JSON representation
 [<RequireQualifiedAccess>]
-module Mapping =
+module Json =
-  
-  /// Map a history entry to BSON
-  let historyToBson (hist : History) : BsonValue =
-    let doc = BsonDocument ()
-    doc["asOf"]   <- hist.asOf.ToUnixTimeMilliseconds ()
-    doc["status"] <- RequestAction.toString hist.status
-    doc["text"]   <- match hist.text with Some t -> t | None -> ""
-    upcast doc
 
-  /// Map a BSON document to a history entry
+    open System.Text.Json.Serialization
-  let historyFromBson (doc : BsonValue) =
-    { asOf   = Instant.FromUnixTimeMilliseconds doc["asOf"].AsInt64
-      status = RequestAction.ofString doc["status"].AsString
-      text   = match doc["text"].AsString with "" -> None | txt -> Some txt
-      }
 
-  /// Map a note entry to BSON
+    /// Convert a wrapped DU to/from its string representation
-  let noteToBson (note : Note) : BsonValue =
+    type WrappedJsonConverter<'T>(wrap : string -> 'T, unwrap : 'T -> string) =
-    let doc = BsonDocument ()
+        inherit JsonConverter<'T>()
-    doc["asOf"]  <- note.asOf.ToUnixTimeMilliseconds ()
+        override _.Read(reader, _, _) =
-    doc["notes"] <- note.notes
+            wrap (reader.GetString()) 
-    upcast doc
+        override _.Write(writer, value, _) =
-
+            writer.WriteStringValue(unwrap value)
-  /// Map a BSON document to a note entry
-  let noteFromBson (doc : BsonValue) =
-    { asOf  = Instant.FromUnixTimeMilliseconds doc["asOf"].AsInt64
-      notes = doc["notes"].AsString
-      }
-
-  /// Map a request to its BSON representation
-  let requestToBson req : BsonValue =
-    let doc = BsonDocument ()
-    doc["_id"]          <- RequestId.toString req.id
-    doc["enteredOn"]    <- req.enteredOn.ToUnixTimeMilliseconds ()
-    doc["userId"]       <- UserId.toString req.userId
-    doc["snoozedUntil"] <- req.snoozedUntil.ToUnixTimeMilliseconds ()
-    doc["showAfter"]    <- req.showAfter.ToUnixTimeMilliseconds ()
-    doc["recurType"]    <- Recurrence.toString req.recurType
-    doc["recurCount"]   <- BsonValue req.recurCount
-    doc["history"]      <- BsonArray (req.history |> List.map historyToBson |> Seq.ofList)
-    doc["notes"]        <- BsonArray (req.notes   |> List.map noteToBson    |> Seq.ofList)
-    upcast doc
-  
-  /// Map a BSON document to a request
-  let requestFromBson (doc : BsonValue) =
-    { id           = RequestId.ofString doc["_id"].AsString
-      enteredOn    = Instant.FromUnixTimeMilliseconds doc["enteredOn"].AsInt64
-      userId       = UserId doc["userId"].AsString
-      snoozedUntil = Instant.FromUnixTimeMilliseconds doc["snoozedUntil"].AsInt64
-      showAfter    = Instant.FromUnixTimeMilliseconds doc["showAfter"].AsInt64
-      recurType    = Recurrence.ofString doc["recurType"].AsString
-      recurCount   = int16 doc["recurCount"].AsInt32
-      history      = doc["history"].AsArray |> Seq.map historyFromBson |> List.ofSeq
-      notes        = doc["notes"].AsArray   |> Seq.map noteFromBson    |> List.ofSeq
-      }
-  
-  /// Set up the mapping
-  let register () = 
-    BsonMapper.Global.RegisterType<Request>(
-      Func<Request, BsonValue> requestToBson, Func<BsonValue, Request> requestFromBson)
-
-/// Code to be run at startup
-module Startup =
-  
-  /// Ensure the database is set up
-  let ensureDb (db : LiteDatabase) =
-    db.requests.EnsureIndex (fun it -> it.userId) |> ignore
-    Mapping.register ()
-
-
-/// Async wrappers for LiteDB, and request -> journal mappings
-[<AutoOpen>]
-module private Helpers =
-
-  open System.Linq
-
-  /// Convert a sequence to a list asynchronously (used for LiteDB IO)
-  let toListAsync<'T> (q : 'T seq) =
-    (q.ToList >> Task.FromResult) ()
-
-  /// Convert a sequence to a list asynchronously (used for LiteDB IO)
-  let firstAsync<'T> (q : 'T seq) =
-    q.FirstOrDefault () |> Task.FromResult
-
-  /// Async wrapper around a request update
-  let doUpdate (db : LiteDatabase) (req : Request) =
-    db.requests.Update req |> ignore
-    Task.CompletedTask
-
-
-/// Retrieve a request, including its history and notes, by its ID and user ID
-let tryFullRequestById reqId userId (db : LiteDatabase) = backgroundTask {
-  let! req = db.requests.Find (Query.EQ ("_id", RequestId.toString reqId)) |> firstAsync
-  return match box req with null -> None | _ when req.userId = userId -> Some req | _ -> None
-  }
-
-/// Add a history entry
-let addHistory reqId userId hist db = backgroundTask {
-  match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with history = hist :: req.history }
-  | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
-
-/// Add a note
-let addNote reqId userId note db = backgroundTask {
-  match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with notes = note :: req.notes }
-  | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
-
-/// Add a request
-let addRequest (req : Request) (db : LiteDatabase) =
-  db.requests.Insert req |> ignore
-
-// FIXME: make a common function here
-
-/// Retrieve all answered requests for the given user
-let answeredRequests userId (db : LiteDatabase) = backgroundTask {
-  let! reqs = db.requests.Find (Query.EQ ("userId", UserId.toString userId)) |> toListAsync
-  return
-    reqs
-    |> Seq.map JournalRequest.ofRequestFull
-    |> Seq.filter (fun it -> it.lastStatus = Answered)
-    |> Seq.sortByDescending (fun it -> it.asOf)
-    |> List.ofSeq
-  }
-
-/// Retrieve the user's current journal
-let journalByUserId userId (db : LiteDatabase) = backgroundTask {
-  let! jrnl = db.requests.Find (Query.EQ ("userId", UserId.toString userId)) |> toListAsync
-  return
-    jrnl
-    |> Seq.map JournalRequest.ofRequestLite
-    |> Seq.filter (fun it -> it.lastStatus <> Answered)
-    |> Seq.sortBy (fun it -> it.asOf)
-    |> List.ofSeq
-  }
-
-/// Does the user have any snoozed requests?
-let hasSnoozed userId now (db : LiteDatabase) = backgroundTask {
-  let! jrnl = journalByUserId userId db
-  return jrnl |> List.exists (fun r -> r.snoozedUntil > now)
-  }
-
-/// Retrieve a request by its ID and user ID (without notes and history)
-let tryRequestById reqId userId db = backgroundTask {
-  let! req = tryFullRequestById reqId userId db
-  return req |> Option.map (fun r -> { r with history = []; notes = [] })
-  }
-
-/// Retrieve notes for a request by its ID and user ID
-let notesById reqId userId (db : LiteDatabase) = backgroundTask {
-  match! tryFullRequestById reqId userId db with | Some req -> return req.notes | None -> return []
-  }
     
-/// Retrieve a journal request by its ID and user ID
+    open System.Text.Json
-let tryJournalById reqId userId (db : LiteDatabase) = backgroundTask {
+    open NodaTime.Serialization.SystemTextJson
-  let! req = tryFullRequestById reqId userId db
+
-  return req |> Option.map JournalRequest.ofRequestLite
+    /// JSON serializer options to support the target domain
-  }
+    let options =
+        let opts = JsonSerializerOptions()
+        [ WrappedJsonConverter(Recurrence.ofString,    Recurrence.toString) :> JsonConverter
+          WrappedJsonConverter(RequestAction.ofString, RequestAction.toString)
+          WrappedJsonConverter(RequestId.ofString,     RequestId.toString)
+          WrappedJsonConverter(UserId,                 UserId.toString)
+          JsonFSharpConverter() ]
+        |> List.iter opts.Converters.Add
+        let _ = opts.ConfigureForNodaTime NodaTime.DateTimeZoneProviders.Tzdb
+        opts.PropertyNamingPolicy   <- JsonNamingPolicy.CamelCase
+        opts.DefaultIgnoreCondition <- JsonIgnoreCondition.WhenWritingNull
+        opts
+
+
+open BitBadger.Documents.Postgres
+
+/// Connection 
+[<RequireQualifiedAccess>]
+module Connection =
+
+    open BitBadger.Documents
+    open Microsoft.Extensions.Configuration
+    open Npgsql
+    open System.Text.Json
+
+    /// Ensure the database is ready to use
+    let private ensureDb () = backgroundTask {
+        do! Custom.nonQuery "CREATE SCHEMA IF NOT EXISTS mpj" []
+        do! Definition.ensureTable         Table.Request
+        do! Definition.ensureDocumentIndex Table.Request Optimized
+    }
+
+    /// Set up the data environment
+    let setUp (cfg : IConfiguration) = backgroundTask {
+        let builder = NpgsqlDataSourceBuilder (cfg.GetConnectionString "mpj")
+        let _ = builder.UseNodaTime()
+        Configuration.useDataSource (builder.Build())
+        Configuration.useIdField "id"
+        Configuration.useSerializer
+            { new IDocumentSerializer with
+                member _.Serialize<'T>(it : 'T)       = JsonSerializer.Serialize(it, Json.options)
+                member _.Deserialize<'T>(it : string) = JsonSerializer.Deserialize<'T>(it, Json.options)
+            }
+        do! ensureDb ()
+    }
+
+
+/// Data access functions for requests
+[<RequireQualifiedAccess>]
+module Request =
     
-/// Update the recurrence for a request
+    open NodaTime
-let updateRecurrence reqId userId recurType recurCount db = backgroundTask {
-  match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with recurType = recurType; recurCount = recurCount }
-  | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
 
-/// Update a snoozed request
+    /// Add a request
-let updateSnoozed reqId userId until db = backgroundTask {
+    let add req =
-  match! tryFullRequestById reqId userId db with
+        insert<Request> Table.Request req
-  | Some req -> do! doUpdate db { req with snoozedUntil = until; showAfter = until }
-  | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
 
-/// Update the "show after" timestamp for a request
+    /// Does a request exist for the given request ID and user ID?
-let updateShowAfter reqId userId showAfter db = backgroundTask {
+    let existsById (reqId : RequestId) (userId : UserId) =
-  match! tryFullRequestById reqId userId db with
+        Exists.byContains Table.Request {| Id = reqId; UserId = userId |}
-  | Some req -> do! doUpdate db { req with showAfter = showAfter }
+    
-  | None     -> invalidOp $"{RequestId.toString reqId} not found"
+    /// Retrieve a request by its ID and user ID
-  }
+    let tryById reqId userId = backgroundTask {
+        match! Find.byId<string, Request> Table.Request (RequestId.toString reqId) with
+        | Some req when req.UserId = userId -> return Some req
+        | _ -> return None
+    }
+    
+    /// Update recurrence for a request
+    let updateRecurrence reqId userId (recurType : Recurrence) = backgroundTask {
+        let dbId = RequestId.toString reqId
+        match! existsById reqId userId with
+        | true -> do! Patch.byId Table.Request dbId {| Recurrence = recurType |}
+        | false -> invalidOp $"Request ID {dbId} not found"
+    }
+
+    /// Update the show-after time for a request
+    let updateShowAfter reqId userId (showAfter : Instant option) = backgroundTask {
+        let dbId = RequestId.toString reqId
+        match! existsById reqId userId with
+        | true -> do! Patch.byId Table.Request dbId {| ShowAfter = showAfter |}
+        | false -> invalidOp $"Request ID {dbId} not found"
+    }
+
+    /// Update the snoozed and show-after values for a request
+    let updateSnoozed reqId userId (until : Instant option) = backgroundTask {
+        let dbId = RequestId.toString reqId
+        match! existsById reqId userId with
+        | true -> do! Patch.byId Table.Request dbId {| SnoozedUntil = until; ShowAfter = until |}
+        | false -> invalidOp $"Request ID {dbId} not found"
+    }
+
+
+/// Specific manipulation of history entries
+[<RequireQualifiedAccess>]
+module History =
+
+    /// Add a history entry
+    let add reqId userId hist = backgroundTask {
+        let dbId = RequestId.toString reqId
+        match! Request.tryById reqId userId with
+        | Some req ->
+            do! Patch.byId Table.Request dbId {| History = (hist :: req.History) |> List.sortByDescending (_.AsOf) |}
+        | None -> invalidOp $"Request ID {dbId} not found"
+    }
+
+
+/// Data access functions for journal-style requests
+[<RequireQualifiedAccess>]
+module Journal =
+
+    /// Retrieve a user's answered requests
+    let answered (userId : UserId) = backgroundTask {
+        let! reqs =
+            Custom.list
+                $"""{Query.Find.byContains Table.Request} AND {Query.whereJsonPathMatches "@stat"}"""
+                [ jsonParam "@criteria" {| UserId = userId |}
+                  "@stat", Sql.string """$.history[0].status ? (@ == "Answered")""" ]
+                fromData<Request>
+        return
+            reqs
+            |> Seq.ofList
+            |> Seq.map JournalRequest.ofRequestLite
+            |> Seq.filter (fun it -> it.LastStatus = Answered)
+            |> Seq.sortByDescending (_.AsOf)
+            |> List.ofSeq
+    }
+
+    /// Retrieve a user's current prayer journal (includes snoozed and non-immediate recurrence)
+    let forUser (userId : UserId) = backgroundTask {
+        let! reqs =
+            Custom.list
+                $"""{Query.Find.byContains Table.Request} AND {Query.whereJsonPathMatches "@stat"}"""
+                [ jsonParam "@criteria" {| UserId = userId |}
+                  "@stat", Sql.string """$.history[0].status ? (@ <> "Answered")""" ]
+                fromData<Request>
+        return
+            reqs
+            |> Seq.ofList
+            |> Seq.map JournalRequest.ofRequestLite
+            |> Seq.filter (fun it -> it.LastStatus <> Answered)
+            |> Seq.sortBy (_.AsOf)
+            |> List.ofSeq
+    }
+
+    /// Does the user's journal have any snoozed requests?
+    let hasSnoozed userId now = backgroundTask {
+        let! jrnl = forUser userId
+        return jrnl |> List.exists (fun r -> defaultArg (r.SnoozedUntil |> Option.map (fun it -> it > now)) false)
+    }
+
+    let tryById reqId userId = backgroundTask {
+        let! req = Request.tryById reqId userId
+        return req |> Option.map JournalRequest.ofRequestLite
+    }
+
+
+/// Specific manipulation of note entries
+[<RequireQualifiedAccess>]
+module Note =
+
+    /// Add a note
+    let add reqId userId note = backgroundTask {
+        let dbId = RequestId.toString reqId
+        match! Request.tryById reqId userId with
+        | Some req ->
+            do! Patch.byId Table.Request dbId {| Notes = (note :: req.Notes) |> List.sortByDescending (_.AsOf) |}
+        | None -> invalidOp $"Request ID {dbId} not found"
+    }
+
+    /// Retrieve notes for a request by the request ID
+    let byRequestId reqId userId = backgroundTask {
+        match! Request.tryById reqId userId with Some req -> return req.Notes | None -> return []
+    }

src/MyPrayerJournal/Dates.fs

@@ -5,39 +5,39 @@ module MyPrayerJournal.Dates
 open NodaTime
 
 type internal FormatDistanceToken =
-  | LessThanXMinutes
+    | LessThanXMinutes
-  | XMinutes
+    | XMinutes
-  | AboutXHours
+    | AboutXHours
-  | XHours
+    | XHours
-  | XDays
+    | XDays
-  | AboutXWeeks
+    | AboutXWeeks
-  | XWeeks
+    | XWeeks
-  | AboutXMonths
+    | AboutXMonths
-  | XMonths
+    | XMonths
-  | AboutXYears
+    | AboutXYears
-  | XYears
+    | XYears
-  | OverXYears
+    | OverXYears
-  | AlmostXYears
+    | AlmostXYears
 
 let internal locales =
-  let format = PrintfFormat<int -> string, unit, string, string>
+    let format = PrintfFormat<int -> string, unit, string, string>
-  Map.ofList [
+    Map.ofList [
-    "en-US", Map.ofList [
+        "en-US", Map.ofList [
-      LessThanXMinutes, ("less than a minute", format "less than %i minutes")
+            LessThanXMinutes, ("less than a minute", format "less than %i minutes")
-      XMinutes,         ("a minute",           format "%i minutes")
+            XMinutes,         ("a minute",           format "%i minutes")
-      AboutXHours,      ("about an hour",      format "about %i hours")
+            AboutXHours,      ("about an hour",      format "about %i hours")
-      XHours,           ("an hour",            format "%i hours")
+            XHours,           ("an hour",            format "%i hours")
-      XDays,            ("a day",              format "%i days")
+            XDays,            ("a day",              format "%i days")
-      AboutXWeeks,      ("about a week",       format "about %i weeks")
+            AboutXWeeks,      ("about a week",       format "about %i weeks")
-      XWeeks,           ("a week",             format "%i weeks")
+            XWeeks,           ("a week",             format "%i weeks")
-      AboutXMonths,     ("about a month",      format "about %i months")
+            AboutXMonths,     ("about a month",      format "about %i months")
-      XMonths,          ("a month",            format "%i months")
+            XMonths,          ("a month",            format "%i months")
-      AboutXYears,      ("about a year",       format "about %i years")
+            AboutXYears,      ("about a year",       format "about %i years")
-      XYears,           ("a year",             format "%i years")
+            XYears,           ("a year",             format "%i years")
-      OverXYears,       ("over a year",        format "over %i years")
+            OverXYears,       ("over a year",        format "over %i years")
-      AlmostXYears,     ("almost a year",      format "almost %i years")
+            AlmostXYears,     ("almost a year",      format "almost %i years")
+        ]
     ]
-  ]
 
 let aDay        =  1_440.
 let almost2Days =  2_520.
@@ -46,33 +46,31 @@ let twoMonths   = 86_400.
 
 open System
 
-/// Convert from a JavaScript "ticks" value to a date/time
+/// Format the distance between two instants in approximate English terms
-let fromJs ticks = DateTime.UnixEpoch + TimeSpan.FromTicks (ticks * 10_000L)
+let formatDistance (startOn : Instant) (endOn : Instant) =
+    let format (token, number) locale =
+        let labels = locales |> Map.find locale
+        match number with 1 -> fst labels[token] | _ -> sprintf (snd labels[token]) number
+    let round (it : float) = Math.Round it |> int
 
-let formatDistance (startDate : Instant) (endDate : Instant) =
+    let diff        = startOn - endOn
-  let format (token, number) locale =
+    let minutes     = Math.Abs diff.TotalMinutes
-    let labels = locales |> Map.find locale
+    let formatToken =
-    match number with 1 -> fst labels[token] | _ -> sprintf (snd labels[token]) number
+        let months = minutes / aMonth |> round
-  let round (it : float) = Math.Round it |> int
+        let years  = months / 12
-
+        match true with
-  let diff        = startDate - endDate
+        | _ when minutes < 1.          -> LessThanXMinutes, 1
-  let minutes     = Math.Abs diff.TotalMinutes
+        | _ when minutes < 45.         -> XMinutes, round minutes
-  let formatToken =
+        | _ when minutes < 90.         -> AboutXHours, 1
-    let months = minutes / aMonth |> round
+        | _ when minutes < aDay        -> AboutXHours, round (minutes / 60.)
-    let years  = months / 12
+        | _ when minutes < almost2Days -> XDays, 1
-    match true with
+        | _ when minutes < aMonth      -> XDays, round (minutes / aDay)
-    | _ when minutes < 1.          -> LessThanXMinutes, 1
+        | _ when minutes < twoMonths   -> AboutXMonths, round (minutes / aMonth)
-    | _ when minutes < 45.         -> XMinutes, round minutes
+        | _ when months      < 12      -> XMonths, round (minutes / aMonth)
-    | _ when minutes < 90.         -> AboutXHours, 1
+        | _ when months % 12 < 3       -> AboutXYears, years
-    | _ when minutes < aDay        -> AboutXHours, round (minutes / 60.)
+        | _ when months % 12 < 9       -> OverXYears, years
-    | _ when minutes < almost2Days -> XDays, 1
+        | _                            -> AlmostXYears, years + 1
-    | _ when minutes < aMonth      -> XDays, round (minutes / aDay)
-    | _ when minutes < twoMonths   -> AboutXMonths, round (minutes / aMonth)
-    | _ when months      < 12      -> XMonths, round (minutes / aMonth)
-    | _ when months % 12 < 3       -> AboutXYears, years
-    | _ when months % 12 < 9       -> OverXYears, years
-    | _                            -> AlmostXYears, years + 1
   
-  format formatToken "en-US"
+    format formatToken "en-US"
-  |> match startDate > endDate with true -> sprintf "%s ago" | false -> sprintf "in %s"
+    |> match startOn > endOn with true -> sprintf "%s ago" | false -> sprintf "in %s"
 

src/MyPrayerJournal/Domain.fs

@@ -1,213 +1,279 @@
-[<AutoOpen>]
 /// The data model for myPrayerJournal
+[<AutoOpen>]
 module MyPrayerJournal.Domain
 
-// fsharplint:disable RecordFieldNames
+open System
-
 open Cuid
 open NodaTime
 
 /// An identifier for a request
-type RequestId =
+type RequestId = RequestId of Cuid
-  | RequestId of Cuid
 
 /// Functions to manipulate request IDs
 module RequestId =
-  /// The string representation of the request ID
+    
-  let toString = function RequestId x -> Cuid.toString x
+    /// The string representation of the request ID
-  /// Create a request ID from a string representation
+    let toString = function RequestId x -> Cuid.toString x
-  let ofString = Cuid >> RequestId
+    
+    /// Create a request ID from a string representation
+    let ofString = Cuid >> RequestId
 
 
 /// The identifier of a user (the "sub" part of the JWT)
-type UserId =
+type UserId = UserId of string
-  | UserId of string
 
 /// Functions to manipulate user IDs
 module UserId =
-  /// The string representation of the user ID
+    
-  let toString = function UserId x -> x
+    /// The string representation of the user ID
+    let toString = function UserId x -> x
 
 
 /// How frequently a request should reappear after it is marked "Prayed"
 type Recurrence =
-  | Immediate
+    
-  | Hours
+    /// A request should reappear immediately at the bottom of the list
-  | Days
+    | Immediate
-  | Weeks
+    
+    /// A request should reappear in the given number of hours
+    | Hours of int16
+    
+    /// A request should reappear in the given number of days
+    | Days  of int16
+    
+    /// A request should reappear in the given number of weeks (7-day increments)
+    | Weeks of int16
 
 /// Functions to manipulate recurrences
 module Recurrence =
-  /// Create a string representation of a recurrence
+    
-  let toString =
+    /// Create a string representation of a recurrence
-    function
+    let toString =
-    | Immediate -> "Immediate"
+        function
-    | Hours     -> "Hours"
+        | Immediate -> "Immediate"
-    | Days      -> "Days"
+        | Hours   h -> $"{h} Hours"
-    | Weeks     -> "Weeks"
+        | Days    d -> $"{d} Days"
-  /// Create a recurrence value from a string
+        | Weeks   w -> $"{w} Weeks"
-  let ofString =
+    
-    function
+    /// Create a recurrence value from a string
-    | "Immediate" -> Immediate
+    let ofString =
-    | "Hours"     -> Hours
+        function
-    | "Days"      -> Days
+        | "Immediate" -> Immediate
-    | "Weeks"     -> Weeks
+        | it when it.Contains " " ->
-    | it          -> invalidOp $"{it} is not a valid recurrence"
+            let parts = it.Split " "
-  /// An hour's worth of seconds
+            let length = Convert.ToInt16 parts[0]
-  let private oneHour = 3_600L
+            match parts[1] with
-  /// The duration of the recurrence (in milliseconds)
+            | "Hours" -> Hours length
-  let duration x =
+            | "Days"  -> Days  length
-    (match x with
+            | "Weeks" -> Weeks length
-    | Immediate -> 0L
+            | _       -> invalidOp $"{parts[1]} is not a valid recurrence"
-    | Hours     -> oneHour
+        | it -> invalidOp $"{it} is not a valid recurrence"
-    | Days      -> oneHour * 24L
+    
-    | Weeks     -> oneHour * 24L * 7L)
+    /// An hour's worth of seconds
+    let private oneHour = 3_600L
+    
+    /// The duration of the recurrence (in milliseconds)
+    let duration =
+        function
+        | Immediate -> 0L
+        | Hours   h -> int64 h * oneHour
+        | Days    d -> int64 d * oneHour * 24L
+        | Weeks   w -> int64 w * oneHour * 24L * 7L
 
 
 /// The action taken on a request as part of a history entry
 type RequestAction =
-  | Created
+    | Created
-  | Prayed
+    | Prayed
-  | Updated
+    | Updated
-  | Answered
+    | Answered
+
+/// Functions to manipulate request actions
+module RequestAction =
+  
+    /// Create a string representation of an action
+    let toString =
+        function
+        | Created  -> "Created"
+        | Prayed   -> "Prayed"
+        | Updated  -> "Updated"
+        | Answered -> "Answered"
+    
+    /// Create a RequestAction from a string
+    let ofString =
+        function
+        | "Created"  -> Created
+        | "Prayed"   -> Prayed
+        | "Updated"  -> Updated
+        | "Answered" -> Answered
+        | it         -> invalidOp $"Bad request action {it}"
+    
 
 
 /// History is a record of action taken on a prayer request, including updates to its text
 [<CLIMutable; NoComparison; NoEquality>]
-type History = {
+type History =
-  /// The time when this history entry was made
+    {   /// The time when this history entry was made
-  asOf   : Instant
+        AsOf : Instant
-  /// The status for this history entry
+        
-  status : RequestAction
+        /// The status for this history entry
-  /// The text of the update, if applicable
+        Status : RequestAction
-  text   : string option
+        
-  }
+        /// The text of the update, if applicable
+        Text : string option
+    }
+
+/// Functions to manipulate history entries
+module History =
+  
+    /// Determine if a history's status is `Created`
+    let isCreated hist = hist.Status = Created
+    
+    /// Determine if a history's status is `Prayed`
+    let isPrayed hist = hist.Status = Prayed
+    
+    /// Determine if a history's status is `Answered`
+    let isAnswered hist = hist.Status = Answered
+
 
 /// Note is a note regarding a prayer request that does not result in an update to its text
 [<CLIMutable; NoComparison; NoEquality>]
-type Note = {
+type Note =
-  /// The time when this note was made
+    {   /// The time when this note was made
-  asOf  : Instant
+        AsOf : Instant
-  /// The text of the notes
+        
-  notes : string
+        /// The text of the notes
-  }
+        Notes : string
+    }
+
 
 /// Request is the identifying record for a prayer request
 [<CLIMutable; NoComparison; NoEquality>]
-type Request = {
+type Request =
-  /// The ID of the request
+    {   /// The ID of the request
-  id           : RequestId
+        Id : RequestId
-  /// The time this request was initially entered
+        
-  enteredOn    : Instant
+        /// The time this request was initially entered
-  /// The ID of the user to whom this request belongs ("sub" from the JWT)
+        EnteredOn : Instant
-  userId       : UserId
+        
-  /// The time at which this request should reappear in the user's journal by manual user choice
+        /// The ID of the user to whom this request belongs ("sub" from the JWT)
-  snoozedUntil : Instant
+        UserId : UserId
-  /// The time at which this request should reappear in the user's journal by recurrence
+        
-  showAfter    : Instant
+        /// The time at which this request should reappear in the user's journal by manual user choice
-  /// The type of recurrence for this request
+        SnoozedUntil : Instant option
-  recurType    : Recurrence
+        
-  /// How many of the recurrence intervals should occur between appearances in the journal
+        /// The time at which this request should reappear in the user's journal by recurrence
-  recurCount   : int16
+        ShowAfter : Instant option
-  /// The history entries for this request
+        
-  history      : History list
+        /// The recurrence for this request
-  /// The notes for this request
+        Recurrence : Recurrence
-  notes        : Note list
+        
-  }
+        /// The history entries for this request
-with
+        History : History list
-  /// An empty request
+        
-  static member empty =
+        /// The notes for this request
-    { id           = Cuid.generate () |> RequestId
+        Notes : Note list
-      enteredOn    = Instant.MinValue
+    }
-      userId       = UserId ""
+
-      snoozedUntil = Instant.MinValue
+/// Functions to support requests
-      showAfter    = Instant.MinValue
+module Request =
-      recurType    = Immediate
+    
-      recurCount   = 0s
+    /// An empty request
-      history      = []
+    let empty =
-      notes        = []
+        {   Id           = Cuid.generate () |> RequestId
-      }
+            EnteredOn    = Instant.MinValue
+            UserId       = UserId ""
+            SnoozedUntil = None
+            ShowAfter    = None
+            Recurrence   = Immediate
+            History      = []
+            Notes        = []
+        }
+
 
 /// JournalRequest is the form of a prayer request returned for the request journal display. It also contains
 /// properties that may be filled for history and notes.
 [<NoComparison; NoEquality>]
-type JournalRequest = {
+type JournalRequest =
-  /// The ID of the request (just the CUID part)
+    {   /// The ID of the request (just the CUID part)
-  requestId    : RequestId
+        RequestId : RequestId
-  /// The ID of the user to whom the request belongs
+        
-  userId       : UserId
+        /// The ID of the user to whom the request belongs
-  /// The current text of the request
+        UserId : UserId
-  text         : string
+        
-  /// The last time action was taken on the request
+        /// The current text of the request
-  asOf         : Instant
+        Text : string
-  /// The last status for the request
+        
-  lastStatus   : RequestAction
+        /// The last time action was taken on the request
-  /// The time that this request should reappear in the user's journal
+        AsOf : Instant
-  snoozedUntil : Instant
+        
-  /// The time after which this request should reappear in the user's journal by configured recurrence
+        /// The last time a request was marked as prayed
-  showAfter    : Instant
+        LastPrayed : Instant option
-  /// The type of recurrence for this request
+        
-  recurType    : Recurrence
+        /// The last status for the request
-  /// How many of the recurrence intervals should occur between appearances in the journal
+        LastStatus : RequestAction
-  recurCount   : int16
+        
-  /// History entries for the request
+        /// The time that this request should reappear in the user's journal
-  history      : History list
+        SnoozedUntil : Instant option
-  /// Note entries for the request
+        
-  notes        : Note list
+        /// The time after which this request should reappear in the user's journal by configured recurrence
-  }
+        ShowAfter : Instant option
+        
+        /// The recurrence for this request
+        Recurrence : Recurrence
+        
+        /// History entries for the request
+        History : History list
+        
+        /// Note entries for the request
+        Notes : Note list
+    }
 
 /// Functions to manipulate journal requests
 module JournalRequest =
 
-  /// Convert a request to the form used for the journal (precomputed values, no notes or history)
+    /// Convert a request to the form used for the journal (precomputed values, no notes or history)
-  let ofRequestLite (req : Request) =
+    let ofRequestLite (req : Request) =
-    let hist = req.history |> List.sortByDescending (fun it -> it.asOf) |> List.tryHead
+        let history = Seq.ofList req.History
-    { requestId    = req.id
+        let lastHistory = Seq.tryHead history
-      userId       = req.userId
+        // Requests are sorted by the "as of" field in this record; for sorting to work properly, we will put the
-      text         = req.history
+        // largest of the last prayed date, the "snoozed until". or the "show after" date; if none of those are filled,
-                      |> List.filter (fun it -> Option.isSome it.text)
+        // we will use the last activity date. This will mean that:
-                      |> List.sortByDescending (fun it -> it.asOf)
+        //  - Immediately shown requests will be at the top of the list, in order from least recently prayed to most.
-                      |> List.tryHead
+        //  - Non-immediate requests will enter the list as if they were marked as prayed at that time; this will put
-                      |> Option.map (fun h -> Option.get h.text)
+        //    them at the bottom of the list.
-                      |> Option.defaultValue ""
+        //  - Snoozed requests will reappear at the bottom of the list when they return.
-      asOf         = match hist with Some h -> h.asOf   | None -> Instant.MinValue
+        //  - New requests will go to the bottom of the list, but will rise as others are marked as prayed.
-      lastStatus   = match hist with Some h -> h.status | None -> Created
+        let lastActivity = lastHistory |> Option.map (_.AsOf) |> Option.defaultValue Instant.MinValue
-      snoozedUntil = req.snoozedUntil
+        let showAfter    = defaultArg req.ShowAfter    Instant.MinValue
-      showAfter    = req.showAfter
+        let snoozedUntil = defaultArg req.SnoozedUntil Instant.MinValue
-      recurType    = req.recurType
+        let lastPrayed   =
-      recurCount   = req.recurCount
+            history
-      history      = []
+            |> Seq.filter History.isPrayed
-      notes        = []
+            |> Seq.tryHead
-      }
+            |> Option.map (_.AsOf)
+            |> Option.defaultValue Instant.MinValue
+        let asOf = List.max [ lastPrayed; showAfter; snoozedUntil ]
+        {   RequestId    = req.Id
+            UserId       = req.UserId
+            Text         = history
+                           |> Seq.filter (fun it -> Option.isSome it.Text)
+                           |> Seq.tryHead
+                           |> Option.map (fun h -> Option.get h.Text)
+                           |> Option.defaultValue ""
+            AsOf         = if asOf > Instant.MinValue then asOf else lastActivity
+            LastPrayed   = if lastPrayed = Instant.MinValue then None else Some lastPrayed
+            LastStatus   = match lastHistory with Some h -> h.Status | None -> Created
+            SnoozedUntil = req.SnoozedUntil
+            ShowAfter    = req.ShowAfter
+            Recurrence   = req.Recurrence
+            History      = []
+            Notes        = []
+        }
 
-  /// Same as `ofRequestLite`, but with notes and history
+    /// Same as `ofRequestLite`, but with notes and history
-  let ofRequestFull req =
+    let ofRequestFull req =
-    { ofRequestLite req with 
+        { ofRequestLite req with 
-        history = req.history
+            History = req.History
-        notes   = req.notes
+            Notes   = req.Notes
-      }
+        }
-
-
-/// Functions to manipulate request actions
-module RequestAction =
-  /// Create a string representation of an action
-  let toString =
-    function
-    | Created  -> "Created"
-    | Prayed   -> "Prayed"
-    | Updated  -> "Updated"
-    | Answered -> "Answered"
-  /// Create a RequestAction from a string
-  let ofString =
-    function
-    | "Created"  -> Created
-    | "Prayed"   -> Prayed
-    | "Updated"  -> Updated
-    | "Answered" -> Answered
-    | it         -> invalidOp $"Bad request action {it}"
-  /// Determine if a history's status is `Created`
-  let isCreated hist = hist.status = Created
-  /// Determine if a history's status is `Prayed`
-  let isPrayed hist = hist.status = Prayed
-  /// Determine if a history's status is `Answered`
-  let isAnswered hist = hist.status = Answered

src/MyPrayerJournal/MyPrayerJournal.fsproj

@@ -1,7 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
-    <Version>3.0.0.0</Version>
+    <Version>3.4</Version>
+    <DebugType>embedded</DebugType>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <PublishSingleFile>false</PublishSingleFile>
+    <SelfContained>false</SelfContained>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Domain.fs" />
@@ -12,20 +16,21 @@
     <Compile Include="Views/Layout.fs" />
     <Compile Include="Views/Legal.fs" />
     <Compile Include="Views/Request.fs" />
+    <Compile Include="Views\Docs.fs" />
     <Compile Include="Handlers.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.4" />
+    <PackageReference Include="BitBadger.Documents.Postgres" Version="3.1.0" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
     <PackageReference Include="FunctionalCuid" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="5.0.0" />
+    <PackageReference Include="Giraffe" Version="6.4.0" />
-    <PackageReference Include="LiteDB" Version="5.0.11" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.9.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.10" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.12" />
-    <PackageReference Include="NodaTime" Version="3.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.6" />
-  </ItemGroup>
+    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
-  <ItemGroup>
+    <PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
-    <ProjectReference Include="../../../Giraffe.Htmx/src/Htmx/Giraffe.Htmx.fsproj" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
-    <ProjectReference Include="../../../Giraffe.Htmx/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />

src/MyPrayerJournal/Program.fs

@@ -1,181 +1,111 @@
 module MyPrayerJournal.Api
 
+open Microsoft.AspNetCore.Http
+
+let sameSite (opts : CookieOptions) =
+    match opts.SameSite, opts.Secure with
+    | SameSiteMode.None, false -> opts.SameSite <- SameSiteMode.Unspecified
+    | _, _ -> ()
+
+open Giraffe
+open Giraffe.EndpointRouting
+open Microsoft.AspNetCore.Authentication.Cookies
+open Microsoft.AspNetCore.Authentication.OpenIdConnect
 open Microsoft.AspNetCore.Builder
-open Microsoft.AspNetCore.Hosting
+open Microsoft.AspNetCore.HttpOverrides
-open System.IO
+open Microsoft.Extensions.Configuration
-
+open Microsoft.Extensions.DependencyInjection
-/// Configuration functions for the application
+open Microsoft.Extensions.Hosting
-module Configure =
+open Microsoft.Extensions.Logging
-  
+open Microsoft.IdentityModel.Protocols.OpenIdConnect
-  /// Configure the content root
+open MyPrayerJournal.Data
-  let contentRoot root =
+open NodaTime
-    WebApplicationOptions (ContentRootPath = root) |> WebApplication.CreateBuilder
+open System
-
+open System.Text.Json
-
+open System.Threading.Tasks
-  open Microsoft.Extensions.Configuration
-
-  /// Configure the application configuration
-  let appConfiguration (bldr : WebApplicationBuilder) =
-    bldr.Configuration
-      .SetBasePath(bldr.Environment.ContentRootPath)
-      .AddJsonFile("appsettings.json", optional = false, reloadOnChange = true)
-      .AddJsonFile($"appsettings.{bldr.Environment.EnvironmentName}.json", optional = true, reloadOnChange = true)
-      .AddEnvironmentVariables ()
-    |> ignore
-    bldr
-
-
-  open Microsoft.AspNetCore.Server.Kestrel.Core
-
-  /// Configure Kestrel from appsettings.json
-  let kestrel (bldr : WebApplicationBuilder) =
-    let kestrelOpts (ctx : WebHostBuilderContext) (opts : KestrelServerOptions) =
-      (ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel"
-    bldr.WebHost.UseKestrel().ConfigureKestrel kestrelOpts |> ignore
-    bldr
-
-
-  /// Configure the web root directory
-  let webRoot pathSegments (bldr : WebApplicationBuilder) =
-    Array.concat [ [| bldr.Environment.ContentRootPath |]; pathSegments ]
-    |> (Path.Combine >> bldr.WebHost.UseWebRoot >> ignore)
-    bldr
-
-
-  open Microsoft.Extensions.Logging
-  open Microsoft.Extensions.Hosting
-
-  /// Configure logging
-  let logging (bldr : WebApplicationBuilder) =
-    match bldr.Environment.IsDevelopment () with
-    | true -> ()
-    | false -> bldr.Logging.AddFilter (fun l -> l > LogLevel.Information) |> ignore
-    bldr.Logging.AddConsole().AddDebug() |> ignore
-    bldr
-
-
-  open Giraffe
-  open LiteDB
-  open Microsoft.AspNetCore.Authentication.Cookies
-  open Microsoft.AspNetCore.Authentication.OpenIdConnect
-  open Microsoft.AspNetCore.Http
-  open Microsoft.Extensions.DependencyInjection
-  open Microsoft.IdentityModel.Protocols.OpenIdConnect
-  open NodaTime
-  open System
-  open System.Text.Json
-  open System.Text.Json.Serialization
-  open System.Threading.Tasks
-
-  /// Configure dependency injection
-  let services (bldr : WebApplicationBuilder) =
-    let sameSite (opts : CookieOptions) =
-      match opts.SameSite, opts.Secure with
-      | SameSiteMode.None, false -> opts.SameSite <- SameSiteMode.Unspecified
-      | _, _ -> ()
-
-    bldr.Services
-      .AddRouting()
-      .AddGiraffe()
-      .AddSingleton<IClock>(SystemClock.Instance)
-      .Configure<CookiePolicyOptions>(
-        fun (opts : CookiePolicyOptions) ->
-          opts.MinimumSameSitePolicy <- SameSiteMode.Unspecified
-          opts.OnAppendCookie        <- fun ctx -> sameSite ctx.CookieOptions
-          opts.OnDeleteCookie        <- fun ctx -> sameSite ctx.CookieOptions)
-      .AddAuthentication(
-        /// Use HTTP "Bearer" authentication with JWTs
-        fun opts ->
-          opts.DefaultAuthenticateScheme <- CookieAuthenticationDefaults.AuthenticationScheme
-          opts.DefaultSignInScheme       <- CookieAuthenticationDefaults.AuthenticationScheme
-          opts.DefaultChallengeScheme    <- CookieAuthenticationDefaults.AuthenticationScheme)
-      .AddCookie()
-      .AddOpenIdConnect("Auth0",
-        /// Configure OIDC with Auth0 options from configuration
-        fun opts ->
-          let cfg = bldr.Configuration.GetSection "Auth0"
-          opts.Authority    <- sprintf "https://%s/" cfg["Domain"]
-          opts.ClientId     <- cfg["Id"]
-          opts.ClientSecret <- cfg["Secret"]
-          opts.ResponseType <- OpenIdConnectResponseType.Code
-          
-          opts.Scope.Clear ()
-          opts.Scope.Add "openid"
-          opts.Scope.Add "profile"
-
-          opts.CallbackPath <- PathString "/user/log-on/success"
-          opts.ClaimsIssuer <- "Auth0"
-          opts.SaveTokens   <- true
-
-          opts.Events <- OpenIdConnectEvents ()
-          opts.Events.OnRedirectToIdentityProviderForSignOut <- fun ctx ->
-            let returnTo =
-              match ctx.Properties.RedirectUri with
-              | it when isNull it || it = "" -> ""
-              | redirUri ->
-                  let finalRedirUri =
-                    match redirUri.StartsWith "/" with
-                    | true ->
-                        // transform to absolute
-                        let request = ctx.Request
-                        sprintf "%s://%s%s%s" request.Scheme request.Host.Value request.PathBase.Value redirUri
-                    | false -> redirUri
-                  Uri.EscapeDataString finalRedirUri |> sprintf "&returnTo=%s"
-            sprintf "https://%s/v2/logout?client_id=%s%s" cfg["Domain"] cfg["Id"] returnTo
-            |> ctx.Response.Redirect
-            ctx.HandleResponse ()
-
-            Task.CompletedTask
-          opts.Events.OnRedirectToIdentityProvider <- fun ctx ->
-            let bldr = UriBuilder ctx.ProtocolMessage.RedirectUri
-            bldr.Scheme <- cfg["Scheme"]
-            bldr.Port   <- int cfg["Port"]
-            ctx.ProtocolMessage.RedirectUri <- string bldr
-            Task.CompletedTask
-          )
-    |> ignore
-    let jsonOptions = JsonSerializerOptions ()
-    jsonOptions.Converters.Add (JsonFSharpConverter ())
-    let db = new LiteDatabase (bldr.Configuration.GetConnectionString "db")
-    Data.Startup.ensureDb db
-    bldr.Services.AddSingleton(jsonOptions)
-      .AddSingleton<Json.ISerializer, SystemTextJson.Serializer>()
-      .AddSingleton<LiteDatabase> db
-    |> ignore
-    bldr.Build ()
-  
-
-  open Giraffe.EndpointRouting
-
-  /// Configure the web application
-  let application (app : WebApplication) =
-    // match app.Environment.IsDevelopment () with
-    // | true -> app.UseDeveloperExceptionPage ()
-    // | false -> app.UseGiraffeErrorHandler Handlers.Error.error
-    // |> ignore
-    app
-      .UseStaticFiles()
-      .UseCookiePolicy()
-      .UseRouting()
-      .UseAuthentication()
-      .UseGiraffeErrorHandler(Handlers.Error.error)
-      .UseEndpoints (fun e -> e.MapGiraffeEndpoints Handlers.routes |> ignore)
-    |> ignore
-    app
-
-  /// Compose all the configurations into one
-  let webHost pathSegments =
-    contentRoot
-    >> appConfiguration
-    >> kestrel
-    >> webRoot pathSegments
-    >> logging
-    >> services
-    >> application
-
 
 [<EntryPoint>]
-let main _ =
+let main args =
-  use host = Configure.webHost [| "wwwroot" |] (Directory.GetCurrentDirectory ())
+    //use host = Configure.webHost [| "wwwroot" |] (Directory.GetCurrentDirectory ())
-  host.Run ()
+    //host.Run ()
-  0
+    let builder = WebApplication.CreateBuilder args
+    let _       = builder.Configuration.AddEnvironmentVariables "MPJ_"
+    let svc     = builder.Services
+    let cfg     = svc.BuildServiceProvider().GetRequiredService<IConfiguration>()
+
+    let _ = svc.AddRouting()
+    let _ = svc.AddGiraffe()
+    let _ = svc.AddSingleton<IClock> SystemClock.Instance
+    let _ = svc.AddSingleton<IDateTimeZoneProvider> DateTimeZoneProviders.Tzdb
+    let _ = svc.Configure<ForwardedHeadersOptions>(fun (opts : ForwardedHeadersOptions) ->
+                opts.ForwardedHeaders <- ForwardedHeaders.XForwardedFor ||| ForwardedHeaders.XForwardedProto)
+    
+    let _ =
+        svc.Configure<CookiePolicyOptions>(fun (opts : CookiePolicyOptions) ->
+            opts.MinimumSameSitePolicy <- SameSiteMode.Unspecified
+            opts.OnAppendCookie        <- fun ctx -> sameSite ctx.CookieOptions
+            opts.OnDeleteCookie        <- fun ctx -> sameSite ctx.CookieOptions)
+    let _ =
+        svc.AddAuthentication(fun opts ->
+            opts.DefaultAuthenticateScheme <- CookieAuthenticationDefaults.AuthenticationScheme
+            opts.DefaultSignInScheme       <- CookieAuthenticationDefaults.AuthenticationScheme
+            opts.DefaultChallengeScheme    <- CookieAuthenticationDefaults.AuthenticationScheme)
+            .AddCookie()
+            .AddOpenIdConnect("Auth0", fun opts ->
+                // Configure OIDC with Auth0 options from configuration
+                let auth0 = cfg.GetSection "Auth0"
+                opts.Authority    <- $"""https://{auth0["Domain"]}/"""
+                opts.ClientId     <- auth0["Id"]
+                opts.ClientSecret <- auth0["Secret"]
+                opts.ResponseType <- OpenIdConnectResponseType.Code
+                
+                opts.Scope.Clear()
+                opts.Scope.Add "openid"
+                opts.Scope.Add "profile"
+                
+                opts.CallbackPath <- PathString "/user/log-on/success"
+                opts.ClaimsIssuer <- "Auth0"
+                opts.SaveTokens   <- true
+                
+                opts.Events <- OpenIdConnectEvents()
+                opts.Events.OnRedirectToIdentityProviderForSignOut <- fun ctx ->
+                    let returnTo =
+                        match ctx.Properties.RedirectUri with
+                        | it when isNull it || it = "" -> ""
+                        | redirUri ->
+                            let finalRedirUri =
+                                match redirUri.StartsWith "/" with
+                                | true ->
+                                    // transform to absolute
+                                    let request = ctx.Request
+                                    $"{request.Scheme}://{request.Host.Value}{request.PathBase.Value}{redirUri}"
+                                | false -> redirUri
+                            Uri.EscapeDataString $"&returnTo={finalRedirUri}"
+                    ctx.Response.Redirect $"""https://{auth0["Domain"]}/v2/logout?client_id={auth0["Id"]}{returnTo}"""
+                    ctx.HandleResponse()
+                    Task.CompletedTask
+                opts.Events.OnRedirectToIdentityProvider <- fun ctx ->
+                    let uri = UriBuilder ctx.ProtocolMessage.RedirectUri
+                    uri.Scheme <- auth0["Scheme"]
+                    uri.Port   <- int auth0["Port"]
+                    ctx.ProtocolMessage.RedirectUri <- string uri
+                    Task.CompletedTask)
+    
+    let _ = svc.AddSingleton<JsonSerializerOptions> Json.options
+    let _ = svc.AddSingleton<Json.ISerializer>(SystemTextJson.Serializer Json.options)
+    let _ = Connection.setUp cfg |> Async.AwaitTask |> Async.RunSynchronously
+    
+    if builder.Environment.IsDevelopment() then builder.Logging.AddFilter(fun l -> l > LogLevel.Information) |> ignore
+    let _ = builder.Logging.AddConsole().AddDebug() |> ignore
+
+    use app = builder.Build()
+    let _ = app.UseStaticFiles()
+    let _ = app.UseCookiePolicy()
+    let _ = app.UseRouting()
+    let _ = app.UseAuthentication()
+    let _ = app.UseGiraffeErrorHandler Handlers.Error.error
+    let _ = app.UseEndpoints(fun e -> e.MapGiraffeEndpoints Handlers.routes)
+    
+    app.Run()
+
+    0

src/MyPrayerJournal/Views/Docs.fs

@@ -0,0 +1,184 @@
+module MyPrayerJournal.Views.Docs
+
+open Giraffe.ViewEngine
+
+/// The "About myPrayerJournal" section
+let private about = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "About myPrayerJournal" ]
+    p [] [
+        rawText "Journaling has a long history; it helps people remember what happened, and the act of writing helps "
+        rawText "people think about what happened and process it. A prayer journal is not a new concept; it helps you "
+        rawText "keep track of the requests for which you've prayed, you can use it to pray over things repeatedly, "
+        rawText "and you can write the result when the answer comes "; em [] [ rawText "(or it was “no”)" ]
+        rawText "."
+    ]
+    p [] [
+        rawText "myPrayerJournal was borne of out of a personal desire "
+        a [ _href "https://daniel.summershome.org"; _target "_blank"; _rel "noopener" ] [ rawText "Daniel" ]
+        rawText " had to have something that would help him with his prayer life. When it’s time to pray, "
+        rawText "it’s not really time to use an app, so the design goal here is to keep it simple and "
+        rawText "unobtrusive. It will also help eliminate some of the downsides to a paper prayer journal, like not "
+        rawText "remembering whether you’ve prayed for a request, or running out of room to write another update "
+        rawText "on one."
+    ]
+]
+
+/// The "Signing Up" section
+let private signUp = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Signing Up" ]
+    p [] [
+        rawText "myPrayerJournal uses login services using Google or Microsoft accounts. The only information the "
+        rawText "application stores in its database is your user Id token it receives from these services, so there "
+        rawText "are no permissions you should have to accept from these provider other than establishing that you can "
+        rawText "log on with that account. Because of this, you’ll want to pick the same one each time; the "
+        rawText "tokens between the two accounts are different, even if you use the same e-mail address to log on to "
+        rawText "both."
+    ]
+]
+
+/// The "Your Prayer Journal" section
+let private yourJournal = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Your Prayer Journal" ]
+    p [] [
+        rawText "Your current requests will be presented in columns (usually three, but it could be more or less, "
+        rawText "depending on the size of your screen or device). Each request is in its own card, and the buttons at "
+        rawText "the top of each card apply to that request. The last line of each request also tells you how long it "
+        rawText "has been since anything has been done on that request. Any time you see something like “a few "
+        rawText "minutes ago,” you can hover over that to see the actual date/time the action was taken."
+    ]
+]
+
+/// The "Adding a Request" section
+let private addRequest = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Adding a Request" ]
+    p [] [
+        rawText "To add a request, click the “Add a New Request” button at the top of your journal. Then, "
+        rawText "enter the text of the request as you see fit; there is no right or wrong way, and you are the only "
+        rawText "person who will see the text you enter. When you save the request, it will go to the bottom of the "
+        rawText "list of requests."
+    ]
+]
+
+/// The "Setting Request Recurrence" section
+let private setRecurrence = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Setting Request Recurrence" ]
+    p [] [
+        rawText "When you add or update a request, you can choose whether requests go to the bottom of the journal "
+        rawText "once they have been marked “Prayed” or whether they will reappear after a delay. You can "
+        rawText "set recurrence in terms of hours, days, or weeks, but it cannot be longer than 365 days. If you "
+        rawText "decide you want a request to reappear sooner, you can skip the current delay; click the "
+        rawText "“Active” menu link, find the request in the list (likely near the bottom), and click the "
+        rawText "“Show Now” button."
+    ]
+]
+
+/// The "Praying for Requests" section
+let private praying = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Praying for Requests" ]
+    p [] [
+        rawText "The first button for each request has a checkmark icon; clicking this button will mark the request as "
+        rawText "“Prayed” and move it to the bottom of the list (or off, if you’ve set a recurrence "
+        rawText "period for the request). This allows you, if you’re praying through your requests, to start at "
+        rawText "the top left (with the request that it’s been the longest since you’ve prayed) and click "
+        rawText "the button as you pray; when the request move below or away, the next-least-recently-prayed request "
+        rawText "will take the top spot."
+    ]
+]
+
+/// The "Editing Requests" section
+let private editing = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Editing Requests" ]
+    p [] [
+        rawText "The second button for each request has a pencil icon. This allows you to edit the text of the "
+        rawText "request, pretty much the same way you entered it; it starts with the current text, and you can add to "
+        rawText "it, modify it, or completely replace it. By default, updates will go in with an “Updated” "
+        rawText "status; you have the option to also mark this update as “Prayed” or "
+        rawText "“Answered”. Answered requests will drop off the journal list."
+    ]
+]
+
+/// The "Adding Notes" section
+let private addNotes = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Adding Notes" ]
+    p [] [
+        rawText "The third button for each request has an icon that looks like a speech bubble with lines on it; this "
+        rawText "lets you record notes about the request. If there is something you want to record that doesn’t "
+        rawText "change the text of the request, this is the place to do it. For example, you may be praying for a "
+        rawText "long-term health issue, and that person tells you that their status is the same; or, you may want to "
+        rawText "record something God said to you while you were praying for that request."
+    ]
+]
+
+/// The "Snoozing Requests" section
+let private snoozing = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Snoozing Requests" ]
+    p [] [
+        rawText "There may be a time where a request does not need to appear. The fourth button, with the clock icon, "
+        rawText "allows you to snooze requests until the day you specify. Additionally, if you have any snoozed "
+        rawText "requests, a “Snoozed” menu item will appear next to the “Journal” one; this "
+        rawText "page allows you to see what requests are snoozed, and return them to your journal by canceling the "
+        rawText "snooze."
+    ]
+]
+
+/// The "Viewing a Request and Its History" section
+let private viewing = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Viewing a Request and Its History" ]
+    p [] [
+        rawText "myPrayerJournal tracks all of the actions related to a request; from the “Active” and "
+        rawText "“Answered” menu links (and “Snoozed”, if it’s showing), there is a "
+        rawText "“View Full Request” button. That page will show the current text of the request; how many "
+        rawText "times it has been marked as prayed; how long it has been an active request; and a log of all updates, "
+        rawText "prayers, and notes you have recorded. That log is listed from most recent to least recent; if you "
+        rawText "want to read it chronologically, press the “End” key on your keyboard and read it from "
+        rawText "the bottom up."
+    ]
+    p [] [
+        rawText "The “Active” link will show all requests that have not yet been marked answered, "
+        rawText "including snoozed and recurring requests. If requests are snoozed, or in a recurrence period off the "
+        rawText "journal, there will be a button where you can return the request to the list (either “Cancel "
+        rawText "Snooze” or “Show Now”). The “Answered” link shows all requests that "
+        rawText "have been marked answered. The “Snoozed” link only shows snoozed requests."
+    ]
+]
+
+/// The "Final Notes" section
+let private finalNotes = [
+    h3 [ _class "mb-3 mt-4" ] [ rawText "Final Notes" ]
+    ul [] [
+        li [] [
+            rawText "If you encounter errors, please "
+            a [ _href "https://git.bitbadger.solutions/bit-badger/myPrayerJournal/issues"; _target "_blank" ] [
+                rawText "file an issue"
+            ]; rawText " (or "
+            a [ _href "mailto:daniel@bitbadger.solutions?subject=myPrayerJournal+Issue" ] [ rawText "e-mail Daniel" ]
+            rawText " if you do not have an account on that server) with as much detail as possible. You can also "
+            rawText "provide suggestions, or browse the list of currently open issues."
+        ]
+        li [] [
+            rawText "Prayer requests and their history are securely backed up nightly along with other Bit Badger "
+            rawText "Solutions data."
+        ]
+        li [] [
+            rawText "Prayer changes things - most of all, the one doing the praying. I pray that this tool enables you "
+            rawText "to deepen and strengthen your prayer life."
+        ]
+    ]
+]
+
+/// The documentation page
+let index =
+    article [ _class "container mt-3" ] [
+        h2 [ _class "mb-3" ] [ rawText "Documentation" ]
+        yield! about
+        yield! signUp
+        yield! yourJournal
+        yield! addRequest
+        yield! setRecurrence
+        yield! praying
+        yield! editing
+        yield! addNotes
+        yield! snoozing
+        yield! viewing
+        yield! finalNotes
+    ]

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
@@ -9,23 +10,33 @@ open NodaTime
 
 /// Create a link that targets the `#top` element and pushes a URL to history
 let pageLink href attrs =
-  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
+    |> a
 
 /// Create a Material icon
 let icon name = span [ _class "material-icons" ] [ str name ]
 
 /// Create a card when there are no results found
 let noResults heading link buttonText text =
-  div [ _class "card" ] [
+    div [ _class "card" ] [
-    h5 [ _class "card-header"] [ str heading ]
+        h5 [ _class "card-header"] [ str heading ]
-    div [ _class "card-body text-center" ] [
+        div [ _class "card-body text-center" ] [
-      p [ _class "card-text" ] text
+            p [ _class "card-text" ] text
-      pageLink link [ _class "btn btn-primary" ] [ str buttonText ]
+            pageLink link [ _class "btn btn-primary" ] [ str buttonText ]
-      ]
+        ]
     ]
 
 /// Create a date with a span tag, displaying the relative date with the full date/time in the tooltip
-let relativeDate (date : Instant) now =
+let relativeDate (date : Instant) now (tz : DateTimeZone) =
-  span [ _title (date.ToDateTimeOffset().ToString ("f", null)) ] [ Dates.formatDistance now date |> str ]
+    span [ _title (date.InZone(tz).ToDateTimeOffset().ToString("f", null)) ] [ Dates.formatDistance now date |> str ]
+
+/// The version of myPrayerJournal
+let version =
+    let v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version
+    seq {
+        string v.Major
+        if v.Minor > 0 then
+            $".{v.Minor}"
+            if v.Revision > 0 then $".{v.Revision}"
+    } |> Seq.reduce (+)

src/MyPrayerJournal/Views/Journal.fs

@@ -1,177 +1,180 @@
 /// Views for journal pages and components
 module MyPrayerJournal.Views.Journal
 
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Accessibility
 open Giraffe.ViewEngine.Htmx
 open MyPrayerJournal
 
 /// Display a card for this prayer request
-let journalCard now req =
+let journalCard now tz req =
-  let reqId = RequestId.toString req.requestId
+    let reqId = RequestId.toString req.RequestId
-  let spacer = span [] [ rawText " " ]
+    let spacer = span [] [ rawText " " ]
-  div [ _class "col" ] [
+    div [ _class "col" ] [
-    div [ _class "card h-100" ] [
+        div [ _class "card h-100" ] [
-      div [ _class "card-header p-0 d-flex"; _roleToolBar ] [
+            div [ _class "card-header p-0 d-flex"; _roleToolBar ] [
-        pageLink $"/request/{reqId}/edit" [ _class  "btn btn-secondary"; _title "Edit Request" ] [ icon "edit" ]
+                pageLink $"/request/{reqId}/edit" [ _class  "btn btn-secondary"; _title "Edit Request" ] [ icon "edit" ]
-        spacer
+                spacer
-        button [
+                button [ _type     "button"
-          _type     "button"
+                         _class    "btn btn-secondary"
-          _class    "btn btn-secondary"
+                         _title    "Add Notes"
-          _title    "Add Notes"
+                         _data     "bs-toggle" "modal"
-          _data     "bs-toggle" "modal"
+                         _data     "bs-target" "#notesModal"
-          _data     "bs-target" "#notesModal"
+                         _hxGet    $"/components/request/{reqId}/add-notes"
-          _hxGet    $"/components/request/{reqId}/add-notes"
+                         _hxTarget "#notesBody"
-          _hxTarget "#notesBody"
+                         _hxSwap   HxSwap.InnerHtml ] [
-          _hxSwap   HxSwap.InnerHtml
+                    icon "comment"
-          ] [ icon "comment" ]
+                ]
-        spacer
+                spacer
-        button [
+                button [ _type     "button"
-          _type     "button"
+                         _class    "btn btn-secondary"
-          _class    "btn btn-secondary"
+                         _title    "Snooze Request"
-          _title    "Snooze Request"
+                         _data     "bs-toggle" "modal"
-          _data     "bs-toggle" "modal"
+                         _data     "bs-target" "#snoozeModal"
-          _data     "bs-target" "#snoozeModal"
+                         _hxGet    $"/components/request/{reqId}/snooze"
-          _hxGet    $"/components/request/{reqId}/snooze"
+                         _hxTarget "#snoozeBody"
-          _hxTarget "#snoozeBody"
+                         _hxSwap   HxSwap.InnerHtml ] [
-          _hxSwap   HxSwap.InnerHtml
+                    icon "schedule"
-          ] [ icon "schedule" ]
+                ]
-        div [ _class "flex-grow-1" ] []
+                div [ _class "flex-grow-1" ] []
-        button [
+                button [ _type    "button"
-          _type    "button"
+                         _class   "btn btn-success w-25"
-          _class   "btn btn-success w-25"
+                         _hxPatch $"/request/{reqId}/prayed"
-          _hxPatch $"/request/{reqId}/prayed"
+                         _title   "Mark as Prayed" ] [
-          _title   "Mark as Prayed"
+                    icon "done"
-          ] [ icon "done" ]
+                ]
+            ]
+            div [ _class "card-body" ] [
+                p [ _class "request-text" ] [ str req.Text ]
+            ]
+            div [ _class "card-footer text-end text-muted px-1 py-0" ] [
+                em [] [
+                    match req.LastPrayed with
+                    | Some dt -> str "last prayed ";   relativeDate dt       now tz
+                    | None    -> str "last activity "; relativeDate req.AsOf now tz
+                ]
+            ]
         ]
-      div [ _class "card-body" ] [
-        p [ _class "request-text" ] [ str req.text ]
-        ]
-      div [ _class "card-footer text-end text-muted px-1 py-0" ] [
-        em [] [ str "last activity "; relativeDate req.asOf now ]
-        ]
-      ]
     ]
 
 /// The journal loading page
-let journal user = article [ _class "container-fluid mt-3" ] [
+let journal user =
-  h2 [ _class "pb-3" ] [
+    article [ _class "container-fluid mt-3" ] [
-    str user
+        h2 [ _class "pb-3" ] [
-    match user with "Your" -> () | _ -> rawText "’s"
+            str user
-    str " Prayer Journal"
+            match user with "Your" -> () | _ -> rawText "’s"
-    ]
+            str " Prayer Journal"
-  p [ _class "pb-3 text-center" ] [
-    pageLink "/request/new/edit" [ _class "btn btn-primary "] [ icon "add_box"; str " Add a Prayer Request" ]
-    ]
-  p [ _hxGet "/components/journal-items"; _hxSwap HxSwap.OuterHtml; _hxTrigger HxTrigger.Load ] [
-    rawText "Loading your prayer journal…"
-    ]
-  div [
-    _id             "notesModal"
-    _class          "modal fade"
-    _tabindex       "-1"
-    _ariaLabelledBy "nodesModalLabel"
-    _ariaHidden     "true"
-    ] [
-    div [ _class "modal-dialog modal-dialog-scrollable" ] [
-      div [ _class "modal-content" ] [
-        div [ _class "modal-header" ] [
-          h5 [ _class "modal-title"; _id "nodesModalLabel" ] [ str "Add Notes to Prayer Request" ]
-          button [ _type "button"; _class "btn-close"; _data "bs-dismiss" "modal"; _ariaLabel "Close" ] []
-          ]
-        div [ _class "modal-body"; _id "notesBody" ] [ ]
-        div [ _class "modal-footer" ] [
-          button [ _type "button"; _id "notesDismiss"; _class "btn btn-secondary"; _data "bs-dismiss" "modal" ] [
-            str "Close"
-            ]
-          ]
         ]
-      ]
+        p [ _class "pb-3 text-center" ] [
-    ]
+            pageLink "/request/new/edit" [ _class "btn btn-primary "] [ icon "add_box"; str " Add a Prayer Request" ]
-  div [
+        ]
-    _id             "snoozeModal"
+        p [ _hxGet "/components/journal-items"; _hxSwap HxSwap.OuterHtml; _hxTrigger HxTrigger.Load ] [
-    _class          "modal fade"
+            rawText "Loading your prayer journal…"
-    _tabindex       "-1"
+        ]
-    _ariaLabelledBy "snoozeModalLabel"
+        div [ _id             "notesModal"
-    _ariaHidden     "true"
+              _class          "modal fade"
-    ] [
+              _tabindex       "-1"
-    div [ _class "modal-dialog modal-sm" ] [
+              _ariaLabelledBy "nodesModalLabel"
-      div [ _class "modal-content" ] [
+              _ariaHidden     "true" ] [
-        div [ _class "modal-header" ] [
+            div [ _class "modal-dialog modal-dialog-scrollable" ] [
-          h5 [ _class "modal-title"; _id "snoozeModalLabel" ] [ str "Snooze Prayer Request" ]
+                div [ _class "modal-content" ] [
-          button [ _type "button"; _class "btn-close"; _data "bs-dismiss" "modal"; _ariaLabel "Close" ] []
+                    div [ _class "modal-header" ] [
-          ]
+                        h5 [ _class "modal-title"; _id "nodesModalLabel" ] [ str "Add Notes to Prayer Request" ]
-        div [ _class "modal-body"; _id "snoozeBody" ] [ ]
+                        button [ _type "button"; _class "btn-close"; _data "bs-dismiss" "modal"; _ariaLabel "Close" ] []
-        div [ _class "modal-footer" ] [
+                    ]
-          button [ _type "button"; _id "snoozeDismiss"; _class "btn btn-secondary"; _data "bs-dismiss" "modal" ] [
+                    div [ _class "modal-body"; _id "notesBody" ] [ ]
-            str "Close"
+                    div [ _class "modal-footer" ] [
-            ]
+                        button [ _type  "button"
-          ]
+                                 _id    "notesDismiss"
+                                 _class "btn btn-secondary"
+                                 _data  "bs-dismiss" "modal" ] [
+                            str "Close"
+                        ]
+                    ]
+                ]
+            ]
+        ]
+        div [ _id             "snoozeModal"
+              _class          "modal fade"
+              _tabindex       "-1"
+              _ariaLabelledBy "snoozeModalLabel"
+              _ariaHidden     "true" ] [
+            div [ _class "modal-dialog modal-sm" ] [
+                div [ _class "modal-content" ] [
+                    div [ _class "modal-header" ] [
+                        h5 [ _class "modal-title"; _id "snoozeModalLabel" ] [ str "Snooze Prayer Request" ]
+                        button [ _type "button"; _class "btn-close"; _data "bs-dismiss" "modal"; _ariaLabel "Close" ] []
+                    ]
+                    div [ _class "modal-body"; _id "snoozeBody" ] [ ]
+                    div [ _class "modal-footer" ] [
+                        button [ _type "button"
+                                 _id "snoozeDismiss"
+                                 _class "btn btn-secondary"
+                                 _data "bs-dismiss" "modal" ] [
+                            str "Close"
+                        ]
+                      ]
+                ]
+            ]
         ]
-      ]
     ]
-  ]
 
 /// The journal items
-let journalItems now items =
+let journalItems now tz items =
-  match items |> List.isEmpty with
+    match items |> List.isEmpty with
-  | true ->
+    | true ->
-      noResults "No Active Requests" "/request/new/edit" "Add a Request" [
+        noResults "No Active Requests" "/request/new/edit" "Add a Request" [
-        rawText "You have no requests to be shown; see the “Active” link above for snoozed or deferred "
+            rawText "You have no requests to be shown; see the “Active” link above for snoozed or deferred "
-        rawText "requests, and the “Answered” link for answered requests"
+            rawText "requests, and the “Answered” link for answered requests"
         ]
-  | false ->
+    | false ->
-      items
+        items
-      |> List.map (journalCard now)
+        |> List.map (journalCard now tz)
-      |> section [
+        |> section [ _id        "journalItems"
-          _id       "journalItems"
+                     _class     "row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3"
-          _class    "row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3"
+                     _hxTarget  "this"
-          _hxTarget "this"
+                     _hxSwap    HxSwap.OuterHtml
-          _hxSwap   HxSwap.OuterHtml
+                     _ariaLabel "Prayer Requests" ]
-          ]
 
 /// The notes edit modal body
 let notesEdit requestId =
-  let reqId = RequestId.toString requestId
+    let reqId = RequestId.toString requestId
-  [ form [ _hxPost $"/request/{reqId}/note" ] [
+    [   form [ _hxPost $"/request/{reqId}/note" ] [
-      div [ _class "form-floating pb-3" ] [
+            div [ _class "form-floating pb-3" ] [
-        textarea [
+                textarea [ _id          "notes"
-          _id          "notes"
+                           _name        "notes"
-          _name        "notes"
+                           _class       "form-control"
-          _class       "form-control"
+                           _style       "min-height: 8rem;"
-          _style       "min-height: 8rem;"
+                           _placeholder "Notes"
-          _placeholder "Notes"
+                           _autofocus;  _required ] [ ]
-          _autofocus;  _required
+                label [ _for "notes" ] [ str "Notes" ]
-          ] [ ]
+            ]
-        label [ _for "notes" ] [ str "Notes" ]
+            p [ _class "text-end" ] [ button [ _type "submit"; _class "btn btn-primary" ] [ str "Add Notes" ] ]
         ]
-      p [ _class "text-end" ] [ button [ _type "submit"; _class "btn btn-primary" ] [ str "Add Notes" ] ]
+        hr [ _style "margin: .5rem -1rem" ]
-      ]
+        div [ _id "priorNotes" ] [
-    hr [ _style "margin: .5rem -1rem" ]
+            p [ _class "text-center pt-3" ] [
-    div [ _id "priorNotes" ] [
+                button [ _type     "button"
-      p [ _class "text-center pt-3" ] [
+                         _class    "btn btn-secondary"
-        button [
+                         _hxGet    $"/components/request/{reqId}/notes"
-          _type     "button"
+                         _hxSwap   HxSwap.OuterHtml
-          _class    "btn btn-secondary"
+                         _hxTarget "#priorNotes" ] [
-          _hxGet    $"/components/request/{reqId}/notes"
+                    str "Load Prior Notes"
-          _hxSwap   HxSwap.OuterHtml
+                ]
-          _hxTarget "#priorNotes"
+            ]
-          ] [str "Load Prior Notes" ]
         ]
-      ]
     ]
 
 /// The snooze edit form
 let snooze requestId =
-  let today = System.DateTime.Today.ToString "yyyy-MM-dd"
+    let today = System.DateTime.Today.ToString "yyyy-MM-dd"
-  form [
+    form [ _hxPatch  $"/request/{RequestId.toString requestId}/snooze"
-    _hxPatch  $"/request/{RequestId.toString requestId}/snooze"
+           _hxTarget "#journalItems"
-    _hxTarget "#journalItems"
+           _hxSwap   HxSwap.OuterHtml ] [
-    _hxSwap   HxSwap.OuterHtml
+        div [ _class "form-floating pb-3" ] [
-    ] [
+            input [ _type "date"; _id "until"; _name "until"; _class "form-control"; _min today; _required ]
-    div [ _class "form-floating pb-3" ] [
+            label [ _for "until" ] [ str "Until" ]
-      input [ _type "date"; _id "until"; _name "until"; _class "form-control"; _min today; _required ]
+        ]
-      label [ _for "until" ] [ str "Until" ]
+        p [ _class "text-end mb-0" ] [ button [ _type "submit"; _class "btn btn-primary" ] [ str "Snooze" ] ]
-      ]
-    p [ _class "text-end mb-0" ] [ button [ _type "submit"; _class "btn btn-primary" ] [ str "Snooze" ] ]
     ]

src/MyPrayerJournal/Views/Layout.fs

@@ -1,151 +1,125 @@
 /// Layout / home views
 module MyPrayerJournal.Views.Layout
 
-// fsharplint:disable RecordFieldNames
-
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Accessibility
 
 /// The data needed to render a page-level view
-type PageRenderContext = {
+type PageRenderContext =
-  /// Whether the user is authenticated
+    { /// Whether the user is authenticated
-  isAuthenticated : bool
+      IsAuthenticated: bool
-  /// Whether the user has snoozed requests
+      
-  hasSnoozed      : bool
+      /// Whether the user has snoozed requests
-  /// The current URL
+      HasSnoozed: bool
-  currentUrl      : string
+      
-  /// The title for the page to be rendered
+      /// The current URL
-  pageTitle       : string
+      CurrentUrl: string
-  /// The content of the page
+      
-  content         : XmlNode
+      /// The title for the page to be rendered
-  }
+      PageTitle: string
+      
+      /// The content of the page
+      Content: XmlNode }
 
 /// The home page
-let home = article [ _class "container mt-3" ] [
+let home =
-  p [] [ rawText " " ]
+    article [ _class "container mt-3" ]
-  p [] [
+        [ p [] [ rawText " " ]
-    str "myPrayerJournal is a place where individuals can record their prayer requests, record that they prayed for "
+          p []
-    str "them, update them as God moves in the situation, and record a final answer received on that request. It also "
+            [ str "myPrayerJournal is a place where individuals can record their prayer requests, record that they "
-    str "allows individuals to review their answered prayers."
+              str "prayed for them, update them as God moves in the situation, and record a final answer received on "
-    ]
+              str "that request. It also allows individuals to review their answered prayers." ]
-  p [] [
+          p []
-    str "This site is open and available to the general public. To get started, simply click the "
+            [ str "This site is open and available to the general public. To get started, simply click the "
-    rawText "“Log On” link above, and log on with either a Microsoft or Google account. You can also "
+              rawText "“Log On” link above, and log on with either a Microsoft or Google account. You can "
-    rawText "learn more about the site at the “Docs” link, also above."
+              rawText "also learn more about the site at the “Docs” link, also above." ] ]
-    ]
-  ]
 
 /// The default navigation bar, which will load the items on page load, and whenever a refresh event occurs
 let private navBar ctx =
-  nav [ _class "navbar navbar-dark"; _roleNavigation ] [
+    nav [ _class "navbar navbar-dark"; _roleNavigation ]
-    div [ _class "container-fluid" ] [
+        [ div [ _class "container-fluid" ]
-      pageLink "/" [ _class "navbar-brand" ] [
+            [ pageLink
-        span [ _class "m" ] [ str "my" ]
+                "/" [ _class "navbar-brand" ]
-        span [ _class "p" ] [ str "Prayer" ]
+                [ span [ _class "m" ] [ str "my" ]
-        span [ _class "j" ] [ str "Journal" ]
+                  span [ _class "p" ] [ str "Prayer" ]
-      ]
+                  span [ _class "j" ] [ str "Journal" ] ]
-      seq {
+              seq {
-        let navLink (matchUrl : string) =
+                let navLink (matchUrl : string) =
-          match ctx.currentUrl.StartsWith matchUrl with true -> [ _class "is-active-route" ] | false -> []
+                    match ctx.CurrentUrl.StartsWith matchUrl with true -> [ _class "is-active-route" ] | false -> []
-          |> pageLink matchUrl
+                    |> pageLink matchUrl
-        match ctx.isAuthenticated with
+                if ctx.IsAuthenticated then
-        | true ->
+                    li [ _class "nav-item" ] [ navLink "/journal" [ str "Journal" ] ]
-            li [ _class "nav-item" ] [ navLink "/journal" [ str "Journal" ] ]
+                    li [ _class "nav-item" ] [ navLink "/requests/active" [ str "Active" ] ]
-            li [ _class "nav-item" ] [ navLink "/requests/active" [ str "Active" ] ]
+                    if ctx.HasSnoozed then li [ _class "nav-item" ] [ navLink "/requests/snoozed" [ str "Snoozed" ] ]
-            if ctx.hasSnoozed then li [ _class "nav-item" ] [ navLink "/requests/snoozed" [ str "Snoozed" ] ]
+                    li [ _class "nav-item" ] [ navLink "/requests/answered" [ str "Answered" ] ]
-            li [ _class "nav-item" ] [ navLink "/requests/answered" [ str "Answered" ] ]
+                    li [ _class "nav-item" ] [ a [ _href "/user/log-off" ] [ str "Log Off" ] ]
-            li [ _class "nav-item" ] [ a [ _href "/user/log-off" ] [ str "Log Off" ] ]
+                else li [ _class "nav-item"] [ a [ _href "/user/log-on" ] [ str "Log On" ] ]
-        | false -> li [ _class "nav-item"] [ a [ _href "/user/log-on" ] [ str "Log On" ] ]
+                li [ _class "nav-item" ] [ navLink "/docs" [ str "Docs" ] ]
-        li [ _class "nav-item" ] [
+              }
-          a [ _href "https://docs.prayerjournal.me"; _target "_blank"; _rel "noopener" ] [ str "Docs" ]
+              |> List.ofSeq
-          ]
+              |> ul [ _class "navbar-nav me-auto d-flex flex-row" ] ] ]
-        }
-      |> List.ofSeq
-      |> ul [ _class "navbar-nav me-auto d-flex flex-row" ]
-      ]
-    ]
 
 /// The title tag with the application name appended
-let titleTag ctx = title [] [ str ctx.pageTitle; rawText " « myPrayerJournal" ]
+let titleTag ctx =
+    title [] [ rawText ctx.PageTitle; rawText " « myPrayerJournal" ]
 
 /// The HTML `head` element
 let htmlHead ctx =
-  head [ _lang "en" ] [
+    head [ _lang "en" ]
-    meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
+        [ meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
-    meta [ _name "description"; _content "Online prayer journal - free w/Google or Microsoft account" ]
+          meta [ _name "description"; _content "Online prayer journal - free w/Google or Microsoft account" ]
-    titleTag ctx
+          titleTag ctx
-    link [
+          link [ _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
-      _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+                 _rel         "stylesheet"
-      _rel         "stylesheet"
+                 _integrity   "sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
-      _integrity   "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
+                 _crossorigin "anonymous" ]
-      _crossorigin "anonymous"
+          link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
-      ]
+          link [ _href "/style/style.css"; _rel "stylesheet" ] ]
-    link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
-    link [ _href "/style/style.css"; _rel "stylesheet" ]
-    ]
 
 /// Element used to display toasts
 let toaster =
-  div [ _ariaLive "polite"; _ariaAtomic "true"; _id "toastHost" ] [
+    div [ _ariaLive "polite"; _ariaAtomic "true"; _id "toastHost" ]
-    div [ _class "toast-container position-absolute p-3 bottom-0 end-0"; _id "toasts" ] []
+        [ div [ _class "toast-container position-absolute p-3 bottom-0 end-0"; _id "toasts" ] [] ]
-  ]
 
 /// The page's `footer` element
 let htmlFoot =
-  footer [ _class "container-fluid" ] [
+    footer [ _class "container-fluid" ]
-    p [ _class "text-muted text-end" ] [
+        [ p [ _class "text-muted text-end" ]
-      str "myPrayerJournal v3"
+            [ str $"myPrayerJournal {version}"
-      br []
+              br []
-      em [] [
+              em []
-        small [] [
+                  [ small []
-          pageLink "/legal/privacy-policy" [] [ str "Privacy Policy" ]
+                        [ pageLink "/legal/privacy-policy" [] [ str "Privacy Policy" ]
-          rawText " • "
+                          rawText " • "
-          pageLink "/legal/terms-of-service" [] [ str "Terms of Service" ]
+                          pageLink "/legal/terms-of-service" [] [ str "Terms of Service" ]
-          rawText " • "
+                          rawText " • "
-          a [ _href "https://github.com/bit-badger/myprayerjournal"; _target "_blank"; _rel "noopener" ] [
+                          a [ _href "https://git.bitbadger.solutions/bit-badger/myPrayerJournal"
-            str "Developed"
+                              _target "_blank"
-            ]
+                              _rel "noopener" ] [ str "Developed" ]
-          str " and hosted by "
+                          str " and hosted by "
-          a [ _href "https://bitbadger.solutions"; _target "_blank"; _rel "noopener" ] [ str "Bit Badger Solutions" ]
+                          a   [ _href "https://bitbadger.solutions"; _target "_blank"; _rel "noopener" ]
-          ]
+                              [ str "Bit Badger Solutions" ] ] ] ]
-        ]
+          Htmx.Script.minified
-      ]
+          script [] [ rawText "if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')" ]
-    script [
+          script [ _async
-      _src         "https://unpkg.com/htmx.org@1.5.0"
+                   _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-      _integrity   "sha384-oGA+prIp5Vchu6we2YkI51UtVzN9Jpx2Z7PnR1I78PnZlN8LkrCT4lqqqmDkyrvI"
+                   _integrity   "sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-      _crossorigin "anonymous"
+                   _crossorigin "anonymous" ] []
-      ] []
+          script []
-    script [] [
+              [ rawText "setTimeout(function () { "
-      rawText "if (!htmx) document.write('<script src=\"/script/htmx-1.5.0.min.js\"><\/script>')"
+                rawText "if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>') "
-      ]
+                rawText "}, 2000)" ]
-    script [
+          script [ _src "/script/mpj.js" ] [] ]
-      _async
-      _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
-      _integrity   "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
-      _crossorigin "anonymous"
-      ] []
-    script [] [
-      rawText "setTimeout(function () { "
-      rawText "if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>') "
-      rawText "}, 2000)"
-      ]
-    script [ _src "/script/mpj.js" ] []
-    ]
 
 /// Create the full view of the page
 let view ctx =
-  html [ _lang "en" ] [
+    html [ _lang "en" ]
-    htmlHead ctx
+        [ htmlHead ctx
-    body [] [
+          body []
-      section [ _id "top" ] [ navBar ctx; main [ _roleMain ] [ ctx.content ] ]
+            [ section [ _id "top"; _ariaLabel "Top navigation" ] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
-      toaster
+              toaster
-      htmlFoot
+              htmlFoot ] ]
-      ]
-    ]
 
 /// Create a partial view
 let partial ctx =
-  html [ _lang "en" ] [
+    html [ _lang "en" ] [ head [] [ titleTag ctx ]; body [] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ] ]
-    head [] [ titleTag ctx ]
-    body [] [ navBar ctx; main [ _roleMain ] [ ctx.content ] ]
-    ]

src/MyPrayerJournal/Views/Legal.fs

@@ -4,150 +4,159 @@ module MyPrayerJournal.Views.Legal
 open Giraffe.ViewEngine
 
 /// View for the "Privacy Policy" page
-let privacyPolicy = article [ _class "container mt-3" ] [
+let privacyPolicy =
-  h2 [ _class "mb-2" ] [ str "Privacy Policy" ]
+    article [ _class "container mt-3" ] [
-  h6 [ _class "text-muted pb-3" ] [ str "as of May 21"; sup [] [ str "st"]; str ", 2018" ]
+        h2 [ _class "mb-2" ] [ str "Privacy Policy" ]
-  p [] [
+        h6 [ _class "text-muted pb-3" ] [ str "as of May 21"; sup [] [ str "st"]; str ", 2018" ]
-    str "The nature of the service is one where privacy is a must. The items below will help you understand the data "
+        p [] [
-    str "we collect, access, and store on your behalf as you use this service."
+            str "The nature of the service is one where privacy is a must. The items below will help you understand "
+            str "the data we collect, access, and store on your behalf as you use this service."
+        ]
+        div [ _class "card" ] [
+            div [ _class "list-group list-group-flush" ] [
+                div [ _class "list-group-item"] [
+                    h3 [] [ str "Third Party Services" ]
+                    p [ _class "card-text" ] [
+                        str "myPrayerJournal utilizes a third-party authentication and identity provider. You should "
+                        str "familiarize yourself with the privacy policy for "
+                        a [ _href "https://auth0.com/privacy"; _target "_blank" ] [ str "Auth0" ]
+                        str ", as well as your chosen provider ("
+                        a [ _href "https://privacy.microsoft.com/en-us/privacystatement"; _target "_blank" ] [
+                            str "Microsoft"
+                        ]
+                        str " or "
+                        a [ _href "https://policies.google.com/privacy"; _target "_blank" ] [ str "Google" ]
+                        str ")."
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "What We Collect" ]
+                    h4 [] [ str "Identifying Data" ]
+                    ul [] [
+                        li [] [
+                            str "The only identifying data myPrayerJournal stores is the subscriber "
+                            rawText "(“sub”) field from the token we receive from Auth0, once you have "
+                            str "signed in through their hosted service. All information is associated with you via "
+                            str "this field."
+                        ]
+                        li [] [
+                            str "While you are signed in, within your browser, the service has access to your first "
+                            str "and last names, along with a URL to the profile picture (provided by your selected "
+                            str "identity provider). This information is not transmitted to the server, and is removed "
+                            rawText "when “Log Off” is clicked."
+                        ]
+                    ]
+                    h4 [] [ str "User Provided Data" ]
+                    ul [ _class "mb-0" ] [
+                        li [] [
+                            str "myPrayerJournal stores the information you provide, including the text of prayer "
+                            str "requests, updates, and notes; and the date/time when certain actions are taken."
+                        ]
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "How Your Data Is Accessed / Secured" ]
+                    ul [ _class "mb-0" ] [
+                        li [] [
+                            str "Your provided data is returned to you, as required, to display your journal or your "
+                            str "answered requests. On the server, it is stored in a controlled-access database."
+                        ]
+                        li [] [
+                            str "Your data is backed up, along with other Bit Badger Solutions hosted systems, in a "
+                            str "rolling manner; backups are preserved for the prior 7 days, and backups from the 1"
+                            sup [] [ str "st" ]
+                            str " and 15"
+                            sup [] [ str "th" ]
+                            str " are preserved for 3 months. These backups are stored in a private cloud data "
+                            str "repository."
+                        ]
+                        li [] [
+                            str "The data collected and stored is the absolute minimum necessary for the functionality "
+                            rawText "of the service. There are no plans to “monetize” this service, and "
+                            str "storing the minimum amount of information means that the data we have is not "
+                            str "interesting to purchasers (or those who may have more nefarious purposes)."
+                        ]
+                        li [] [
+                            str "Access to servers and backups is strictly controlled and monitored for unauthorized "
+                            str "access attempts."
+                        ]
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "Removing Your Data" ]
+                    p [ _class "card-text" ] [
+                        str "At any time, you may choose to discontinue using this service. Both Microsoft and Google "
+                        str "provide ways to revoke access from this application. However, if you want your data "
+                        str "removed from the database, please contact daniel at bitbadger.solutions (via e-mail, "
+                        str "replacing at with @) prior to doing so, to ensure we can determine which subscriber ID "
+                        str "belongs to you."
+                    ]
+                ]
+            ]
+        ]
     ]
-  div [ _class "card" ] [
-    div [ _class "list-group list-group-flush" ] [
-      div [ _class "list-group-item"] [
-        h3 [] [ str "Third Party Services" ]
-        p [ _class "card-text" ] [
-          str "myPrayerJournal utilizes a third-party authentication and identity provider. You should familiarize "
-          str "yourself with the privacy policy for "
-          a [ _href "https://auth0.com/privacy"; _target "_blank" ] [ str "Auth0" ]
-          str ", as well as your chosen provider ("
-          a [ _href "https://privacy.microsoft.com/en-us/privacystatement"; _target "_blank" ] [ str "Microsoft"]
-          str " or "
-          a [ _href "https://policies.google.com/privacy"; _target "_blank" ] [ str "Google" ]
-          str ")."
-          ]
-        ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "What We Collect" ]
-        h4 [] [ str "Identifying Data" ]
-        ul [] [
-          li [] [
-            rawText "The only identifying data myPrayerJournal stores is the subscriber (“sub”) field from "
-            str "the token we receive from Auth0, once you have signed in through their hosted service. All "
-            str "information is associated with you via this field."
-            ]
-          li [] [
-            str "While you are signed in, within your browser, the service has access to your first and last names, "
-            str "along with a URL to the profile picture (provided by your selected identity provider). This "
-            rawText "information is not transmitted to the server, and is removed when “Log Off” is "
-            str "clicked."
-            ]
-          ]
-        h4 [] [ str "User Provided Data" ]
-        ul [ _class "mb-0" ] [
-          li [] [
-            str "myPrayerJournal stores the information you provide, including the text of prayer requests, updates, "
-            str "and notes; and the date/time when certain actions are taken."
-            ]
-          ]
-        ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "How Your Data Is Accessed / Secured" ]
-        ul [ _class "mb-0" ] [
-          li [] [
-            str "Your provided data is returned to you, as required, to display your journal or your answered "
-            str "requests. On the server, it is stored in a controlled-access database."
-            ]
-          li [] [
-            str "Your data is backed up, along with other Bit Badger Solutions hosted systems, in a rolling manner; "
-            str "backups are preserved for the prior 7 days, and backups from the 1"
-            sup [] [ str "st" ]
-            str " and 15"
-            sup [] [ str "th" ]
-            str " are preserved for 3 months. These backups are stored in a private cloud data repository."
-            ]
-          li [] [
-            str "The data collected and stored is the absolute minimum necessary for the functionality of the service. "
-            rawText "There are no plans to “monetize” this service, and storing the minimum amount of "
-            str "information means that the data we have is not interesting to purchasers (or those who may have more "
-            str "nefarious purposes)."
-            ]
-          li [] [
-            str "Access to servers and backups is strictly controlled and monitored for unauthorized access attempts."
-            ]
-          ]
-        ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "Removing Your Data" ]
-        p [ _class "card-text" ] [
-          str "At any time, you may choose to discontinue using this service. Both Microsoft and Google provide ways "
-          str "to revoke access from this application. However, if you want your data removed from the database, "
-          str "please contact daniel at bitbadger.solutions (via e-mail, replacing at with @) prior to doing so, to "
-          str "ensure we can determine which subscriber ID belongs to you."
-          ]
-        ]
-      ]
-    ]
-  ]
 
 /// View for the "Terms of Service" page
-let termsOfService = article [ _class "container mt-3" ] [
+let termsOfService =
-  h2 [ _class "mb-2" ] [ str "Terms of Service" ]
+    article [ _class "container mt-3" ] [
-  h6 [ _class "text-muted pb-3"] [ str "as of May 21"; sup [] [ str "st" ]; str ", 2018" ]
+        h2 [ _class "mb-2" ] [ str "Terms of Service" ]
-  div [ _class "card" ] [
+        h6 [ _class "text-muted pb-3"] [ str "as of May 21"; sup [] [ str "st" ]; str ", 2018" ]
-    div [ _class "list-group list-group-flush" ] [
+        div [ _class "card" ] [
-      div [ _class "list-group-item" ] [
+            div [ _class "list-group list-group-flush" ] [
-        h3 [] [ str "1. Acceptance of Terms" ]
+                div [ _class "list-group-item" ] [
-        p [ _class "card-text" ] [
+                    h3 [] [ str "1. Acceptance of Terms" ]
-          str "By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you "
+                    p [ _class "card-text" ] [
-          str "are responsible to ensure that your use of this site complies with all applicable laws. Your continued "
+                        str "By accessing this web site, you are agreeing to be bound by these Terms and Conditions, "
-          str "use of this site implies your acceptance of these terms."
+                        str "and that you are responsible to ensure that your use of this site complies with all "
-          ]
+                        str "applicable laws. Your continued use of this site implies your acceptance of these terms."
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "2. Description of Service and Registration" ]
+                    p [ _class "card-text" ] [
+                        str "myPrayerJournal is a service that allows individuals to enter and amend their prayer "
+                        str "requests. It requires no registration by itself, but access is granted based on a "
+                        str "successful login with an external identity provider. See "
+                        pageLink "/legal/privacy-policy" [] [ str "our privacy policy" ]
+                        str " for details on how that information is accessed and stored."
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "3. Third Party Services" ]
+                    p [ _class "card-text" ] [
+                        str "This service utilizes a third-party service provider for identity management. Review the "
+                        str "terms of service for "
+                        a [ _href "https://auth0.com/terms"; _target "_blank" ] [ str "Auth0"]
+                        str ", as well as those for the selected authorization provider ("
+                        a [ _href "https://www.microsoft.com/en-us/servicesagreement"; _target "_blank" ] [
+                            str "Microsoft"
+                        ]
+                        str " or "
+                        a [ _href "https://policies.google.com/terms"; _target "_blank" ] [ str "Google" ]
+                        str ")."
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "4. Liability" ]
+                    p [ _class "card-text" ] [
+                        rawText "This service is provided “as is”, and no warranty (express or implied) "
+                        str "exists. The service and its developers may not be held liable for any damages that may "
+                        str "arise through the use of this service."
+                    ]
+                ]
+                div [ _class "list-group-item" ] [
+                    h3 [] [ str "5. Updates to Terms" ]
+                    p [ _class "card-text" ] [
+                        str "These terms and conditions may be updated at any time, and this service does not have the "
+                        str "capability to notify users when these change. The date at the top of the page will be "
+                        str "updated when any of the text of these terms is updated."
+                    ]
+                ]
+            ]
         ]
-      div [ _class "list-group-item" ] [
+        p [ _class "pt-3" ] [
-        h3 [] [ str "2. Description of Service and Registration" ]
+            str "You may also wish to review our "
-        p [ _class "card-text" ] [
+            pageLink "/legal/privacy-policy" [] [ str "privacy policy" ]
-          str "myPrayerJournal is a service that allows individuals to enter and amend their prayer requests. It "
+            str " to learn how we handle your data."
-          str "requires no registration by itself, but access is granted based on a successful login with an external "
-          str "identity provider. See "
-          pageLink "/legal/privacy-policy" [] [ str "our privacy policy" ]
-          str " for details on how that information is accessed and stored."
-          ]
         ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "3. Third Party Services" ]
-        p [ _class "card-text" ] [
-          str "This service utilizes a third-party service provider for identity management. Review the terms of "
-          str "service for "
-          a [ _href "https://auth0.com/terms"; _target "_blank" ] [ str "Auth0"]
-          str ", as well as those for the selected authorization provider ("
-          a [ _href "https://www.microsoft.com/en-us/servicesagreement"; _target "_blank" ] [ str "Microsoft"]
-          str " or "
-          a [ _href "https://policies.google.com/terms"; _target "_blank" ] [ str "Google" ]
-          str ")."
-          ]
-        ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "4. Liability" ]
-        p [ _class "card-text" ] [
-          rawText "This service is provided “as is”, and no warranty (express or implied) exists. The "
-          str "service and its developers may not be held liable for any damages that may arise through the use of "
-          str "this service."
-          ]
-        ]
-      div [ _class "list-group-item" ] [
-        h3 [] [ str "5. Updates to Terms" ]
-        p [ _class "card-text" ] [
-          str "These terms and conditions may be updated at any time, and this service does not have the capability to "
-          str "notify users when these change. The date at the top of the page will be updated when any of the text of "
-          str "these terms is updated."
-          ]
-        ]
-      ]
     ]
-  p [ _class "pt-3" ] [
-    str "You may also wish to review our "
-    pageLink "/legal/privacy-policy" [] [ str "privacy policy" ]
-    str " to learn how we handle your data."
-    ]
-  ]
-

src/MyPrayerJournal/Views/Request.fs

@@ -1,268 +1,273 @@
 /// Views for request pages and components
 module MyPrayerJournal.Views.Request
 
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Htmx
 open MyPrayerJournal
 open NodaTime
-open System
 
 /// Create a request within the list
-let reqListItem now req =
+let reqListItem now tz req =
-  let reqId      = RequestId.toString req.requestId
+    let isFuture instant = defaultArg (instant |> Option.map (fun it -> it > now)) false
-  let isAnswered = req.lastStatus = Answered
+    let reqId      = RequestId.toString req.RequestId
-  let isSnoozed  = req.snoozedUntil > now
+    let isAnswered = req.LastStatus = Answered
-  let isPending  = (not isSnoozed) && req.showAfter > now
+    let isSnoozed  = isFuture req.SnoozedUntil
-  let btnClass   = _class "btn btn-light mx-2"
+    let isPending  = (not isSnoozed) && isFuture req.ShowAfter
-  let restoreBtn (link : string) title =
+    let btnClass   = _class "btn btn-light mx-2"
-    button [ btnClass; _hxPatch $"/request/{reqId}/{link}"; _title title ] [ icon "restore" ]
+    let restoreBtn (link : string) title =
-  div [ _class "list-group-item px-0 d-flex flex-row align-items-start"; _hxTarget "this"; _hxSwap HxSwap.OuterHtml ] [
+        button [ btnClass; _hxPatch $"/request/{reqId}/{link}"; _title title ] [ icon "restore" ]
-    pageLink $"/request/{reqId}/full" [ btnClass; _title "View Full Request" ] [ icon "description" ]
+    div [ _class "list-group-item px-0 d-flex flex-row align-items-start"
-    match isAnswered with
+          _hxTarget "this"
-    | true  -> ()
+          _hxSwap HxSwap.OuterHtml ] [
-    | false -> pageLink $"/request/{reqId}/edit" [ btnClass; _title "Edit Request" ] [ icon "edit" ]
+        pageLink $"/request/{reqId}/full" [ btnClass; _title "View Full Request" ] [ icon "description" ]
-    match true with
+        if not isAnswered then pageLink $"/request/{reqId}/edit" [ btnClass; _title "Edit Request" ] [ icon "edit" ]
-    | _ when isSnoozed -> restoreBtn "cancel-snooze" "Cancel Snooze"
+        if   isSnoozed then restoreBtn "cancel-snooze" "Cancel Snooze"
-    | _ when isPending -> restoreBtn "show"          "Show Now"
+        elif isPending then restoreBtn "show"          "Show Now"
-    | _ -> ()
+        p [ _class "request-text mb-0" ] [
-    p [ _class "request-text mb-0" ] [
+            str req.Text
-      str req.text
+            if isSnoozed || isPending || isAnswered then
-      match isSnoozed || isPending || isAnswered with
+                br []
-      | true ->
+                small [ _class "text-muted" ] [
-          br []
+                    if   isSnoozed then   [ str "Snooze expires ";       relativeDate req.SnoozedUntil.Value now tz ]
-          small [ _class "text-muted" ] [
+                    elif isPending then   [ str "Request appears next "; relativeDate req.ShowAfter.Value    now tz ]
-            match () with
+                    else (* isAnswered *) [ str "Answered ";             relativeDate req.AsOf               now tz ]
-            | _ when isSnoozed   -> [ str "Snooze expires ";       relativeDate req.snoozedUntil now ]
+                    |> em []
-            | _ when isPending   -> [ str "Request appears next "; relativeDate req.showAfter    now ]
+                ]
-            | _ (* isAnswered *) -> [ str "Answered ";             relativeDate req.asOf         now ]
+          ]
-            |> em []
-            ]
-      | false -> ()
-      ]
     ]
 
 /// Create a list of requests
-let reqList now reqs =
+let reqList now tz reqs =
-  reqs
+    reqs
-  |> List.map (reqListItem now)
+    |> List.map (reqListItem now tz)
-  |> div [ _class "list-group" ]
+    |> div [ _class "list-group" ]
 
 /// View for Active Requests page
-let active now reqs = article [ _class "container mt-3" ] [
+let active now tz reqs =
-  h2 [ _class "pb-3" ] [ str "Active Requests" ]
+    article [ _class "container mt-3" ] [
-  match reqs |> List.isEmpty with
+        h2 [ _class "pb-3" ] [ str "Active Requests" ]
-  | true ->
+        if List.isEmpty reqs then
-      noResults "No Active Requests" "/journal" "Return to your journal"
+            noResults "No Active Requests" "/journal" "Return to your journal"
-        [ str "Your prayer journal has no active requests" ]
+                [ str "Your prayer journal has no active requests" ]
-  | false -> reqList now reqs
+        else reqList now tz reqs
-  ]
+    ]
 
 /// View for Answered Requests page
-let answered now reqs = article [ _class "container mt-3" ] [
+let answered now tz reqs =
-  h2 [ _class "pb-3" ] [ str "Answered Requests" ]
+    article [ _class "container mt-3" ] [
-  match reqs |> List.isEmpty with
+        h2 [ _class "pb-3" ] [ str "Answered Requests" ]
-  | true ->
+        if List.isEmpty reqs then
-      noResults "No Active Requests" "/journal" "Return to your journal" [
+            noResults "No Answered Requests" "/journal" "Return to your journal" [
-        rawText "Your prayer journal has no answered requests; once you have marked one as “Answered”, "
+                str "Your prayer journal has no answered requests; once you have marked one as "
-        str "it will appear here"
+                rawText "“Answered”, it will appear here"
-        ]
+            ]
-  | false -> reqList now reqs
+        else reqList now tz reqs
-  ]
+    ]
 
 /// View for Snoozed Requests page
-let snoozed now reqs = article [ _class "container mt-3" ] [
+let snoozed now tz reqs =
-  h2 [ _class "pb-3" ] [ str "Snoozed Requests" ]
+    article [ _class "container mt-3" ] [
-  reqList now reqs
+        h2 [ _class "pb-3" ] [ str "Snoozed Requests" ]
-  ]
+        reqList now tz reqs
+    ]
 
 /// View for Full Request page
-let full (clock : IClock) (req : Request) =
+let full (clock : IClock) tz (req : Request) =
-  let now = clock.GetCurrentInstant ()
+    let now = clock.GetCurrentInstant()
-  let answered =
+    let answered =
-    req.history
+        req.History
-    |> List.filter RequestAction.isAnswered
+        |> Seq.ofList
-    |> List.tryHead
+        |> Seq.filter History.isAnswered
-    |> Option.map (fun x -> x.asOf)
+        |> Seq.tryHead
-  let prayed = (req.history |> List.filter RequestAction.isPrayed |> List.length).ToString "N0"
+        |> Option.map (_.AsOf)
-  let daysOpen =
+    let prayed = (req.History |> List.filter History.isPrayed |> List.length).ToString "N0"
-    let asOf = defaultArg answered now
+    let daysOpen =
-    ((asOf - (req.history |> List.filter RequestAction.isCreated |> List.head).asOf).TotalDays |> int).ToString "N0"
+        let asOf = defaultArg answered now
-  let lastText =
+        ((asOf - (req.History |> List.filter History.isCreated |> List.head).AsOf).TotalDays |> int).ToString "N0"
-    req.history
+    let lastText =
-    |> List.filter (fun h -> Option.isSome h.text)
+        req.History
-    |> List.sortByDescending (fun h -> h.asOf)
+        |> Seq.ofList
-    |> List.map (fun h -> Option.get h.text)
+        |> Seq.filter (fun h -> Option.isSome h.Text)
-    |> List.head
+        |> Seq.sortByDescending (_.AsOf)
-  // The history log including notes (and excluding the final entry for answered requests)
+        |> Seq.map (fun h -> Option.get h.Text)
-  let log =
+        |> Seq.head
-    let toDisp (h : History) = {| asOf = h.asOf; text = h.text; status = RequestAction.toString h.status |}
+    // The history log including notes (and excluding the final entry for answered requests)
-    let all =
+    let log =
-      req.notes
+        let toDisp (h : History) = {| asOf = h.AsOf; text = h.Text; status = RequestAction.toString h.Status |}
-      |> List.map (fun n -> {| asOf = n.asOf; text = Some n.notes; status = "Notes" |})
+        let all =
-      |> List.append (req.history |> List.map toDisp)
+            req.Notes
-      |> List.sortByDescending (fun it -> it.asOf)
+            |> Seq.ofList
-    // Skip the first entry for answered requests; that info is already displayed
+            |> Seq.map (fun n -> {| asOf = n.AsOf; text = Some n.Notes; status = "Notes" |})
-    match answered with Some _ -> all |> List.skip 1 | None -> all
+            |> Seq.append (req.History |> List.map toDisp)
-  article [ _class "container mt-3" ] [
+            |> Seq.sortByDescending (_.asOf)
-    div [_class "card" ] [
+            |> List.ofSeq
-      h5 [ _class "card-header" ] [ str "Full Prayer Request" ]
+        // Skip the first entry for answered requests; that info is already displayed
-      div [ _class "card-body" ] [
+        match answered with Some _ -> all.Tail | None -> all
-        h6 [ _class "card-subtitle text-muted mb-2"] [
+    article [ _class "container mt-3" ] [
-          match answered with
+        div [_class "card" ] [
-          | Some date ->
+            h5 [ _class "card-header" ] [ str "Full Prayer Request" ]
-              str "Answered "
+            div [ _class "card-body" ] [
-              date.ToDateTimeOffset().ToString ("D", null) |> str
+                h6 [ _class "card-subtitle text-muted mb-2"] [
-              str " ("
+                    match answered with
-              relativeDate date now
+                    | Some date ->
-              rawText ") • "
+                        str "Answered "
-          | None -> ()
+                        date.ToDateTimeOffset().ToString("D", null) |> str
-          sprintf "Prayed %s times • Open %s days" prayed daysOpen |> rawText
+                        str " ("
-          ]
+                        relativeDate date now tz
-        p [ _class "card-text" ] [ str lastText ]
+                        rawText ") • "
+                    | None -> ()
+                    rawText $"Prayed %s{prayed} times • Open %s{daysOpen} days"
+                ]
+                p [ _class "card-text" ] [ str lastText ]
+            ]
+            log
+            |> List.map (fun it ->
+                li [ _class "list-group-item" ] [
+                    p [ _class "m-0" ] [
+                        str it.status
+                        rawText "  "
+                        small [] [ em [] [ it.asOf.ToDateTimeOffset().ToString("D", null) |> str ] ]
+                    ]
+                    match it.text with
+                    | Some txt -> p [ _class "mt-2 mb-0" ] [ str txt ]
+                    | None -> ()
+                ])
+            |> ul [ _class "list-group list-group-flush" ]
         ]
-      log
-      |> List.map (fun it -> li [ _class "list-group-item" ] [
-        p [ _class "m-0" ] [
-          str it.status
-          rawText "  "
-          small [] [ em [] [ it.asOf.ToDateTimeOffset().ToString ("D", null) |> str ] ]
-          ]
-        match it.text with
-        | Some txt -> p [ _class "mt-2 mb-0" ] [ str txt ]
-        | None -> ()
-      ])
-      |> ul [ _class "list-group list-group-flush" ]
-      ]
     ]
 
 /// View for the edit request component
 let edit (req : JournalRequest) returnTo isNew =
-  let cancelLink =
+    let cancelLink =
-    match returnTo with
+        match returnTo with
-    | "active"          -> "/requests/active"
+        | "active"          -> "/requests/active"
-    | "snoozed"         -> "/requests/snoozed"
+        | "snoozed"         -> "/requests/snoozed"
-    | _ (* "journal" *) -> "/journal"
+        | _ (* "journal" *) -> "/journal"
-  article [ _class "container" ] [
+    let recurCount =
-    h2 [ _class "pb-3" ] [ (match isNew with true -> "Add" | false -> "Edit") |> strf "%s Prayer Request" ]
+        match req.Recurrence with
-    form [
+        | Immediate -> None
-      _hxBoost
+        | Hours   h -> Some h
-      _hxTarget "#top"
+        | Days    d -> Some d
-      _hxPushUrl
+        | Weeks   w -> Some w
-      "/request" |> match isNew with true -> _hxPost | false -> _hxPatch
+        |> Option.map string
-      ] [
+        |> Option.defaultValue ""
-      input [
+    article [ _class "container" ] [
-        _type  "hidden"
+        h2 [ _class "pb-3" ] [ (match isNew with true -> "Add" | false -> "Edit") |> strf "%s Prayer Request" ]
-        _name  "requestId"
+        form [ _hxBoost
-        _value (match isNew with true -> "new" | false -> RequestId.toString req.requestId)
+               _hxTarget  "#top"
-        ]
+               _hxPushUrl "true"
-      input [ _type "hidden"; _name "returnTo"; _value returnTo ]
+               "/request" |> match isNew with true -> _hxPost | false -> _hxPatch ] [
-      div [ _class "form-floating pb-3" ] [
+            input [ _type  "hidden"
-        textarea [
+                    _name  "requestId"
-          _id          "requestText"
+                    _value (match isNew with true -> "new" | false -> RequestId.toString req.RequestId) ]
-          _name        "requestText"
+            input [ _type "hidden"; _name "returnTo"; _value returnTo ]
-          _class       "form-control"
+            div [ _class "form-floating pb-3" ] [
-          _style       "min-height: 8rem;"
+                textarea [ _id          "requestText"
-          _placeholder "Enter the text of the request"
+                           _name        "requestText"
-          _autofocus;  _required
+                           _class       "form-control"
-          ] [ str req.text ]
+                           _style       "min-height: 8rem;"
-        label [ _for "requestText" ] [ str "Prayer Request" ]
+                           _placeholder "Enter the text of the request"
-        ]
+                           _autofocus;  _required ] [ str req.Text ]
-      br []
+                label [ _for "requestText" ] [ str "Prayer Request" ]
-      match isNew with
+            ]
-      | true -> ()
-      | false ->
-          div [ _class "pb-3" ] [
-            label [] [ str "Also Mark As" ]
             br []
-            div [ _class "form-check form-check-inline" ] [
+            if not isNew then
-              input [ _type "radio"; _class "form-check-input"; _id "sU"; _name "status"; _value "Updated"; _checked ]
+                div [ _class "pb-3" ] [
-              label [ _for "sU" ] [ str "Updated" ]
+                    label [] [ str "Also Mark As" ]
-              ]
+                    br []
-            div [ _class "form-check form-check-inline" ] [
+                    div [ _class "form-check form-check-inline" ] [
-              input [ _type "radio"; _class "form-check-input"; _id "sP"; _name "status"; _value "Prayed" ]
+                        input [ _type  "radio"
-              label [ _for "sP" ] [ str "Prayed" ]
+                                _class "form-check-input"
-              ]
+                                _id    "sU"
-            div [ _class "form-check form-check-inline" ] [
+                                _name  "status"
-              input [ _type "radio"; _class "form-check-input"; _id "sA"; _name "status"; _value "Answered" ]
+                                _value "Updated"
-              label [ _for "sA" ] [ str "Answered" ]
+                                _checked ]
-              ]
+                        label [ _for "sU" ] [ str "Updated" ]
+                    ]
+                    div [ _class "form-check form-check-inline" ] [
+                        input [ _type "radio"; _class "form-check-input"; _id "sP"; _name "status"; _value "Prayed" ]
+                        label [ _for "sP" ] [ str "Prayed" ]
+                    ]
+                    div [ _class "form-check form-check-inline" ] [
+                        input [ _type "radio"; _class "form-check-input"; _id "sA"; _name "status"; _value "Answered" ]
+                        label [ _for "sA" ] [ str "Answered" ]
+                    ]
+                ]
+            div [ _class "row" ] [
+                div [ _class "col-12 offset-md-2 col-md-8 offset-lg-3 col-lg-6" ] [
+                    p [] [
+                        strong [] [ rawText "Recurrence   " ]
+                        em [ _class "text-muted" ] [ rawText "After prayer, request reappears…" ]
+                    ]
+                    div [ _class "d-flex flex-row flex-wrap justify-content-center align-items-center" ] [
+                        div [ _class "form-check mx-2" ] [
+                            input [ _type    "radio"
+                                    _class   "form-check-input"
+                                    _id      "rI"
+                                    _name    "recurType"
+                                    _value   "Immediate"
+                                    _onclick "mpj.edit.toggleRecurrence(event)"
+                                    match req.Recurrence with Immediate -> _checked | _ -> () ]
+                            label [ _for "rI" ] [ str "Immediately" ]
+                        ]
+                        div [ _class "form-check mx-2"] [
+                            input [ _type    "radio"
+                                    _class   "form-check-input"
+                                    _id      "rO"
+                                    _name    "recurType"
+                                    _value   "Other"
+                                    _onclick "mpj.edit.toggleRecurrence(event)"
+                                    match req.Recurrence with Immediate -> () | _ -> _checked ]
+                            label [ _for "rO" ] [ rawText "Every…" ]
+                        ]
+                        div [ _class "form-floating mx-2"] [
+                            input [ _type        "number"
+                                    _class       "form-control"
+                                    _id          "recurCount"
+                                    _name        "recurCount"
+                                    _placeholder "0"
+                                    _value       recurCount
+                                    _style       "width:6rem;"
+                                    _required
+                                    match req.Recurrence with Immediate -> _disabled | _ -> () ]
+                            label [ _for "recurCount" ] [ str "Count" ]
+                        ]
+                        div [ _class "form-floating mx-2" ] [
+                            select [ _class    "form-control"
+                                     _id       "recurInterval"
+                                     _name     "recurInterval"
+                                     _style    "width:6rem;"
+                                     _required
+                                     match req.Recurrence with Immediate -> _disabled | _ -> () ] [
+                                option [ _value "Hours"; match req.Recurrence with Hours _ -> _selected | _ -> () ] [
+                                    str "hours"
+                                ]
+                                option [ _value "Days";  match req.Recurrence with Days  _ -> _selected | _ -> () ] [
+                                    str "days"
+                                ]
+                                option [ _value "Weeks"; match req.Recurrence with Weeks _ -> _selected | _ -> () ] [
+                                    str "weeks"
+                                ]
+                            ]
+                            label [ _form "recurInterval" ] [ str "Interval" ]
+                        ]
+                    ]
+                ]
             ]
-      div [ _class "row" ] [
+            div [ _class "text-end pt-3" ] [
-        div [ _class "col-12 offset-md-2 col-md-8 offset-lg-3 col-lg-6" ] [
+                button [ _class "btn btn-primary me-2"; _type "submit" ] [ icon "save"; str " Save" ]
-          p [] [
+                pageLink cancelLink [ _class "btn btn-secondary ms-2" ] [ icon "arrow_back"; str " Cancel" ]
-            strong [] [ rawText "Recurrence   " ]
-            em [ _class "text-muted" ] [ rawText "After prayer, request reappears…" ]
             ]
-          div [ _class "d-flex flex-row flex-wrap justify-content-center align-items-center" ] [
-            div [ _class "form-check mx-2" ] [
-              input [
-                _type    "radio"
-                _class   "form-check-input"
-                _id      "rI"
-                _name    "recurType"
-                _value   "Immediate"
-                _onclick "mpj.edit.toggleRecurrence(event)"
-                match req.recurType with Immediate -> _checked | _ -> ()
-                ]
-              label [ _for "rI" ] [ str "Immediately" ]
-              ]
-            div [ _class "form-check mx-2"] [
-              input [
-                _type    "radio"
-                _class   "form-check-input"
-                _id      "rO"
-                _name    "recurType"
-                _value   "Other"
-                _onclick "mpj.edit.toggleRecurrence(event)"
-                match req.recurType with Immediate -> () | _ -> _checked
-                ]
-              label [ _for "rO" ] [ rawText "Every…" ]
-              ]
-            div [ _class "form-floating mx-2"] [
-              input [
-                _type        "number"
-                _class       "form-control"
-                _id          "recurCount"
-                _name        "recurCount"
-                _placeholder "0"
-                _value       (string req.recurCount)
-                _style       "width:6rem;"
-                _required
-                match req.recurType with Immediate -> _disabled | _ -> ()
-                ]
-              label [ _for "recurCount" ] [ str "Count" ]
-              ]
-            div [ _class "form-floating mx-2" ] [
-              select [
-                _class    "form-control"
-                _id       "recurInterval"
-                _name     "recurInterval"
-                _style    "width:6rem;"
-                _required
-                match req.recurType with Immediate -> _disabled | _ -> ()
-                ] [
-                option [ _value "Hours"; match req.recurType with Hours -> _selected | _ -> () ] [ str "hours" ]
-                option [ _value "Days";  match req.recurType with Days  -> _selected | _ -> () ] [ str "days" ]
-                option [ _value "Weeks"; match req.recurType with Weeks -> _selected | _ -> () ] [ str "weeks" ]
-                ]
-              label [ _form "recurInterval" ] [ str "Interval" ]
-              ]
-            ]
-          ]
         ]
-      div [ _class "text-end pt-3" ] [
-        button [ _class "btn btn-primary me-2"; _type "submit" ] [ icon "save"; str " Save" ]
-        pageLink cancelLink [ _class "btn btn-secondary ms-2" ] [ icon "arrow_back"; str " Cancel" ]
-        ]
-      ]
     ]
 
 /// Display a list of notes for a request
-let notes now notes =
+let notes now tz notes =
-  let toItem (note : Note) =
+    let toItem (note : Note) =
-    p [] [ small [ _class "text-muted" ] [ relativeDate note.asOf now ]; br []; str note.notes ]
+        p [] [ small [ _class "text-muted" ] [ relativeDate note.AsOf now tz ]; br []; str note.Notes ]
-  [ p [ _class "text-center" ] [ strong [] [ str "Prior Notes for This Request" ] ]
+    [   p [ _class "text-center" ] [ strong [] [ str "Prior Notes for This Request" ] ]
-    match notes with
+        match notes with
-    | [] -> p [ _class "text-center text-muted" ] [ str "There are no prior notes for this request" ]
+        | [] -> p [ _class "text-center text-muted" ] [ str "There are no prior notes for this request" ]
-    | _  -> yield! notes |> List.map toItem
+        | _  -> yield! notes |> List.map toItem
     ]

src/MyPrayerJournal/appsettings.json

@@ -1,12 +1,2 @@
-{
+{
-  "ConnectionStrings": {
-    "db": "Filename=./mpj.db"
-  },
-  "Kestrel": {
-    "EndPoints": {
-      "Http": {
-        "Url": "http://localhost:3000"
-      }
-    }
-  }
 }

src/MyPrayerJournal/wwwroot/script/mpj.js

@@ -1,7 +1,7 @@
 "use strict"
 
 /** myPrayerJournal script */
-const mpj = {
+this.mpj = {
   /**
    * Show a message via toast
    * @param {string} message The message to show
@@ -66,6 +66,19 @@ const mpj = {
       const isDisabled = target.value === "Immediate"
       ;["recurCount", "recurInterval"].forEach(it => document.getElementById(it).disabled = isDisabled)
     }
+  },
+  /**
+   * The time zone of the current browser
+   * @type {string}
+   **/
+  timeZone: undefined,
+  /**
+   * Derive the time zone from the current browser
+   */
+  deriveTimeZone () {
+    try {
+      this.timeZone = (new Intl.DateTimeFormat()).resolvedOptions().timeZone
+    } catch (_) { }
   }
 }
 
@@ -80,3 +93,12 @@ htmx.on("htmx:afterOnLoad", function (evt) {
     document.getElementById(evt.detail.xhr.getResponseHeader("x-hide-modal") + "Dismiss").click()
   }
 })
+
+htmx.on("htmx:configRequest", function (evt) {
+  // Send the user's current time zone so that we can display local time
+  if (mpj.timeZone) {
+    evt.detail.headers["X-Time-Zone"] = mpj.timeZone
+  }
+})
+
+mpj.deriveTimeZone()