Add cancel snooze

- Add common request validation function

.gitignore

@@ -254,3 +254,9 @@ paket-files/
 
 # Ionide VSCode extension
 .ionide
+
+src/environment.txt
+
+# PHP ignore files
+src/vendor
+src/.env

README.md

@@ -8,9 +8,4 @@ myPrayerJournal was borne of out of a personal desire [Daniel](https://github.co
 
 ## 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)
+The documentation for the site is at <https://prayerjournal.me/docs>.

src/Caddyfile

@@ -0,0 +1,9 @@
+{
+	frankenphp
+	order php_server before file_server
+}
+http://localhost:3000 {
+	root * ./public
+	try_files {path} {path}.php
+	php_server
+}

src/Dockerfile

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

src/MyPrayerJournal.ConvertRecurrence/MyPrayerJournal.ConvertRecurrence.fsproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MyPrayerJournal\MyPrayerJournal.fsproj" />
-  </ItemGroup>
-
-</Project>

src/MyPrayerJournal.ConvertRecurrence/Program.fs

@@ -1,114 +0,0 @@
-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.sln

@@ -1,12 +1,10 @@
-
+
 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

src/MyPrayerJournal/.gitignore

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

src/MyPrayerJournal/Data.fs

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

src/MyPrayerJournal/Domain.fs

@@ -1,4 +1,4 @@
-/// The data model for myPrayerJournal
+/// The data model for myPrayerJournal
 [<AutoOpen>]
 module MyPrayerJournal.Domain
 
@@ -169,10 +169,10 @@ type Request =
         Recurrence : Recurrence
         
         /// The history entries for this request
-        History : History[]
+        History : History list
         
         /// The notes for this request
-        Notes : Note[]
+        Notes : Note list
     }
 
 /// Functions to support requests
@@ -186,8 +186,8 @@ module Request =
             SnoozedUntil = None
             ShowAfter    = None
             Recurrence   = Immediate
-            History      = [||]
-            Notes        = [||]
+            History      = []
+            Notes        = []
         }
 
 
@@ -234,7 +234,8 @@ 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
+        let history = Seq.ofList req.History
+        let lastHistory = Seq.tryHead history
         // 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:
@@ -243,23 +244,21 @@ module JournalRequest =
         //    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 lastActivity = lastHistory |> Option.map (_.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)
+            history
+            |> Seq.filter History.isPrayed
+            |> Seq.tryHead
+            |> Option.map (_.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
+            Text         = history
+                           |> Seq.filter (fun it -> Option.isSome it.Text)
+                           |> Seq.tryHead
                            |> Option.map (fun h -> Option.get h.Text)
                            |> Option.defaultValue ""
             AsOf         = if asOf > Instant.MinValue then asOf else lastActivity
@@ -275,6 +274,6 @@ module JournalRequest =
     /// Same as `ofRequestLite`, but with notes and history
     let ofRequestFull req =
         { ofRequestLite req with 
-            History = List.ofArray req.History
-            Notes   = List.ofArray req.Notes
+            History = req.History
+            Notes   = req.Notes
         }

src/MyPrayerJournal/Handlers.fs

@@ -1,4 +1,4 @@
-/// HTTP handlers for the myPrayerJournal API
+/// HTTP handlers for the myPrayerJournal API
 [<RequireQualifiedAccess>]
 module MyPrayerJournal.Handlers
 
@@ -16,7 +16,7 @@ module private LogOnHelpers =
     let logOn url : HttpHandler = fun next ctx -> task {
         match url with
         | Some it ->
-            do! ctx.ChallengeAsync ("Auth0", AuthenticationProperties (RedirectUri = it))
+            do! ctx.ChallengeAsync("Auth0", AuthenticationProperties(RedirectUri = it))
             return! next ctx
         | None -> return! challenge "Auth0" next ctx
     }
@@ -45,30 +45,26 @@ module Error =
 
 
 open System.Security.Claims
-open LiteDB
 open Microsoft.AspNetCore.Http
 open NodaTime
 
 /// Extensions on the HTTP context
 type HttpContext with
     
-    /// The LiteDB database
-    member this.Db = this.GetService<LiteDatabase> ()
-    
     /// 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)
+        |> Option.map (_.Value)
     
     /// 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
     
     /// The system clock
-    member this.Clock = this.GetService<IClock> ()
+    member this.Clock = this.GetService<IClock>()
     
     /// Get the current instant from the system clock
     member this.Now = this.Clock.GetCurrentInstant
@@ -83,6 +79,8 @@ type HttpContext with
         | None -> DateTimeZone.Utc
 
 
+open MyPrayerJournal.Data
+
 /// Handler helpers
 [<AutoOpen>]
 module private Helpers =
@@ -96,7 +94,7 @@ module private Helpers =
     
     /// Debug logger
     let debug (ctx : HttpContext) message =
-        let fac = ctx.GetService<ILoggerFactory> ()
+        let fac = ctx.GetService<ILoggerFactory>()
         let log = fac.CreateLogger "Debug"
         log.LogInformation message
 
@@ -117,7 +115,7 @@ module private Helpers =
     let renderComponent nodes : HttpHandler =
         noResponseCaching
         >=> fun _ ctx -> backgroundTask {
-            return! ctx.WriteHtmlStringAsync (ViewEngine.RenderView.AsString.htmlNodes nodes)
+            return! ctx.WriteHtmlStringAsync(ViewEngine.RenderView.AsString.htmlNodes nodes)
         }
 
     open Views.Layout
@@ -127,7 +125,7 @@ module private Helpers =
     let pageContext (ctx : HttpContext) pageTitle content = backgroundTask {
         let! hasSnoozed =
             match ctx.CurrentUser with
-            | Some _ -> Data.hasSnoozed ctx.UserId (ctx.Now ()) ctx.Db
+            | Some _ -> Journal.hasSnoozed ctx.UserId (ctx.Now())
             | None   -> Task.FromResult false
         return
             {   IsAuthenticated = Option.isSome ctx.CurrentUser
@@ -155,17 +153,17 @@ module private Helpers =
 
         /// Push a new message into the list
         let push (ctx : HttpContext) message url = lock upd8 (fun () ->
-          messages <- messages.Add (ctx.UserId, (message, url)))
+            messages <- messages.Add(ctx.UserId, (message, url)))
 
         /// Add a success message header to the response
         let pushSuccess ctx message url =
-          push ctx $"success|||%s{message}" url
+            push ctx $"success|||%s{message}" url
         
         /// Pop the messages for the given user
         let pop userId = lock upd8 (fun () ->
-          let msg = messages.TryFind userId
-          msg |> Option.iter (fun _ -> messages <- messages.Remove userId)
-          msg)
+            let msg = messages.TryFind userId
+            msg |> Option.iter (fun _ -> messages <- messages.Remove userId)
+            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 -> task {
@@ -238,7 +236,6 @@ module Models =
         }
 
 
-open MyPrayerJournal.Data.Extensions
 open NodaTime.Text
 
 /// Handlers for less-than-full-page HTML requests
@@ -254,15 +251,15 @@ module Components =
             | Some snooze, _ when snooze < now -> true
             | _, Some hide when hide < now -> true
             | _, _ -> false
-        let! journal = Data.journalByUserId ctx.UserId ctx.Db
+        let! journal = Journal.forUser ctx.UserId
         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 = 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
+        match! Journal.tryById (RequestId.ofString reqId) ctx.UserId with
+        | Some req -> return! renderComponent [ Views.Request.reqListItem (ctx.Now()) ctx.TimeZone req ] next ctx
         | None     -> return! Error.notFound next ctx
     }
 
@@ -272,8 +269,8 @@ module Components =
 
     // GET /components/request/[req-id]/notes
     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
+        let! notes = Note.byRequestId (RequestId.ofString requestId) ctx.UserId
+        return! renderComponent (Views.Request.notes (ctx.Now()) ctx.TimeZone notes) next ctx
     }
   
     // GET /components/request/[req-id]/snooze
@@ -281,13 +278,16 @@ module Components =
         requireUser >=> renderComponent [ RequestId.ofString requestId |> Views.Journal.snooze ]
 
 
-/// / URL    
+/// / URL and documentation
 module Home =
   
     // GET /
     let home : HttpHandler =
         partialStatic "Welcome!" Views.Layout.home
   
+    // GET /docs
+    let docs : HttpHandler =
+        partialStatic "Documentation" Views.Docs.index
 
 /// /journal URL
 module Journal =
@@ -297,9 +297,9 @@ module Journal =
         let usr =
             ctx.User.Claims
             |> Seq.tryFind (fun c -> c.Type = ClaimTypes.GivenName)
-            |> Option.map (fun c -> c.Value)
+            |> Option.map (_.Value)
             |> Option.defaultValue "Your"
-        let title = usr |> match usr with "Your" -> sprintf "%s" | _ -> sprintf "%s's"
+        let title = usr |> match usr with "Your" -> sprintf "%s" | _ -> sprintf "%s&rsquo;s"
         return! partial $"{title} Prayer Journal" (Views.Journal.journal usr) next ctx
     }
 
@@ -333,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) ctx.UserId ctx.Db with
+            match! Journal.tryById (RequestId.ofString requestId) ctx.UserId with
             | Some req ->
                 debug ctx "Found - sending view"
                 return! partial "Edit Prayer Request" (Views.Request.edit req returnTo false) next ctx
@@ -344,47 +344,43 @@ module Request =
 
     // PATCH /request/[req-id]/prayed
     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 userId db with
+        match! Journal.tryById reqId userId with
         | Some req ->
             let now  = ctx.Now ()
-            do! Data.addHistory reqId userId { AsOf = now; Status = Prayed; Text = None } db
+            do! History.add reqId userId { AsOf = now; Status = Prayed; Text = None }
             let nextShow =
                 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 ()
+            do! Request.updateShowAfter reqId userId nextShow
             return! (withSuccessMessage "Request marked as prayed" >=> Components.journalItems) next ctx
         | None -> return! Error.notFound next ctx
     }
   
-    /// POST /request/[req-id]/note
+    // POST /request/[req-id]/note
     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 userId db with
-        | Some _ ->
-            let! notes = ctx.BindFormAsync<Models.NoteEntry> ()
-            do! Data.addNote reqId userId { AsOf = ctx.Now (); Notes = notes.notes } db
-            do! db.SaveChanges ()
+        match! Request.existsById reqId userId with
+        | true ->
+            let! notes = ctx.BindFormAsync<Models.NoteEntry>()
+            do! Note.add reqId userId { AsOf = ctx.Now(); Notes = notes.notes }
             return! (withSuccessMessage "Added Notes" >=> hideModal "notes" >=> created) next ctx
-        | None -> return! Error.notFound next ctx
+        | false -> return! Error.notFound next ctx
     }
           
     // GET /requests/active
     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
