Remove ID col from doc table

- Add partial output template
- Group routes

.gitignore

@@ -254,3 +254,7 @@ paket-files/
 
 # Ionide VSCode extension
 .ionide
+
+# in-progress: PHP version
+src/app/vendor
+**/.env

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/MyPrayerJournal.ConvertRecurrence/MyPrayerJournal.ConvertRecurrence.fsproj

@@ -9,12 +9,6 @@
     <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>

src/MyPrayerJournal.ConvertRecurrence/Program.fs

@@ -0,0 +1,114 @@
+open MyPrayerJournal.Domain
+open NodaTime
+
+/// The old definition of the history entry
+[<CLIMutable; NoComparison; NoEquality>]
+type OldHistory =
+    {   /// The time when this history entry was made
+        asOf   : int64
+        /// The status for this history entry
+        status : RequestAction
+        /// The text of the update, if applicable
+        text   : string option
+    }
+
+/// The old definition of of the note entry
+[<CLIMutable; NoComparison; NoEquality>]
+type OldNote =
+    {   /// The time when this note was made
+        asOf  : int64
+        
+        /// The text of the notes
+        notes : string
+    }
+
+/// Request is the identifying record for a prayer request
+[<CLIMutable; NoComparison; NoEquality>]
+type OldRequest =
+    {   /// The ID of the request
+        id           : RequestId
+        
+        /// The time this request was initially entered
+        enteredOn    : int64
+        
+        /// The ID of the user to whom this request belongs ("sub" from the JWT)
+        userId       : UserId
+        
+        /// The time at which this request should reappear in the user's journal by manual user choice
+        snoozedUntil : int64
+        
+        /// The time at which this request should reappear in the user's journal by recurrence
+        showAfter    : int64
+        
+        /// The type of recurrence for this request
+        recurType    : string
+        
+        /// How many of the recurrence intervals should occur between appearances in the journal
+        recurCount   : int16
+        
+        /// The history entries for this request
+        history      : OldHistory[]
+        
+        /// The notes for this request
+        notes        : OldNote[]
+    }
+
+
+open LiteDB
+open MyPrayerJournal.Data
+
+let db = new LiteDatabase ("Filename=./mpj.db")
+Startup.ensureDb db
+
+/// Map the old recurrence to the new style
+let mapRecurrence old =
+    match old.recurType with
+    | "Days" -> Days old.recurCount
+    | "Hours" -> Hours old.recurCount
+    | "Weeks" -> Weeks old.recurCount
+    | _ -> Immediate
+
+/// Convert an old history entry to the new form
+let convertHistory (old : OldHistory) =
+    {   AsOf   = Instant.FromUnixTimeMilliseconds old.asOf
+        Status = old.status
+        Text   = old.text
+    }
+
+/// Convert an old note to the new form
+let convertNote (old : OldNote) =
+    {   AsOf  = Instant.FromUnixTimeMilliseconds old.asOf
+        Notes = old.notes
+    }
+
+/// Convert items that may be Instant.MinValue or Instant(0) to None
+let noneIfOld ms =
+    match Instant.FromUnixTimeMilliseconds ms with
+    | instant when instant > Instant.FromUnixTimeMilliseconds 0 -> Some instant
+    | _ -> None
+    
+/// Map the old request to the new request
+let convert old =
+    {   Id           = old.id
+        EnteredOn    = Instant.FromUnixTimeMilliseconds old.enteredOn
+        UserId       = old.userId
+        SnoozedUntil = noneIfOld old.snoozedUntil
+        ShowAfter    = noneIfOld old.showAfter
+        Recurrence   = mapRecurrence old
+        History      = old.history |> Array.map convertHistory |> List.ofArray
+        Notes        = old.notes   |> Array.map convertNote    |> List.ofArray
+    }
+
+/// Remove the old request, add the converted one (removes recurType / recurCount fields)
+let replace (req : Request) =
+    db.Requests.Delete (Mapping.RequestId.toBson req.Id) |> ignore
+    db.Requests.Insert req |> ignore
+    db.Checkpoint ()
+
+db.GetCollection<OldRequest>("request").FindAll ()
+|> Seq.map convert
+|> List.ofSeq
+|> List.iter replace
+
+// For more information see https://aka.ms/fsharp-console-apps
+printfn "Done"

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,28 @@
+
+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
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MyPrayerJournal.ConvertRecurrence", "MyPrayerJournal.ConvertRecurrence\MyPrayerJournal.ConvertRecurrence.fsproj", "{72B57736-8721-4636-A309-49FA4222416E}"
+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/Data.fs

@@ -1,23 +1,21 @@
 module MyPrayerJournal.Data
 
 open LiteDB
-open NodaTime
-open System
+open MyPrayerJournal
 open System.Threading.Tasks
 
-// fsharplint:disable MemberNames
-
 /// LiteDB extensions
 [<AutoOpen>]
 module Extensions =
   
     /// Extensions on the LiteDatabase class
     type LiteDatabase with
+        
         /// The Request collection
-    member this.requests
-      with get () = this.GetCollection<Request> "request"
+        member this.Requests = this.GetCollection<Request> "request"
+        
         /// Async version of the checkpoint command (flushes log)
-    member this.saveChanges () =
+        member this.SaveChanges () =
             this.Checkpoint ()
             Task.CompletedTask
 
@@ -27,72 +25,61 @@ module Extensions =
 [<RequireQualifiedAccess>]
 module Mapping =
     
-  /// 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
+    open NodaTime
+    open NodaTime.Text
     
-  /// Map a BSON document to a history entry
-  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
-      }
+    /// A NodaTime instant pattern to use for parsing instants from the database
+    let instantPattern = InstantPattern.CreateWithInvariantCulture "g"
     
-  /// Map a note entry to BSON
-  let noteToBson (note : Note) : BsonValue =
-    let doc = BsonDocument ()
-    doc["asOf"]  <- note.asOf.ToUnixTimeMilliseconds ()
-    doc["notes"] <- note.notes
-    upcast doc
+    /// Mapping for NodaTime's Instant type
+    module Instant =
+        let fromBson (value : BsonValue) = (instantPattern.Parse value.AsString).Value
+        let toBson (value : Instant) : BsonValue = value.ToString ("g", null)
     
-  /// Map a BSON document to a note entry
-  let noteFromBson (doc : BsonValue) =
-    { asOf  = Instant.FromUnixTimeMilliseconds doc["asOf"].AsInt64
-      notes = doc["notes"].AsString
-      }
+    /// Mapping for option types
+    module Option =
+        let instantFromBson (value : BsonValue) = if value.IsNull then None else Some (Instant.fromBson value)
+        let instantToBson (value : Instant option) = match value with Some it -> Instant.toBson it | None -> null
         
-  /// 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
+        let stringFromBson (value : BsonValue) = match value.AsString with "" -> None | x -> Some x
+        let stringToBson (value : string option) : BsonValue = match value with Some txt -> txt | None -> ""
     
-  /// 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
-      }
+    /// Mapping for Recurrence
+    module Recurrence =
+        let fromBson (value : BsonValue) = Recurrence.ofString value
+        let toBson (value : Recurrence) : BsonValue = Recurrence.toString value
+    
+    /// Mapping for RequestAction
+    module RequestAction =
+        let fromBson (value : BsonValue) = RequestAction.ofString value.AsString
+        let toBson (value : RequestAction) : BsonValue = RequestAction.toString value
+    
+    /// Mapping for RequestId
+    module RequestId =
+        let fromBson (value : BsonValue) = RequestId.ofString value.AsString
+        let toBson (value : RequestId) : BsonValue = RequestId.toString value
+    
+    /// Mapping for UserId
+    module UserId =
+        let fromBson (value : BsonValue) = UserId value.AsString
+        let toBson (value : UserId) : BsonValue = UserId.toString value
     
     /// Set up the mapping
     let register () = 
-    BsonMapper.Global.RegisterType<Request>(
-      Func<Request, BsonValue> requestToBson, Func<BsonValue, Request> requestFromBson)
+        BsonMapper.Global.RegisterType<Instant>(Instant.toBson, Instant.fromBson)
+        BsonMapper.Global.RegisterType<Instant option>(Option.instantToBson, Option.instantFromBson)
+        BsonMapper.Global.RegisterType<Recurrence>(Recurrence.toBson, Recurrence.fromBson)
+        BsonMapper.Global.RegisterType<RequestAction>(RequestAction.toBson, RequestAction.fromBson)
+        BsonMapper.Global.RegisterType<RequestId>(RequestId.toBson, RequestId.fromBson)
+        BsonMapper.Global.RegisterType<string option>(Option.stringToBson, Option.stringFromBson)
+        BsonMapper.Global.RegisterType<UserId>(UserId.toBson, UserId.fromBson)
 
 /// 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
+        db.Requests.EnsureIndex (fun it -> it.UserId) |> ignore
         Mapping.register ()
 
 
@@ -112,98 +99,101 @@ module private Helpers =
 
     /// Async wrapper around a request update
     let doUpdate (db : LiteDatabase) (req : Request) =
-    db.requests.Update req |> ignore
+        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
-  }
+    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 }
+    | Some req -> do! doUpdate db { req with History = Array.append [| 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 }
+    | Some req -> do! doUpdate db { req with Notes = Array.append [| note |] req.Notes }
     | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
+}
 
 /// Add a request
 let addRequest (req : Request) (db : LiteDatabase) =
-  db.requests.Insert req |> ignore
+    db.Requests.Insert req |> ignore
 
-// FIXME: make a common function here
+/// Find all requests for the given user
+let private getRequestsForUser (userId : UserId) (db : LiteDatabase) = backgroundTask {
+    return! db.Requests.Find (Query.EQ (nameof Request.empty.UserId, Mapping.UserId.toBson userId)) |> toListAsync
+}
 
 /// 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
+let answeredRequests userId db = backgroundTask {
+    let! reqs = getRequestsForUser userId db
     return
         reqs
         |> Seq.map JournalRequest.ofRequestFull
-    |> Seq.filter (fun it -> it.lastStatus = Answered)
-    |> Seq.sortByDescending (fun it -> it.asOf)
+        |> 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
+let journalByUserId userId db = backgroundTask {
+    let! reqs = getRequestsForUser userId db
     return
-    jrnl
+        reqs
         |> Seq.map JournalRequest.ofRequestLite
-    |> Seq.filter (fun it -> it.lastStatus <> Answered)
-    |> Seq.sortBy (fun it -> it.asOf)
+        |> 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)
-  }
+    return jrnl |> List.exists (fun r -> defaultArg (r.SnoozedUntil |> Option.map (fun it -> it > now)) false)
+}
 
 /// 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 = [] })
-  }
+    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 []
-  }
+    match! tryFullRequestById reqId userId db with | Some req -> return req.Notes | None -> return [||]
+}
     
 /// Retrieve a journal request by its ID and user ID
 let tryJournalById reqId userId (db : LiteDatabase) = backgroundTask {
     let! req = tryFullRequestById reqId userId db
     return req |> Option.map JournalRequest.ofRequestLite
-  }
+}
     
 /// Update the recurrence for a request
-let updateRecurrence reqId userId recurType recurCount db = backgroundTask {
+let updateRecurrence reqId userId recurType db = backgroundTask {
     match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with recurType = recurType; recurCount = recurCount }
+    | Some req -> do! doUpdate db { req with Recurrence = recurType }
     | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
+}
 
 /// Update a snoozed request
 let updateSnoozed reqId userId until db = backgroundTask {
     match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with snoozedUntil = until; showAfter = until }
+    | 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
 let updateShowAfter reqId userId showAfter db = backgroundTask {
     match! tryFullRequestById reqId userId db with
-  | Some req -> do! doUpdate db { req with showAfter = showAfter }
+    | Some req -> do! doUpdate db { req with ShowAfter = showAfter }
     | None     -> invalidOp $"{RequestId.toString reqId} not found"
-  }
+}

src/MyPrayerJournal/Dates.fs

@@ -46,16 +46,14 @@ let twoMonths   = 86_400.
 
 open System
 
-/// Convert from a JavaScript "ticks" value to a date/time
-let fromJs ticks = DateTime.UnixEpoch + TimeSpan.FromTicks (ticks * 10_000L)
-
-let formatDistance (startDate : Instant) (endDate : Instant) =
+/// Format the distance between two instants in approximate English terms
+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 diff        = startDate - endDate
+    let diff        = startOn - endOn
     let minutes     = Math.Abs diff.TotalMinutes
     let formatToken =
         let months = minutes / aMonth |> round
@@ -74,5 +72,5 @@ let formatDistance (startDate : Instant) (endDate : Instant) =
         | _                            -> AlmostXYears, years + 1
   
     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,67 +1,84 @@
-[<AutoOpen>]
-/// The data model for myPrayerJournal
+/// 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 =
-  | RequestId of Cuid
+type RequestId = 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
+    
     /// 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 =
-  | UserId of string
+type UserId = UserId of string
 
 /// Functions to manipulate user IDs
 module UserId =
+    
     /// 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 =
+    
+    /// A request should reappear immediately at the bottom of the list
     | Immediate
-  | Hours
-  | Days
-  | 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 =
         function
         | Immediate -> "Immediate"
-    | Hours     -> "Hours"
-    | Days      -> "Days"
-    | Weeks     -> "Weeks"
+        | Hours   h -> $"{h} Hours"
+        | Days    d -> $"{d} Days"
+        | Weeks   w -> $"{w} Weeks"
+    
     /// Create a recurrence value from a string
     let ofString =
         function
         | "Immediate" -> Immediate
-    | "Hours"     -> Hours
-    | "Days"      -> Days
-    | "Weeks"     -> Weeks
+        | it when it.Contains " " ->
+            let parts = it.Split " "
+            let length = Convert.ToInt16 parts[0]
+            match parts[1] with
+            | "Hours" -> Hours length
+            | "Days"  -> Days  length
+            | "Weeks" -> Weeks length
+            | _       -> invalidOp $"{parts[1]} is not a valid recurrence"
         | it -> invalidOp $"{it} is not a valid recurrence"
+    
     /// An hour's worth of seconds
     let private oneHour = 3_600L
+    
     /// The duration of the recurrence (in milliseconds)
-  let duration x =
-    (match x with
+    let duration =
+        function
         | Immediate -> 0L
-    | Hours     -> oneHour
-    | Days      -> oneHour * 24L
-    | Weeks     -> oneHour * 24L * 7L)
+        | 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
@@ -71,125 +88,9 @@ type RequestAction =
     | Updated
     | Answered
 