+        let! reqs = Journal.forUser ctx.UserId
+        return! partial "Active Requests" (Views.Request.active (ctx.Now()) ctx.TimeZone reqs) next ctx
     }
   
     // GET /requests/snoozed
     let snoozed : HttpHandler = requireUser >=> fun next ctx -> task {
-        let! reqs    = Data.journalByUserId ctx.UserId ctx.Db
-        let  now     = ctx.Now ()
+        let! reqs    = Journal.forUser ctx.UserId
+        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
@@ -392,62 +388,56 @@ module Request =
 
     // GET /requests/answered
     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
+        let! reqs = Journal.answered ctx.UserId
+        return! partial "Answered Requests" (Views.Request.answered (ctx.Now()) ctx.TimeZone reqs) next ctx
     }
   
     // GET /request/[req-id]/full
     let getFull requestId : HttpHandler = requireUser >=> fun next ctx -> task {
-        match! Data.tryFullRequestById (RequestId.ofString requestId) ctx.UserId ctx.Db with
+        match! Request.tryById (RequestId.ofString requestId) ctx.UserId 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 = requireUser >=> fun next ctx -> task {
-        let db     = ctx.Db
         let userId = ctx.UserId
         let reqId  = RequestId.ofString requestId
-        match! Data.tryRequestById reqId userId db with
-        | Some _ ->
-            do! Data.updateShowAfter reqId userId None db
-            do! db.SaveChanges ()
+        match! Request.existsById reqId userId with
+        | true ->
+            do! Request.updateShowAfter reqId userId None
             return! (withSuccessMessage "Request now shown" >=> Components.requestItem requestId) next ctx
-        | None -> return! Error.notFound next ctx
+        | false -> return! Error.notFound next ctx
     }
   
     // PATCH /request/[req-id]/snooze
     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 userId db with
-        | Some _ ->
-            let! until = ctx.BindFormAsync<Models.SnoozeUntil> ()
+        match! Request.existsById reqId userId with
+        | true ->
+            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 userId (Some date) db
-            do! db.SaveChanges ()
+                    .ToInstant()
+            do! Request.updateSnoozed reqId userId (Some date)
             return!
                 (withSuccessMessage $"Request snoozed until {until.until}"
                  >=> hideModal "snooze"
                  >=> Components.journalItems) next ctx
-        | None -> return! Error.notFound next ctx
+        | false -> return! Error.notFound next ctx
     }
   
     // PATCH /request/[req-id]/cancel-snooze
     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 userId db with
-        | Some _ ->
-            do! Data.updateSnoozed reqId userId None db
-            do! db.SaveChanges ()
+        match! Request.existsById reqId userId with
+        | true ->
+            do! Request.updateSnoozed reqId userId None
             return! (withSuccessMessage "Request unsnoozed" >=> Components.requestItem requestId) next ctx
-        | None -> return! Error.notFound next ctx
+        | false -> return! Error.notFound next ctx
     }
 
     /// Derive a recurrence from its representation in the form
@@ -457,10 +447,9 @@ module Request =
 
     // POST /request
     let add : HttpHandler = requireUser >=> fun next ctx -> task {
-        let! form   = ctx.BindModelAsync<Models.Request> ()
-        let  db     = ctx.Db
+        let! form   = ctx.BindModelAsync<Models.Request>()
         let  userId = ctx.UserId
-        let  now    = ctx.Now ()
+        let  now    = ctx.Now()
         let  req    =
             { Request.empty with
                 Id         = Cuid.generate () |> RequestId
@@ -468,41 +457,39 @@ module Request =
                 EnteredOn  = now
                 ShowAfter  = None
                 Recurrence = parseRecurrence form
-                History    = [|
+                History    = [
                     {   AsOf   = now
                         Status = Created
                         Text   = Some form.requestText
                     }      
-                |]
+                ]
             }
-        Data.addRequest req db
-        do! db.SaveChanges ()
+        do! Request.add req
         Messages.pushSuccess ctx "Added prayer request" "/journal"
         return! seeOther "/journal" next ctx
     }
   
     // PATCH /request
     let update : HttpHandler = requireUser >=> fun next ctx -> task {
-        let! form   = ctx.BindModelAsync<Models.Request> ()
-        let  db     = ctx.Db
+        let! form   = ctx.BindModelAsync<Models.Request>()
         let  userId = ctx.UserId
-        match! Data.tryJournalById (RequestId.ofString form.requestId) userId db with
+        // TODO: update the instance and save rather than all these little updates
+        match! Journal.tryById (RequestId.ofString form.requestId) userId with
         | Some req ->
             // update recurrence if changed
             let recur = parseRecurrence form
             match recur = req.Recurrence with
             | true  -> ()
             | false ->
-                do! Data.updateRecurrence req.RequestId userId recur db
+                do! Request.updateRecurrence req.RequestId userId recur
                 match recur with
-                | Immediate -> do! Data.updateShowAfter req.RequestId userId None db
+                | Immediate -> do! Request.updateShowAfter req.RequestId userId None
                 | _         -> ()
             // append history
-            let upd8Text = form.requestText.Trim ()
+            let upd8Text = form.requestText.Trim()
             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 ()
+            do! History.add req.RequestId userId
+                    { AsOf = ctx.Now(); Status = (Option.get >> RequestAction.ofString) form.status; Text = text }
             let nextUrl =
                 match form.returnTo with
                 | "active"          -> "/requests/active"
@@ -526,7 +513,7 @@ module User =
   
     // GET /user/log-off
     let logOff : HttpHandler = requireUser >=> fun next ctx -> task {
-        do! ctx.SignOutAsync ("Auth0", AuthenticationProperties (RedirectUri = "/"))
+        do! ctx.SignOutAsync("Auth0", AuthenticationProperties (RedirectUri = "/"))
         do! ctx.SignOutAsync CookieAuthenticationDefaults.AuthenticationScheme
         return! next ctx
     }
@@ -539,44 +526,45 @@ let routes = [
     GET_HEAD [ route "/" Home.home ]
     subRoute "/components/" [
         GET_HEAD [
-            route  "journal-items"        Components.journalItems
-            routef "request/%s/add-notes" Components.addNotes
+            route  "journal-items"        Components.journalItems // done
+            routef "request/%s/add-notes" Components.addNotes // done
             routef "request/%s/item"      Components.requestItem
-            routef "request/%s/notes"     Components.notes
-            routef "request/%s/snooze"    Components.snooze
+            routef "request/%s/notes"     Components.notes // done
+            routef "request/%s/snooze"    Components.snooze // done
         ]
     ]
-    GET_HEAD [ route "/journal" Journal.journal ]
+    GET_HEAD [ route "/docs"    Home.docs ] // done
+    GET_HEAD [ route "/journal" Journal.journal ] // done
     subRoute "/legal/" [
         GET_HEAD [
-            route "privacy-policy"   Legal.privacyPolicy
-            route "terms-of-service" Legal.termsOfService
+            route "privacy-policy"   Legal.privacyPolicy // done
+            route "terms-of-service" Legal.termsOfService // done
         ]
     ]
     subRoute "/request" [
         GET_HEAD [
-            routef "/%s/edit"   Request.edit
-            routef "/%s/full"   Request.getFull
-            route  "s/active"   Request.active
-            route  "s/answered" Request.answered
-            route  "s/snoozed"  Request.snoozed
+            routef "/%s/edit"   Request.edit // done
+            routef "/%s/full"   Request.getFull // done
+            route  "s/active"   Request.active // done
+            route  "s/answered" Request.answered // done
+            route  "s/snoozed"  Request.snoozed // done
         ]
         PATCH [
-            route  ""                  Request.update
+            route  ""                  Request.update // done
             routef "/%s/cancel-snooze" Request.cancelSnooze
-            routef "/%s/prayed"        Request.prayed
+            routef "/%s/prayed"        Request.prayed // done
             routef "/%s/show"          Request.show
-            routef "/%s/snooze"        Request.snooze
+            routef "/%s/snooze"        Request.snooze // done
         ]
         POST [
-            route  ""         Request.add
-            routef "/%s/note" Request.addNote
+            route  ""         Request.add // done
+            routef "/%s/note" Request.addNote // done
         ]
     ]
     subRoute "/user/" [
         GET_HEAD [
-            route "log-off" User.logOff
-            route "log-on"  User.logOn
+            route "log-off" User.logOff // done
+            route "log-on"  User.logOn // done
         ]
     ]
 ]

src/MyPrayerJournal/MyPrayerJournal.fsproj

@@ -1,8 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.1</Version>
-    <NoWarn>3391</NoWarn>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>3.4</Version>
+    <DebugType>embedded</DebugType>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <PublishSingleFile>false</PublishSingleFile>
+    <SelfContained>false</SelfContained>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Domain.fs" />
@@ -13,19 +16,21 @@
     <Compile Include="Views/Layout.fs" />
     <Compile Include="Views/Legal.fs" />
     <Compile Include="Views/Request.fs" />
+    <Compile Include="Views\Docs.fs" />
     <Compile Include="Handlers.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.19.13" />
+    <PackageReference Include="BitBadger.Documents.Postgres" Version="3.1.0" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.3.13" />
     <PackageReference Include="FunctionalCuid" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.8.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.0" />
-    <PackageReference Include="LiteDB" Version="5.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.8" />
-    <PackageReference Include="NodaTime" Version="3.1.2" />
-    <PackageReference Update="FSharp.Core" Version="6.0.5" />
+    <PackageReference Include="Giraffe" Version="6.4.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.9.12" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.6" />
+    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
+    <PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />

src/MyPrayerJournal/Program.fs

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

src/MyPrayerJournal/Views/Docs.fs

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

src/MyPrayerJournal/Views/Helpers.fs

@@ -29,4 +29,14 @@ 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 (tz : DateTimeZone) =
-    span [ _title (date.InZone(tz).ToDateTimeOffset().ToString ("f", null)) ] [ Dates.formatDistance now date |> str ]
+    span [ _title (date.InZone(tz).ToDateTimeOffset().ToString("f", null)) ] [ Dates.formatDistance now date |> str ]
+
+/// The version of myPrayerJournal
+let version =
+    let v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version
+    seq {
+        string v.Major
+        if v.Minor > 0 then
+            $".{v.Minor}"
+            if v.Revision > 0 then $".{v.Revision}"
+    } |> Seq.reduce (+)

src/MyPrayerJournal/Views/Layout.fs

@@ -6,48 +6,44 @@ open Giraffe.ViewEngine.Accessibility
 
 /// The data needed to render a page-level view
 type PageRenderContext =
-    {   /// Whether the user is authenticated
-        IsAuthenticated : bool
-        
-        /// Whether the user has snoozed requests
-        HasSnoozed      : bool
-        
-        /// The current URL
-        CurrentUrl      : string
-        
-        /// The title for the page to be rendered
-        PageTitle       : string
-        
-        /// The content of the page
-        Content         : XmlNode
-    }
+    { /// Whether the user is authenticated
+      IsAuthenticated: bool
+      
+      /// Whether the user has snoozed requests
+      HasSnoozed: bool
+      
+      /// The current URL
+      CurrentUrl: string
+      
+      /// The title for the page to be rendered
+      PageTitle: string
+      
+      /// The content of the page
+      Content: XmlNode }
 
 /// The home page
 let home =
-    article [ _class "container mt-3" ] [
-        p [] [ rawText " " ]
-        p [] [
-            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 "
-            rawText "also learn more about the site at the “Docs” link, also above."
-        ]
-    ]
+    article [ _class "container mt-3" ]
+        [ p [] [ rawText " " ]
+          p []
+            [ 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 "
+              rawText "also learn more about the site at the “Docs” link, also above." ] ]
 
 /// The default navigation bar, which will load the items on page load, and whenever a refresh event occurs
 let private navBar ctx =
-    nav [ _class "navbar navbar-dark"; _roleNavigation ] [
-        div [ _class "container-fluid" ] [
-            pageLink "/" [ _class "navbar-brand" ] [
-                span [ _class "m" ] [ str "my" ]
-                span [ _class "p" ] [ str "Prayer" ]
-                span [ _class "j" ] [ str "Journal" ]
-            ]
-            seq {
+    nav [ _class "navbar navbar-dark"; _roleNavigation ]
+        [ div [ _class "container-fluid" ]
+            [ pageLink
+                "/" [ _class "navbar-brand" ]
+                [ span [ _class "m" ] [ str "my" ]
+                  span [ _class "p" ] [ str "Prayer" ]
+                  span [ _class "j" ] [ str "Journal" ] ]
+              seq {
                 let navLink (matchUrl : string) =
                     match ctx.CurrentUrl.StartsWith matchUrl with true -> [ _class "is-active-route" ] | false -> []
                     |> pageLink matchUrl
@@ -58,91 +54,72 @@ let private navBar ctx =
                     li [ _class "nav-item" ] [ navLink "/requests/answered" [ str "Answered" ] ]
                     li [ _class "nav-item" ] [ a [ _href "/user/log-off" ] [ str "Log Off" ] ]
                 else li [ _class "nav-item"] [ a [ _href "/user/log-on" ] [ str "Log On" ] ]
-                li [ _class "nav-item" ] [
-                    a [ _href "https://docs.prayerjournal.me"; _target "_blank"; _rel "noopener" ] [ str "Docs" ]
-                ]
-            }
-            |> List.ofSeq
-            |> ul [ _class "navbar-nav me-auto d-flex flex-row" ]
-        ]
-    ]
+                li [ _class "nav-item" ] [ navLink "/docs" [ str "Docs" ] ]
+              }
+              |> List.ofSeq
+              |> ul [ _class "navbar-nav me-auto d-flex flex-row" ] ] ]
 
 /// The title tag with the application name appended
 let titleTag ctx =
-    title [] [ str ctx.PageTitle; rawText " « myPrayerJournal" ]
+    title [] [ rawText ctx.PageTitle; rawText " « myPrayerJournal" ]
 
 /// The HTML `head` element
 let htmlHead ctx =
-    head [ _lang "en" ] [
-        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.2.0/dist/css/bootstrap.min.css"
-               _rel         "stylesheet"
-               _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" ]
-    ]
+    head [ _lang "en" ]
+        [ 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.3.2/dist/css/bootstrap.min.css"
+                 _rel         "stylesheet"
+                 _integrity   "sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
+                 _crossorigin "anonymous" ]
+          link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
+          link [ _href "/style/style.css"; _rel "stylesheet" ] ]
 
 /// Element used to display toasts
 let toaster =
-    div [ _ariaLive "polite"; _ariaAtomic "true"; _id "toastHost" ] [
-        div [ _class "toast-container position-absolute p-3 bottom-0 end-0"; _id "toasts" ] []
-    ]
+    div [ _ariaLive "polite"; _ariaAtomic "true"; _id "toastHost" ]
+        [ div [ _class "toast-container position-absolute p-3 bottom-0 end-0"; _id "toasts" ] [] ]
 
 /// The page's `footer` element
 let htmlFoot =
-    footer [ _class "container-fluid" ] [
-        p [ _class "text-muted text-end" ] [
-            str "myPrayerJournal v3.1.1"
-            br []
-            em [] [
-                small [] [
-                    pageLink "/legal/privacy-policy" [] [ str "Privacy Policy" ]
-                    rawText " • "
-                    pageLink "/legal/terms-of-service" [] [ str "Terms of Service" ]
-                    rawText " • "
-                    a [ _href "https://github.com/bit-badger/myprayerjournal"; _target "_blank"; _rel "noopener" ] [
-                        str "Developed"
-                    ]
-                    str " and hosted by "
-                    a [ _href "https://bitbadger.solutions"; _target "_blank"; _rel "noopener" ] [
-                        str "Bit Badger Solutions"
-                    ]
-                ]
-            ]
-        ]
-        Htmx.Script.minified
-        script [] [
-            rawText "if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')"
-        ]
-        script [ _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>') "
-            rawText "}, 2000)"
-        ]
-        script [ _src "/script/mpj.js" ] []
-    ]
+    footer [ _class "container-fluid" ]
+        [ p [ _class "text-muted text-end" ]
+            [ str $"myPrayerJournal {version}"
+              br []
+              em []
+                  [ small []
+                        [ pageLink "/legal/privacy-policy" [] [ str "Privacy Policy" ]
+                          rawText " &bull; "
+                          pageLink "/legal/terms-of-service" [] [ str "Terms of Service" ]
+                          rawText " &bull; "
+                          a [ _href "https://git.bitbadger.solutions/bit-badger/myPrayerJournal"
+                              _target "_blank"
+                              _rel "noopener" ] [ str "Developed" ]
+                          str " and hosted by "
+                          a   [ _href "https://bitbadger.solutions"; _target "_blank"; _rel "noopener" ]
+                              [ str "Bit Badger Solutions" ] ] ] ]
+          Htmx.Script.minified
+          script [] [ rawText "if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')" ]
+          script [ _async
+                   _src         "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+                   _integrity   "sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+                   _crossorigin "anonymous" ] []
+          script []
+              [ rawText "setTimeout(function () { "
+                rawText "if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>') "
+                rawText "}, 2000)" ]
+          script [ _src "/script/mpj.js" ] [] ]
 
 /// Create the full view of the page
 let view ctx =
-    html [ _lang "en" ] [
-        htmlHead ctx
-        body [] [
-            section [ _id "top"; _ariaLabel "Top navigation" ] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
-            toaster
-            htmlFoot
-        ]
-    ]
+    html [ _lang "en" ]
+        [ htmlHead ctx
+          body []
+            [ section [ _id "top"; _ariaLabel "Top navigation" ] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
+              toaster
+              htmlFoot ] ]
 
 /// Create a partial view
 let partial ctx =
-    html [ _lang "en" ] [
-        head [] [ titleTag ctx ]
-        body [] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ]
-    ]
+    html [ _lang "en" ] [ head [] [ titleTag ctx ]; body [] [ navBar ctx; main [ _roleMain ] [ ctx.Content ] ] ]

src/MyPrayerJournal/Views/Request.fs

@@ -74,31 +74,34 @@ let snoozed now tz reqs =
 
 /// View for Full Request page
 let full (clock : IClock) tz (req : Request) =
-    let now = clock.GetCurrentInstant ()
+    let now = clock.GetCurrentInstant()
     let answered =
         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"
+        |> Seq.ofList
+        |> Seq.filter History.isAnswered
+        |> Seq.tryHead
+        |> Option.map (_.AsOf)
+    let prayed = (req.History |> List.filter History.isPrayed |> List.length).ToString "N0"
     let daysOpen =
         let asOf = defaultArg answered now
-        ((asOf - (req.History |> Array.filter History.isCreated |> Array.head).AsOf).TotalDays |> int).ToString "N0"
+        ((asOf - (req.History |> List.filter History.isCreated |> List.head).AsOf).TotalDays |> int).ToString "N0"
     let lastText =
         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
+        |> Seq.ofList
+        |> Seq.filter (fun h -> Option.isSome h.Text)
+        |> Seq.sortByDescending (_.AsOf)
+        |> Seq.map (fun h -> Option.get h.Text)
+        |> Seq.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 all =
             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
+            |> Seq.ofList
+            |> Seq.map (fun n -> {| asOf = n.AsOf; text = Some n.Notes; status = "Notes" |})
+            |> Seq.append (req.History |> List.map toDisp)
+            |> Seq.sortByDescending (_.asOf)
+            |> List.ofSeq
         // Skip the first entry for answered requests; that info is already displayed
         match answered with Some _ -> all.Tail | None -> all
     article [ _class "container mt-3" ] [
@@ -109,7 +112,7 @@ let full (clock : IClock) tz (req : Request) =
                     match answered with
                     | Some date ->
                         str "Answered "
-                        date.ToDateTimeOffset().ToString ("D", null) |> str
+                        date.ToDateTimeOffset().ToString("D", null) |> str
                         str " ("
                         relativeDate date now tz
                         rawText ") • "
@@ -124,7 +127,7 @@ let full (clock : IClock) tz (req : Request) =
                     p [ _class "m-0" ] [
                         str it.status
                         rawText "  "
-                        small [] [ em [] [ it.asOf.ToDateTimeOffset().ToString ("D", null) |> str ] ]
+                        small [] [ em [] [ it.asOf.ToDateTimeOffset().ToString("D", null) |> str ] ]
                     ]
                     match it.text with
                     | Some txt -> p [ _class "mt-2 mb-0" ] [ str txt ]

src/MyPrayerJournal/appsettings.json

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

src/composer.json

@@ -0,0 +1,26 @@
+{
+  "name": "bit-badger/my-prayer-journal",
+  "minimum-stability": "beta",
+  "require": {
+    "php": ">=8.2",
+    "ext-pdo": "*",
+    "ext-sqlite3": "*",
+    "bit-badger/pdo-document": "^1",
+    "visus/cuid2": "^4",
+    "guzzlehttp/guzzle": "^7.8",
+    "guzzlehttp/psr7": "^2.6",
+    "http-interop/http-factory-guzzle": "^1.2",
+    "auth0/auth0-php": "^8.11",
+    "vlucas/phpdotenv": "^5.6"
+  },
+  "autoload": {
+    "psr-4": {
+      "MyPrayerJournal\\": "lib/"
+    }
+  },
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  }
+}

src/convert-from-v3.php