-
-/// History is a record of action taken on a prayer request, including updates to its text
-[<CLIMutable; NoComparison; NoEquality>]
-type History = {
-  /// The time when this history entry was made
-  asOf   : Instant
-  /// The status for this history entry
-  status : RequestAction
-  /// The text of the update, if applicable
-  text   : string option
-  }
-
-/// Note is a note regarding a prayer request that does not result in an update to its text
-[<CLIMutable; NoComparison; NoEquality>]
-type Note = {
-  /// The time when this note was made
-  asOf  : Instant
-  /// The text of the notes
-  notes : string
-  }
-
-/// Request is the identifying record for a prayer request
-[<CLIMutable; NoComparison; NoEquality>]
-type Request = {
-  /// The ID of the request
-  id           : RequestId
-  /// The time this request was initially entered
-  enteredOn    : Instant
-  /// The ID of the user to whom this request belongs ("sub" from the JWT)
-  userId       : UserId
-  /// The time at which this request should reappear in the user's journal by manual user choice
-  snoozedUntil : Instant
-  /// The time at which this request should reappear in the user's journal by recurrence
-  showAfter    : Instant
-  /// The type of recurrence for this request
-  recurType    : Recurrence
-  /// How many of the recurrence intervals should occur between appearances in the journal
-  recurCount   : int16
-  /// The history entries for this request
-  history      : History list
-  /// The notes for this request
-  notes        : Note list
-  }
-with
-  /// An empty request
-  static member empty =
-    { id           = Cuid.generate () |> RequestId
-      enteredOn    = Instant.MinValue
-      userId       = UserId ""
-      snoozedUntil = Instant.MinValue
-      showAfter    = Instant.MinValue
-      recurType    = Immediate
-      recurCount   = 0s
-      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 = {
-  /// The ID of the request (just the CUID part)
-  requestId    : RequestId
-  /// The ID of the user to whom the request belongs
-  userId       : UserId
-  /// The current text of the request
-  text         : string
-  /// The last time action was taken on the request
-  asOf         : Instant
-  /// The last status for the request
-  lastStatus   : RequestAction
-  /// The time that this request should reappear in the user's journal
-  snoozedUntil : Instant
-  /// The time after which this request should reappear in the user's journal by configured recurrence
-  showAfter    : Instant
-  /// The type of recurrence for this request
-  recurType    : Recurrence
-  /// How many of the recurrence intervals should occur between appearances in the journal
-  recurCount   : int16
-  /// 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)
-  let ofRequestLite (req : Request) =
-    let hist = req.history |> List.sortByDescending (fun it -> it.asOf) |> List.tryHead
-    { requestId    = req.id
-      userId       = req.userId
-      text         = req.history
-                      |> List.filter (fun it -> Option.isSome it.text)
-                      |> List.sortByDescending (fun it -> it.asOf)
-                      |> List.tryHead
-                      |> Option.map (fun h -> Option.get h.text)
-                      |> Option.defaultValue ""
-      asOf         = match hist with Some h -> h.asOf   | None -> Instant.MinValue
-      lastStatus   = match hist with Some h -> h.status | None -> Created
-      snoozedUntil = req.snoozedUntil
-      showAfter    = req.showAfter
-      recurType    = req.recurType
-      recurCount   = req.recurCount
-      history      = []
-      notes        = []
-      }
-
-  /// Same as `ofRequestLite`, but with notes and history
-  let ofRequestFull req =
-    { ofRequestLite req with 
-        history = req.history
-        notes   = req.notes
-      }
-
-
 /// Functions to manipulate request actions
 module RequestAction =
+  
     /// Create a string representation of an action
     let toString =
         function
@@ -197,6 +98,7 @@ module RequestAction =
         | Prayed   -> "Prayed"
         | Updated  -> "Updated"
         | Answered -> "Answered"
+    
     /// Create a RequestAction from a string
     let ofString =
         function
@@ -205,9 +107,174 @@ module RequestAction =
         | "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 =
+    {   /// The time when this history entry was made
+        AsOf : Instant
+        
+        /// The status for this history entry
+        Status : RequestAction
+        
+        /// 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
+    let isCreated hist = hist.Status = Created
+    
     /// Determine if a history's status is `Prayed`
-  let isPrayed hist = hist.status = Prayed
+    let isPrayed hist = hist.Status = Prayed
+    
     /// Determine if a history's status is `Answered`
-  let isAnswered hist = hist.status = 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 =
+    {   /// The time when this note was made
+        AsOf : Instant
+        
+        /// The text of the notes
+        Notes : string
+    }
+
+
+/// Request is the identifying record for a prayer request
+[<CLIMutable; NoComparison; NoEquality>]
+type Request =
+    {   /// The ID of the request
+        Id : RequestId
+        
+        /// The time this request was initially entered
+        EnteredOn : Instant
+        
+        /// The ID of the user to whom this request belongs ("sub" from the JWT)
+        UserId : UserId
+        
+        /// The time at which this request should reappear in the user's journal by manual user choice
+        SnoozedUntil : Instant option
+        
+        /// The time at which this request should reappear in the user's journal by recurrence
+        ShowAfter : Instant option
+        
+        /// The recurrence for this request
+        Recurrence : Recurrence
+        
+        /// The history entries for this request
+        History : History[]
+        
+        /// The notes for this request
+        Notes : Note[]
+    }
+
+/// Functions to support requests
+module Request =
+    
+    /// An empty request
+    let empty =
+        {   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 =
+    {   /// The ID of the request (just the CUID part)
+        RequestId : RequestId
+        
+        /// The ID of the user to whom the request belongs
+        UserId : UserId
+        
+        /// The current text of the request
+        Text : string
+        
+        /// The last time action was taken on the request
+        AsOf : Instant
+        
+        /// The last time a request was marked as prayed
+        LastPrayed : Instant option
+        
+        /// The last status for the request
+        LastStatus : RequestAction
+        
+        /// The time that this request should reappear in the user's journal
+        SnoozedUntil : Instant option
+        
+        /// 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)
+    let ofRequestLite (req : Request) =
+        let lastHistory = req.History |> Array.sortByDescending (fun it -> it.AsOf) |> Array.tryHead
+        // Requests are sorted by the "as of" field in this record; for sorting to work properly, we will put the
+        // largest of the last prayed date, the "snoozed until". or the "show after" date; if none of those are filled,
+        // we will use the last activity date. This will mean that:
+        //  - Immediately shown requests will be at the top of the list, in order from least recently prayed to most.
+        //  - Non-immediate requests will enter the list as if they were marked as prayed at that time; this will put
+        //    them at the bottom of the list.
+        //  - Snoozed requests will reappear at the bottom of the list when they return.
+        //  - New requests will go to the bottom of the list, but will rise as others are marked as prayed.
+        let lastActivity = lastHistory |> Option.map (fun it -> it.AsOf) |> Option.defaultValue Instant.MinValue
+        let showAfter    = defaultArg req.ShowAfter    Instant.MinValue
+        let snoozedUntil = defaultArg req.SnoozedUntil Instant.MinValue
+        let lastPrayed   =
+            req.History
+            |> Array.sortByDescending (fun it -> it.AsOf)
+            |> Array.filter History.isPrayed
+            |> Array.tryHead
+            |> Option.map (fun it -> it.AsOf)
+            |> Option.defaultValue Instant.MinValue
+        let asOf = List.max [ lastPrayed; showAfter; snoozedUntil ]
+        {   RequestId    = req.Id
+            UserId       = req.UserId
+            Text         = req.History
+                           |> Array.filter (fun it -> Option.isSome it.Text)
+                           |> Array.sortByDescending (fun it -> it.AsOf)
+                           |> Array.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
+    let ofRequestFull req =
+        { ofRequestLite req with 
+            History = List.ofArray req.History
+            Notes   = List.ofArray req.Notes
+        }

src/MyPrayerJournal/Handlers.fs

@@ -2,23 +2,18 @@
 [<RequireQualifiedAccess>]
 module MyPrayerJournal.Handlers
 
-// fsharplint:disable RecordFieldNames
-
 open Giraffe
 open Giraffe.Htmx
-open Microsoft.AspNetCore.Authentication
-open Microsoft.AspNetCore.Http
 open System
-open System.Security.Claims
-open NodaTime
 
 /// Helper function to be able to split out log on
 [<AutoOpen>]
 module private LogOnHelpers =
 
+    open Microsoft.AspNetCore.Authentication
+    
     /// Log on, optionally specifying a redirected URL once authentication is complete
-  let logOn url : HttpHandler =
-    fun next ctx -> backgroundTask {
+    let logOn url : HttpHandler = fun next ctx -> task {
         match url with
         | Some it ->
             do! ctx.ChallengeAsync ("Auth0", AuthenticationProperties (RedirectUri = it))
@@ -26,79 +21,93 @@ module private LogOnHelpers =
         | None -> return! challenge "Auth0" next ctx
     }
 
+
 /// Handlers for error conditions
 module Error =
 
     open Microsoft.Extensions.Logging
-  open System.Threading.Tasks
 
     /// Handle errors
     let error (ex : Exception) (log : ILogger) =
-    log.LogError (EventId(), ex, "An unhandled exception has occurred while executing the request.")
+        log.LogError (EventId (), ex, "An unhandled exception has occurred while executing the request.")
         clearResponse
         >=> setStatusCode 500
-    >=> setHttpHeader "X-Toast" (sprintf "error|||%s: %s" (ex.GetType().Name) ex.Message)
+        >=> setHttpHeader "X-Toast" $"error|||{ex.GetType().Name}: {ex.Message}"
         >=> text ex.Message
 
-  /// Handle unauthorized actions, redirecting to log on for GETs, otherwise returning a 401 Not Authorized reponse
-  let notAuthorized : HttpHandler =
-    fun next ctx ->
-      (next, ctx)
-      ||> match ctx.Request.Method with
-          | "GET" -> logOn None
-          | _ -> setStatusCode 401 >=> fun _ _ -> Task.FromResult<HttpContext option> None
+    /// Handle unauthorized actions, redirecting to log on for GETs, otherwise returning a 401 Not Authorized response
+    let notAuthorized : HttpHandler = fun next ctx ->
+        (if ctx.Request.Method = "GET" then logOn None next else setStatusCode 401 earlyReturn) ctx
 
     /// Handle 404s from the API, sending known URL paths to the Vue app so that they can be handled there
     let notFound : HttpHandler =
         setStatusCode 404 >=> text "Not found"
 
 
-/// Handler helpers
-[<AutoOpen>]
-module private Helpers =
+open System.Security.Claims
+open LiteDB
+open Microsoft.AspNetCore.Http
+open NodaTime
 
-  open LiteDB
-  open Microsoft.Extensions.Logging
-  open Microsoft.Net.Http.Headers
+/// Extensions on the HTTP context
+type HttpContext with
     
-  let debug (ctx : HttpContext) message =
-    let fac = ctx.GetService<ILoggerFactory>()
-    let log = fac.CreateLogger "Debug"
-    log.LogInformation message
+    /// The LiteDB database
+    member this.Db = this.GetService<LiteDatabase> ()
     
-  /// Get the LiteDB database
-  let db (ctx : HttpContext) = ctx.GetService<LiteDatabase>()
-
-  /// Get the user's "sub" claim
-  let user (ctx : HttpContext) =
-    ctx.User
+    /// The "sub" for the current user (None if no user is authenticated)
+    member this.CurrentUser =
+        this.User
         |> Option.ofObj
         |> Option.map (fun user -> user.Claims |> Seq.tryFind (fun u -> u.Type = ClaimTypes.NameIdentifier))
         |> Option.flatten
         |> Option.map (fun claim -> claim.Value)
     
-  /// Get the current user's ID
-  //  NOTE: this may raise if you don't run the request through the requiresAuthentication handler first
-  let userId ctx =
-    (user >> Option.get) ctx |> UserId
+    /// The current user's ID
+    //  NOTE: this may raise if you don't run the request through the requireUser handler first
+    member this.UserId = UserId this.CurrentUser.Value
     
-  /// Get the system clock
-  let clock (ctx : HttpContext) =
-    ctx.GetService<IClock> ()
+    /// The system clock
+    member this.Clock = this.GetService<IClock> ()
     
-  /// Get the current instant
-  let now ctx =
-    (clock ctx).GetCurrentInstant ()
+    /// Get the current instant from the system clock
+    member this.Now = this.Clock.GetCurrentInstant
+    
+    /// Get the time zone from the X-Time-Zone header (default UTC)
+    member this.TimeZone =
+        match this.TryGetRequestHeader "X-Time-Zone" with
+        | Some tz ->
+            match this.GetService<IDateTimeZoneProvider>().GetZoneOrNull tz with
+            | null -> DateTimeZone.Utc
+            | zone -> zone
+        | None -> DateTimeZone.Utc
+
+
+/// Handler helpers
+[<AutoOpen>]
+module private Helpers =
+  
+    open Microsoft.Extensions.Logging
+    open Microsoft.Net.Http.Headers
+
+    /// Require a user to be logged on
+    let requireUser : HttpHandler =
+        requiresAuthentication Error.notAuthorized
+    
+    /// Debug logger
+    let debug (ctx : HttpContext) message =
+        let fac = ctx.GetService<ILoggerFactory> ()
+        let log = fac.CreateLogger "Debug"
+        log.LogInformation message
 
     /// Return a 201 CREATED response
     let created =
         setStatusCode 201
 
     /// Return a 201 CREATED response with the location header set for the created resource
-  let createdAt url : HttpHandler =
-    fun next ctx ->
-      (sprintf "%s://%s%s" ctx.Request.Scheme ctx.Request.Host.Value url |> setHttpHeader HeaderNames.Location
-       >=> created) next ctx
+    let createdAt url : HttpHandler = fun next ctx ->
+        Successful.CREATED
+            ($"{ctx.Request.Scheme}://{ctx.Request.Host.Value}{url}" |> setHttpHeader HeaderNames.Location) next ctx
   
     /// Return a 303 SEE OTHER response (forces a GET on the redirected URL)
     let seeOther (url : string) =
@@ -107,50 +116,50 @@ module private Helpers =
     /// Render a component result
     let renderComponent nodes : HttpHandler =
         noResponseCaching
-    >=> fun next ctx -> backgroundTask {
+        >=> fun _ ctx -> backgroundTask {
             return! ctx.WriteHtmlStringAsync (ViewEngine.RenderView.AsString.htmlNodes nodes)
         }
 
     open Views.Layout
+    open System.Threading.Tasks
     
     /// Create a page rendering context
     let pageContext (ctx : HttpContext) pageTitle content = backgroundTask {
-    let! hasSnoozed = backgroundTask {
-      match user ctx with
-      | Some _ -> return! Data.hasSnoozed (userId ctx) (now ctx) (db ctx)
-      | None   -> return  false
-      }
-    return {
-      isAuthenticated = (user >> Option.isSome) ctx
-      hasSnoozed      = hasSnoozed
-      currentUrl      = ctx.Request.Path.Value
-      pageTitle       = pageTitle
-      content         = content
+        let! hasSnoozed =
+            match ctx.CurrentUser with
+            | Some _ -> Data.hasSnoozed ctx.UserId (ctx.Now ()) ctx.Db
+            | None   -> Task.FromResult false
+        return
+            {   IsAuthenticated = Option.isSome ctx.CurrentUser
+                HasSnoozed      = hasSnoozed
+                CurrentUrl      = ctx.Request.Path.Value
+                PageTitle       = pageTitle
+                Content         = content
             }
     }
 
     /// Composable handler to write a view to the output
-  let writeView view : HttpHandler =
-    fun next ctx -> backgroundTask {
+    let writeView view : HttpHandler = fun _ ctx -> backgroundTask {
         return! ctx.WriteHtmlViewAsync view
     }
     
+    
     /// Hold messages across redirects
     module Messages =
 
         /// The messages being held
-    let mutable private messages : Map<string, (string * string)> = Map.empty
+        let mutable private messages : Map<UserId, string * string> = Map.empty
 
         /// Locked update to prevent updates by multiple threads
         let private upd8 = obj ()
 
         /// Push a new message into the list
-    let push ctx message url = lock upd8 (fun () ->
-      messages <- messages.Add (ctx |> (user >> Option.get), (message, url)))
+        let push (ctx : HttpContext) message url = lock upd8 (fun () ->
+          messages <- messages.Add (ctx.UserId, (message, url)))
 
         /// Add a success message header to the response
         let pushSuccess ctx message url =
-      push ctx (sprintf "success|||%s" message) url
+          push ctx $"success|||%s{message}" url
         
         /// Pop the messages for the given user
         let pop userId = lock upd8 (fun () ->
@@ -159,17 +168,16 @@ module private Helpers =
           msg)
 
     /// Send a partial result if this is not a full page load (does not append no-cache headers)
-  let partialStatic (pageTitle : string) content : HttpHandler =
-    fun next ctx -> backgroundTask {
+    let partialStatic (pageTitle : string) content : HttpHandler = fun next ctx -> task {
         let  isPartial = ctx.Request.IsHtmx && not ctx.Request.IsHtmxRefresh
         let! pageCtx   = pageContext ctx pageTitle content
         let  view      = (match isPartial with true -> partial | false -> view) pageCtx
         return! 
             (next, ctx)
-        ||> match user ctx with
-            | Some u ->
-                match Messages.pop u with
-                | Some (msg, url) -> setHttpHeader "X-Toast" msg >=> withHxPush url >=> writeView view
+            ||> match ctx.CurrentUser with
+                | Some _ ->
+                    match Messages.pop ctx.UserId with
+                    | Some (msg, url) -> setHttpHeader "X-Toast" msg >=> withHxPushUrl url >=> writeView view
                     | None -> writeView view
                 | None -> writeView view
     }
@@ -192,34 +200,40 @@ module Models =
   
     /// An additional note
     [<CLIMutable; NoComparison; NoEquality>]
-  type NoteEntry = {
-    /// The notes being added
+    type NoteEntry =
+        {   /// The notes being added
             notes : string
         }
     
     /// A prayer request
     [<CLIMutable; NoComparison; NoEquality>]
-  type Request = {
-    /// The ID of the request
+    type Request =
+        {   /// The ID of the request
             requestId     : string
+            
             /// Where to redirect after saving
             returnTo      : string
+            
             /// The text of the request
             requestText   : string
+            
             /// The additional status to record
             status        : string option
+            
             /// The recurrence type
             recurType     : string
+            
             /// The recurrence count
             recurCount    : int16 option
+            
             /// The recurrence interval
             recurInterval : string option
         }
   
     /// The date until which a request should not appear in the journal
     [<CLIMutable; NoComparison; NoEquality>]
-  type SnoozeUntil = {
-    /// The date (YYYY-MM-DD) at which the request should reappear
+    type SnoozeUntil =
+        {   /// The date (YYYY-MM-DD) at which the request should reappear
             until : string
         }
 
@@ -231,41 +245,40 @@ open NodaTime.Text
 module Components =
 
     // GET /components/journal-items
-  let journalItems : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let  now   = now ctx
-      let! jrnl  = Data.journalByUserId (userId ctx) (db ctx)
-      let  shown = jrnl |> List.filter (fun it -> now > it.snoozedUntil && now > it.showAfter)
-      return! renderComponent [ Views.Journal.journalItems now shown ] next ctx
+    let journalItems : HttpHandler = requireUser >=> fun next ctx -> task {
+        let now = ctx.Now ()
+        let shouldBeShown (req : JournalRequest) =
+            match req.SnoozedUntil, req.ShowAfter with
+            | None, None -> true
+            | Some snooze, Some hide when snooze < now && hide < now -> true
+            | Some snooze, _ when snooze < now -> true
+            | _, Some hide when hide < now -> true
+            | _, _ -> false
+        let! journal = Data.journalByUserId ctx.UserId ctx.Db
+        let  shown   = journal |> List.filter shouldBeShown
+        return! renderComponent [ Views.Journal.journalItems now ctx.TimeZone shown ] next ctx
     }
   
     // GET /components/request-item/[req-id]
-  let requestItem reqId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      match! Data.tryJournalById (RequestId.ofString reqId) (userId ctx) (db ctx) with
-      | Some req -> return! renderComponent [ Views.Request.reqListItem (now ctx) req ] next ctx
+    let requestItem reqId : HttpHandler = requireUser >=> fun next ctx -> task {
+        match! Data.tryJournalById (RequestId.ofString reqId) ctx.UserId ctx.Db with
+        | Some req -> return! renderComponent [ Views.Request.reqListItem (ctx.Now ()) ctx.TimeZone req ] next ctx
         | None     -> return! Error.notFound next ctx
     }
 
     // GET /components/request/[req-id]/add-notes
     let addNotes requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> renderComponent (Views.Journal.notesEdit (RequestId.ofString requestId))
+        requireUser >=> renderComponent (Views.Journal.notesEdit (RequestId.ofString requestId))
 
     // GET /components/request/[req-id]/notes
-  let notes requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let! notes = Data.notesById (RequestId.ofString requestId) (userId ctx) (db ctx)
-      return! renderComponent (Views.Request.notes (now ctx) notes) next ctx
+    let notes requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let! notes = Data.notesById (RequestId.ofString requestId) ctx.UserId ctx.Db
+        return! renderComponent (Views.Request.notes (ctx.Now ()) ctx.TimeZone (List.ofArray notes)) next ctx
     }
   
     // GET /components/request/[req-id]/snooze
     let snooze requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> renderComponent [ RequestId.ofString requestId |> Views.Journal.snooze ]
+        requireUser >=> renderComponent [ RequestId.ofString requestId |> Views.Journal.snooze ]
 
 
 /// / URL    
@@ -280,16 +293,14 @@ module Home =
 module Journal =
   
     // GET /journal
-  let journal : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
+    let journal : HttpHandler = requireUser >=> fun next ctx -> task {
         let usr =
             ctx.User.Claims
             |> Seq.tryFind (fun c -> c.Type = ClaimTypes.GivenName)
             |> Option.map (fun c -> c.Value)
             |> Option.defaultValue "Your"
         let title = usr |> match usr with "Your" -> sprintf "%s" | _ -> sprintf "%s's"
-      return! partial (sprintf "%s Prayer Journal" title) (Views.Journal.journal usr) next ctx
+        return! partial $"{title} Prayer Journal" (Views.Journal.journal usr) next ctx
     }
 
 
@@ -308,12 +319,12 @@ module Legal =
 /// /api/request and /request(s) URLs
 module Request =
     
+    open Cuid
+    
     // GET /request/[req-id]/edit  
-  let edit requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
+    let edit requestId : HttpHandler = requireUser >=> fun next ctx -> task {
         let returnTo =
-        match ctx.Request.Headers.Referer.[0] with
+            match ctx.Request.Headers.Referer[0] with
             | it when it.EndsWith "/active"  -> "active"
             | it when it.EndsWith "/snoozed" -> "snoozed"
             | _                              -> "journal"
@@ -322,7 +333,7 @@ module Request =
             return! partial "Add Prayer Request"
                         (Views.Request.edit (JournalRequest.ofRequestLite Request.empty) returnTo true) next ctx
         | _     ->
-          match! Data.tryJournalById (RequestId.ofString requestId) (userId ctx) (db ctx) with
+            match! Data.tryJournalById (RequestId.ofString requestId) ctx.UserId ctx.Db with
             | Some req ->
                 debug ctx "Found - sending view"
                 return! partial "Edit Prayer Request" (Views.Request.edit req returnTo false) next ctx
@@ -332,117 +343,93 @@ module Request =
     }
 
     // PATCH /request/[req-id]/prayed
-  let prayed requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let db    = db     ctx
-      let usrId = userId ctx
+    let prayed requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let db     = ctx.Db
+        let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-      match! Data.tryRequestById reqId usrId db with
+        match! Data.tryRequestById reqId userId db with
         | Some req ->
-          let now  = now ctx
-          do! Data.addHistory reqId usrId { asOf = now; status = Prayed; text = None } db
+            let now  = ctx.Now ()
+            do! Data.addHistory reqId userId { AsOf = now; Status = Prayed; Text = None } db
             let nextShow =
-            match Recurrence.duration req.recurType with
-            | 0L       -> Instant.MinValue
-            | duration -> now.Plus (Duration.FromSeconds (duration * int64 req.recurCount))
-          do! Data.updateShowAfter reqId usrId nextShow db
-          do! db.saveChanges ()
+                match Recurrence.duration req.Recurrence with
+                | 0L       -> None
+                | duration -> Some <| now.Plus (Duration.FromSeconds duration)
+            do! Data.updateShowAfter reqId userId nextShow db
+            do! db.SaveChanges ()
             return! (withSuccessMessage "Request marked as prayed" >=> Components.journalItems) next ctx
         | None -> return! Error.notFound next ctx
     }
   
     /// POST /request/[req-id]/note
-  let addNote requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let db    = db     ctx
-      let usrId = userId ctx
+    let addNote requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let db     = ctx.Db
+        let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-      match! Data.tryRequestById reqId usrId db with
+        match! Data.tryRequestById reqId userId db with
         | Some _ ->
             let! notes = ctx.BindFormAsync<Models.NoteEntry> ()
-          do! Data.addNote reqId usrId { asOf = now ctx; notes = notes.notes } db
-          do! db.saveChanges ()
+            do! Data.addNote reqId userId { AsOf = ctx.Now (); Notes = notes.notes } db
+            do! db.SaveChanges ()
             return! (withSuccessMessage "Added Notes" >=> hideModal "notes" >=> created) next ctx
         | None -> return! Error.notFound next ctx
     }
           
     // GET /requests/active
-  let active : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let! reqs = Data.journalByUserId (userId ctx) (db ctx)
-      return! partial "Active Requests" (Views.Request.active (now ctx) reqs) next ctx
+    let active : HttpHandler = requireUser >=> fun next ctx -> task {
+        let! reqs = Data.journalByUserId ctx.UserId ctx.Db
+        return! partial "Active Requests" (Views.Request.active (ctx.Now ()) ctx.TimeZone reqs) next ctx
     }
   
     // GET /requests/snoozed
-  let snoozed : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let! reqs    = Data.journalByUserId (userId ctx) (db ctx)
-      let  now     = now ctx
-      let  snoozed = reqs |> List.filter (fun it -> it.snoozedUntil > now)
-      return! partial "Active Requests" (Views.Request.snoozed now snoozed) next ctx
+    let snoozed : HttpHandler = requireUser >=> fun next ctx -> task {
+        let! reqs    = Data.journalByUserId ctx.UserId ctx.Db
+        let  now     = ctx.Now ()
+        let  snoozed = reqs
+                       |> List.filter (fun it -> defaultArg (it.SnoozedUntil |> Option.map (fun it -> it > now)) false)
+        return! partial "Snoozed Requests" (Views.Request.snoozed now ctx.TimeZone snoozed) next ctx
     }
 
     // GET /requests/answered
-  let answered : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let! reqs = Data.answeredRequests (userId ctx) (db ctx)
-      return! partial "Answered Requests" (Views.Request.answered (now ctx) reqs) next ctx
-      }
-  
-  // GET /api/request/[req-id]
-  let get requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      match! Data.tryJournalById (RequestId.ofString requestId) (userId ctx) (db ctx) with
-      | Some req -> return! json req next ctx
-      | None -> return! Error.notFound next ctx
+    let answered : HttpHandler = requireUser >=> fun next ctx -> task {
+        let! reqs = Data.answeredRequests ctx.UserId ctx.Db
+        return! partial "Answered Requests" (Views.Request.answered (ctx.Now ()) ctx.TimeZone reqs) next ctx
     }
   
     // GET /request/[req-id]/full
-  let getFull requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      match! Data.tryFullRequestById (RequestId.ofString requestId) (userId ctx) (db ctx) with
-      | Some req -> return! partial "Prayer Request" (Views.Request.full (clock ctx) req) next ctx
+    let getFull requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        match! Data.tryFullRequestById (RequestId.ofString requestId) ctx.UserId ctx.Db with
+        | Some req -> return! partial "Prayer Request" (Views.Request.full ctx.Clock ctx.TimeZone req) next ctx
         | None     -> return! Error.notFound next ctx
     }
   
     // PATCH /request/[req-id]/show
-  let show requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let db    = db     ctx
-      let usrId = userId ctx
+    let show requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let db     = ctx.Db
+        let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-      match! Data.tryRequestById reqId usrId db with
+        match! Data.tryRequestById reqId userId db with
         | Some _ ->
-          do! Data.updateShowAfter reqId usrId Instant.MinValue db
-          do! db.saveChanges ()
+            do! Data.updateShowAfter reqId userId None db
+            do! db.SaveChanges ()
             return! (withSuccessMessage "Request now shown" >=> Components.requestItem requestId) next ctx
         | None -> return! Error.notFound next ctx
     }
   
     // PATCH /request/[req-id]/snooze
-  let snooze requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let db    = db     ctx
-      let usrId = userId ctx
+    let snooze requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let db     = ctx.Db
+        let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-      match! Data.tryRequestById reqId usrId db with
+        match! Data.tryRequestById reqId userId db with
         | Some _ ->
             let! until = ctx.BindFormAsync<Models.SnoozeUntil> ()
             let date =
                 LocalDatePattern.CreateWithInvariantCulture("yyyy-MM-dd").Parse(until.until).Value
                     .AtStartOfDayInZone(DateTimeZone.Utc)
                     .ToInstant ()
-          do! Data.updateSnoozed reqId usrId date db
-          do! db.saveChanges ()
+            do! Data.updateSnoozed reqId userId (Some date) db
+            do! db.SaveChanges ()
             return!
                 (withSuccessMessage $"Request snoozed until {until.until}"
                  >=> hideModal "snooze"
@@ -451,78 +438,71 @@ module Request =
     }
   
     // PATCH /request/[req-id]/cancel-snooze
-  let cancelSnooze requestId : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
-      let db    = db     ctx
-      let usrId = userId ctx
+    let cancelSnooze requestId : HttpHandler = requireUser >=> fun next ctx -> task {
+        let db     = ctx.Db
+        let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-      match! Data.tryRequestById reqId usrId db with
+        match! Data.tryRequestById reqId userId db with
         | Some _ ->
-          do! Data.updateSnoozed reqId usrId Instant.MinValue db
-          do! db.saveChanges ()
+            do! Data.updateSnoozed reqId userId None db
+            do! db.SaveChanges ()
             return! (withSuccessMessage "Request unsnoozed" >=> Components.requestItem requestId) next ctx
         | None -> return! Error.notFound next ctx
     }
 
-  /// Derive a recurrence and interval from its primitive representation in the form
+    /// Derive a recurrence from its representation in the form
     let private parseRecurrence (form : Models.Request) =
-    (Recurrence.ofString (match form.recurInterval with Some x -> x | _ -> "Immediate"),
-     defaultArg form.recurCount (int16 0))
+        match form.recurInterval with Some x -> $"{defaultArg form.recurCount 0s} {x}" | None -> "Immediate"
+        |> Recurrence.ofString
 
     // POST /request
-  let add : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
+    let add : HttpHandler = requireUser >=> fun next ctx -> task {
         let! form   = ctx.BindModelAsync<Models.Request> ()
-      let  db               = db ctx
-      let  usrId            = userId ctx
-      let  now              = now ctx
-      let (recur, interval) = parseRecurrence form
+        let  db     = ctx.Db
+        let  userId = ctx.UserId
+        let  now    = ctx.Now ()
         let  req    =
             { Request.empty with
-            userId     = usrId
-            enteredOn  = now
-            showAfter  = Instant.MinValue
-            recurType  = recur
-            recurCount = interval
-            history    = [
-              { asOf   = now
-                status = Created
-                text   = Some form.requestText
+                Id         = Cuid.generate () |> RequestId
+                UserId     = userId
+                EnteredOn  = now
+                ShowAfter  = None
+                Recurrence = parseRecurrence form
+                History    = [|
+                    {   AsOf   = now
+                        Status = Created
+                        Text   = Some form.requestText
                     }      
-              ]
+                |]
             }
         Data.addRequest req db
-      do! db.saveChanges ()
+        do! db.SaveChanges ()
         Messages.pushSuccess ctx "Added prayer request" "/journal"
         return! seeOther "/journal" next ctx
     }
   
     // PATCH /request
-  let update : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> backgroundTask {
+    let update : HttpHandler = requireUser >=> fun next ctx -> task {
         let! form   = ctx.BindModelAsync<Models.Request> ()
-      let  db    = db ctx
-      let  usrId = userId ctx
-      match! Data.tryJournalById (RequestId.ofString form.requestId) usrId db with
+        let  db     = ctx.Db
+        let  userId = ctx.UserId
+        match! Data.tryJournalById (RequestId.ofString form.requestId) userId db with
         | Some req ->
             // update recurrence if changed
-          let (recur, interval) = parseRecurrence form
-          match recur = req.recurType && interval = req.recurCount with
+            let recur = parseRecurrence form
+            match recur = req.Recurrence with
             | true  -> ()
             | false ->
-              do! Data.updateRecurrence req.requestId usrId recur interval db
+                do! Data.updateRecurrence req.RequestId userId recur db
                 match recur with
-              | Immediate -> do! Data.updateShowAfter req.requestId usrId Instant.MinValue db
+                | Immediate -> do! Data.updateShowAfter req.RequestId userId None db
                 | _         -> ()
             // append history
             let upd8Text = form.requestText.Trim ()
-          let text     = match upd8Text = req.text with true -> None | false -> Some upd8Text
-          do! Data.addHistory req.requestId usrId
-                { asOf = now ctx; status = (Option.get >> RequestAction.ofString) form.status; text = text } db
-          do! db.saveChanges ()
+            let text     = if upd8Text = req.Text then None else Some upd8Text
+            do! Data.addHistory req.RequestId userId
+                    { AsOf = ctx.Now (); Status = (Option.get >> RequestAction.ofString) form.status; Text = text } db
+            do! db.SaveChanges ()
             let nextUrl =
                 match form.returnTo with
                 | "active"          -> "/requests/active"
@@ -537,6 +517,7 @@ module Request =
 /// Handlers for /user URLs
 module User =
 
+    open Microsoft.AspNetCore.Authentication
     open Microsoft.AspNetCore.Authentication.Cookies
 
     // GET /user/log-on
@@ -544,9 +525,7 @@ module User =
         logOn (Some "/journal")
   
     // GET /user/log-off
-  let logOff : HttpHandler =
-    requiresAuthentication Error.notAuthorized
-    >=> fun next ctx -> task {
+    let logOff : HttpHandler = requireUser >=> fun next ctx -> task {
         do! ctx.SignOutAsync ("Auth0", AuthenticationProperties (RedirectUri = "/"))
         do! ctx.SignOutAsync CookieAuthenticationDefaults.AuthenticationScheme
         return! next ctx
@@ -556,8 +535,8 @@ module User =
 open Giraffe.EndpointRouting
 
 /// The routes for myPrayerJournal
-let routes =
-  [ GET_HEAD [ route "/" Home.home ]
+let routes = [
+    GET_HEAD [ route "/" Home.home ]
     subRoute "/components/" [
         GET_HEAD [
             route  "journal-items"        Components.journalItems
@@ -600,4 +579,4 @@ let routes =
             route "log-on"  User.logOn
         ]
     ]
-    ]
+]

src/MyPrayerJournal/MyPrayerJournal.fsproj

@@ -1,7 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.0.0</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>3.2</Version>
+    <DebugType>embedded</DebugType>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <NoWarn>3391</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Domain.fs" />
@@ -16,16 +19,15 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.4" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.1.23" />
     <PackageReference Include="FunctionalCuid" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="5.0.0" />
-    <PackageReference Include="LiteDB" Version="5.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.10" />
-    <PackageReference Include="NodaTime" Version="3.0.9" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Giraffe.Htmx/src/Htmx/Giraffe.Htmx.fsproj" />
-    <ProjectReference Include="../../../Giraffe.Htmx/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj" />
+    <PackageReference Include="Giraffe" Version="6.0.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.9.2" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.2" />
+    <PackageReference Include="LiteDB" Version="5.0.16" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.5" />
+    <PackageReference Include="NodaTime" Version="3.1.2" />
+    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />

src/MyPrayerJournal/Program.fs

@@ -47,9 +47,7 @@ module Configure =
 
     /// Configure logging
     let logging (bldr : WebApplicationBuilder) =
-    match bldr.Environment.IsDevelopment () with
-    | true -> ()
-    | false -> bldr.Logging.AddFilter (fun l -> l > LogLevel.Information) |> ignore
+        if bldr.Environment.IsDevelopment () then bldr.Logging.AddFilter (fun l -> l > LogLevel.Information) |> ignore
         bldr.Logging.AddConsole().AddDebug() |> ignore
         bldr
 
@@ -74,27 +72,26 @@ module Configure =
             | SameSiteMode.None, false -> opts.SameSite <- SameSiteMode.Unspecified
             | _, _ -> ()
 
-    bldr.Services
-      .AddRouting()
-      .AddGiraffe()
-      .AddSingleton<IClock>(SystemClock.Instance)
-      .Configure<CookiePolicyOptions>(
-        fun (opts : CookiePolicyOptions) ->
+        let _ = bldr.Services.AddRouting ()
+        let _ = bldr.Services.AddGiraffe ()
+        let _ = bldr.Services.AddSingleton<IClock> SystemClock.Instance
+        let _ = bldr.Services.AddSingleton<IDateTimeZoneProvider> DateTimeZoneProviders.Tzdb
+        
+        let _ =
+            bldr.Services.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 ->
+        let _ =
+            bldr.Services.AddAuthentication(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 ->
+                .AddOpenIdConnect("Auth0", fun opts ->
+                    // Configure OIDC with Auth0 options from configuration
                     let cfg = bldr.Configuration.GetSection "Auth0"
-          opts.Authority    <- sprintf "https://%s/" cfg["Domain"]
+                    opts.Authority    <- $"""https://{cfg["Domain"]}/"""
                     opts.ClientId     <- cfg["Id"]
                     opts.ClientSecret <- cfg["Secret"]
                     opts.ResponseType <- OpenIdConnectResponseType.Code
@@ -118,30 +115,27 @@ module Configure =
                                     | true ->
                                         // transform to absolute
                                         let request = ctx.Request
-                        sprintf "%s://%s%s%s" request.Scheme request.Host.Value request.PathBase.Value redirUri
+                                        $"{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
+                                Uri.EscapeDataString $"&returnTo={finalRedirUri}"
+                        ctx.Response.Redirect $"""https://{cfg["Domain"]}/v2/logout?client_id={cfg["Id"]}{returnTo}"""
                         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
+                        Task.CompletedTask)
+        
         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
+        let _ = bldr.Services.AddSingleton jsonOptions
+        let _ = bldr.Services.AddSingleton<Json.ISerializer, SystemTextJson.Serializer> ()
+        let _ = bldr.Services.AddSingleton<LiteDatabase> db
+        
         bldr.Build ()
   
 
@@ -149,18 +143,12 @@ module Configure =
 
     /// 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
+        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
 
     /// Compose all the configurations into one

src/MyPrayerJournal/Views/Helpers.fs

@@ -2,6 +2,7 @@
 [<AutoOpen>]
 module private MyPrayerJournal.Views.Helpers
   
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Htmx
 open MyPrayerJournal
@@ -10,7 +11,7 @@ open NodaTime
 /// Create a link that targets the `#top` element and pushes a URL to history
 let pageLink href attrs =
     attrs
-  |> List.append [ _href href; _hxBoost; _hxTarget "#top"; _hxSwap HxSwap.InnerHtml; _hxPushUrl ]
+    |> List.append [ _href href; _hxBoost; _hxTarget "#top"; _hxSwap HxSwap.InnerHtml; _hxPushUrl "true" ]
     |> a
 
 /// Create a Material icon
@@ -27,5 +28,15 @@ let noResults heading link buttonText text =
     ]
 
 /// Create a date with a span tag, displaying the relative date with the full date/time in the tooltip
-let relativeDate (date : Instant) now =
-  span [ _title (date.ToDateTimeOffset().ToString ("f", null)) ] [ Dates.formatDistance now date |> str ]
+let relativeDate (date : Instant) now (tz : DateTimeZone) =
+    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,60 +1,66 @@
 /// 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 reqId = RequestId.toString req.requestId
+let journalCard now tz req =
+    let reqId = RequestId.toString req.RequestId
     let spacer = span [] [ rawText " " ]
     div [ _class "col" ] [
         div [ _class "card h-100" ] [
             div [ _class "card-header p-0 d-flex"; _roleToolBar ] [
                 pageLink $"/request/{reqId}/edit" [ _class  "btn btn-secondary"; _title "Edit Request" ] [ icon "edit" ]
                 spacer
-        button [
-          _type     "button"
+                button [ _type     "button"
                          _class    "btn btn-secondary"
                          _title    "Add Notes"
                          _data     "bs-toggle" "modal"
                          _data     "bs-target" "#notesModal"
                          _hxGet    $"/components/request/{reqId}/add-notes"
                          _hxTarget "#notesBody"
-          _hxSwap   HxSwap.InnerHtml
-          ] [ icon "comment" ]
+                         _hxSwap   HxSwap.InnerHtml ] [
+                    icon "comment"
+                ]
                 spacer
-        button [
-          _type     "button"
+                button [ _type     "button"
                          _class    "btn btn-secondary"
                          _title    "Snooze Request"
                          _data     "bs-toggle" "modal"
                          _data     "bs-target" "#snoozeModal"
                          _hxGet    $"/components/request/{reqId}/snooze"
                          _hxTarget "#snoozeBody"
-          _hxSwap   HxSwap.InnerHtml
-          ] [ icon "schedule" ]
+                         _hxSwap   HxSwap.InnerHtml ] [
+                    icon "schedule"
+                ]
                 div [ _class "flex-grow-1" ] []
-        button [
-          _type    "button"
+                button [ _type    "button"
                          _class   "btn btn-success w-25"
                          _hxPatch $"/request/{reqId}/prayed"
-          _title   "Mark as Prayed"
-          ] [ icon "done" ]
+                         _title   "Mark as Prayed" ] [
+                    icon "done"
+                ]
             ]
             div [ _class "card-body" ] [
-        p [ _class "request-text" ] [ str req.text ]
+                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 ]
+                em [] [
+                    match req.LastPrayed with
+                    | Some dt -> str "last prayed ";   relativeDate dt       now tz
+                    | None    -> str "last activity "; relativeDate req.AsOf now tz
+                ]
             ]
         ]
     ]
 
 /// The journal loading page
-let journal user = article [ _class "container-fluid mt-3" ] [
+let journal user =
+    article [ _class "container-fluid mt-3" ] [
         h2 [ _class "pb-3" ] [
             str user
             match user with "Your" -> () | _ -> rawText "’s"
@@ -66,13 +72,11 @@ let journal user = article [ _class "container-fluid mt-3" ] [
         p [ _hxGet "/components/journal-items"; _hxSwap HxSwap.OuterHtml; _hxTrigger HxTrigger.Load ] [
             rawText "Loading your prayer journal…"
         ]
-  div [
-    _id             "notesModal"
+        div [ _id             "notesModal"
               _class          "modal fade"
               _tabindex       "-1"
               _ariaLabelledBy "nodesModalLabel"
-    _ariaHidden     "true"
-    ] [
+              _ariaHidden     "true" ] [
             div [ _class "modal-dialog modal-dialog-scrollable" ] [
                 div [ _class "modal-content" ] [
                     div [ _class "modal-header" ] [
@@ -81,20 +85,21 @@ let journal user = article [ _class "container-fluid mt-3" ] [
                     ]
                     div [ _class "modal-body"; _id "notesBody" ] [ ]
                     div [ _class "modal-footer" ] [
-          button [ _type "button"; _id "notesDismiss"; _class "btn btn-secondary"; _data "bs-dismiss" "modal" ] [
+                        button [ _type  "button"
+                                 _id    "notesDismiss"
+                                 _class "btn btn-secondary"
+                                 _data  "bs-dismiss" "modal" ] [
                             str "Close"
                         ]
                     ]
                 ]
             ]
         ]
-  div [
-    _id             "snoozeModal"
+        div [ _id             "snoozeModal"
               _class          "modal fade"
               _tabindex       "-1"
               _ariaLabelledBy "snoozeModalLabel"
-    _ariaHidden     "true"
-    ] [
+              _ariaHidden     "true" ] [
             div [ _class "modal-dialog modal-sm" ] [
                 div [ _class "modal-content" ] [
                     div [ _class "modal-header" ] [
@@ -103,7 +108,10 @@ let journal user = article [ _class "container-fluid mt-3" ] [
                     ]
                     div [ _class "modal-body"; _id "snoozeBody" ] [ ]
                     div [ _class "modal-footer" ] [
-          button [ _type "button"; _id "snoozeDismiss"; _class "btn btn-secondary"; _data "bs-dismiss" "modal" ] [
+                        button [ _type "button"
+                                 _id "snoozeDismiss"
+                                 _class "btn btn-secondary"
+                                 _data "bs-dismiss" "modal" ] [
                             str "Close"
                         ]
                       ]
@@ -113,7 +121,7 @@ let journal user = article [ _class "container-fluid mt-3" ] [
     ]
 
 /// The journal items
-let journalItems now items =
+let journalItems now tz items =
     match items |> List.isEmpty with
     | true ->
         noResults "No Active Requests" "/request/new/edit" "Add a Request" [
@@ -122,27 +130,24 @@ let journalItems now items =
         ]
     | false ->
         items
-      |> List.map (journalCard now)
-      |> section [
-          _id       "journalItems"
+        |> List.map (journalCard now tz)
+        |> section [ _id        "journalItems"
                      _class     "row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3"
                      _hxTarget  "this"
                      _hxSwap    HxSwap.OuterHtml
-          ]
+                     _ariaLabel "Prayer Requests" ]
 
 /// The notes edit modal body
 let notesEdit requestId =
     let reqId = RequestId.toString requestId
     [   form [ _hxPost $"/request/{reqId}/note" ] [
             div [ _class "form-floating pb-3" ] [
-        textarea [
-          _id          "notes"
+                textarea [ _id          "notes"
                            _name        "notes"
                            _class       "form-control"
                            _style       "min-height: 8rem;"
                            _placeholder "Notes"
-          _autofocus;  _required
-          ] [ ]
+                           _autofocus;  _required ] [ ]
                 label [ _for "notes" ] [ str "Notes" ]
             ]
             p [ _class "text-end" ] [ button [ _type "submit"; _class "btn btn-primary" ] [ str "Add Notes" ] ]
@@ -150,13 +155,13 @@ let notesEdit requestId =
         hr [ _style "margin: .5rem -1rem" ]
         div [ _id "priorNotes" ] [
             p [ _class "text-center pt-3" ] [
-        button [
-          _type     "button"
+                button [ _type     "button"
                          _class    "btn btn-secondary"
                          _hxGet    $"/components/request/{reqId}/notes"
                          _hxSwap   HxSwap.OuterHtml
-          _hxTarget "#priorNotes"
-          ] [str "Load Prior Notes" ]
+                         _hxTarget "#priorNotes" ] [
+                    str "Load Prior Notes"
+                ]
             ]
         ]
     ]
@@ -164,11 +169,9 @@ let notesEdit requestId =
 /// The snooze edit form
 let snooze requestId =
     let today = System.DateTime.Today.ToString "yyyy-MM-dd"
-  form [
-    _hxPatch  $"/request/{RequestId.toString requestId}/snooze"
+    form [ _hxPatch  $"/request/{RequestId.toString requestId}/snooze"
            _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 ]
             label [ _for "until" ] [ str "Until" ]

src/MyPrayerJournal/Views/Layout.fs

@@ -1,37 +1,40 @@
 /// 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 = {
-  /// Whether the user is authenticated
-  isAuthenticated : bool
+type PageRenderContext =
+    {   /// Whether the user is authenticated
+        IsAuthenticated : bool
+        
         /// Whether the user has snoozed requests
-  hasSnoozed      : bool
+        HasSnoozed      : bool
+        
         /// The current URL
-  currentUrl      : string
+        CurrentUrl      : string
+        
         /// The title for the page to be rendered
-  pageTitle       : string
+        PageTitle       : string
+        
         /// The content of the page
-  content         : XmlNode
+        Content         : XmlNode
     }
 
 /// The home page
-let home = article [ _class "container mt-3" ] [
+let home =
+    article [ _class "container mt-3" ] [
         p [] [ rawText " " ]
         p [] [
-    str "myPrayerJournal is a place where individuals can record their prayer requests, record that they prayed for "
-    str "them, update them as God moves in the situation, and record a final answer received on that request. It also "
-    str "allows individuals to review their answered prayers."
+            str "myPrayerJournal is a place where individuals can record their prayer requests, record that they "
+            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 [] [
             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 "learn more about the site at the “Docs” link, also above."
+            rawText "“Log On” link above, and log on with either a Microsoft or Google account. You can "
+            rawText "also learn more about the site at the “Docs” link, also above."
         ]
     ]
 
@@ -46,16 +49,15 @@ let private navBar ctx =
             ]
             seq {
                 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
-        match ctx.isAuthenticated with
-        | true ->
+                if ctx.IsAuthenticated then
                     li [ _class "nav-item" ] [ navLink "/journal" [ str "Journal" ] ]
                     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" ] [ a [ _href "/user/log-off" ] [ str "Log Off" ] ]
-        | false -> li [ _class "nav-item"] [ a [ _href "/user/log-on" ] [ str "Log On" ] ]
+                else li [ _class "nav-item"] [ a [ _href "/user/log-on" ] [ str "Log On" ] ]
                 li [ _class "nav-item" ] [
                     a [ _href "https://docs.prayerjournal.me"; _target "_blank"; _rel "noopener" ] [ str "Docs" ]
                 ]
@@ -66,7 +68,8 @@ let private navBar ctx =
     ]
 
 /// The title tag with the application name appended
-let titleTag ctx = title [] [ str ctx.pageTitle; rawText " « myPrayerJournal" ]
+let titleTag ctx =
+    title [] [ str ctx.PageTitle; rawText " « myPrayerJournal" ]
 
 /// The HTML `head` element
 let htmlHead ctx =
@@ -74,12 +77,10 @@ let htmlHead ctx =
         meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
         meta [ _name "description"; _content "Online prayer journal - free w/Google or Microsoft account" ]
         titleTag ctx
-    link [
-      _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css"
+        link [ _href        "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css"
                _rel         "stylesheet"
-      _integrity   "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
-      _crossorigin "anonymous"
-      ]
+               _integrity   "sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx"
+               _crossorigin "anonymous" ]
         link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
         link [ _href "/style/style.css"; _rel "stylesheet" ]
     ]
@@ -94,7 +95,7 @@ let toaster =
 let htmlFoot =
     footer [ _class "container-fluid" ] [
         p [ _class "text-muted text-end" ] [
-      str "myPrayerJournal v3"
+            str $"myPrayerJournal {version}"
             br []
             em [] [
                 small [] [
@@ -106,24 +107,20 @@ let htmlFoot =
                         str "Developed"
                     ]
                     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"
                     ]
                 ]
             ]
-    script [
-      _src         "https://unpkg.com/htmx.org@1.5.0"
-      _integrity   "sha384-oGA+prIp5Vchu6we2YkI51UtVzN9Jpx2Z7PnR1I78PnZlN8LkrCT4lqqqmDkyrvI"
-      _crossorigin "anonymous"
-      ] []
+        ]
+        Htmx.Script.minified
         script [] [
-      rawText "if (!htmx) document.write('<script src=\"/script/htmx-1.5.0.min.js\"><\/script>')"
+            rawText "if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')"
         ]
-    script [
-      _async
-      _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
-      _integrity   "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
-      _crossorigin "anonymous"
-      ] []
+        script [ _async
+                 _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js"
+                 _integrity   "sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa"
+                 _crossorigin "anonymous" ] []
         script [] [
             rawText "setTimeout(function () { "
             rawText "if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>') "
@@ -137,7 +134,7 @@ let view ctx =
     html [ _lang "en" ] [
         htmlHead ctx
         body [] [
-      section [ _id "top" ] [ navBar ctx; main [ _roleMain ] [ ctx.content ] ]
+            section [ _id "top"; _ariaLabel "Top navigation" ] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
             toaster
             htmlFoot
         ]
@@ -147,5 +144,5 @@ let view ctx =
 let partial ctx =
     html [ _lang "en" ] [
         head [] [ titleTag ctx ]
-    body [] [ navBar ctx; main [ _roleMain ] [ ctx.content ] ]
+        body [] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
     ]

src/MyPrayerJournal/Views/Legal.fs

@@ -4,23 +4,26 @@ module MyPrayerJournal.Views.Legal
 open Giraffe.ViewEngine
 
 /// View for the "Privacy Policy" page
-let privacyPolicy = article [ _class "container mt-3" ] [
+let privacyPolicy =
+    article [ _class "container mt-3" ] [
         h2 [ _class "mb-2" ] [ str "Privacy Policy" ]
         h6 [ _class "text-muted pb-3" ] [ str "as of May 21"; sup [] [ str "st"]; str ", 2018" ]
         p [] [
-    str "The nature of the service is one where privacy is a must. The items below will help you understand the data "
-    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 familiarize "
-          str "yourself with the privacy policy for "
+                        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"]
+                        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 ")."
@@ -31,22 +34,23 @@ let privacyPolicy = article [ _class "container mt-3" ] [
                     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."
+                            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 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."
+                            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 requests, updates, "
-            str "and notes; and the date/time when certain actions are taken."
+                            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."
                         ]
                     ]
                 ]
@@ -54,35 +58,38 @@ let privacyPolicy = article [ _class "container mt-3" ] [
                     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."
+                            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 rolling manner; "
-            str "backups are preserved for the prior 7 days, and backups from the 1"
+                            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 repository."
+                            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 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)."
+                            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 access attempts."
+                            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 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."
+                        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."
                     ]
                 ]
             ]
@@ -90,7 +97,8 @@ let privacyPolicy = article [ _class "container mt-3" ] [
     ]
 
 /// View for the "Terms of Service" page
-let termsOfService = article [ _class "container mt-3" ] [
+let termsOfService =
+    article [ _class "container mt-3" ] [
         h2 [ _class "mb-2" ] [ str "Terms of Service" ]
         h6 [ _class "text-muted pb-3"] [ str "as of May 21"; sup [] [ str "st" ]; str ", 2018" ]
         div [ _class "card" ] [
@@ -98,17 +106,17 @@ let termsOfService = article [ _class "container mt-3" ] [
                 div [ _class "list-group-item" ] [
                     h3 [] [ str "1. Acceptance of Terms" ]
                     p [ _class "card-text" ] [
-          str "By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you "
-          str "are responsible to ensure that your use of this site complies with all applicable laws. Your continued "
-          str "use of this site implies your acceptance of these terms."
+                        str "By accessing this web site, you are agreeing to be bound by these Terms and Conditions, "
+                        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 requests. It "
-          str "requires no registration by itself, but access is granted based on a successful login with an external "
-          str "identity provider. See "
+                        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."
                     ]
@@ -116,11 +124,13 @@ let termsOfService = article [ _class "container mt-3" ] [
                 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 "
+                        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"]
+                        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 ")."
@@ -129,17 +139,17 @@ let termsOfService = article [ _class "container mt-3" ] [
                 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."
+                        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 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."
+                        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."
                     ]
                 ]
             ]
@@ -150,4 +160,3 @@ let termsOfService = article [ _class "container mt-3" ] [
             str " to learn how we handle your data."
         ]
     ]
-

src/MyPrayerJournal/Views/Request.fs

@@ -1,108 +1,106 @@
 /// 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 reqId      = RequestId.toString req.requestId
-  let isAnswered = req.lastStatus = Answered
-  let isSnoozed  = req.snoozedUntil > now
-  let isPending  = (not isSnoozed) && req.showAfter > now
+let reqListItem now tz req =
+    let isFuture instant = defaultArg (instant |> Option.map (fun it -> it > now)) false
+    let reqId      = RequestId.toString req.RequestId
+    let isAnswered = req.LastStatus = Answered
+    let isSnoozed  = isFuture req.SnoozedUntil
+    let isPending  = (not isSnoozed) && isFuture req.ShowAfter
     let btnClass   = _class "btn btn-light mx-2"
     let restoreBtn (link : string) title =
         button [ btnClass; _hxPatch $"/request/{reqId}/{link}"; _title title ] [ icon "restore" ]
-  div [ _class "list-group-item px-0 d-flex flex-row align-items-start"; _hxTarget "this"; _hxSwap HxSwap.OuterHtml ] [
+    div [ _class "list-group-item px-0 d-flex flex-row align-items-start"
+          _hxTarget "this"
+          _hxSwap HxSwap.OuterHtml ] [
         pageLink $"/request/{reqId}/full" [ btnClass; _title "View Full Request" ] [ icon "description" ]
-    match isAnswered with
-    | true  -> ()
-    | false -> pageLink $"/request/{reqId}/edit" [ btnClass; _title "Edit Request" ] [ icon "edit" ]
-    match true with
-    | _ when isSnoozed -> restoreBtn "cancel-snooze" "Cancel Snooze"
-    | _ when isPending -> restoreBtn "show"          "Show Now"
-    | _ -> ()
+        if not isAnswered then pageLink $"/request/{reqId}/edit" [ btnClass; _title "Edit Request" ] [ icon "edit" ]
+        if   isSnoozed then restoreBtn "cancel-snooze" "Cancel Snooze"
+        elif isPending then restoreBtn "show"          "Show Now"
         p [ _class "request-text mb-0" ] [
-      str req.text
-      match isSnoozed || isPending || isAnswered with
-      | true ->
+            str req.Text
+            if isSnoozed || isPending || isAnswered then
                 br []
                 small [ _class "text-muted" ] [
-            match () with
-            | _ when isSnoozed   -> [ str "Snooze expires ";       relativeDate req.snoozedUntil now ]
-            | _ when isPending   -> [ str "Request appears next "; relativeDate req.showAfter    now ]
-            | _ (* isAnswered *) -> [ str "Answered ";             relativeDate req.asOf         now ]
+                    if   isSnoozed then   [ str "Snooze expires ";       relativeDate req.SnoozedUntil.Value now tz ]
+                    elif isPending then   [ str "Request appears next "; relativeDate req.ShowAfter.Value    now tz ]
+                    else (* isAnswered *) [ str "Answered ";             relativeDate req.AsOf               now tz ]
                     |> em []
                 ]
-      | false -> ()
           ]
     ]
 
 /// Create a list of requests
-let reqList now reqs =
+let reqList now tz reqs =
     reqs
-  |> List.map (reqListItem now)
+    |> List.map (reqListItem now tz)
     |> div [ _class "list-group" ]
 
 /// View for Active Requests page
-let active now reqs = article [ _class "container mt-3" ] [
+let active now tz reqs =
+    article [ _class "container mt-3" ] [
         h2 [ _class "pb-3" ] [ str "Active Requests" ]
-  match reqs |> List.isEmpty with
-  | true ->
+        if List.isEmpty reqs then
             noResults "No Active Requests" "/journal" "Return to your journal"
                 [ 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 =
+    article [ _class "container mt-3" ] [
         h2 [ _class "pb-3" ] [ str "Answered Requests" ]
-  match reqs |> List.isEmpty with
-  | true ->
-      noResults "No Active Requests" "/journal" "Return to your journal" [
-        rawText "Your prayer journal has no answered requests; once you have marked one as “Answered”, "
-        str "it will appear here"
+        if List.isEmpty reqs then
+            noResults "No Answered Requests" "/journal" "Return to your journal" [
+                str "Your prayer journal has no answered requests; once you have marked one as "
+                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 =
+    article [ _class "container mt-3" ] [
         h2 [ _class "pb-3" ] [ str "Snoozed Requests" ]
-  reqList now reqs
+        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 answered =
-    req.history
-    |> List.filter RequestAction.isAnswered
-    |> List.tryHead
-    |> Option.map (fun x -> x.asOf)
-  let prayed = (req.history |> List.filter RequestAction.isPrayed |> List.length).ToString "N0"
+        req.History
+        |> Array.filter History.isAnswered
+        |> Array.tryHead
+        |> Option.map (fun x -> x.AsOf)
+    let prayed = (req.History |> Array.filter History.isPrayed |> Array.length).ToString "N0"
     let daysOpen =
         let asOf = defaultArg answered now
-    ((asOf - (req.history |> List.filter RequestAction.isCreated |> List.head).asOf).TotalDays |> int).ToString "N0"
+        ((asOf - (req.History |> Array.filter History.isCreated |> Array.head).AsOf).TotalDays |> int).ToString "N0"
     let lastText =
-    req.history
-    |> List.filter (fun h -> Option.isSome h.text)
-    |> List.sortByDescending (fun h -> h.asOf)
-    |> List.map (fun h -> Option.get h.text)
-    |> List.head
+        req.History
+        |> Array.filter (fun h -> Option.isSome h.Text)
+        |> Array.sortByDescending (fun h -> h.AsOf)
+        |> Array.map (fun h -> Option.get h.Text)
+        |> Array.head
     // The history log including notes (and excluding the final entry for answered requests)
     let log =
-    let toDisp (h : History) = {| asOf = h.asOf; text = h.text; status = RequestAction.toString h.status |}
+        let toDisp (h : History) = {| asOf = h.AsOf; text = h.Text; status = RequestAction.toString h.Status |}
         let all =
-      req.notes
-      |> List.map (fun n -> {| asOf = n.asOf; text = Some n.notes; status = "Notes" |})
-      |> List.append (req.history |> List.map toDisp)
-      |> List.sortByDescending (fun it -> it.asOf)
+            req.Notes
+            |> Array.map (fun n -> {| asOf = n.AsOf; text = Some n.Notes; status = "Notes" |})
+            |> Array.append (req.History |> Array.map toDisp)
+            |> Array.sortByDescending (fun it -> it.asOf)
+            |> List.ofArray
         // Skip the first entry for answered requests; that info is already displayed
-    match answered with Some _ -> all |> List.skip 1 | None -> all
+        match answered with Some _ -> all.Tail | None -> all
     article [ _class "container mt-3" ] [
         div [_class "card" ] [
             h5 [ _class "card-header" ] [ str "Full Prayer Request" ]
@@ -113,15 +111,16 @@ let full (clock : IClock) (req : Request) =
                         str "Answered "
                         date.ToDateTimeOffset().ToString ("D", null) |> str
                         str " ("
-              relativeDate date now
+                        relativeDate date now tz
                         rawText ") • "
                     | None -> ()
-          sprintf "Prayed %s times • Open %s days" prayed daysOpen |> rawText
+                    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" ] [
+            |> List.map (fun it ->
+                li [ _class "list-group-item" ] [
                     p [ _class "m-0" ] [
                         str it.status
                         rawText "  "
@@ -142,40 +141,45 @@ let edit (req : JournalRequest) returnTo isNew =
         | "active"          -> "/requests/active"
         | "snoozed"         -> "/requests/snoozed"
         | _ (* "journal" *) -> "/journal"
+    let recurCount =
+        match req.Recurrence with
+        | Immediate -> None
+        | Hours   h -> Some h
+        | Days    d -> Some d
+        | Weeks   w -> Some w
+        |> Option.map string
+        |> Option.defaultValue ""
     article [ _class "container" ] [
         h2 [ _class "pb-3" ] [ (match isNew with true -> "Add" | false -> "Edit") |> strf "%s Prayer Request" ]
-    form [
-      _hxBoost
+        form [ _hxBoost
                _hxTarget  "#top"
-      _hxPushUrl
-      "/request" |> match isNew with true -> _hxPost | false -> _hxPatch
-      ] [
-      input [
-        _type  "hidden"
+               _hxPushUrl "true"
+               "/request" |> match isNew with true -> _hxPost | false -> _hxPatch ] [
+            input [ _type  "hidden"
                     _name  "requestId"
-        _value (match isNew with true -> "new" | false -> RequestId.toString req.requestId)
-        ]
+                    _value (match isNew with true -> "new" | false -> RequestId.toString req.RequestId) ]
             input [ _type "hidden"; _name "returnTo"; _value returnTo ]
             div [ _class "form-floating pb-3" ] [
-        textarea [
-          _id          "requestText"
+                textarea [ _id          "requestText"
                            _name        "requestText"
                            _class       "form-control"
                            _style       "min-height: 8rem;"
                            _placeholder "Enter the text of the request"
-          _autofocus;  _required
-          ] [ str req.text ]
+                           _autofocus;  _required ] [ str req.Text ]
                 label [ _for "requestText" ] [ str "Prayer Request" ]
             ]
             br []
-      match isNew with
-      | true -> ()
-      | false ->
+            if not isNew then
                 div [ _class "pb-3" ] [
                     label [] [ str "Also Mark As" ]
                     br []
                     div [ _class "form-check form-check-inline" ] [
-              input [ _type "radio"; _class "form-check-input"; _id "sU"; _name "status"; _value "Updated"; _checked ]
+                        input [ _type  "radio"
+                                _class "form-check-input"
+                                _id    "sU"
+                                _name  "status"
+                                _value "Updated"
+                                _checked ]
                         label [ _for "sU" ] [ str "Updated" ]
                     ]
                     div [ _class "form-check form-check-inline" ] [
@@ -195,55 +199,53 @@ let edit (req : JournalRequest) returnTo isNew =
                     ]
                     div [ _class "d-flex flex-row flex-wrap justify-content-center align-items-center" ] [
                         div [ _class "form-check mx-2" ] [
-              input [
-                _type    "radio"
+                            input [ _type    "radio"
                                     _class   "form-check-input"
                                     _id      "rI"
                                     _name    "recurType"
                                     _value   "Immediate"
                                     _onclick "mpj.edit.toggleRecurrence(event)"
-                match req.recurType with Immediate -> _checked | _ -> ()
-                ]
+                                    match req.Recurrence with Immediate -> _checked | _ -> () ]
                             label [ _for "rI" ] [ str "Immediately" ]
                         ]
                         div [ _class "form-check mx-2"] [
-              input [
-                _type    "radio"
+                            input [ _type    "radio"
                                     _class   "form-check-input"
                                     _id      "rO"
                                     _name    "recurType"
                                     _value   "Other"
                                     _onclick "mpj.edit.toggleRecurrence(event)"
-                match req.recurType with Immediate -> () | _ -> _checked
-                ]
+                                    match req.Recurrence with Immediate -> () | _ -> _checked ]
                             label [ _for "rO" ] [ rawText "Every…" ]
                         ]
                         div [ _class "form-floating mx-2"] [
-              input [
-                _type        "number"
+                            input [ _type        "number"
                                     _class       "form-control"
                                     _id          "recurCount"
                                     _name        "recurCount"
                                     _placeholder "0"
-                _value       (string req.recurCount)
+                                    _value       recurCount
                                     _style       "width:6rem;"
                                     _required
-                match req.recurType with Immediate -> _disabled | _ -> ()
-                ]
+                                    match req.Recurrence with Immediate -> _disabled | _ -> () ]
                             label [ _for "recurCount" ] [ str "Count" ]
                         ]
                         div [ _class "form-floating mx-2" ] [
-              select [
-                _class    "form-control"
+                            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" ]
+                                     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" ]
                         ]
@@ -258,9 +260,9 @@ let edit (req : JournalRequest) returnTo isNew =
     ]
 
 /// Display a list of notes for a request
-let notes now notes =
+let notes now tz notes =
     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" ] ]
         match notes with
         | [] -> p [ _class "text-center text-muted" ] [ str "There are no prior notes for this request" ]

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()

src/app/composer.json

@@ -0,0 +1,33 @@
+{
+    "name": "bitbadger/my-prayer-journal",
+    "description": "Minimalist prayer journal to enhance your prayer life",
+    "type": "project",
+    "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "MyPrayerJournal\\": "lib/",
+            "MyPrayerJournal\\Domain\\": "lib/domain/",
+            "BitBadger\\PgDocuments\\": "lib/documents/"
+        }
+    },
+    "authors": [
+        {
+            "name": "Daniel J. Summers",
+            "email": "daniel@bitbadger.solutions"
+        }
+    ],
+    "require": {
+        "netresearch/jsonmapper": "^4.2",
+        "guzzlehttp/guzzle": "^7.8",
+        "guzzlehttp/psr7": "^2.6",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "auth0/auth0-php": "^8.8",
+        "vlucas/phpdotenv": "^5.5",
+        "visus/cuid2": "^4.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
+    }
+}

src/app/lib/Constants.php

@@ -0,0 +1,67 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+/**
+ * Constants for use throughout the application
+ */
+class Constants
+{
+    /** @var string The `$_ENV` key for the Auth0 domain configured for myPrayerJournal */
+    const AUTH0_DOMAIN = 'AUTH0_DOMAIN';
+
+    /** @var string The `$_ENV` key for the Auth0 client ID for myPrayerJournal */
+    const AUTH0_CLIENT_ID = 'AUTH0_CLIENT_ID';
+
+    /** @var string The `$_ENV` key for the Auth0 client secret */
+    const AUTH0_CLIENT_SECRET = 'AUTH0_CLIENT_SECRET';
+
+    /** @var string The `$_ENV` key for the Auth0 cookie secret */
+    const AUTH0_COOKIE_SECRET = 'AUTH0_COOKIE_SECRET';
+
+    /** @var string The `$_ENV` key for the base URL for this instance of myPrayerJournal */
+    const BASE_URL = 'AUTH0_BASE_URL';
+
+    /** @var string The Auth0 given name (first name) claim */
+    const CLAIM_GIVEN_NAME = 'given_name';
+
+    /** @var string The Auth0 subscriber (sub) claim */
+    const CLAIM_SUB = 'sub';
+
+    /** @var string The name of the cookie used to persist redirection after Auth0 authentication */
+    const COOKIE_REDIRECT = 'mpjredirect';
+
+    /** @var string the `$_SERVER` key for the HX-Request header */
+    const HEADER_HX_REQUEST = 'HTTP_HX_REQUEST';
+
+    /** @var string The `$_SERVER` key for the HX-History-Restore-Request header */
+    const HEADER_HX_HIST_REQ = 'HTTP_HX_HISTORY_RESTORE_REQUEST';
+
+    /** @var string The `$_SERVER` key for the X-Time-Zone header */
+    const HEADER_USER_TZ = 'HTTP_X_TIME_ZONE';
+
+    /** @var string The `$_REQUEST` key for whether the request was initiated by htmx */
+    const IS_HTMX = 'MPJ_IS_HTMX';
+
+    /** @var string The `$_GET` key for state passed to Auth0 if redirection is required once authenticated */
+    const LOG_ON_STATE = 'state';
+
+    /** @var string The `$_REQUEST` key for the page title for this request */
+    const PAGE_TITLE = 'MPJ_PAGE_TITLE';
+
+    /** @var string The `$_SERVER` key for the current page's relative URI */
+    const REQUEST_URI = 'REQUEST_URI';
+
+    /** @var string The `$_GET` key sent to the log on page if redirection is required once authenticated */
+    const RETURN_URL = 'return_url';
+
+    /** @var string The `$_REQUEST` key for the timezone reference to use for this request */
+    const TIME_ZONE = 'MPJ_TIME_ZONE';
+
+    /** @var string The `$_REQUEST` key for the current user's ID */
+    const USER_ID = 'MPJ_USER_ID';
+
+    /** @var string The `$_REQUEST` key for the current version of myPrayerJournal */
+    const VERSION = 'MPJ_VERSION';
+}

src/app/lib/Data.php

@@ -0,0 +1,134 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use BitBadger\PgDocuments\{ Definition, Document, DocumentIndex, Query };
+use MyPrayerJournal\Domain\{ History, JournalRequest, Note, Request, RequestAction };
+
+class Data
+{
+    /** The prayer request table */
+    const REQ_TABLE = 'mpj.request';
+
+    /**
+     * Ensure the table and index exist
+     */
+    public static function startUp(): void
+    {
+        Definition::ensureTable(self::REQ_TABLE);
+        Definition::ensureIndex(self::REQ_TABLE, DocumentIndex::Optimized);
+    }
+
+    // /**
+    //  * Find a full prayer request by its ID
+    //  * 
+    //  * @param string $reqId The request ID
+    //  * @param string $userId The ID of the currently logged-on user
+    //  * @return ?Request The request, or null if it is not found
+    //  */
+    // public static function findFullRequestById(string $reqId, string $userId): ?Request
+    // {
+    //     $req = Document::findById(self::REQ_TABLE, $reqId, Request::class);
+    //     return is_null($req) || $req->userId != $userId ? null : $req;
+    // }
+
+    // /**
+    //  * Add a history entry to the specified request
+    //  * 
+    //  * @param string $reqId The request ID
+    //  * @param string $userId The ID of the currently logged-on user
+    //  * @param History $history The history entry to be added
+    //  */
+    // public static function addHistory(string $reqId, string $userId, History $history)
+    // {
+    //     $req = self::findFullRequestById($reqId, $userId);
+    //     if (is_null($req)) throw new \InvalidArgumentException("$reqId not found");
+    //     array_unshift($req->history, $history);
+    //     Document::updateFull(self::REQ_TABLE, $reqId, $req);
+    // }
+
+    // /**
+    //  * Add a note to the specified request
+    //  * 
+    //  * @param string $reqId The request ID
+    //  * @param string $userId The ID of the currently logged-on user
+    //  * @param Note $note The note to be added
+    //  */
+    // public static function addNote(string $reqId, string $userId, Note $note)
+    // {
+    //     $req = self::findFullRequestById($reqId, $userId);
+    //     if (is_null($req)) throw new \InvalidArgumentException("$reqId not found");
+    //     array_unshift($req->notes, $note);
+    //     Document::updateFull(self::REQ_TABLE, $reqId, $req);
+    // }
+
+    // /**
+    //  * Add a new request
+    //  * 
+    //  * @param Request $req The request to be added
+    //  */
+    // public static function addRequest(Request $req)
+    // {
+    //     Document::insert(self::REQ_TABLE, $req->id, $req);
+    // }
+
+    /**
+     * Map an array of `Request`s to an array of `JournalRequest`s
+     * 
+     * @param Request[] $reqs The requests to map
+     * @param bool $full Whether to include history and notes (true) or not (false)
+     * @return JournalRequest[] The journal request objects
+     */
+    private static function mapToJournalRequest(array $reqs, bool $full): array
+    {
+        return array_map(fn (Request $req) => new JournalRequest($req, $full), $reqs);
+    }
+
+    /**
+     * Get journal requests for the given user by "answered" status
+     * 
+     * @param string $userId The ID of the user for whom requests should be retrieved
+     * @param string $op The JSON Path operator to use for comparison (`==` or `<>`)
+     * @return JournalRequest[] The journal request objects
+     */
+    private static function getJournalByAnswered(string $userId, string $op): array
+    {
+        $sql = sprintf('%s WHERE %s AND %s', Query::selectFromTable(self::REQ_TABLE), Query::whereDataContains('$1'),
+            Query::whereJsonPathMatches('$2'));
+        $params = [
+            Query::jsonbDocParam([ 'userId' => $userId ]),
+            sprintf('$.history[0].status ? (@ %s "%s")', $op, RequestAction::Answered->name)
+        ];
+        return self::mapToJournalRequest(
+            Document::customList($sql, $params, Request::class, Document::mapFromJson(...)), true);
+    }
+    
+    // /**
+    //  * Retrieve all answered requests for this user
+    //  * 
+    //  * @param string $userId The ID of the user for whom answered requests should be retrieved
+    //  * @return JournalRequest[] The answered requests
+    //  */
+    // public static function getAnsweredRequests(string $userId): array
+    // {
+    //     $answered = self::getJournalByAnswered($userId, '==');
+    //     usort($answered,
+    //         fn (JournalRequest $a, JournalRequest $b) => $a->asOf == $b->asOf ? 0 : ($a->asOf > $b->asOf ? -1 : 1));
+    //     return $answered;
+    // }
+
+    /**
+     * Get the user's current prayer request journal
+     * 
+     * @param string $userId The ID of the user whose journal should be retrieved
+     * @return JournalRequest[] The journal request objects
+     */
+    public static function getJournal(string $userId): array
+    {
+        $reqs = self::getJournalByAnswered($userId, '<>');
+        usort($reqs,
+            fn (JournalRequest $a, JournalRequest $b) => $a->asOf == $b->asOf ? 0 : ($a->asOf < $b->asOf ? -1 : 1));
+        return $reqs;
+    }
+}

src/app/lib/Dates.php

@@ -0,0 +1,63 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use DateTimeImmutable, DateTimeInterface, DateTimeZone;
+
+class Dates
+{
+    /** Minutes in a day */
+    private const A_DAY =  1_440;
+
+    /** Minutes in two days(-ish) */
+    private const ALMOST_2_DAYS = 2_520;
+    
+    /** Minutes in a month */
+    private const A_MONTH = 43_200;
+    
+    /** Minutes in two months */
+    private const TWO_MONTHS = 86_400;
+
+    /**
+     * Get a UTC-referenced current date/time
+     * 
+     * @return DateTimeImmutable The current date/time with UTC reference
+     */
+    public static function now(): DateTimeImmutable
+    {
+        return new DateTimeImmutable(timezone: new DateTimeZone('Etc/UTC'));
+    }
+
+    /**
+     * Format the distance between two instants in approximate English terms
+     * 
+     * @param DateTimeInterface $startOn The starting date/time for the comparison
+     * @param DateTimeInterface $endOn THe ending date/time for the comparison
+     * @return string The formatted interval
+     */
+    public static function formatDistance(DateTimeInterface $startOn, DateTimeInterface $endOn): string
+    {
+        $diff    = $startOn->diff($endOn);
+        $minutes =
+            $diff->i + ($diff->h * 60) + ($diff->d * 60 * 24) + ($diff->m * 60 * 24 * 30) + ($diff->y * 60 * 24 * 365);
+        $months = round($minutes / self::A_MONTH);
+        $years  = $months / 12;
+        [ $format, $number ] = match (true) {
+            $minutes < 1                   => [ DistanceFormat::LessThanXMinutes, 1 ],
+            $minutes < 45                  => [ DistanceFormat::XMinutes, $minutes ],
+            $minutes < 90                  => [ DistanceFormat::AboutXHours, 1 ],
+            $minutes < self::A_DAY         => [ DistanceFormat::AboutXHours, round($minutes / 60) ],
+            $minutes < self::ALMOST_2_DAYS => [ DistanceFormat::XDays, 1 ],
+            $minutes < self::A_MONTH       => [ DistanceFormat::XDays, round($minutes / self::A_DAY) ],
+            $minutes < self::TWO_MONTHS    => [ DistanceFormat::AboutXMonths, round($minutes / self::A_MONTH) ],
+            $months      < 12              => [ DistanceFormat::XMonths, round($minutes / self::A_MONTH) ],
+            $months % 12 < 3               => [ DistanceFormat::AboutXYears, $years ],
+            $months % 12 < 9               => [ DistanceFormat::OverXYears, $years ],
+            default                        => [ DistanceFormat::AlmostXYears, $years + 1 ],
+        };
+
+        $relativeWords = sprintf(DistanceFormat::format($format, $number == 1), $number);
+        return $startOn > $endOn ? "$relativeWords ago" : "in $relativeWords";
+    }
+}

src/app/lib/DistanceFormat.php

@@ -0,0 +1,50 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+/**
+ * The different distance formats supported
+ */
+enum DistanceFormat
+{
+    case LessThanXMinutes;
+    case XMinutes;
+    case AboutXHours;
+    case XHours;
+    case XDays;
+    case AboutXWeeks;
+    case XWeeks;
+    case AboutXMonths;
+    case XMonths;
+    case AboutXYears;
+    case XYears;
+    case OverXYears;
+    case AlmostXYears;
+
+    /**
+     * Return the formatting string for the given format and number
+     * 
+     * @param DistanceFormat $it The distance format
+     * @param bool $singular If true, returns the singular version; if false (default), returns the plural version
+     * @return string The format string
+     */
+    public static function format(DistanceFormat $it, bool $singular = false): string
+    {
+        return match ($it) {
+            self::LessThanXMinutes => $singular ? 'less than a minute' : 'less than %d minutes',
+            self::XMinutes         => $singular ? 'a minute'           : '%d minutes',
+            self::AboutXHours      => $singular ? 'about an hour'      : 'about %d hours',
+            self::XHours           => $singular ? 'an hour'            : '%d hours',
+            self::XDays            => $singular ? 'a day'              : '%d days',
+            self::AboutXWeeks      => $singular ? 'about a week'       : 'about %d weeks',
+            self::XWeeks           => $singular ? 'a week'             : '%d weeks',
+            self::AboutXMonths     => $singular ? 'about a month'      : 'about %d months',
+            self::XMonths          => $singular ? 'a month'            : '%d months',
+            self::AboutXYears      => $singular ? 'about a year'       : 'about %d years',
+            self::XYears           => $singular ? 'a year'             : '%d years',
+            self::OverXYears       => $singular ? 'over a year'        : 'over %d years',
+            self::AlmostXYears     => $singular ? 'almost a year'      : 'almost %d years',
+        };
+    }
+}

src/app/lib/documents/Configuration.php

@@ -0,0 +1,73 @@
+<?php
+declare(strict_types=1);
+
+namespace BitBadger\PgDocuments;
+
+use PgSql\Connection;
+
+/**
+ * Document table configuration
+ */
+class Configuration
+{
+    /** @var string $connectionString The connection string to use when establishing a database connection */
+    public static string $connectionString = '';
+
+    /** @var ?Connection $pgConn The active connection */
+    private static ?Connection $pgConn = null;
+
+    /** @var ?string $startUp The name of a function to run on first connection to the database */
+    public static ?string $startUp = null;
+
+    /** @var string $keyName The key name for document IDs (default "id") */
+    public static string $keyName = 'id';
+
+    /**
+     * Ensure that the connection string is set, either explicitly, by environment variables, or with defaults
+     */
+    private static function ensureConnectionString(): void
+    {
+        if (self::$connectionString == "") {
+            $host = $_ENV['PGDOC_HOST'] ?? 'localhost';
+            $port = $_ENV['PGDOC_PORT'] ?? 5432;
+            $db   = $_ENV['PGDOC_DB']   ?? 'postgres';
+            $user = $_ENV['PGDOC_USER'] ?? 'postgres';
+            $pass = $_ENV['PGDOC_PASS'] ?? 'postgres';
+            $opts = $_ENV['PGDOC_OPTS'] ?? '';
+            self::$connectionString = "host=$host port=$port dbname=$db user=$user password=$pass"
+                . ($opts ? " options='$opts'" : '');
+        }
+    }
+
+    /**
+     * A no-op function to force this file to be autoloaded if no explicit configuration is required
+     */
+    public static function init() { }
+
+    /**
+     * Get the PostgreSQL connection, connecting on first request
+     * 
+     * @return Connection The open PostgreSQL connection
+     */
+    public static function getPgConn(): Connection
+    {
+        if (is_null(self::$pgConn)) {
+            self::ensureConnectionString();
+            self::$pgConn = pg_connect(self::$connectionString);
+        }
+        return self::$pgConn;
+    }
+
+    /**
+     * Close the PostgreSQL connection if it is open
+     */
+    public static function closeConn(): void
+    {
+        if (!is_null(self::$pgConn)) {
+            pg_close(self::$pgConn);
+            self::$pgConn = null;
+        }
+    }
+}
+
+require('functions.php');

src/app/lib/documents/Definition.php

@@ -0,0 +1,87 @@
+<?php
+declare(strict_types=1);
+
+namespace BitBadger\PgDocuments;
+
+use PgSql\Result;
+
+/**
+ * Methods to define tables and indexes for document tables
+ */
+class Definition
+{
+    /**
+     * Create a statement to create a document table
+     * 
+     * @param string $name The name of the table to create
+     * @return string A `CREATE TABLE` statement for the document table
+     */
+    public static function createTable(string $name): string
+    {
+        return "CREATE TABLE IF NOT EXISTS $name (data JSONB NOT NULL)";
+    }
+
+    /**
+     * Create a statement to create a key for a document table
+     *
+     * @param string $tableName The table (or schema/table) for which a key should be created
+     * @return string A `CREATE INDEX` statement for a unique key for the document table
+     */
+    public static function createKey(string $tableName): string
+    {
+        return sprintf('CREATE UNIQUE INDEX IF NOT EXISTS idx_%s_key ON %s ((data -> \'%s\'))',
+            self::extractTable($tableName), $tableName, Configuration::$keyName);
+    }
+
+    /**
+     * Create a statement to create an index on a document table
+     * 
+     * @param string $name The name of the table for which the index should be created
+     * @param DocumentIndex $type The type of index to create
+     * @return string A `CREATE INDEX` statement for the given table
+     */
+    public static function createIndex(string $name, DocumentIndex $type): string
+    {
+        return sprintf('CREATE INDEX IF NOT EXISTS idx_%s ON %s USING GIN (data%s)',
+            self::extractTable($name), $name, $type == DocumentIndex::Full ? '' : ' jsonb_path_ops');
+    }
+
+    /**
+     * Ensure the given document table exists
+     * 
+     * @param string $tableName The name of the table
+     */
+    public static function ensureTable(string $tableName): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query(pg_conn(), self::createTable($tableName));
+        if ($result) pg_free_result($result);
+        $result = pg_query(pg_conn(), self::createKey($tableName));
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Ensure an index on the given document table exists
+     * 
+     * @param string $name The name of the table for which the index should be created
+     * @param DocumentIndex $type The type of index to create
+     */
+    public static function ensureIndex(string $name, DocumentIndex $type): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query(pg_conn(), self::createIndex($name, $type));
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Extract just the table name from a possible `schema.table` name
+     *
+     * @param string $name The name of the table, possibly including the schema
+     * @return string The table name
+     */
+    private static function extractTable(string $name): string
+    {
+        $schemaAndTable = explode('.', $name);
+        return end($schemaAndTable);
+    }
+}

src/app/lib/documents/Document.php

@@ -0,0 +1,431 @@
+<?php
+declare(strict_types=1);
+
+namespace BitBadger\PgDocuments;
+
+use Exception;
+use JsonMapper;
+use PgSql\Result;
+
+/** Document manipulation functions */
+class Document
+{
+    /** JSON Mapper instance to use for creating a domain type instance from a document */
+    private static ?JsonMapper $mapper = null;
+
+    /**
+     * Map a domain type from the JSON document retrieved
+     * 
+     * @param string $columnName The name of the column from the database
+     * @param array $result An associative array with a single result to be mapped
+     * @param class-string<Type> $className The name of the class onto which the JSON will be mapped
+     * @return Type The domain type
+     */
+    public static function mapDocFromJson(string $columnName, array $result, string $className): mixed
+    {
+        if (is_null(self::$mapper)) {
+            self::$mapper = new JsonMapper();
+        }
+
+        $mapped = new $className();
+        self::$mapper->map(json_decode($result[$columnName]), $mapped);
+        return $mapped;
+    }
+
+    /**
+     * Map a domain type from the JSON document retrieved
+     * 
+     * @param array $result An associative array with a single result to be mapped
+     * @param class-string<Type> $className The name of the class onto which the JSON will be mapped
+     * @return Type The domain type
+     */
+    public static function mapFromJson(array $result, string $className): mixed
+    {
+        return self::mapDocFromJson('data', $result, $className);
+    }
+
+    /**
+     * Execute a document-focused statement that does not return results
+     *
+     * @param string $query The query to be executed
+     * @param array|object $document The array or object representing the document
+     * @throws Exception If the document's ID is null
+     */
+    private static function executeNonQuery(string $query, array|object $document): void
+    {
+        $docId = is_array($document)
+            ? $document[Configuration::$keyName]
+            : get_object_vars($document)[Configuration::$keyName];
+        if (is_null($docId)) throw new Exception('PgDocument: ID cannot be NULL');
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $query, [ $docId, Query::jsonbDocParam($document) ]);
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Insert a document
+     * 
+     * @param string $tableName The name of the table into which a document should be inserted
+     * @param array|object $document The array or object representing the document
+     */
+    public static function insert(string $tableName, array|object $document): void
+    {
+        self::executeNonQuery(Query::insert($tableName), $document);
+    }
+
+    /**
+     * Save (upsert) a document
+     * 
+     * @param string $tableName The name of the table into which a document should be inserted
+     * @param array|object $document The array or object representing the document
+     */
+    public static function save(string $tableName, array|object $document): void
+    {
+        self::executeNonQuery(Query::save($tableName), $document);
+    }
+
+    /**
+     * Run a count query, returning the `it` parameter of that query as an integer
+     * 
+     * @param string $sql The SQL query that will return a count
+     * @param array $params Parameters needed for that query
+     * @return int The count of matching rows for the query
+     */
+    private static function runCount(string $sql, array $params): int
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $sql, $params);
+        if (!$result) return -1;
+        $count = intval(pg_fetch_assoc($result)['it']);
+        pg_free_result($result);
+        return $count;
+    }
+
+    /**
+     * Count all documents in a table
+     * 
+     * @param string $tableName The name of the table in which documents should be counted
+     * @return int The number of documents in the table
+     */
+    public static function countAll(string $tableName): int
+    {
+        return self::runCount(Query::countAll($tableName), []);
+    }
+
+    /**
+     * Count documents in a table by JSON containment `@>`
+     * 
+     * @param string $tableName The name of the table in which documents should be counted
+     * @param array|object $criteria The criteria for the JSON containment query
+     * @return int The number of documents in the table matching the JSON containment query
+     */
+    public static function countByContains(string $tableName, array|object $criteria): int
+    {
+        return self::runCount(Query::countByContains($tableName), [ Query::jsonbDocParam($criteria) ]);
+    }
+
+    /**
+     * Count documents in a table by JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table in which documents should be counted
+     * @param string $jsonPath The JSON Path to be matched
+     * @return int The number of documents in the table matching the JSON Path
+     */
+    public static function countByJsonPath(string $tableName, string $jsonPath): int
+    {
+        return self::runCount(Query::countByJsonPath($tableName), [ $jsonPath ]);
+    }
+
+    /**
+     * Run an existence query (returning the `it` parameter of that query)
+     * 
+     * @param string $sql The SQL query that will return existence
+     * @param array $params Parameters needed for that query
+     * @return bool The result of the existence query
+     */
+    private static function runExists(string $sql, array $params): bool
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $sql, $params);
+        if (!$result) return false;
+        $exists = boolval(pg_fetch_assoc($result)['it']);
+        pg_free_result($result);
+        return $exists;
+    }
+
+    /**
+     * Determine if a document exists for the given ID
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @param string $docId The ID of the document whose existence should be checked
+     * @return bool True if the document exists, false if not
+     */
+    public static function existsById(string $tableName, string $docId): bool
+    {
+        return self::runExists(Query::existsById($tableName), [ $docId ]);
+    }
+
+    /**
+     * Determine if documents exist by JSON containment `@>`
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @param array|object $criteria The criteria for the JSON containment query
+     * @return bool True if any documents in the table match the JSON containment query, false if not
+     */
+    public static function existsByContains(string $tableName, array|object $criteria): bool
+    {
+        return self::runExists(Query::existsByContains($tableName), [ Query::jsonbDocParam($criteria) ]);
+    }
+
+    /**
+     * Determine if documents exist by JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @param string $jsonPath The JSON Path to be matched
+     * @return bool True if any documents in the table match the JSON Path, false if not
+     */
+    public static function existsByJsonPath(string $tableName, string $jsonPath): bool
+    {
+        return self::runExists(Query::existsByJsonPath($tableName), [ $jsonPath ]);
+    }
+
+    /**
+     * Run a query, mapping the results to an array of domain type objects
+     * 
+     * @param string $sql The query to be run
+     * @param array $params The parameters for the query
+     * @param class-string<Type> $className The type of document to be mapped
+     * @return array<Type> The documents matching the query
+     */
+    private static function runListQuery(string $sql, array $params, string $className): array
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $sql, $params);
+        try {
+            if (!$result || pg_result_status($result) == PGSQL_EMPTY_QUERY) return [];
+            return array_map(fn ($it) => self::mapFromJson($it, $className), pg_fetch_all($result));
+        } finally {
+            if ($result) pg_free_result($result);
+        }
+    }
+
+    /**
+     * Retrieve all documents in a table
+     * 
+     * @param string $tableName The table from which all documents should be retrieved
+     * @param class-string<Type> $className The type of document to be retrieved
+     * @return array<Type> An array of documents
+     */
+    public static function findAll(string $tableName, string $className): array
+    {
+        return self::runListQuery(Query::selectFromTable($tableName), [], $className);
+    }
+
+    /**
+     * Retrieve a document by its ID
+     * 
+     * @param string $tableName The table from which a document should be retrieved
+     * @param string $docId The ID of the document to retrieve
+     * @param class-string<Type> $className The type of document to retrieve
+     * @return Type|null The document, or null if it is not found
+     */
+    public static function findById(string $tableName, string $docId, string $className): mixed
+    {
+        $results = self::runListQuery(Query::findById($tableName), [ $docId ], $className);
+        return $results ? $results[0] : null;
+    }
+
+    /**
+     * Retrieve documents in a table via JSON containment `@>`
+     * 
+     * @param string $tableName The table from which documents should be retrieved
+     * @param array|object $criteria The criteria for the JSON containment query
+     * @param class-string<Type> $className The type of document to be retrieved
+     * @return array<Type> Documents matching the JSON containment query
+     */
+    public static function findByContains(string $tableName, array|object $criteria, string $className): array
+    {
+        return self::runListQuery(Query::findByContains($tableName), [ Query::jsonbDocParam($criteria) ], $className);
+    }
+
+    /**
+     * Retrieve the first matching document via JSON containment `@>`
+     * 
+     * @param string $tableName The table from which documents should be retrieved
+     * @param array|object $criteria The criteria for the JSON containment query
+     * @param class-string<Type> $className The type of document to be retrieved
+     * @return Type|null The document, or null if none match
+     */
+    public static function findFirstByContains(string $tableName, array|object $criteria, string $className): mixed
+    {
+        $results = self::runListQuery(Query::findByContains($tableName) . ' LIMIT 1',
+            [ Query::jsonbDocParam($criteria) ], $className);
+        return $results ? $results[0] : null;
+    }
+
+    /**
+     * Retrieve documents in a table via JSON Path match `@?`
+     * 
+     * @param string $tableName The table from which documents should be retrieved
+     * @param string $jsonPath The JSON Path to be matched
+     * @param class-string<Type> $className The type of document to be retrieved
+     * @return array<Type> Documents matching the JSON Path
+     */
+    public static function findByJsonPath(string $tableName, string $jsonPath, string $className): array
+    {
+        return self::runListQuery(Query::findByJsonPath($tableName), [ $jsonPath ], $className);
+    }
+
+    /**
+     * Retrieve the first matching document via JSON Path match `@?`
+     * 
+     * @param string $tableName The table from which documents should be retrieved
+     * @param string $jsonPath The JSON Path to be matched
+     * @param class-string<Type> $className The type of document to be retrieved
+     * @return Type|null The document, or null if none match
+     */
+    public static function findFirstByJsonPath(string $tableName, string $jsonPath, string $className): mixed
+    {
+        $results = self::runListQuery(Query::findByJsonPath($tableName) . ' LIMIT 1', [ $jsonPath ], $className);
+        return $results ? $results[0] : null;
+    }
+
+    /**
+     * Update a full document
+     * 
+     * @param string $tableName The table in which the document should be updated
+     * @param array|object $document The document to be updated
+     */
+    public static function updateFull(string $tableName, array|object $document): void
+    {
+        self::executeNonQuery(Query::updateFull($tableName), $document);
+    }
+
+    /**
+     * Update a partial document by its ID
+     * 
+     * @param string $tableName The table in which the document should be updated
+     * @param array|object $document The partial document to be updated
+     */
+    public static function updatePartialById(string $tableName, array|object $document): void
+    {
+        self::executeNonQuery(Query::updatePartialById($tableName), $document);
+    }
+
+    /**
+     * Update partial documents by JSON containment `@>`
+     * 
+     * @param string $tableName The table in which documents should be updated
+     * @param array|object $criteria The JSON containment criteria
+     * @param array|object $document The document to be updated
+     */
+    public static function updatePartialByContains(string $tableName, array|object $criteria,
+                                                   array|object $document): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), Query::updatePartialByContains($tableName),
+            [ Query::jsonbDocParam($criteria), Query::jsonbDocParam($document) ]);
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Update partial documents by JSON Path match `@?`
+     * 
+     * @param string $tableName The table in which documents should be updated
+     * @param string $jsonPath The JSON Path to be matched
+     * @param array|object $document The document to be updated
+     */
+    public static function updatePartialByJsonPath(string $tableName, string $jsonPath, array|object $document): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), Query::updatePartialByJsonPath($tableName),
+            [ $jsonPath, Query::jsonbDocParam($document) ]);
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Delete a document by its ID
+     * 
+     * @param string $tableName The table from which a document should be deleted
+     * @param string $docId The ID of the document to be deleted
+     */
+    public static function deleteById(string $tableName, string $docId): void
+    {
+        self::executeNonQuery(Query::deleteById($tableName), [ Configuration::$keyName => $docId ]);
+    }
+
+    /**
+     * Delete documents by JSON containment `@>`
+     * 
+     * @param string $tableName The table from which documents should be deleted
+     * @param array|object $criteria The criteria for the JSON containment query
+     */
+    public static function deleteByContains(string $tableName, array|object $criteria): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), Query::deleteByContains($tableName), [ Query::jsonbDocParam($criteria) ]);
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Delete documents by JSON Path match `@?`
+     * 
+     * @param string $tableName The table from which documents should be deleted
+     * @param string $jsonPath The JSON Path expression to be matched
+     */
+    public static function deleteByJsonPath(string $tableName, string $jsonPath): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), Query::deleteByJsonPath($tableName), [ $jsonPath ]);
+        if ($result) pg_free_result($result);
+    }
+
+    /**
+     * Retrieve documents via a custom query and mapping
+     * 
+     * @param string $sql The SQL query to execute
+     * @param array $params A positional array of parameters for the SQL query
+     * @param callable $mapFunc A function that expects an associative array and returns a value of the desired type
+     * @param class-string<Type> $className The type of document to be mapped
+     * @return array<Type> The documents matching the query
+     */
+    public static function customList(string $sql, array $params, string $className, callable $mapFunc): array
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $sql, $params);
+        try {
+            if (!$result || pg_result_status($result) == PGSQL_EMPTY_QUERY) return [];
+            return array_map(fn ($it) => $mapFunc($it, $className), pg_fetch_all($result));
+        } finally {
+            if ($result) pg_free_result($result);
+        }
+    }
+
+    /**
+     * Retrieve a document via a custom query and mapping
+     * 
+     * @param string $sql The SQL query to execute ("LIMIT 1" will be appended)
+     * @param array $params A positional array of parameters for the SQL query
+     * @param callable $mapFunc A function that expects an associative array and returns a value of the desired type
+     * @param class-string<Type> $className The type of document to be mapped
+     * @return ?Type The document matching the query, or null if none is found
+     */
+    public static function customSingle(string $sql, array $params, string $className, callable $mapFunc): mixed
+    {
+        $results = self::customList("$sql LIMIT 1", $params, $className, $mapFunc);
+        return $results ? $results[0] : null;
+    }
+
+    /**
+     * Execute a custom query that does not return a result
+     * 
+     * @param string $sql The SQL query to execute
+     * @param array $params A positional array of parameters for the SQL query
+     */
+    public static function customNonQuery(string $sql, array $params): void
+    {
+        /** @var Result|bool $result */
+        $result = pg_query_params(pg_conn(), $sql, $params);
+        if ($result) pg_free_result($result);
+    }
+}

src/app/lib/documents/DocumentIndex.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace BitBadger\PgDocuments;
+
+/** The type of index to generate for the document */
+enum DocumentIndex
+{
+    /** A GIN index with standard operations (all operators supported) */
+    case Full;
+
+    /** A GIN index with JSONPath operations (optimized for `@>`, `@?`, `@@` operators) */
+    case Optimized;
+}

src/app/lib/documents/Query.php

@@ -0,0 +1,309 @@
+<?php
+declare(strict_types=1);
+
+namespace BitBadger\PgDocuments;
+
+/** Query construction functions */
+class Query
+{
+    /**
+     * Create a `SELECT` clause to retrieve the document data from the given table
+     * 
+     * @param string $tableName The name of the table from which documents should be selected
+     * @return string A `SELECT` clause for the given table
+     */
+    public static function selectFromTable(string $tableName): string
+    {
+        return "SELECT data FROM $tableName";
+    }
+
+    /**
+     * Create a `WHERE` clause fragment to implement a key check condition
+     *
+     * @param string $paramName The name of the parameter to be replaced when the query is executed
+     * @return string A `WHERE` clause fragment with the named key and parameter
+     */
+    public static function whereById(string $paramName): string
+    {
+        return sprintf("data -> '%s' = %s", Configuration::$keyName, $paramName);
+    }
+
+    /**
+     * Create a `WHERE` clause fragment to implement a @> (JSON contains) condition
+     * 
+     * @param string $paramName The name of the parameter for the contains clause
+     * @return string A `WHERE` clause fragment with the named parameter
+     */
+    public static function whereDataContains(string $paramName): string
+    {
+        return "data @> $paramName";
+    }
+    
+    /**
+     * Create a `WHERE` clause fragment to implement a @? (JSON Path match) condition
+     * 
+     * @param string $paramName THe name of the parameter for the JSON Path match
+     * @return string A `WHERE` clause fragment with the named parameter
+     */
+    public static function whereJsonPathMatches(string $paramName): string
+    {
+        return "data @? $paramName::jsonpath";
+    }
+    
+    /**
+     * Create a JSONB document parameter
+     * 
+     * @param array|object $it The array or object to become a JSONB parameter
+     * @return string The encoded JSON
+     */
+    public static function jsonbDocParam(array|object $it): string
+    {
+        return json_encode($it);
+    }
+
+    /**
+     * Query to insert a document
+     * 
+     * @param string $tableName The name of the table into which the document will be inserted
+     * @return string The `INSERT` statement (with `$1` parameter defined for the document)
+     */
+    public static function insert(string $tableName): string
+    {
+        return sprintf('INSERT INTO %s (data) VALUES ($1)', $tableName);
+    }
+
+    /**
+     * Query to save a document, inserting it if it does not exist and updating it if it does (AKA "upsert")
+     * 
+     * @param string $tableName The name of the table into which the document will be saved
+     * @return string The `INSERT`/`ON CONFLICT DO UPDATE` statement (with `$1` parameter defined for the document)
+     */
+    public static function save(string $tableName): string
+    {
+        return sprintf('INSERT INTO %s (data) VALUES ($1) ON CONFLICT (data) DO UPDATE SET data = EXCLUDED.data',
+            $tableName);
+    }
+
+    /**
+     * Query to count documents in a table
+     *
+     * @param string $tableName The name of the table for which documents should be counted
+     * @param string $where The condition for which documents should be counted
+     * @return string A `SELECT` statement to obtain the count of documents for the given table
+     */
+    private static function countQuery(string $tableName, string $where): string
+    {
+        return "SELECT COUNT(*) AS it FROM $tableName WHERE $where";
+    }
+
+    /**
+     * Query to count all documents in a table
+     * 
+     * @param string $tableName The name of the table whose rows will be counted
+     * @return string A `SELECT` statement to obtain the count of all documents in the given table
+     */
+    public static function countAll(string $tableName): string
+    {
+        return self::countQuery($tableName, '1 = 1');
+    }
+    
+    /**
+     * Query to count matching documents using a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table from which the count should be obtained
+     * @return string A `SELECT` statement to obtain the count of documents via JSON containment
+     */
+    public static function countByContains(string $tableName): string
+    {
+        return self::countQuery($tableName, self::whereDataContains('$1'));
+    }
+    
+    /**
+     * Query to count matching documents using a JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table from which the count should be obtained
+     * @return string A `SELECT` statement to obtain the count of documents via JSON Path match
+     */
+    public static function countByJsonPath(string $tableName): string
+    {
+        return self::countQuery($tableName, self::whereJsonPathMatches('$1'));
+    }
+
+    /**
+     * Query to check document existence
+     *
+     * @param string $tableName The name of the table in which document existence should be checked
+     * @param string $where The criteria for which document existence should be checked
+     * @return string A `SELECT` statement to check document existence for the given criteria
+     */
+    private static function existsQuery(string $tableName, string $where): string
+    {
+        return "SELECT EXISTS (SELECT 1 FROM $tableName WHERE $where) AS it";
+    }
+    /**
+     * Query to determine if a document exists for the given ID
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @return string A `SELECT` statement to check existence of a document by its ID
+     */
+    public static function existsById(string $tableName): string
+    {
+        return self::existsQuery($tableName, self::whereById('$1'));
+    }
+
+    /**
+     * Query to determine if documents exist using a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @return string A `SELECT` statement to check existence of a document by JSON containment
+     */
+    public static function existsByContains(string $tableName): string
+    {
+        return self::existsQuery($tableName, self::whereDataContains('$1'));
+    }
+    
+    /**
+     * Query to determine if documents exist using a JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table in which existence should be checked
+     * @return string A `SELECT` statement to check existence of a document by JSON Path match
+     */
+    public static function existsByJsonPath(string $tableName): string
+    {
+        return self::existsQuery($tableName, self::whereJsonPathMatches('$1'));
+    }
+    
+    /**
+     * Query to retrieve a document by its ID
+     * 
+     * @param string $tableName The name of the table from which a document should be retrieved
+     * @return string A `SELECT` statement to retrieve a document by its ID
+     */
+    public static function findById(string $tableName): string
+    {
+        return sprintf('%s WHERE %s', self::selectFromTable($tableName), self::whereById('$1'));
+    }
+    
+    /**
+     * Query to retrieve documents using a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table from which a document should be retrieved
+     * @return string A `SELECT` statement to retrieve documents by JSON containment
+     */
+    public static function findByContains(string $tableName): string
+    {
+        return sprintf('%s WHERE %s', self::selectFromTable($tableName), self::whereDataContains('$1'));
+    }
+    
+    /**
+     * Query to retrieve documents using a JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table from which a document should be retrieved
+     * @return string A `SELECT` statement to retrieve a documents by JSON Path match
+     */
+    public static function findByJsonPath(string $tableName): string
+    {
+        return sprintf('%s WHERE %s', self::selectFromTable($tableName), self::whereJsonPathMatches('$1'));
+    }
+    
+    /**
+     * Query to update a document, replacing the existing document
+     * 
+     * @param string $tableName The name of the table in which a document should be updated
+     * @return string An `UPDATE` statement to update a document by its ID
+     */
+    public static function updateFull(string $tableName): string
+    {
+        return sprintf('UPDATE %s SET data = $2 WHERE %s', $tableName, self::whereById('$1'));
+    }
+
+    /**
+     * Query to apply a partial update to a document
+     *
+     * @param string $tableName The name of the table in which documents should be updated
+     * @param string $where The `WHERE` clause specifying which documents should be updated
+     * @return string An `UPDATE` statement to update a partial document ($1 is ID, $2 is document)
+     */
+    private static function updatePartial(string $tableName, string $where): string
+    {
+        return sprintf('UPDATE %s SET data = data || $2 WHERE %s', $tableName, $where);
+    }
+
+    /**
+     * Query to update a document, merging the existing document with the one provided
+     * 
+     * @param string $tableName The name of the table in which a document should be updated
+     * @return string An `UPDATE` statement to update a document by its ID
+     */
+    public static function updatePartialById(string $tableName): string
+    {
+        return self::updatePartial($tableName, self::whereById('$1'));
+    }
+    
+    /**
+     * Query to update partial documents matching a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table in which documents should be updated
+     * @return string An `UPDATE` statement to update documents by JSON containment
+     */
+    public static function updatePartialByContains(string $tableName): string
+    {
+        return self::updatePartial($tableName, self::whereDataContains('$1'));
+    }
+
+    /**
+     * Query to update partial documents matching a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table in which documents should be updated
+     * @return string An `UPDATE` statement to update  documents by JSON Path match
+     */
+    public static function updatePartialByJsonPath(string $tableName): string
+    {
+        return self::updatePartial($tableName, self::whereJsonPathMatches('$1'));
+    }
+
+    /**
+     * Query to delete documents
+     *
+     * @param string $tableName The name of the table from which documents should be deleted
+     * @param string $where The criteria by which documents should be deleted
+     * @return string A `DELETE` statement to delete documents in the specified table
+     */
+    private static function deleteQuery(string $tableName, string $where): string
+    {
+        return "DELETE FROM $tableName WHERE $where";
+    }
+
+    /**
+     * Query to delete a document by its ID
+     * 
+     * @param string $tableName The name of the table from which a document should be deleted
+     * @return string A `DELETE` statement to delete a document by its ID
+     */
+    public static function deleteById(string $tableName): string
+    {
+        return self::deleteQuery($tableName, self::whereById('$1'));
+    }
+
+    /**
+     * Query to delete documents using a JSON containment query `@>`
+     * 
+     * @param string $tableName The name of the table from which documents should be deleted
+     * @return string A `DELETE` statement to delete documents by JSON containment
+     */
+    public static function deleteByContains(string $tableName): string
+    {
+        return self::deleteQuery($tableName, self::whereDataContains('$1'));
+    }
+
+    /**
+     * Query to delete documents using a JSON Path match `@?`
+     * 
+     * @param string $tableName The name of the table from which documents should be deleted
+     * @return string A `DELETE` statement to delete documents by JSON Path match
+     */
+    public static function deleteByJsonPath(string $tableName): string
+    {
+        return self::deleteQuery($tableName, self::whereJsonPathMatches('$1'));
+    }
+}

src/app/lib/documents/functions.php

@@ -0,0 +1,16 @@
+<?php
+
+use BitBadger\PgDocuments\Configuration;
+use PgSql\Connection;
+
+if (!function_exists('pg_conn')) {
+    /**
+     * Return the active PostgreSQL connection
+     * 
+     * @return Connection The data connection from the configuration
+     */
+    function pg_conn(): Connection
+    {
+        return Configuration::getPgConn();
+    }
+}

src/app/lib/domain/AsOf.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use DateTimeImmutable;
+
+class AsOf
+{
+    /** The "as of" date/time */
+    public DateTimeImmutable $asOf;
+
+    /**
+     * Sort an as-of item from oldest to newest
+     * 
+     * @param AsOf $a The first item to compare
+     * @param AsOf $b The second item to compare
+     * @return int 0 if they are equal, -1 if A is earlier than B, or 1 if B is earlier than A
+     */
+    public static function oldestToNewest(AsOf $a, AsOf $b): int
+    {
+        return $a->asOf == $b->asOf ? 0 : ($a->asOf < $b->asOf ? -1 : 1);
+    }
+    
+    /**
+     * Sort an as-of item from newest to oldest
+     * 
+     * @param AsOf $a The first item to compare
+     * @param AsOf $b The second item to compare
+     * @return int 0 if they are equal, -1 if B is earlier than A, or 1 if A is earlier than B
+     */
+    public static function newestToOldest(AsOf $a, AsOf $b): int
+    {
+        return $a->asOf == $b->asOf ? 0 : ($a->asOf > $b->asOf ? -1 : 1);
+    }
+}

src/app/lib/domain/History.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+/**
+ * A record of action taken on a prayer request, including updates to its text
+ */
+class History extends AsOf
+{
+    /** The action taken that generated this history entry */
+    public RequestAction $status = RequestAction::Created;
+
+    /** The text of the update, if applicable */
+    public ?string $text = null;
+
+    public function __construct()
+    {
+        $this->asOf = unix_epoch();
+    }
+
+    public function isCreated(): bool
+    {
+        return $this->status == RequestAction::Created;
+    }
+
+    public function isPrayed(): bool
+    {
+        return $this->status == RequestAction::Prayed;
+    }
+
+    public function isAnswered(): bool
+    {
+        return $this->status == RequestAction::Answered;
+    }
+}

src/app/lib/domain/JournalRequest.php

@@ -0,0 +1,85 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use DateTimeImmutable, DateTimeZone;
+
+/**
+ * A prayer request, along with calculated fields, for use in displaying journal lists
+ */
+class JournalRequest extends AsOf
+{
+    /** The ID of the prayer request */
+    public string $id = '';
+
+    /** The ID of the user to whom the prayer request belongs */
+    public string $userId = '';
+
+    /** The current text of the request */
+    public string $text = '';
+
+    /** The date/time this request was last marked as prayed */
+    public ?DateTimeImmutable $lastPrayed = null;
+
+    /** The last action taken on this request */
+    public RequestAction $lastAction = RequestAction::Created;
+
+    /** When this request will be shown again after having been snoozed */
+    public ?DateTimeImmutable $snoozedUntil = null;
+
+    /** When this request will be show again after a non-immediate recurrence */
+    public ?DateTimeImmutable $showAfter = null;
+
+    /** The type of recurrence for this request */
+    public RecurrenceType $recurrenceType = RecurrenceType::Immediate;
+
+    /** The units for non-immediate recurrence */
+    public ?int $recurrence = null;
+
+    /**
+     * The history for this request
+     * @var History[] $history
+     */
+    public array $history = [];
+    
+    /**
+     * The notes for this request
+     * @var Note[] $notes
+     */
+    public array $notes = [];
+
+    /**
+     * Constructor
+     * 
+     * @param ?Request $req The request off which this journal request should be populated
+     * @param bool $full Whether to include history and notes (true) or exclude them (false)
+     */
+    public function __construct(?Request $req = null, bool $full = false)
+    {
+        if (is_null($req)) {
+            $this->asOf       = unix_epoch();
+            $this->lastPrayed = null;
+        } else {
+            $this->id             = $req->id;
+            $this->userId         = $req->userId;
+            $this->snoozedUntil   = $req->snoozedUntil;
+            $this->showAfter      = $req->showAfter;
+            $this->recurrenceType = $req->recurrenceType;
+            $this->recurrence     = $req->recurrence;
+
+            usort($req->history, AsOf::newestToOldest(...));
+            $this->asOf = $req->history[array_key_first($req->history)]->asOf;
+            $lastText = array_filter($req->history, fn (History $it) => !is_null($it->text));
+            $this->text = $lastText[array_key_first($lastText)]->text;
+            $lastPrayed = array_filter($req->history, fn (History $it) => $it->isPrayed());
+            if ($lastPrayed) $this->lastPrayed = $lastPrayed[array_key_first($lastPrayed)]->asOf;
+            
+            if ($full) {
+                usort($req->notes, AsOf::newestToOldest(...));
+                $this->history = $req->history;
+                $this->notes   = $req->notes;
+            }
+        }
+    }
+}

src/app/lib/domain/Note.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use DateTimeImmutable, DateTimeZone;
+
+/**
+ * A note entered on a prayer request
+ */
+class Note extends AsOf
+{
+    /** The note */
+    public string $notes = '';
+
+    public function __construct()
+    {
+        $this->asOf = unix_epoch();
+    }
+}

src/app/lib/domain/RecurrenceType.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use JsonSerializable;
+
+/**
+ * The unit to use when determining when to show a recurring request
+ */
+enum RecurrenceType implements JsonSerializable
+{
+    /** The request should reappear immediately */
+    case Immediate;
+
+    /** The request should reappear after the specified number of hours */
+    case Hours;
+
+    /** The request should reappear after the specified number of days */
+    case Days;
+
+    /** The request should reappear after the specified number of weeks */
+    case Weeks;
+
+    /**
+     * Serialize this enum using its name
+     */
+    public function jsonSerialize(): mixed
+    {
+        return $this->name;
+    }
+}

src/app/lib/domain/Request.php

@@ -0,0 +1,52 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use DateTimeImmutable;
+use Visus\Cuid2\Cuid2;
+
+/**
+ * A prayer request
+ */
+class Request
+{
+    /** The ID for the request */
+    public string $id;
+
+    /** The date/time the request was originally entered */
+    public DateTimeImmutable $enteredOn;
+
+    /** The ID of the user to whom this request belongs */
+    public string $userId = '';
+
+    /** The date/time the snooze expires for this request */
+    public ?DateTimeImmutable $snoozedUntil = null;
+
+    /** The date/time this request should once again show as defined by recurrence */
+    public ?DateTimeImmutable $showAfter = null;
+
+    /** The type of recurrence for this request */
+    public RecurrenceType $recurrenceType = RecurrenceType::Immediate;
+
+    /** The units which apply to recurrences other than Immediate */
+    public ?int $recurrence = null;
+
+    /**
+     * The history for this request
+     * @var History[] $history
+     */
+    public array $history = [];
+
+    /**
+     * The notes for this request
+     * @var Note[] $notes
+     */
+    public array $notes = [];
+
+    public function __construct()
+    {
+        $this->id = (new Cuid2())->toString();
+        $this->enteredOn = unix_epoch();
+    }
+}

src/app/lib/domain/RequestAction.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace MyPrayerJournal\Domain;
+
+use JsonSerializable;
+
+/**
+ * An action that was taken on a request
+ */
+enum RequestAction: string implements JsonSerializable
+{
+    /** The request was entered */
+    case Created = 'Created';
+
+    /** Prayer was recorded for the request */
+    case Prayed = 'Prayed';
+
+    /** The request was updated */
+    case Updated = 'Updated';
+
+    /** The request was marked as answered */
+    case Answered = 'Answered';
+
+    /**
+     * Serialize this enum using its name
+     */
+    public function jsonSerialize(): mixed
+    {
+        return $this->name;
+    }
+}

src/app/lib/start.php

@@ -0,0 +1,108 @@
+<?php
+declare(strict_types=1);
+
+require __DIR__ . '/../vendor/autoload.php';
+
+error_reporting(E_ALL);
+ini_set('display_errors', 'On');
+
+use Auth0\SDK\Auth0;
+use BitBadger\PgDocuments\Configuration;
+use DateTimeZone;
+use Dotenv\Dotenv;
+use MyPrayerJournal\Constants;
+
+Dotenv::createImmutable(__DIR__)->load();
+
+/** @var Auth0 The Auth0 instance to use for the request */
+$auth0 = new Auth0([
+    'domain'       => $_ENV[Constants::AUTH0_DOMAIN],
+    'clientId'     => $_ENV[Constants::AUTH0_CLIENT_ID],
+    'clientSecret' => $_ENV[Constants::AUTH0_CLIENT_SECRET],
+    'cookieSecret' => $_ENV[Constants::AUTH0_COOKIE_SECRET]
+]);
+
+/** @var ?object The Auth0 session for the current user */
+$session = $auth0->getCredentials();
+if (!is_null($session)) $_REQUEST[Constants::USER_ID] = $session->user[Constants::CLAIM_SUB];
+
+$_REQUEST[Constants::IS_HTMX] = array_key_exists(Constants::HEADER_HX_REQUEST, $_SERVER)
+    && (!array_key_exists(Constants::HEADER_HX_HIST_REQ, $_SERVER));
+
+$_REQUEST[Constants::TIME_ZONE] = new DateTimeZone(
+    array_key_exists(Constants::HEADER_USER_TZ, $_SERVER) ? $_SERVER[Constants::HEADER_USER_TZ] : 'Etc/UTC');
+
+$_REQUEST[Constants::VERSION] = 4;
+
+Configuration::$startUp = '\MyPrayerJournal\Data::startUp';
+
+/**
+ * Bring in a template
+ */
+function template(string $name): void
+{
+    require_once __DIR__ . "/../templates/$name.php";
+}
+
+/**
+ * If a user is not found, either redirect them or fail the request
+ * 
+ * @param bool $fail Whether to fail the request (true) or redirect to log on (false - optional, default)
+ */
+function require_user(bool $fail = false): void
+{
+    if (!array_key_exists(Constants::USER_ID, $_REQUEST)) {
+        if ($fail) {
+            http_response_code(403);
+        } else {
+            header(sprintf('Location: /user/log-on?%s=%s', Constants::RETURN_URL, $_SERVER[Constants::REQUEST_URI]));
+        }
+        exit;
+    }
+}
+
+/**
+ * Write a bare header for a component result
+ */
+function bare_header(): void
+{
+    echo '<!DOCTYPE html><html lang="en"><head><meta charset="utf8"><title></title></head><body>';
+}
+
+/**
+ * Create a traditional and htmx link, and apply an active class if the link is active
+ * 
+ * @param string $url The URL of the page to be linked
+ * @param array $classNames CSS class names to be applied to the link (optional, default none)
+ * @param bool $checkActive Whether to apply an active class if the route matches (optional, default false)
+ */
+function page_link(string $url, array $classNames = [], bool $checkActive = false): void
+{
+    echo 'href="'. $url . '" hx-get="' . $url . '"';
+    if ($checkActive && str_starts_with($_SERVER[Constants::REQUEST_URI], $url)) {
+        $classNames[] = 'is-active-route';
+    }
+    if (!empty($classNames)) {
+        echo sprintf(' class="%s"', implode(' ', $classNames));
+    }
+    echo ' hx-target="#top" hx-swap="innerHTML" hx-push-url="true"';
+}
+
+/**
+ * Close any open database connection; close the `body` and `html` tags
+ */
+function end_request(): void
+{
+    Configuration::closeConn();
+    echo '</body></html>';
+}
+
+/**
+ * Create a new instance of the Unix epoch
+ *
+ * @return DateTimeImmutable An immutable date/time as of the Unix epoch
+ */
+function unix_epoch(): DateTimeImmutable
+{
+    return new DateTimeImmutable('1/1/1970', new DateTimeZone('Etc/UTC'));
+}

src/app/public/components/journal-items.php

@@ -0,0 +1,90 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\{ Constants, Data, Dates };
+use MyPrayerJournal\Domain\JournalRequest;
+
+require_user(true);
+
+$requests = Data::getJournal($_REQUEST[Constants::USER_ID]);
+
+bare_header();
+if ($requests) { ?>
+    <section id="journalItems" class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3" hx-target="this"
+             hx-swap="outerHTML" aria-label="Prayer Requests">
+        <p class="mb-3 has-text-centered">
+            <a <?php page_link('/request/edit?new'); ?> class="button is-light">
+                <span class="material-icons">add_box</span> Add a Prayer Request
+            </a>
+        </p><?php
+        array_walk($requests, journal_card(...)); ?>
+    </section><?php
+} else {
+    $_REQUEST['EMPTY_HEADING'] = 'No Active Requests';
+    $_REQUEST['EMPTY_LINK']    = '/request/edit?new';
+    $_REQUEST['EMPTY_BTN_TXT'] = 'Add a Request';
+    $_REQUEST['EMPTY_TEXT']    = 'You have no requests to be shown; see the &ldquo;Active&rdquo; link above for '
+        . 'snoozed or deferred requests, and the &ldquo;Answered&rdquo; link for answered requests';
+    template('no_content');
+}
+end_request();
+
+/**
+ * Format the activity and relative time
+ * 
+ * @param string $activity The activity performed (activity or prayed)
+ * @param DateTimeImmutable $asOf The date/time the activity was performed
+ */
+function format_activity(string $activity, DateTimeImmutable $asOf): void
+{
+    echo sprintf('last %s <span title="%s">%s</span>', $activity,
+        $asOf->setTimezone($_REQUEST[Constants::TIME_ZONE])->format('l, F jS, Y/g:ia T'),
+        Dates::formatDistance(Dates::now(), $asOf));
+} 
+
+/**
+ * Create a card for a prayer request
+ * 
+ * @param JournalRequest $req The request for which a card should be generated
+ */
+function journal_card(JournalRequest $req): void
+{
+    $spacer = '<span>&nbsp;</span>'; ?>
+    <div class="col">
+        <div class="card h-100">
+            <div class="card-header p-0 d-flex" role="toolbar">
+                <a <?php page_link("/request/edit?{$req->id}"); ?> class="button btn-secondary" title="Edit Request">
+                    <span class="material-icons">edit</span>
+                </a><?php echo $spacer; ?>
+                <button type="button" class="btn btn-secondary" title="Add Notes" data-bs-toggle="modal"
+                        data-bs-target="#notesModal" hx-get="/components/request/<?php echo $req->id; ?>/add-notes"
+                        hx-target="#notesBody" hx-swap="innerHTML">
+                    <span class="material-icons">comment</span>
+                </button><?php echo $spacer; ?>
+                <button type="button" class="btn btn-secondary" title="Snooze Request" data-bs-toggle="modal"
+                        data-bs-target="#snoozeModal" hx-get="/components/request/<?php echo $req->id; ?>/snooze"
+                        hx-target="#snoozeBody" hx-swap="innerHTML">
+                    <span class="material-icons">schedule</span>
+                </button>
+                <div class="flex-grow-1"></div>
+                <a href="/request/prayed?<?php echo $req->id; ?>" class="button btn-success w-25"
+                   hx-patch="/request/prayed?<?php echo $req->id; ?>" title="Mark as Prayed">
+                    <span class="material-icons">done</span>
+                </a>
+            </div>
+            <div class="card-body">
+                <p class="request-text"><?php echo htmlentities($req->text); ?></p>
+            </div>
+            <div class="card-footer text-end text-muted px-1 py-0">
+                <em><?php
+                    [ $activity, $asOf ] = is_null($req->lastPrayed)
+                        ? [ 'activity', $req->asOf ]
+                        : [ 'prayed',   $req->lastPrayed ];
+                    format_activity($activity, $asOf); ?>
+                </em>
+            </div>
+        </div>
+    </div><?php
+}

src/app/public/index.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+require_once '../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+$_REQUEST[Constants::PAGE_TITLE] = 'Welcome';
+
+template('layout/page_header'); ?>
+<main class="container">
+    <p class="block">&nbsp;</p>
+    <p class="block">
+        myPrayerJournal is a place where individuals can record their prayer requests, record that they prayed for them,
+        update them as God moves in the situation, and record a final answer received on that request. It also allows
+        individuals to review their answered prayers.
+    </p>
+    <p class="block">
+        This site is open and available to the general public. To get started, simply click the &ldquo;Log On&rdquo;
+        link above, and log on with either a Microsoft or Google account. You can also learn more about the site at the
+        &ldquo;Docs&rdquo; link, also above.
+    </p>
+</main><?php
+template('layout/page_footer');
+end_request();

src/app/public/journal.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+require_once '../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+require_user();
+
+$_REQUEST[Constants::PAGE_TITLE] = "{$session->user[Constants::CLAIM_GIVEN_NAME]}&rsquo;s Prayer Journal";
+
+template('layout/page_header'); ?>
+<main class="container">
+    <h2 class="title"><?php echo $_REQUEST[Constants::PAGE_TITLE]; ?></h2>
+    <p hx-get="/components/journal-items" hx-swap="outerHTML" hx-trigger="load delay:.25s">
+        Loading your prayer journal&hellip;
+    </p>
+</main><?php
+template('layout/page_footer');
+end_request();

src/app/public/legal/privacy-policy.php

@@ -0,0 +1,98 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+$_REQUEST[Constants::PAGE_TITLE] = 'Privacy Policy';
+
+template('layout/page_header'); ?>
+<main class="container">
+    <h2 class="title">Privacy Policy</h2>
+    <h6 class="subtitle">as of May 21<sup>st</sup>, 2018</h6>
+    <p class="mb-3">
+        The nature of the service is one where privacy is a must. The items below will help you understand the data we
+        collect, access, and store on your behalf as you use this service.
+    </p>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">Third Party Services</h3>
+        </div>
+        <p class="card-content">
+            myPrayerJournal utilizes a third-party authentication and identity provider. You should familiarize yourself
+            with the privacy policy for
+            <a href="https://auth0.com/privacy" target="_blank" rel="noopener">Auth0</a>, as well as your chosen
+            provider
+            (<a href="https://privacy.microsoft.com/en-us/privacystatement" target="_blank"
+                rel="noopener">Microsoft</a> or
+            <a href="https://policies.google.com/privacy" target="_blank" rel="noopener">Google</a>).
+        </p>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">What We Collect</h3>
+        </div>
+        <div class="card-content">
+            <h4 class="subtitle mb-3">Identifying Data</h4>
+            <ul class="mb-3 mx-5">
+                <li>
+                    &bull; The only identifying data myPrayerJournal stores is the subscriber (&ldquo;sub&rdquo;) field
+                    from the token we receive from Auth0, once you have signed in through their hosted service. All
+                    information is associated with you via this field.
+                </li>
+                <li>
+                    &bull; While you are signed in, within your browser, the service has access to your first and last
+                    names, along with a URL to the profile picture (provided by your selected identity provider). This
+                    information is not transmitted to the server, and is removed when &ldquo;Log Off&rdquo; is clicked.
+                </li>
+            </ul>
+            <h4 class="subtitle mb-3">User Provided Data</h4>
+            <ul class="mx-5">
+                <li>
+                    &bull; myPrayerJournal stores the information you provide, including the text of prayer requests,
+                    updates, and notes; and the date/time when certain actions are taken.
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">How Your Data Is Accessed / Secured</h3>
+        </div>
+        <ul class="card-content">
+            <li>
+                &bull; Your provided data is returned to you, as required, to display your journal or your answered
+                requests. On the server, it is stored in a controlled-access database.
+            </li>
+            <li>
+                &bull; Your data is backed up, along with other Bit Badger Solutions hosted systems, in a rolling
+                manner; backups are preserved for the prior 7 days, and backups from the 1<sup>st</sup> and
+                15<sup>th</sup> are preserved for 3 months. These backups are stored in a private cloud data repository.
+            </li>
+            <li>
+                &bull; The data collected and stored is the absolute minimum necessary for the functionality of the
+                service. There are no plans to &ldquo;monetize&rdquo; this service, and storing the minimum amount of
+                information means that the data we have is not interesting to purchasers (or those who may have more
+                nefarious purposes).
+            </li>
+            <li>
+                &bull; Access to servers and backups is strictly controlled and monitored for unauthorized access
+                attempts.
+            </li>
+        </ul>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">Removing Your Data</h3>
+        </div>
+        <p class="card-content">
+            At any time, you may choose to discontinue using this service. Both Microsoft and Google provide ways to
+            revoke access from this application. However, if you want your data removed from the database, please
+            contact daniel at bitbadger.solutions (via e-mail, replacing at with @) prior to doing so, to ensure we can
+            determine which subscriber ID belongs to you.
+        </p>
+    </div>
+</main><?php
+template('layout/page_footer');
+end_request();

src/app/public/legal/terms-of-service.php

@@ -0,0 +1,73 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+$_REQUEST[Constants::PAGE_TITLE] = 'Terms of Service';
+
+template('layout/page_header'); ?>
+<main class="container">
+    <h2 class="title">Terms of Service</h2>
+    <h6 class="subtitle">as of May 21<sup>st</sup>, 2018</h6>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">1. Acceptance of Terms</h3>
+        </div>
+        <p class="card-content">
+            By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you are
+            responsible to ensure that your use of this site complies with all applicable laws. Your continued use of
+            this site implies your acceptance of these terms.
+        </p>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">2. Description of Service and Registration</h3>
+        </div>
+        <p class="card-content">
+            myPrayerJournal is a service that allows individuals to enter and amend their prayer requests. It requires
+            no registration by itself, but access is granted based on a successful login with an external identity
+            provider. See <a <?php page_link('/legal/privacy-policy'); ?>>our privacy policy</a> for details on how that
+            information is accessed and stored.
+        </p>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">3. Third Party Services</h3>
+        </div>
+        <p class="card-content">
+            This service utilizes a third-party service provider for identity management. Review the terms of service
+            for <a href="https://auth0.com/terms" target="_blank" rel="noopener">Auth0</a>, as well as those for the
+            selected authorization provider
+            (<a href="https://www.microsoft.com/en-us/servicesagreement" target="_blank"
+                rel="noopener">Microsoft</a> or
+            <a href="https://policies.google.com/terms" target="_blank" rel="noopener">Google</a>).
+        </p>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">4. Liability</h3>
+        </div>
+        <p class="card-content">
+            This service is provided &ldquo;as is&rdquo;, and no warranty (express or implied) exists. The service and
+            its developers may not be held liable for any damages that may arise through the use of this service.
+        </p>
+    </div>
+    <div class="card mb-3">
+        <div class="card-header has-background-light">
+            <h3 class="card-header-title">5. Updates to Terms</h3>
+        </div>
+        <p class="card-content">
+            These terms and conditions may be updated at any time, and this service does not have the capability to
+            notify users when these change. The date at the top of the page will be updated when any of the text of
+            these terms is updated.
+        </p>
+    </div>
+    <p>
+        You may also wish to review our <a <?php page_link('/legal/privacy-policy'); ?>>privacy policy</a> to learn how
+        we handle your data.
+    </p>
+</main><?php
+template('layout/page_footer');
+end_request();

src/app/public/script/mpj.js

@@ -0,0 +1,104 @@
+"use strict"
+
+/** myPrayerJournal script */
+this.mpj = {
+  /**
+   * Show a message via toast
+   * @param {string} message The message to show
+   */
+  showToast (message) {
+    const [level, msg] = message.split("|||")
+    
+    let header
+    if (level !== "success") {
+      const heading = typ => `<span class="me-auto"><strong>${typ.toUpperCase()}</strong></span>`
+      
+      header = document.createElement("div")
+      header.className = "toast-header"
+      header.innerHTML = heading(level === "warning" ? level : "error")
+      
+      const close = document.createElement("button")
+      close.type = "button"
+      close.className = "btn-close"
+      close.setAttribute("data-bs-dismiss", "toast")
+      close.setAttribute("aria-label", "Close")
+      header.appendChild(close)
+    }
+
+    const body = document.createElement("div")
+    body.className = "toast-body"
+    body.innerText = msg
+    
+    const toastEl = document.createElement("div")
+    toastEl.className = `toast bg-${level === "error" ? "danger" : level} text-white`
+    toastEl.setAttribute("role", "alert")
+    toastEl.setAttribute("aria-live", "assertlive")
+    toastEl.setAttribute("aria-atomic", "true")
+    toastEl.addEventListener("hidden.bs.toast", e => e.target.remove())
+    if (header) toastEl.appendChild(header)
+    
+    toastEl.appendChild(body)
+    document.getElementById("toasts").appendChild(toastEl)
+    new bootstrap.Toast(toastEl, { autohide: level === "success" }).show()
+  },
+  /**
+   * Load local version of Bootstrap CSS if the CDN load failed
+   */
+  ensureCss () {
+    let loaded = false
+    for (let i = 0; !loaded && i < document.styleSheets.length; i++) {
+      loaded = document.styleSheets[i].href.endsWith("bootstrap.min.css")
+    }
+    if (!loaded) {
+      const css = document.createElement("link")
+      css.rel = "stylesheet"
+      css.href = "/style/bootstrap.min.css"
+      document.getElementsByTagName("head")[0].appendChild(css)
+    }
+  },
+  /** Script for the request edit component */
+  edit: {
+    /**
+     * Toggle the recurrence input fields
+     * @param {Event} e The click event
+     */
+    toggleRecurrence ({ target }) {
+      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 (_) { }
+  }
+}
+
+htmx.on("htmx:afterOnLoad", function (evt) {
+  const hdrs = evt.detail.xhr.getAllResponseHeaders()
+  // Show a message if there was one in the response
+  if (hdrs.indexOf("x-toast") >= 0) {
+    mpj.showToast(evt.detail.xhr.getResponseHeader("x-toast"))
+  }
+  // Hide a modal window if requested
+  if (hdrs.indexOf("x-hide-modal") >= 0) {
+    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()

src/app/public/style/style.css

@@ -0,0 +1,60 @@
+
+nav.navbar.is-dark {
+  background-color: green;
+  
+  & .m {
+    font-weight: 100;
+  }
+  & .p {
+    font-weight: 400;
+  }
+  & .j {
+    font-weight: 700;
+  }
+}
+.nav-item {
+  & a:link,
+  & a:visited {
+    padding: .5rem 1rem;
+    margin: 0 .5rem;
+    border-radius: .5rem;
+    color: white;
+    text-decoration: none;
+  }
+  & a:hover {
+    cursor: pointer;
+    background-color: rgba(255, 255, 255, .2);
+  }
+  & a.is-active-route {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top: solid 4px rgba(255, 255, 255, .3);
+  }
+}
+form {
+  max-width: 60rem;
+  margin: auto;
+}
+.action-cell .material-icons {
+  font-size: 1.1rem ;
+}
+.material-icons {
+  vertical-align: bottom;
+}
+#toastHost {
+  position: sticky;
+  bottom: 0;
+}
+.request-text {
+  white-space: pre-line
+}
+  
+footer {
+  border-top: solid 1px lightgray;
+  margin: 1rem -1rem 0;
+  padding: 0 1rem;
+  
+  & p {
+    margin: 0;
+  }
+}

src/app/public/user/log-off.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+header("Location: {$auth0->logout($_ENV[Constants::BASE_URL])}");
+exit;

src/app/public/user/log-on.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+$auth0->clear();
+
+// Check for return URL; if present, store it in a cookie we'll retrieve when we're logged in
+$nonce = '';
+if (array_key_exists(Constants::RETURN_URL, $_GET)) {
+    $nonce = urlencode(base64_encode(openssl_random_pseudo_bytes(8)));
+    setcookie(Constants::COOKIE_REDIRECT, "$nonce|{$_GET[Constants::RETURN_URL]}", [
+        'expires'  => -1,
+        'secure'   => true,
+        'httponly' => true,
+        'samesite' => 'Strict'
+    ]);
+}
+$params = $nonce ? [ Constants::LOG_ON_STATE => $nonce ] : [];
+
+header('Location: ' . $auth0->login("{$_ENV[Constants::BASE_URL]}/user/logged-on", $params));
+exit;

src/app/public/user/logged-on.php

@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+require_once '../../lib/start.php';
+
+use MyPrayerJournal\Constants;
+
+$auth0->exchange("{$_ENV[Constants::BASE_URL]}/user/logged-on");
+
+$nextUrl = '/journal';
+if (array_key_exists(Constants::LOG_ON_STATE, $_GET)) {
+    $nonce = base64_decode(urldecode($_GET[Constants::LOG_ON_STATE]));
+    [$verify, $newNext] = explode('|', $_COOKIE[Constants::COOKIE_REDIRECT]);
+    if ($verify == $nonce && $newNext && str_starts_with($newNext, '/') && !str_starts_with($newNext, '//')) {
+        $nextUrl = $newNext;
+    }
+}
+
+setcookie(Constants::COOKIE_REDIRECT, '', [
+    'expires'  => -1,
+    'secure'   => true,
+    'httponly' => true,
+    'samesite' => 'Strict'
+]);
+header("Location: $nextUrl");
+exit;

src/app/templates/layout/page_footer.php

@@ -0,0 +1,21 @@
+<?php
+use MyPrayerJournal\Constants; ?>
+    </section><?php
+if (!$_REQUEST[Constants::IS_HTMX]) { ?>
+    <footer class="container-fluid mx-1">
+        <p class="text-muted has-text-right">
+            myPrayerJournal <?php echo $_REQUEST[Constants::VERSION]; ?><br>
+            <em><small>
+                <a <?php page_link('/legal/privacy-policy'); ?>>Privacy Policy</a> &bull;
+                <a <?php page_link('/legal/terms-of-service'); ?>>Terms of Service</a> &bull;
+                <a href="https://github.com/bit-badger/myprayerjournal" target="_blank" rel="noopener">Developed</a>
+                and hosted by
+                <a href="https://bitbadger.solutions" target="_blank" rel="noopener">Bit Badger Solutions</a>
+            </small></em>
+        </p>
+    </footer>
+    <script src="https://unpkg.com/htmx.org@1.9.4"
+            integrity="sha384-zUfuhFKKZCbHTY6aRR46gxiqszMk5tcHjsVFxnUo8VMus4kHGVdIYVbOYYNlKmHV"
+            crossorigin="anonymous"></script>
+    <script src="/script/mpj.js"></script><?php
+}

src/app/templates/layout/page_header.php

@@ -0,0 +1,50 @@
+<?php
+use BitBadger\PgDocuments\Document;
+use MyPrayerJournal\{ Constants, Data };
+
+$isLoggedOn = array_key_exists('MPJ_USER_ID', $_REQUEST);
+$hasSnoozed = false;
+if ($isLoggedOn) {
+    $hasSnoozed = Document::countByJsonPath(Data::REQ_TABLE, '$.snoozedUntil ? (@ == "0")') > 0;
+}
+
+$theTitle = array_key_exists(Constants::PAGE_TITLE, $_REQUEST) ? "{$_REQUEST[Constants::PAGE_TITLE]} &#xab; " : ''; ?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf8">
+    <title><?php echo $theTitle; ?>myPrayerJournal</title><?php
+    if (!$_REQUEST[Constants::IS_HTMX]) { ?>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.4/css/bulma.min.css"
+              integrity="sha512-HqxHUkJM0SYcbvxUw5P60SzdOTy/QVwA1JJrvaXJv4q7lmbDZCmZaqz01UPOaQveoxfYRv1tHozWGPMcuTBuvQ=="
+              crossorigin="anonymous" referrerpolicy="no-referrer">
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <link href="/style/style.css" rel="stylesheet"><?php
+    } ?>
+</head>
+<body>
+    <section id="top" aria-label="top navigation">
+    <nav class="navbar is-dark has-shadow" role="navigation" aria-label="main navigation">
+        <div class="navbar-brand">
+            <a <?php page_link('/'); ?> class="navbar-item">
+                <span class="m">my</span><span class="p">Prayer</span><span class="j">Journal</span>
+            </a>
+        </div>
+        <div class="navbar-menu">
+            <div class="navbar-start"><?php
+                if ($isLoggedOn) { ?>
+                    <a <?php page_link('/journal', ['navbar-item'], true); ?>>Journal</a>
+                    <a <?php page_link('/requests/active', ['navbar-item'], true); ?>>Active</a><?php
+                    if ($hasSnoozed) { ?>
+                        <a <?php page_link('/requests/snoozed', ['navbar-item'], true); ?>>Snoozed</a><?php
+                    } ?>
+                    <a <?php page_link('/requests/answered', ['navbar-item'], true); ?>>Answered</a>
+                    <a href="/user/log-off" class="navbar-item">Log Off</a><?php
+                } else { ?>
+                    <a href="/user/log-on" class="navbar-item">Log On</a><?php
+                } ?>
+                <a href="https://docs.prayerjournal.me" class="navbar-item" target="_blank" rel="noopener">Docs</a>
+            </div>
+        </div>
+    </nav>

src/app/templates/no_content.php

@@ -0,0 +1,10 @@
+<div class="card mb-3">
+    <div class="card-header has-background-light">
+        <h5 class="card-header-title"><?php echo $_REQUEST['EMPTY_HEADING']; ?></h5>
+    </div>
+    <div class="card-content has-text-centered">
+        <p class="mb-5"><?php echo $_REQUEST['EMPTY_TEXT']; ?></p>
+        <a <?php page_link($_REQUEST['EMPTY_LINK']); ?>
+           class="button is-link"><?php echo $_REQUEST['EMPTY_BTN_TXT']; ?></a>
+    </div>
+</div>