@@ -0,0 +1,56 @@
+<?php declare(strict_types=1);
+
+use BitBadger\PDODocument\{Configuration, Custom, Definition, Document, Mode};
+use BitBadger\PDODocument\Mapper\ArrayMapper;
+use MyPrayerJournal\{History, Note, Recurrence, RecurrencePeriod, Request, RequestAction, Table};
+
+require 'start.php';
+
+echo 'Retrieving v3 requests...' . PHP_EOL;
+
+Configuration::resetPDO();
+Configuration::$pdoDSN = 'pgsql:host=localhost;user=mpj;password=devpassword;dbname=mpj';
+$reqs = Custom::array('SELECT data FROM mpj.request', [], new ArrayMapper());
+
+echo 'Found ' . sizeof($reqs) . ' requests; migrating to v4...' . PHP_EOL;
+
+Configuration::resetPDO();
+Configuration::$mode   = Mode::SQLite;
+Configuration::$pdoDSN = 'sqlite:./data/mpj.db';
+
+Definition::ensureTable(Table::REQUEST);
+
+/** Convert dates to the same format */
+function convertDate(string $date): string
+{
+    return (new DateTimeImmutable($date))->format('c');
+}
+
+foreach ($reqs as $reqJson) {
+    $req     = json_decode($reqJson['data']);
+    $notes   = array_map(fn(stdClass $note) => new Note(convertDate($note->asOf), $note->notes), $req->notes ?? []);
+    $history = array_map(fn(stdClass $hist) =>
+        new History(
+            asOf:   convertDate($hist->asOf),
+            action: RequestAction::from($hist->status),
+            text:   property_exists($hist, 'text') ? $hist->text : null),
+        $req->history);
+    $recurParts  = explode(' ', $req->recurrence);
+    $recurPeriod = RecurrencePeriod::from(end($recurParts));
+    $recur       = match ($recurPeriod) {
+        RecurrencePeriod::Immediate => new Recurrence(RecurrencePeriod::Immediate),
+        default                     => new Recurrence($recurPeriod, (int)$recurParts[0])
+    };
+    $v4Req = new Request(
+        id:           $req->id,
+        enteredOn:    convertDate($req->enteredOn),
+        userId:       $req->userId,
+        snoozedUntil: property_exists($req, 'snoozedUntil') ? convertDate($req->snoozedUntil) : null,
+        showAfter:    property_exists($req, 'showAfter')    ? convertDate($req->showAfter)    : null,
+        recurrence:   $recur,
+        history:      $history,
+        notes:        $notes);
+    Document::insert(Table::REQUEST, $v4Req);
+}
+
+echo PHP_EOL . 'done' . PHP_EOL;

src/lib/Auth.php

@@ -0,0 +1,79 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use Auth0\SDK\Auth0;
+use Auth0\SDK\Exception\ConfigurationException;
+
+class Auth
+{
+    private static ?Auth0 $auth0 = null;
+
+    public static function client(): Auth0
+    {
+        if (is_null(self::$auth0)) {
+            self::$auth0 = new Auth0([
+                'domain'       => $_ENV['AUTH0_DOMAIN'],
+                'clientId'     => $_ENV['AUTH0_CLIENT_ID'],
+                'clientSecret' => $_ENV['AUTH0_CLIENT_SECRET'],
+                'cookieSecret' => $_ENV['AUTH0_COOKIE_SECRET']
+            ]);
+        }
+        return self::$auth0;
+    }
+
+    /**
+     * Get the logged on user information
+     *
+     * @return array|null The user information (null if no user is logged on)
+     */
+    public static function user(): ?array
+    {
+        return self::client()->getUser();
+    }
+
+    /**
+     * Initiate a log on with Auth0
+     *
+     * @throws ConfigurationException If the Auth0 client is not configured correctly
+     */
+    public static function logOn(): never
+    {
+        $params = match (true) {
+            $_SERVER['PHP_SELF'] <> '/user/log-on.php' => ['redirectUri' => $_SERVER['PHP_SELF']],
+            default                                    => []
+        };
+
+        self::client()->clear();
+        header('Location: ' . self::client()->login($_ENV['AUTH0_BASE_URL'] . '/user/log-on/success', $params));
+        exit;
+    }
+
+    /**
+     * Log off from this application and Auth0
+     *
+     * @throws ConfigurationException If the Auth0 client is not configured correctly
+     */
+    public static function logOff(): never
+    {
+        session_destroy();
+        header('Location: ' . self::client()->logout($_ENV['AUTH0_BASE_URL']));
+        exit;
+    }
+
+    /**
+     * Require a user be logged on
+     *
+     * @param bool $redirect Whether to redirect to log on if there is not a user logged on
+     * @return void If it returns, there is a user logged on; if not, we will be redirected to log on
+     * @throws ConfigurationException If the Auth0 client is not configured correctly
+     */
+    public static function requireUser(bool $redirect = true): void
+    {
+        if (is_null(self::user())) {
+            if ($redirect) self::logOn();
+            http_response_code(403);
+            die('Not Authorized');
+        }
+    }
+}

src/lib/History.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use JsonSerializable;
+
+/**
+ * A record of an action taken on a request
+ */
+class History implements JsonSerializable
+{
+    /**
+     * @param string $asOf The date/time this entry was made
+     * @param RequestAction $action The action taken for this history entry
+     * @param string|null $text The text for this history entry (optional)
+     */
+    public function __construct(public string $asOf, public RequestAction $action, public ?string $text = null) { }
+
+    public function jsonSerialize(): mixed
+    {
+        $values = ['asOf' => $this->asOf, 'action' => $this->action->value];
+        if (isset($this->text)) $values['text'] = $this->text;
+        return $values;
+    }
+}

src/lib/Layout.php

@@ -0,0 +1,181 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use BitBadger\PDODocument\Custom;
+use BitBadger\PDODocument\Mapper\ExistsMapper;
+
+class Layout
+{
+    /**
+     * Generate the heading for a bare result
+     */
+    public static function bareHead(): void
+    {
+        echo '<!DOCTYPE html><html lang=en><head><title></title></head><body>';
+    }
+
+    /**
+     * Generate the end of a bare result
+     */
+    public static function bareFoot(): void
+    {
+        echo '</body></html>';
+    }
+
+    /**
+     * Is this an htmx request?
+     *
+     * @return bool True if this is an htmx request, false if not
+     */
+    private static function isHtmx(): bool
+    {
+        return key_exists('HTTP_HX_REQUEST', $_SERVER) && !key_exists('HTTP_HX_HISTORY_RESTORE_REQUEST', $_SERVER);
+    }
+
+    /**
+     * Create the `DOCTYPE` declaration, `html`, and `head` tags for the page
+     *
+     * @param string $title The title of the page
+     */
+    public static function htmlHead(string $title): void
+    {
+        if (self::isHtmx()) {
+            echo "<!DOCTYPE html><html lang=en><head lang=en><title>$title &#xab; myPrayerJournal</title></head>";
+        } else {
+            echo <<<HEAD
+                <!DOCTYPE html>
+                <html lang=en>
+                <head>
+                    <meta name=viewport content="width=device-width, initial-scale=1">
+                    <meta name=description content="Online prayer journal - free w/Google or Microsoft account">
+                    <meta name=htmx-config content='{"historyCacheSize":0}'>
+                    <title>$title &#xab; myPrayerJournal</title>
+                    <link href=https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css rel=stylesheet
+                          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
+                          crossorigin=anonymous>
+                    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel=stylesheet>
+                    <link href=/style/style.css rel=stylesheet>
+                </head>
+                HEAD;
+        }
+    }
+
+    private static function navLink(string $url, string $text): void
+    {
+        $classAttr = match (true) {
+            str_starts_with($_SERVER['PHP_SELF'], $url) => ['class' => 'is-active-route'],
+            default => []
+        };
+        echo '<li class=nav-item>';
+        UI::pageLink($url, $text, $classAttr);
+    }
+
+    /**
+     * The default navigation bar, which will load the items on page load, and whenever a refresh event occurs
+     */
+    public static function navBar(): void
+    {
+        $table      = Table::REQUEST;
+        $hasSnoozed = key_exists('user_id', $_SESSION)
+            ? Custom::scalar(<<<SQL
+                SELECT EXISTS (
+                    SELECT 1 FROM $table
+                     WHERE data->>'userId' = :userId AND datetime(data->>'snoozedUntil') > datetime('now'))
+                SQL, [':userId' => $_SESSION['user_id']], new ExistsMapper())
+            : false; ?>
+        <nav class="navbar navbar-dark" role="navigation">
+            <div class=container-fluid><?php
+                UI::pageLink('/', '<span class=m>my</span><span class=p>Prayer</span><span class=j>Journal</span>',
+                    ['class' => 'navbar-brand']); ?>
+                <ul class="navbar-nav me-auto d-flex flex-row"><?php
+                    if (key_exists('user_id', $_SESSION)) {
+                        self::navLink('/journal', 'Journal');
+                        self::navLink('/requests/active', 'Active');
+                    if ($hasSnoozed) self::navLink('/requests/snoozed', 'Snoozed');
+                        self::navLink('/requests/answered', 'Answered'); ?>
+                        <li class=nav-item><a href=/user/log-off>Log Off</a><?php
+                    } else { ?>
+                        <li class=nav-item><a href=/user/log-on>Log On</a><?php
+                    }
+                    self::navLink('/docs', 'Docs'); ?>
+                </ul>
+            </div>
+        </nav><?php
+    }
+
+    /**
+     * Drop .0 or .0.0 from the end of the version to format it for display
+     *
+     * @return string The version of the application for user display
+     */
+    private static function displayVersion(): string {
+        [$major, $minor, $rev] = explode('.', MPJ_VERSION);
+        $minor = $minor == '0' ? '' : ".$minor";
+        $rev = match (true) {
+            $rev == '0'                 => '',
+            str_starts_with($rev, '0-') => substr($rev, 1),
+            default                     => ".$rev"
+        };
+        return "v$major$minor$rev";
+    }
+
+    /**
+     * Create the footer
+     */
+    public static function htmlFoot(): void
+    { ?>
+        <footer class=container-fluid>
+            <p class="text-muted text-end">
+                myPrayerJournal <?=self::displayVersion();?><br>
+                <em><small><?php
+                    UI::pageLink('/legal/privacy-policy', 'Privacy Policy');
+                    echo ' &bull; ';
+                    UI::pageLink('/legal/terms-of-service', 'Terms of Service');
+                    echo ' &bull; '; ?>
+                    <a href=https://git.bitbadger.solutions/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>
+            <script src=https://unpkg.com/htmx.org@2.0.0 crossorigin=anonymous
+                    integrity="sha384-wS5l5IKJBvK6sPTKa2WZ1js3d947pvWXbPJ1OmWfEuxLgeHcEbjUUA5i9V5ZkpCw"></script>
+            <script>if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')</script>
+            <script async src=https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js
+                    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+                    crossorigin=anonymous></script>
+            <script>
+                setTimeout(function () {
+                    if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>')
+                }, 2000)
+            </script>
+            <script src=/script/mpj.js></script>
+        </footer><?php
+    }
+
+    /**
+     * Generate the heading for a full or partial page result
+     *
+     * @param string $title The title of the page
+     */
+    public static function pageHead(string $title): void
+    {
+        self::htmlHead($title);
+        echo '<body>';
+        if (!self::isHtmx()) echo '<section id=top aria-label="Top navigation">';
+        self::navBar();
+        echo '<main role=main>';
+    }
+
+    /**
+     * Generate the end of the page for a full or partial page result
+     */
+    public static function pageFoot(): void
+    {
+        echo '</main>';
+        if (!self::isHtmx()) {
+            echo '</section>';
+            self::htmlFoot();
+        }
+        echo '</body></html>';
+    }
+}

src/lib/Note.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use BitBadger\PDODocument\DocumentException;
+
+/**
+ * A note entered on a prayer request
+ */
+class Note
+{
+    /**
+     * @param string $asOf The date/time this note was recorded
+     * @param string $text The text of the note
+     */
+    public function __construct(public string $asOf, public string $text) { }
+
+    /**
+     * Retrieve notes for a given request
+     *
+     * @param string $id The ID of the request for which notes should be retrieved
+     * @return array|Note[] The notes for the request, or an empty array if the request was not found
+     * @throws DocumentException If any is encountered
+     */
+    public static function byRequestId(string $id): array
+    {
+        $req = Request::byId($id);
+        return $req ? $req->notes : [];
+    }
+}

src/lib/Recurrence.php

@@ -0,0 +1,41 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use DateInterval;
+use JsonSerializable;
+
+/**
+ * The recurrence for a prayer request
+ */
+class Recurrence implements JsonSerializable
+{
+    /**
+     * @param RecurrencePeriod $period The recurrence period
+     * @param int|null $interval How many of the periods will pass before the request is visible again
+     */
+    public function __construct(public RecurrencePeriod $period, public ?int $interval = null) { }
+
+    /**
+     * Get the date/time interval for this recurrence
+     *
+     * @return DateInterval The interval matching the recurrence
+     */
+    public function interval(): DateInterval
+    {
+        $period = match ($this->period) {
+            RecurrencePeriod::Immediate => 'T0S',
+            RecurrencePeriod::Hours     => "T{$this->interval}H",
+            RecurrencePeriod::Days      => "{$this->interval}D",
+            RecurrencePeriod::Weeks     => ($this->interval * 7) . 'D'
+        };
+        return new DateInterval("P$period");
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        $values = ['period' => $this->period->value];
+        if (isset($this->interval)) $values['interval'] = $this->interval;
+        return $values;
+    }
+}

src/lib/RecurrencePeriod.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+/**
+ * The type of recurrence a request can have
+ */
+enum RecurrencePeriod: string
+{
+    /** Requests, once prayed, are available again immediately */
+    case Immediate = 'Immediate';
+
+    /** Requests, once prayed, appear again in a number of hours */
+    case Hours = 'Hours';
+
+    /** Requests, once prayed, appear again in a number of days */
+    case Days = 'Days';
+
+    /** Requests, once prayed, appear again in a number of weeks */
+    case Weeks = 'Weeks';
+}

src/lib/Request.php

@@ -0,0 +1,206 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use BitBadger\PDODocument\{Custom, DocumentException, DocumentList, Find, Mapper\DocumentMapper};
+use DateTimeImmutable;
+use Exception;
+use JsonSerializable;
+use Visus\Cuid2\Cuid2;
+
+/**
+ * A prayer request
+ */
+class Request implements JsonSerializable
+{
+    /**
+     * @param string $id The ID for the request
+     * @param string $enteredOn The date/time this request was originally entered
+     * @param string $userId The ID of the user to whom this request belongs
+     * @param string|null $snoozedUntil The date/time the snooze expires for this request (null = not snoozed)
+     * @param string|null $showAfter The date/time the current recurrence period is over (null = immediate)
+     * @param Recurrence $recurrence The recurrence for this request
+     * @param History[] $history The history of this request
+     * @param Note[] $notes Notes regarding this request
+     * @throws Exception If the ID generation fails
+     */
+    public function __construct(public string $id = '', public string $enteredOn = '', public string $userId = '',
+                                public ?string $snoozedUntil = null, public ?string $showAfter = null,
+                                public Recurrence $recurrence = new Recurrence(RecurrencePeriod::Immediate),
+                                public array $history = [], public array $notes = [])
+    {
+        if ($id == '') {
+            $this->id = (new Cuid2())->toString();
+        }
+    }
+
+    /**
+     * Get the current text for this request
+     *
+     * @return string The most recent text for the request
+     */
+    public function currentText(): string
+    {
+        foreach ($this->history as $hist) if (isset($hist->text)) return $hist->text;
+        return '';
+    }
+
+    /**
+     * Get the date/time this request was last marked as prayed
+     *
+     * @return string|null The date/time this request was last marked as prayed
+     */
+    public function lastPrayed(): ?string
+    {
+        foreach ($this->history as $hist) if ($hist->action == RequestAction::Prayed) return $hist->asOf;
+        return null;
+    }
+
+    /**
+     * Has this request been answered?
+     *
+     * @return bool True if the request is answered, false if not
+     */
+    public function isAnswered(): bool
+    {
+        return $this->history[0]->action == RequestAction::Answered;
+    }
+
+    /**
+     * Is this request currently snoozed?
+     *
+     * @return bool True if the request is snoozed, false if not
+     * @throws Exception If the snoozed until date/time is not valid
+     */
+    public function isSnoozed(): bool
+    {
+        return isset($this->snoozedUntil) && new DateTimeImmutable($this->snoozedUntil) > new DateTimeImmutable('now');
+    }
+
+    /**
+     * Is this request currently not shown due to recurrence?
+     *
+     * @return bool True if the request is pending, false if not
+     * @throws Exception If the snoozed or show-after date/times are not valid
+     */
+    public function isPending(): bool
+    {
+        return !$this->isSnoozed()
+            && isset($this->showAfter)
+            && new DateTimeImmutable($this->showAfter) > new DateTimeImmutable('now');
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        $values = [
+            'id'         => $this->id,
+            'enteredOn'  => $this->enteredOn,
+            'userId'     => $this->userId,
+            'recurrence' => $this->recurrence,
+            'history'    => $this->history,
+            'notes'      => $this->notes
+        ];
+        if (isset($this->snoozedUntil)) $values['snoozedUntil'] = $this->snoozedUntil;
+        if (isset($this->showAfter))    $values['showAfter']    = $this->showAfter;
+        return $values;
+    }
+
+    /**
+     * Find a request by its ID
+     *
+     * @param string $id The ID of the request
+     * @return Request|false The request if it is found and belongs to the current user, false if not
+     * @throws DocumentException If any is encountered
+     */
+    public static function byId(string $id): Request|false
+    {
+        $req = Find::byId(Table::REQUEST, $id, self::class);
+        return ($req && $req->userId == $_SESSION['user_id']) ? $req : false;
+    }
+
+    /**
+     * Get the user's active journal requests
+     *
+     * @return DocumentList<Request> The requests for the user's journal
+     * @throws DocumentException If any is encountered
+     */
+    public static function forJournal(): DocumentList
+    {
+        $table = Table::REQUEST;
+        return Custom::list(<<<SQL
+            SELECT data, (
+                   SELECT h.value->>'asOf' as_of
+                     FROM $table i LEFT JOIN json_each(i.data, '$.history') h
+                    WHERE r.data->>'id' = i.data->>'id' AND h.value->>'action' = 'Prayed'
+                    LIMIT 1) last_prayed
+              FROM $table r
+             WHERE data->>'userId'               = :userId
+               AND data->>'$.history[0].action' <> 'Answered'
+               AND (data->>'snoozedUntil' IS NULL OR data->>'snoozedUntil' < datetime('now'))
+               AND (data->>'showAfter'    IS NULL OR data->>'showAfter'    < datetime('now'))
+             ORDER BY coalesce(last_prayed, data->>'snoozedUntil', data->>'showAfter', data->>'$.history[0].asOf')
+            SQL, [':userId' => $_SESSION['user_id']], new DocumentMapper(self::class));
+    }
+
+    /**
+     * Get either the user's active or answered requests
+     *
+     * @param bool $active True to retrieve active requests, false to retrieve answered requests
+     * @param bool $snoozed True to retrieve only snoozed requests
+     * @return DocumentList<Request> The requests matching the criteria
+     * @throws DocumentException If any is encountered
+     */
+    private static function forUser(bool $active = true, bool $snoozed = false): DocumentList
+    {
+        $table = Table::REQUEST;
+        $op    = $active ? '<>' : '=';
+        $extra = $snoozed ? "AND datetime(data->>'snoozedUntil') > datetime('now')" : '';
+        $order = $active
+            ? "coalesce(data->>'snoozedUntil', data->>'showAfter', last_prayed, data->>'$.history[0].asOf')"
+            : "data->>'$.history[0].asOf' DESC";
+        return Custom::list(<<<SQL
+            SELECT data, (
+                   SELECT h.value->>'asOf' as_of
+                     FROM $table i LEFT JOIN json_each(i.data, '$.history') h
+                    WHERE r.data->>'id' = i.data->>'id' AND h.value->>'action' = 'Prayed'
+                    LIMIT 1) last_prayed
+              FROM $table r
+             WHERE data->>'userId'                = :userId
+               AND data->>'$.history[0].action' $op 'Answered' $extra
+             ORDER BY $order
+            SQL, [':userId' => $_SESSION['user_id']], new DocumentMapper(self::class));
+    }
+
+    /**
+     * Get a list of active requests for a user
+     *
+     * @return DocumentList<Request> The user's active requests
+     * @throws DocumentException If any is encountered
+     */
+    public static function active(): DocumentList
+    {
+        return self::forUser();
+    }
+
+    /**
+     * Get a list of answered requests for a user
+     *
+     * @return DocumentList<Request> The user's answered requests
+     * @throws DocumentException If any is encountered
+     */
+    public static function answered(): DocumentList
+    {
+        return self::forUser(false);
+    }
+
+    /**
+     * Get a list of snoozed requests for a user
+     *
+     * @return DocumentList<Request> The user's snoozed requests
+     * @throws DocumentException If any is encountered
+     */
+    public static function snoozed(): DocumentList
+    {
+        return self::forUser(snoozed: true);
+    }
+}

src/lib/RequestAction.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+/**
+ * An action taken on a prayer request
+ */
+enum RequestAction: string
+{
+    /** The request was created */
+    case Created = 'Created';
+
+    /** The request was marked as having been prayed for */
+    case Prayed = 'Prayed';
+
+    /** The request was updated */
+    case Updated = 'Updated';
+
+    /** The request was marked as answered */
+    case Answered = 'Answered';
+}

src/lib/Table.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+/**
+ * Constants for table names
+ */
+class Table
+{
+    /** @var string The prayer request table used by myPrayerJournal */
+    const REQUEST = 'request';
+}

src/lib/UI.php

@@ -0,0 +1,238 @@
+<?php declare(strict_types=1);
+
+namespace MyPrayerJournal;
+
+use BitBadger\PDODocument\{DocumentException, DocumentList};
+use DateTimeImmutable;
+use DateTimeZone;
+use Exception;
+
+/**
+ * User interface building blocks
+ */
+class UI
+{
+    /**
+     * Generate a material icon
+     *
+     * @param string $name The name of the material icon
+     * @return string The material icon wrapped in a `span` tag
+     */
+    public static function icon(string $name): string {
+        return "<span class=material-icons>$name</span>";
+    }
+
+    /**
+     * Render the journal items for the current user
+     *
+     * @throws DocumentException If any is encountered
+     */
+    public static function journal(): void
+    {
+        Layout::bareHead();
+        $reqs = Request::forJournal();
+        if ($reqs->hasItems()) { ?>
+            <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"><?php
+            $spacer = '<span>&nbsp;</span>';
+            foreach ($reqs->items() as /** @var Request $req */ $req) { ?>
+                <div class=col>
+                <div class="card h-100">
+                    <div class="card-header p-0 d-flex" role=toolbar><?php
+                        self::pageLink("/request/edit?id=$req->id", self::icon('edit'),
+                            ['class' => 'btn btn-secondary', 'title' => 'Edit Request']); ?>
+                        <?=$spacer?>
+                        <button type=button class="btn btn-secondary" title="Add Notes" data-bs-toggle=modal
+                                data-bs-target=#notesModal hx-get="/components/request/add-note?id=<?=$req->id?>"
+                                hx-target=#notesBody hx-swap=innerHTML><?=self::icon('comment');?></button>
+                        <?=$spacer?>
+                        <button type=button class="btn btn-secondary" title="Snooze Request" data-bs-toggle=modal
+                                data-bs-target=#snoozeModal hx-get="/components/request/snooze?id=<?=$req->id?>"
+                                hx-target=#snoozeBody hx-swap=innerHTML><?=self::icon('schedule');?></button>
+                        <div class=flex-grow-1></div>
+                        <button type=button class="btn btn-success w-25" hx-patch="/request/prayed?id=<?=$req->id?>"
+                                title="Mark as Prayed"><?=self::icon('done');?></button>
+                    </div>
+                    <div class=card-body>
+                        <p class=request-text><?=htmlentities($req->currentText());?>
+                    </div>
+                    <div class="card-footer text-end text-muted px-1 py-0">
+                        <em><?php
+                            $lastPrayed = $req->lastPrayed();
+                            echo 'last ' . (is_null($lastPrayed) ? 'activity': 'prayed') . ' ';
+                            self::relativeDate($lastPrayed ?? $req->history[0]->asOf); ?>
+                        </em>
+                    </div>
+                </div>
+                </div><?php
+            } ?>
+            </section><?php
+        } else {
+            UI::noResults('No Active Requests', '/request/edit?id=new', 'Add a Request', <<<'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
+                TEXT);
+        }
+        Layout::bareFoot();
+    }
+
+    /**
+     * Create a card when there are no results found
+     */
+    public static function noResults(string $heading, string $link, string $buttonText, string $text): void
+    { ?>
+        <div class=card>
+        <h5 class=card-header><?=$heading?></h5>
+        <div class="card-body text-center">
+            <p class=card-text><?=$text?></p><?php
+            self::pageLink($link, $buttonText, ['class' => 'btn btn-primary']); ?>
+        </div>
+        </div><?php
+    }
+
+    /**
+     * Generate a link to a page within myPrayerJournal
+     *
+     * @param string $href The URL for the link
+     * @param string $text The text for the link
+     * @param array $attrs Any additional attributes that should be placed on the `a` tag
+     */
+    public static function pageLink(string $href, string $text, array $attrs = []): void
+    { ?>
+        <a href="<?=$href?>" hx-get="<?=$href?>" hx-target=#top hx-swap=innerHTML hx-push-url=true<?php
+        foreach ($attrs as $key => $value) echo " $key=\"" . htmlspecialchars($value) . "\""; ?>><?=$text?></a><?php
+    }
+
+    /**
+     * @throws Exception
+     */
+    public static function relativeDate(string $date): void
+    {
+        $parsed = new DateTimeImmutable($date);
+        $inZone = $parsed->setTimezone(new DateTimeZone($_REQUEST['time_zone']));
+        echo '<span title="' . date_format($inZone, 'l, F j, Y \a\t g:ia T') . '">'
+            . self::formatDistance('now', $parsed) . '</span>';
+    }
+
+    //  Many thanks to date-fns (https://date-fns.org) for this logic
+    /**
+     * Format the distance between two dates
+     *
+     * @param string|DateTimeImmutable $from The starting date/time
+     * @param string|DateTimeImmutable $to The ending date/time
+     * @return string The distance between two dates
+     * @throws Exception If date/time objects cannot be created
+     */
+    public static function formatDistance(string|DateTimeImmutable $from, string|DateTimeImmutable $to): string
+    {
+        $aDay        =  1_440.0;
+        $almost2Days =  2_520.0;
+        $aMonth      = 43_200.0;
+        $twoMonths   = 86_400.0;
+
+        $dtFrom  = is_string($from) ? new DateTimeImmutable($from) : $from;
+        $dtTo    = is_string($to)   ? new DateTimeImmutable($to)   : $to;
+        $minutes = abs($dtFrom->getTimestamp() - $dtTo->getTimestamp()) / 60;
+        $months  = round($minutes / $aMonth);
+        $years   = round($months / 12);
+
+        $typeAndNumber = match (true) {
+            $minutes < 1.0          => [FormatDistanceToken::LessThanXMinutes, 1],
+            $minutes < 45.0         => [FormatDistanceToken::XMinutes,         round($minutes)],
+            $minutes < 90.0         => [FormatDistanceToken::AboutXHours,      1],
+            $minutes < $aDay        => [FormatDistanceToken::AboutXHours,      round($minutes / 60)],
+            $minutes < $almost2Days => [FormatDistanceToken::XDays,            1],
+            $minutes < $aMonth      => [FormatDistanceToken::XDays,            round($minutes / $aDay)],
+            $minutes < $twoMonths   => [FormatDistanceToken::AboutXMonths,     round($minutes / $aMonth)],
+            $months      < 12       => [FormatDistanceToken::XMonths,          round($minutes / $aMonth)],
+            $months % 12 < 3        => [FormatDistanceToken::AboutXYears,      $years],
+            $months % 12 < 9        => [FormatDistanceToken::OverXYears,       $years],
+            default                 => [FormatDistanceToken::AlmostXYears,     $years]
+        };
+        $format = match ($typeAndNumber[0]) {
+            FormatDistanceToken::LessThanXMinutes => ['less than a minute', 'less than %d minutes'],
+            FormatDistanceToken::XMinutes         => ['a minute',           '%d minutes'],
+            FormatDistanceToken::AboutXHours      => ['about an hour',      'about %d hours'],
+            FormatDistanceToken::XHours           => ['an hour',            '%d hours'],
+            FormatDistanceToken::XDays            => ['a day',              '%d days'],
+            FormatDistanceToken::AboutXWeeks      => ['about a week',       'about %d weeks'],
+            FormatDistanceToken::XWeeks           => ['a week',             '%d weeks'],
+            FormatDistanceToken::AboutXMonths     => ['about a month',      'about %d months'],
+            FormatDistanceToken::XMonths          => ['a month',            '%d months'],
+            FormatDistanceToken::AboutXYears      => ['about a year',       'about %d years'],
+            FormatDistanceToken::XYears           => ['a year',             '%d years'],
+            FormatDistanceToken::OverXYears       => ['over a year',        'over %d years'],
+            FormatDistanceToken::AlmostXYears     => ['almost a year',      'almost %d years']
+        };
+        $value = $typeAndNumber[1] == 1 ? $format[0] : sprintf($format[1], $typeAndNumber[1]);
+        return $dtFrom > $dtTo ? "$value ago" : "in $value";
+    }
+
+    public static function requestItem(Request $req): void
+    {
+        $btnClass   = "btn btn-light mx-2";
+        $restoreBtn = fn(string $id, string $link, string $title) =>
+            '<button class="' . $btnClass. '" hx-patch="/request/' . $link . '?id=' . $id
+            . '" title="' . htmlspecialchars($title) . '">' . self::icon('restore') . '</button>'; ?>
+        <div class="list-group-item px-0 d-flex flex-row align-items-start" hx-target=this
+             hx-swap=outerHTML><?php
+        self::pageLink("/request/full?id=$req->id", self::icon('description'),
+            ['class' => $btnClass, 'title' => 'View Full Request']);
+        if (!$req->isAnswered()) {
+            self::pageLink("/request/edit?id=$req->id", self::icon('edit'),
+                ['class' => $btnClass, 'title' => 'Edit Request']);
+        }
+        if ($req->isSnoozed()) {
+            echo $restoreBtn($req->id, 'cancel-snooze', 'Cancel Snooze');
+        } elseif ($req->isPending()) {
+            echo $restoreBtn($req->id, 'show', 'Show Now');
+        }
+        echo '<p class="request-text mb-0">' . $req->currentText();
+        if ($req->isSnoozed() || $req->isPending() || $req->isAnswered()) { ?>
+            <br>
+            <small class=text-muted><em><?php
+                switch (true) {
+                    case $req->isSnoozed():
+                        echo 'Snooze expires '; self::relativeDate($req->snoozedUntil);
+                        break;
+                    case $req->isPending():
+                        echo 'Request appears next '; self::relativeDate($req->showAfter);
+                        break;
+                    default:
+                        echo 'Answered '; self::relativeDate($req->history[0]->asOf);
+                } ?>
+            </em></small><?php
+        } ?>
+        </div><?php
+    }
+
+    /**
+     * Render the given list of requests
+     *
+     * @param DocumentList<Request> $reqs The list of requests to render
+     * @throws Exception If date/time instances are not valid
+     */
+    public static function requestList(DocumentList $reqs): void
+    {
+        echo '<div class=list-group>';
+        foreach ($reqs->items() as $req) self::requestItem($req);
+        echo '</div>';
+    }
+}
+
+enum FormatDistanceToken
+{
+    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;
+}

src/public/components/journal-items.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, UI};
+
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+require '../../start.php';
+
+Auth::requireUser(false);
+
+UI::journal();

src/public/components/request/add-note.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, Request};
+
+require '../../../start.php';
+
+$req = validate_request($_GET['id'], ['GET'], false);
+
+Layout::bareHead(); ?>
+<form hx-post="/request/note?id=<?=$req->id?>">
+    <div class="form-floating pb-3">
+        <textarea id=notes name=notes class=form-control style="min-height: 8rem;" placeholder=Notes autofocus
+                  required></textarea>
+        <label for=notes>Notes</label>
+    </div>
+    <p class=text-end><button type=submit class="btn btn-primary">Add Notes</button>
+</form>
+<hr style="margin: .5rem -1rem">
+<div id=priorNotes>
+    <p class="text-center pt-3">
+        <button type=button class="btn btn-secondary" hx-get="/components/request/notes?id=<?=$req->id?>"
+                hx-swap=outerHTML hx-target=#priorNotes>Load Prior Notes</button>
+</div><?php
+Layout::bareFoot();

src/public/components/request/notes.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Layout, UI};
+
+require '../../../start.php';
+
+$req = validate_request($_GET['id'], ['GET'], false);
+
+Layout::bareHead();?>
+<p class=text-center><strong>Prior Notes for This Request</strong><?php
+if (sizeof($req->notes) > 0) {
+    foreach ($req->notes as $note) { ?>
+        <p><small class=text-muted><?php UI::relativeDate($note->asOf); ?></small><br>
+            <?=htmlentities($note->text)?><?php
+    }
+} else { ?>
+    <p class="text-center text-muted">There are no prior notes for this request<?php
+}
+Layout::bareFoot();

src/public/components/request/snooze.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Layout;
+
+require '../../../start.php';
+
+$req = validate_request($_GET['id'], ['GET'], false);
+
+Layout::bareHead(); ?>
+<form hx-patch="/request/snooze?id=<?=$req->id?>" hx-target=#journalItems hx-swap=outerHTML>
+    <div class="form-floating pb-3">
+        <input type=date id=until name=until class=form-control
+               min="<?=(new DateTimeImmutable('now'))->format('Y-m-d')?>" required>
+        <label for=until>Until</label>
+    </div>
+    <p class="text-end mb-0"><button type=submit class="btn btn-primary">Snooze</button>
+</form><?php
+Layout::bareFoot();

src/public/docs.php

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

src/public/index.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Layout;
+
+require '../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Layout::pageHead('Welcome'); ?>
+<article class="container mt-3">
+    <p>&nbsp;
+    <p>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>This site is open and available for anyone who wants to use it. 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.
+</article><?php
+Layout::pageFoot();

src/public/journal.php

@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, UI};
+
+require '../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Auth::requireUser();
+
+$user = Auth::user();
+$name = $user['given_name'] ?? 'Your';
+Layout::pageHead('Journal'); ?>
+<article class="container-fluid mt-3">
+    <h2 class=pb-3><?=$name?><?=$name == 'Your' ? '' : '&rsquo;s'?> Prayer Journal</h2>
+    <p class="pb-3 text-center"><?php
+        UI::pageLink('/request/edit?id=new', UI::icon('add_box') . ' Add a Prayer Request',
+            ['class' => 'btn btn-primary']); ?>
+    <p hx-get=/components/journal-items hx-swap=outerHTML hx-trigger=load hx-target=this>
+        Loading your prayer journal&hellip;
+    <div id=notesModal class="modal fade" tabindex=-1 aria-labelledby=nodesModalLabel aria-hidden=true>
+        <div class="modal-dialog modal-dialog-scrollable">
+            <div class=modal-content>
+                <div class=modal-header>
+                    <h5 class=modal-title id=nodesModalLabel>Add Notes to Prayer Request</h5>
+                    <button type=button class=btn-close data-bs-dismiss=modal aria-label=Close></button>
+                </div>
+                <div class=modal-body id=notesBody></div>
+                <div class=modal-footer>
+                    <button type=button id=notesDismiss class="btn btn-secondary" data-bs-dismiss=modal>Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id=snoozeModal class="modal fade" tabindex=-1 aria-labelledby=snoozeModalLabel aria-hidden=true>
+        <div class="modal-dialog modal-sm">
+            <div class=modal-content>
+                <div class=modal-header>
+                    <h5 class=modal-title id=snoozeModalLabel>Snooze Prayer Request</h5>
+                    <button type=button class=btn-close data-bs-dismiss=modal aria-label=Close></button>
+                </div>
+                <div class=modal-body id=snoozeBody></div>
+                <div class=modal-footer>
+                    <button type=button id=snoozeDismiss class="btn btn-secondary" data-bs-dismiss=modal>Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</article><?php
+Layout::pageFoot();
+

src/public/legal/privacy-policy.php

@@ -0,0 +1,72 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Layout;
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Layout::pageHead('Privacy Policy'); ?>
+<article class="container mt-3">
+    <h2 class=mb-2>Privacy Policy</h2>
+    <h6 class="text-muted pb-3">as of May 21<sup>st</sup>, 2018</h6>
+    <p>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.
+    <div class=card>
+        <div class="list-group list-group-flush">
+            <div class=list-group-item>
+                <h3>Third Party Services</h3>
+                <p class=card-text>
+                    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>).
+            </div>
+            <div class=list-group-item>
+                <h3>What We Collect</h3>
+                <h4>Identifying Data</h4>
+                <ul>
+                    <li>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>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.
+                </ul>
+                <h4>User Provided Data</h4>
+                <ul class=mb-0>
+                    <li>myPrayerJournal stores the information you provide, including the text of prayer requests,
+                        updates, and notes; and the date/time when certain actions are taken.
+                </ul>
+            </div>
+            <div class=list-group-item>
+                <h3>How Your Data Is Accessed / Secured</h3>
+                <ul class=mb-0>
+                    <li>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>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>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>Access to servers and backups is strictly controlled and monitored for unauthorized access
+                        attempts.
+                </ul>
+            </div>
+            <div class=list-group-item>
+                <h3>Removing Your Data</h3>
+                <p class=card-text>
+                    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.
+            </div>
+        </div>
+    </div>
+</article><?php
+Layout::pageFoot();

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

@@ -0,0 +1,59 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Layout, UI};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Layout::pageHead('Terms of Service'); ?>
+<article class="container mt-3">
+    <h2 class=mb-2>Terms of Service</h2>
+    <h6 class="text-muted pb-3">as of May 21<sup>st</sup>, 2018</h6>
+    <div class=card>
+        <div class="list-group list-group-flush">
+            <div class=list-group-item>
+                <h3>1. Acceptance of Terms</h3>
+                <p class=card-text>
+                    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.
+            </div>
+            <div class=list-group-item>
+                <h3>2. Description of Service and Registration</h3>
+                <p class=card-text>
+                    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
+                    <?php UI::pageLink('/legal/privacy-policy', 'our privacy policy'); ?> for details on how that
+                    information is accessed and stored.
+            </div>
+            <div class=list-group-item>
+                <h3>3. Third Party Services</h3>
+                <p class=card-text>
+                    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>).
+            </div>
+            <div class=list-group-item>
+                <h3>4. Liability</h3>
+                <p class=card-text>
+                    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.
+            </div>
+            <div class=list-group-item>
+                <h3>5. Updates to Terms</h3>
+                <p class=card-text>
+                    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."
+            </div>
+        </div>
+    </div>
+    <p class=pt-3>
+        You may also wish to review our <?php UI::pageLink('/legal/privacy-policy', 'privacy policy'); ?> to learn how
+        we handle your data.
+</article><?php
+Layout::pageFoot();

src/public/request/cancel-snooze.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Layout, Table, UI};
+use BitBadger\PDODocument\RemoveFields;
+
+require '../../../start.php';
+
+$req = validate_request($_GET['id'], ['GET'], false);
+
+RemoveFields::byId(Table::REQUEST, $req->id, ['snoozedUntil']);
+
+// TODO: message
+Layout::bareHead();
+UI::requestItem($req);
+Layout::bareFoot();

src/public/request/edit.php

@@ -0,0 +1,105 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, RecurrencePeriod, Request, RequestAction, UI};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Auth::requireUser();
+
+$isNew = $_GET['id'] == 'new';
+
+$req = match ($isNew) {
+    true  => new Request('new'),
+    false => Request::byId($_GET['id'])
+};
+if (!$req) not_found();
+
+$cancelLink = match (true) {
+    str_ends_with($_SERVER['HTTP_REFERER'] ?? '', 'active.php')  => '/requests/active',
+    str_ends_with($_SERVER['HTTP_REFERER'] ?? '', 'snoozed.php') => '/requests/snoozed',
+    default                                                      => '/journal'
+};
+$action = $_GET['id'] == 'new' ? 'Add' : 'Edit';
+
+Layout::pageHead("$action Prayer Request");?>
+<article class=container>
+    <h2 class=pb-3><?=$action?> Prayer Request</h2>
+    <form <?=$isNew ? 'hx-post' : 'hx-patch'?>=/request/save hx-target=#top hx-push-url=true>
+        <input type=hidden name=requestId value=<?=$req->id?>>
+        <input type=hidden name=returnTo value=<?=$cancelLink?>>
+        <div class="form-floating pb-3">
+            <textarea id=requestText name=requestText class=form-control style="min-height: 8rem;"
+                      placeholder="Enter the text of the request" autofocus required><?=$req->currentText()?></textarea>
+            <label for=requestText>Prayer Request</label>
+        </div><br><?php
+        if (!$isNew) { ?>
+            <div class=pb-3>
+                <label>Also Mark As</label><br>
+                <div class="form-check form-check-inline">
+                    <input type=radio class=form-check-input id=sU name=status value=<?=RequestAction::Updated->value?>
+                           checked>
+                    <label for=sU>Updated</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input type=radio class=form-check-input id=sP name=status value=<?=RequestAction::Prayed->value?>>
+                    <label for=sP>Prayed</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input type=radio class=form-check-input id=sA name=status
+                           value=<?=RequestAction::Answered->value?>>
+                    <label for=sA>Answered</label>
+                </div>
+            </div><?php
+        } ?>
+        <div class=row">
+            <div class="col-12 offset-md-2 col-md-8 offset-lg-3 col-lg-6">
+                <p><strong>Recurrence &nbsp;</strong> <em class=text-muted>After prayer, request reappears&hellip;</em>
+                <div class="d-flex flex-row flex-wrap justify-content-center align-items-center">
+                    <div class="form-check mx-2">
+                        <input type=radio class=form-check-input id=rI name=recurType
+                               value=<?=RecurrencePeriod::Immediate->value?>
+                               onclick="mpj.edit.toggleRecurrence(event)"<?php
+                               if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' checked'; ?>>
+                        <label for=rI>Immediately</label>
+                    </div>
+                    <div class="form-check mx-2">
+                        <input type=radio class=form-check-input id=rO name=recurType value=Other
+                               onclick="mpj.edit.toggleRecurrence(event)"<?php
+                               if ($req->recurrence->period <> RecurrencePeriod::Immediate) echo ' checked'; ?>>
+                        <label for=rO>Every&hellip;</label>
+                    </div>
+                    <div class="form-floating mx-2">
+                        <input type=number class=form-control id=recurCount name=recurCount placeholder=0 required
+                               value=<?=$req->recurrence->interval ?? 0?> style="width:6rem;"<?php
+                               if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' disabled'; ?>>
+                        <label for=recurCount>Count</label>
+                    </div>
+                    <div class="form-floating mx-2">
+                        <select class=form-control id=recurInterval name=recurInterval style="width:6rem;" required<?php
+                                if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' disabled'; ?>>
+                            <option value=<?=RecurrencePeriod::Hours->value?><?php
+                                    if ($req->recurrence->period == RecurrencePeriod::Hours) echo ' selected'; ?>>
+                                hours
+                            </option>
+                            <option value=<?=RecurrencePeriod::Days->value?><?php
+                                    if ($req->recurrence->period == RecurrencePeriod::Days) echo ' selected'; ?>>
+                                days
+                            </option>
+                            <option value=<?=RecurrencePeriod::Weeks->value?><?php
+                                    if ($req->recurrence->period == RecurrencePeriod::Weeks) echo ' selected'; ?>>
+                                weeks
+                            </option>
+                        </select>
+                        <label for=recurInterval>Interval</label>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="text-end pt-3">
+            <button class="btn btn-primary me-2" type=submit><?=UI::icon('save');?> Save</button><?php
+            UI::pageLink($cancelLink, UI::icon('arrow_back') . ' Cancel', ['class' => 'btn btn-secondary ms-2']); ?>
+        </div>
+    </form>
+</article><?php
+Layout::pageFoot();

src/public/request/full.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{History, Layout, Note, RequestAction, UI};
+
+require '../../start.php';
+
+$req = validate_request($_GET['id'], ['GET']);
+
+$answered = $req->isAnswered() ? new DateTimeImmutable($req->history[0]->asOf) : null;
+$prayed   = sizeof(array_filter($req->history, fn(History $hist) => $hist->action == RequestAction::Prayed));
+$daysOpen =
+    (($answered ?? new DateTimeImmutable('now'))->getTimestamp()
+        - (new DateTimeImmutable(end($req->history)->asOf))->getTimestamp()) / 86400;
+
+$logs = array_merge(
+    array_map(fn(Note $note) => [new DateTimeImmutable($note->asOf), 'Notes', $note->text], $req->notes),
+    array_map(fn(History $hist) => [new DateTimeImmutable($hist->asOf), $hist->action->value, $hist->text ?? ''],
+        $req->history));
+usort($logs, fn($a, $b) => $a[0] > $b[0] ? -1 : 1);
+if ($req->isAnswered()) array_shift($logs);
+
+Layout::pageHead('Full Request');?>
+<article class="container mt-3">
+    <div class=card>
+        <h5 class=card-header>Full Prayer Request</h5>
+        <div class=card-body>
+            <h6 class="card-subtitle text-muted mb-2"><?php
+                if (!is_null($answered)) { ?>
+                    Answered <?=$answered->format('F j, Y')?>
+                    (<?=UI::formatDistance('now', $req->history[0]->asOf);?>) &bull;<?php
+                } ?>
+                Prayed <?=number_format($prayed)?> times &bull; Open <?=number_format($daysOpen)?> days
+            </h6>
+            <p class=card-text><?=htmlentities($req->currentText())?>
+        </div>
+        <ul class="list-group list-group-flush"><?php
+            foreach ($logs as $log) { ?>
+                <li class=list-group-item>
+                    <p class=m-0><?=$log[1]?>&nbsp; <small><em><?=$log[0]->format('F j, Y')?></em></small><?php
+                    if ($log[2] <> '') echo '<p class="mt-2 mb-0">' . htmlentities($log[2]);
+            } ?>
+        </ul>
+    </div>
+</article><?php
+Layout::pageFoot();

src/public/request/note.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Note, Table};
+use BitBadger\PDODocument\Patch;
+
+require '../../start.php';
+
+$req = validate_request($_GET['id'], ['POST'], false);
+
+array_unshift($req->notes, new Note((new DateTimeImmutable('now'))->format('c'), $_POST['notes']));
+Patch::byId(Table::REQUEST, $req->id, ['notes' => $req->notes]);
+
+hide_modal('notes');
+http_response_code(202);

src/public/request/prayed.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{History, RecurrencePeriod, RequestAction, Table, UI};
+use BitBadger\PDODocument\Patch;
+
+require '../../start.php';
+
+$req = validate_request($_GET['id'], ['PATCH'], false);
+$now = new DateTimeImmutable('now');
+
+array_unshift($req->history, new History($now->format('c'), RequestAction::Prayed));
+$patch = ['history' => $req->history];
+
+if ($req->recurrence->period <> RecurrencePeriod::Immediate) {
+    $patch['showAfter'] = $now->add($req->recurrence->interval())->format('c');
+}
+Patch::byId(Table::REQUEST, $req->id, $patch);
+
+UI::journal();

src/public/request/save.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, History, Recurrence, RecurrencePeriod, Request, RequestAction, Table};
+use BitBadger\PDODocument\{Document, Patch, RemoveFields};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'POST' && $_SERVER['REQUEST_METHOD'] <> 'PATCH') not_found();
+
+Auth::requireUser(false);
+
+$now        = new DateTimeImmutable('now');
+$recurrence = new Recurrence(RecurrencePeriod::from($_POST['recurType'] ?? $_PATCH['recurType']));
+if ($recurrence->period <> RecurrencePeriod::Immediate) {
+    $recurrence->interval = (int)($_POST['recurCount'] ?? $_PATCH['recurCount']);
+}
+
+switch ($_SERVER['REQUEST_METHOD']) {
+    case 'POST':
+        Document::insert(Table::REQUEST, new Request(
+            enteredOn:  $now->format('c'),
+            userId:     $_SESSION['user_id'],
+            recurrence: $recurrence,
+            history:    [new History($now->format('c'), RequestAction::Created, $_POST['requestText'])]));
+        //Messages.pushSuccess ctx "Added prayer request" "/journal"
+        see_other('/journal');
+
+    case 'PATCH':
+        $req = Request::byId($_PATCH['requestId']);
+        if (!$req) not_found();
+        $patch = [];
+        // update recurrence if changed
+        if ($recurrence != $req->recurrence) {
+            $patch['recurrence'] = $recurrence;
+            if ($recurrence->period == RecurrencePeriod::Immediate) {
+                RemoveFields::byId(Table::REQUEST, $req->id, ['showAfter']);
+            }
+        }
+        // append history
+        $upd8Text = trim($_PATCH['requestText']);
+        $text     = $upd8Text == '' || $upd8Text == $req->currentText() ? null : $upd8Text;
+        array_unshift($req->history, new History($now->format('c'), RequestAction::from($_PATCH['status']), $text));
+        $patch['history'] = $req->history;
+        Patch::byId(Table::REQUEST, $req->id, $patch);
+        //Messages.pushSuccess ctx "Prayer request updated successfully" nextUrl
+        see_other($_PATCH['returnTo']);
+}

src/public/request/snooze.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Table, UI};
+use BitBadger\PDODocument\Patch;
+
+require '../../start.php';
+
+$req = validate_request($_GET['id'], ['PATCH'], false);
+
+$until = (new DateTimeImmutable($_PATCH['until'] . 'T00:00:00', new DateTimeZone($_REQUEST['time_zone'])))
+             ->setTimezone(new DateTimeZone('Etc/UTC'));
+Patch::byId(Table::REQUEST, $req->id, ['snoozedUntil' => $until->format('c')]);
+
+// TODO: message
+
+hide_modal('snooze');
+UI::journal();

src/public/requests/active.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, Request, UI};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Auth::requireUser();
+
+$reqs = Request::active();
+
+Layout::pageHead('Active Requests'); ?>
+<article class="container mt-3">
+    <h2 class=pb-3>Active Requests</h2><?php
+    if ($reqs->hasItems()) {
+        UI::requestList($reqs);
+    } else {
+        UI::noResults('No Active Requests', '/journal', 'Return to your journal',
+            'Your prayer journal has no active requests');
+    } ?>
+</article><?php
+Layout::pageFoot();

src/public/requests/answered.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, Request, UI};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Auth::requireUser();
+
+$reqs = Request::answered();
+
+Layout::pageHead('Answered Requests'); ?>
+<article class="container mt-3">
+    <h2 class=pb-3>Answered Requests</h2><?php
+    if ($reqs->hasItems()) {
+        UI::requestList($reqs);
+    } else {
+        UI::noResults('No Answered Requests', '/journal', 'Return to your journal', <<<'TEXT'
+            Your prayer journal has no answered requests; once you have marked one as &ldquo;Answered&rdquo;, it will
+            appear here
+            TEXT);
+    } ?>
+</article><?php
+Layout::pageFoot();

src/public/requests/snoozed.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\{Auth, Layout, Request, UI};
+
+require '../../start.php';
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+
+Auth::requireUser();
+
+$reqs = Request::snoozed();
+
+Layout::pageHead('Snoozed Requests'); ?>
+<article class="container mt-3">
+    <h2 class=pb-3>Snoozed Requests</h2><?php
+    if ($reqs->hasItems()) {
+        UI::requestList($reqs);
+    } else {
+        UI::noResults('No Snoozed Requests', '/journal', 'Return to your journal',
+            'Your prayer journal has no snoozed requests');
+    } ?>
+</article><?php
+Layout::pageFoot();

src/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/public/style/style.css

@@ -0,0 +1,57 @@
+
+nav {
+  background-color: green;
+}
+nav .m {
+  font-weight: 100;
+}
+nav .p {
+  font-weight: 400;
+}
+nav .j {
+  font-weight: 700;
+}
+.nav-item a:link,
+.nav-item a:visited {
+  padding: .5rem 1rem;
+  margin: 0 .5rem;
+  border-radius: .5rem;
+  color: white;
+  text-decoration: none;
+}
+.nav-item a:hover {
+  cursor: pointer;
+  background-color: rgba(255, 255, 255, .2);
+}
+.nav-item 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;
+}
+footer p {
+  margin: 0;
+}

src/public/user/log-off.php

@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Auth;
+
+require '../../start.php';
+
+Auth::logOff();

src/public/user/log-on.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Auth;
+
+if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
+require '../../start.php';
+
+Auth::logOn();

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

@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+use MyPrayerJournal\Auth;
+
+require '../../../start.php';
+
+Auth::client()->exchange($_ENV['AUTH0_BASE_URL'] . '/user/log-on/success');
+
+// TODO: get the possible redirect URL
+header('Location: /journal');
+exit();

src/start.php

@@ -0,0 +1,85 @@
+<?php declare(strict_types=1);
+
+use Auth0\SDK\Exception\ConfigurationException;
+use BitBadger\PDODocument\{Configuration, Definition, DocumentException, Mode};
+use Dotenv\Dotenv;
+use MyPrayerJournal\{Auth, Request, Table};
+
+require __DIR__ . '/vendor/autoload.php';
+
+/** The version of this application */
+const MPJ_VERSION = '4.0.0-alpha1';
+
+(Dotenv::createImmutable(__DIR__))->load();
+
+if (php_sapi_name() != 'cli') {
+    session_start();
+
+    $auth0_user = Auth::user();
+    if (!is_null($auth0_user)) {
+        $_SESSION['user_id'] = $auth0_user['sub'];
+    }
+
+    $_REQUEST['time_zone'] = $_SERVER['HTTP_X_TIME_ZONE'] ?? 'Etc/UTC';
+}
+
+Configuration::$pdoDSN = 'sqlite:' . implode(DIRECTORY_SEPARATOR, [__DIR__, 'data', 'mpj.db']);
+Configuration::$mode   = Mode::SQLite;
+Definition::ensureTable(Table::REQUEST);
+Definition::ensureFieldIndex(Table::REQUEST, 'user', ['userId']);
+
+$_PATCH = [];
+if ($_SERVER['REQUEST_METHOD'] ?? '' == 'PATCH') parse_str(file_get_contents('php://input'), $_PATCH);
+
+/**
+ * Return a 404 and exit
+ */
+function not_found(): never
+{
+    http_response_code(404);
+    die('Not found');
+}
+
+/**
+ * Return a 303 redirect ("see other" - redirects to a GET)
+ *
+ * @param string $url The URL to which the browser should be redirected
+ */
+function see_other(string $url): never
+{
+    header('Location: ' . (str_starts_with($url, 'http') ? '/' : $url));
+    http_response_code(303);
+    exit;
+}
+
+/**
+ * Add a header that instructs the browser to close an open modal dialog
+ *
+ * @param string $name The name of the dialog to be closed
+ */
+function hide_modal(string $name): void
+{
+    header("X-Hide-Modal: $name");
+}
+
+/**
+ * Validate the user, HTTP method, and request
+ *
+ * @param string $id The ID of the prayer request to retrieve
+ * @param array $methods The allowable HTTP methods
+ * @param bool $redirect Whether to redirect not-logged-on users (optional, defaults to true)
+ * @return Request The request (failures will not return)
+ * @throws ConfigurationException If any is encountered
+ * @throws DocumentException If any is encountered
+ */
+function validate_request(string $id, array $methods, bool $redirect = true): Request
+{
+    if (sizeof(array_filter($methods, fn($it) => $_SERVER['REQUEST_METHOD'] == $it)) == 0) not_found();
+
+    Auth::requireUser($redirect);
+
+    $req = Request::byId($id);
+    if (!$req) not_found();
+
+    return $req;
+}