v8.4 (#53)

- Bring help into the application (#51)
- Dependency updates

Reviewed-on: #53

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fake-cli": {
+      "version": "5.23.0",
+      "commands": [
+        "fake"
+      ]
+    }
+  }
+}

.gitignore

@@ -331,3 +331,8 @@ ASALocalRun/
 
 ### --- ###
 src/PrayerTracker/appsettings.json
+docs/_site
+**/*.db*
+
+.ionide
+.vscode

README.md

@@ -1,5 +1,7 @@
 # PrayerTracker
 
+[![Build status](https://ci.appveyor.com/api/projects/status/j5nt9o3pu7er7hyi/branch/main?svg=true)](https://ci.appveyor.com/project/danieljsummers/prayertracker/branch/main)
+
 ### Visit the Site
 
 https://prayer.bitbadger.solutions

build.fsx

@@ -0,0 +1,44 @@
+#r "paket:
+nuget Fake.DotNet.Cli
+nuget Fake.DotNet.Testing.Expecto
+nuget Fake.IO.FileSystem
+nuget Fake.Core.Target //"
+#load ".fake/build.fsx/intellisense.fsx"
+open Fake.Core
+open Fake.DotNet
+open Fake.DotNet.Testing
+open Fake.IO
+open Fake.IO.Globbing.Operators
+open Fake.Core.TargetOperators
+
+Target.initEnvironment ()
+
+/// The root path to the projects within this solution
+let projPath = "src/PrayerTracker"
+
+Target.create "Clean" (fun _ ->
+    !! "src/**/bin"
+    ++ "src/**/obj"
+    |> Shell.cleanDirs 
+)
+
+Target.create "Test" (fun _ ->
+    let testPath = $"{projPath}.Tests"
+    DotNet.build (fun opts -> { opts with NoLogo = true }) $"{testPath}/PrayerTracker.Tests.fsproj"
+    Expecto.run
+        (fun opts -> { opts with WorkingDirectory = $"{testPath}/bin/Release/net7.0" })
+        [ "PrayerTracker.Tests.dll" ])
+
+Target.create "Publish" (fun _ ->
+    DotNet.publish
+        (fun opts -> { opts with Runtime = Some "linux-x64"; SelfContained = Some false; NoLogo = true })
+        $"{projPath}/PrayerTracker.fsproj")
+
+Target.create "All" ignore
+
+"Clean"
+    ==> "Test"
+    ==> "Publish"
+    ==> "All"
+
+Target.runOrDefault "All"

build.fsx.lock

@@ -0,0 +1,233 @@
+STORAGE: NONE
+RESTRICTION: || (== net6.0) (== netstandard2.0)
+NUGET
+  remote: https://api.nuget.org/v3/index.json
+    BlackFox.VsWhere (1.1)
+      FSharp.Core (>= 4.2.3)
+      Microsoft.Win32.Registry (>= 4.7)
+    Fake.Core.CommandLineParsing (5.23)
+      FParsec (>= 1.1.1)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Context (5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Environment (5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.FakeVar (5.23)
+      Fake.Core.Context (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Process (5.23)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.FakeVar (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      Fake.IO.FileSystem (>= 5.23)
+      FSharp.Core (>= 6.0)
+      System.Collections.Immutable (>= 5.0)
+    Fake.Core.SemVer (5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.String (5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Target (5.23)
+      Fake.Core.CommandLineParsing (>= 5.23)
+      Fake.Core.Context (>= 5.23)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.FakeVar (>= 5.23)
+      Fake.Core.Process (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      FSharp.Control.Reactive (>= 5.0.2)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Tasks (5.23)
+      Fake.Core.Trace (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Trace (5.23)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.FakeVar (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Core.Xml (5.23)
+      Fake.Core.String (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.DotNet.Cli (5.23)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.Process (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      Fake.DotNet.MSBuild (>= 5.23)
+      Fake.DotNet.NuGet (>= 5.23)
+      Fake.IO.FileSystem (>= 5.23)
+      FSharp.Core (>= 6.0)
+      Mono.Posix.NETStandard (>= 1.0)
+      Newtonsoft.Json (>= 13.0.1)
+    Fake.DotNet.MSBuild (5.23)
+      BlackFox.VsWhere (>= 1.1)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.Process (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      Fake.IO.FileSystem (>= 5.23)
+      FSharp.Core (>= 6.0)
+      MSBuild.StructuredLogger (>= 2.1.545)
+    Fake.DotNet.NuGet (5.23)
+      Fake.Core.Environment (>= 5.23)
+      Fake.Core.Process (>= 5.23)
+      Fake.Core.SemVer (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Tasks (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      Fake.Core.Xml (>= 5.23)
+      Fake.IO.FileSystem (>= 5.23)
+      Fake.Net.Http (>= 5.23)
+      FSharp.Core (>= 6.0)
+      Newtonsoft.Json (>= 13.0.1)
+      NuGet.Protocol (>= 5.11)
+    Fake.DotNet.Testing.Expecto (5.23)
+      Fake.Core.Process (>= 5.23)
+      Fake.Core.String (>= 5.23)
+      Fake.Core.Trace (>= 5.23)
+      Fake.IO.FileSystem (>= 5.23)
+      Fake.Testing.Common (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.IO.FileSystem (5.23)
+      Fake.Core.String (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Net.Http (5.23)
+      Fake.Core.Trace (>= 5.23)
+      FSharp.Core (>= 6.0)
+    Fake.Testing.Common (5.23)
+      Fake.Core.Trace (>= 5.23)
+      FSharp.Core (>= 6.0)
+    FParsec (1.1.1)
+      FSharp.Core (>= 4.3.4)
+    FSharp.Control.Reactive (5.0.5)
+      FSharp.Core (>= 4.7.2)
+      System.Reactive (>= 5.0 < 6.0)
+    FSharp.Core (6.0.5)
+    Microsoft.Build (17.2)
+      Microsoft.Build.Framework (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
+      System.Collections.Immutable (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      System.Configuration.ConfigurationManager (>= 4.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      System.Reflection.Metadata (>= 1.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
+      System.Security.Principal.Windows (>= 4.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
+      System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
+      System.Text.Json (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+    Microsoft.Build.Framework (17.2)
+      Microsoft.Win32.Registry (>= 4.3)
+      System.Security.Permissions (>= 4.7)
+    Microsoft.Build.Tasks.Core (17.2)
+      Microsoft.Build.Framework (>= 17.2)
+      Microsoft.Build.Utilities.Core (>= 17.2)
+      Microsoft.NET.StringTools (>= 1.0)
+      Microsoft.Win32.Registry (>= 4.3)
+      System.CodeDom (>= 4.4)
+      System.Collections.Immutable (>= 5.0)
+      System.Reflection.Metadata (>= 1.6)
+      System.Resources.Extensions (>= 4.6)
+      System.Security.Cryptography.Pkcs (>= 4.7)
+      System.Security.Cryptography.Xml (>= 4.7)
+      System.Security.Permissions (>= 4.7)
+      System.Threading.Tasks.Dataflow (>= 6.0)
+    Microsoft.Build.Utilities.Core (17.2)
+      Microsoft.Build.Framework (>= 17.2)
+      Microsoft.NET.StringTools (>= 1.0)
+      Microsoft.Win32.Registry (>= 4.3)
+      System.Collections.Immutable (>= 5.0)
+      System.Configuration.ConfigurationManager (>= 4.7)
+      System.Security.Permissions (>= 4.7) - restriction: == netstandard2.0
+      System.Text.Encoding.CodePages (>= 4.0.1) - restriction: == netstandard2.0
+    Microsoft.NET.StringTools (1.0)
+      System.Memory (>= 4.5.4)
+      System.Runtime.CompilerServices.Unsafe (>= 5.0)
+    Microsoft.NETCore.Platforms (6.0.5) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0)
+    Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0)
+    Microsoft.Win32.Registry (5.0)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
+      System.Security.AccessControl (>= 5.0)
+      System.Security.Principal.Windows (>= 5.0)
+    Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    Mono.Posix.NETStandard (1.0)
+    MSBuild.StructuredLogger (2.1.669)
+      Microsoft.Build (>= 16.10)
+      Microsoft.Build.Framework (>= 16.10)
+      Microsoft.Build.Tasks.Core (>= 16.10)
+      Microsoft.Build.Utilities.Core (>= 16.10)
+    Newtonsoft.Json (13.0.1)
+    NuGet.Common (6.3)
+      NuGet.Frameworks (>= 6.3)
+    NuGet.Configuration (6.3)
+      NuGet.Common (>= 6.3)
+      System.Security.Cryptography.ProtectedData (>= 4.4)
+    NuGet.Frameworks (6.3)
+    NuGet.Packaging (6.3)
+      Newtonsoft.Json (>= 13.0.1)
+      NuGet.Configuration (>= 6.3)
+      NuGet.Versioning (>= 6.3)
+      System.Security.Cryptography.Cng (>= 5.0)
+      System.Security.Cryptography.Pkcs (>= 5.0)
+    NuGet.Protocol (6.3)
+      NuGet.Packaging (>= 6.3)
+    NuGet.Versioning (6.3)
+    System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
+    System.CodeDom (6.0)
+    System.Collections.Immutable (6.0)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Configuration.ConfigurationManager (6.0)
+      System.Security.Cryptography.ProtectedData (>= 6.0)
+      System.Security.Permissions (>= 6.0)
+    System.Drawing.Common (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+      Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    System.Formats.Asn1 (6.0)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+    System.Memory (4.5.5)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
+      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
+    System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+    System.Reactive (5.0)
+      System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
+      System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
+    System.Reflection.Metadata (6.0.1)
+      System.Collections.Immutable (>= 6.0)
+    System.Resources.Extensions (6.0)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+    System.Runtime (4.3.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1)
+      Microsoft.NETCore.Targets (>= 1.1.3)
+    System.Runtime.CompilerServices.Unsafe (6.0)
+    System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
+      System.Runtime (>= 4.3)
+    System.Security.AccessControl (6.0)
+      System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
+    System.Security.Cryptography.Cng (5.0)
+      System.Formats.Asn1 (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+    System.Security.Cryptography.Pkcs (6.0.1)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
+      System.Formats.Asn1 (>= 6.0)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
+      System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
+    System.Security.Cryptography.ProtectedData (6.0)
+    System.Security.Cryptography.Xml (6.0.1)
+      System.Memory (>= 4.5.4) - restriction: == netstandard2.0
+      System.Security.AccessControl (>= 6.0)
+      System.Security.Cryptography.Pkcs (>= 6.0.1)
+    System.Security.Permissions (6.0)
+      System.Security.AccessControl (>= 6.0)
+      System.Windows.Extensions (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+    System.Security.Principal.Windows (5.0)
+    System.Text.Encoding.CodePages (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Text.Encodings.Web (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Text.Json (6.0.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+      System.Text.Encodings.Web (>= 6.0)
+    System.Threading.Tasks.Dataflow (6.0)
+    System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
+    System.Windows.Extensions (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
+      System.Drawing.Common (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))

fake.cmd

@@ -0,0 +1,2 @@
+dotnet tool restore
+dotnet fake %*

fake.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -eu
+set -o pipefail
+
+dotnet tool restore
+dotnet fake "$@"

src/.dockerignore

@@ -0,0 +1,3 @@
+**/bin/*
+**/obj/*
+**/appsettings.*

src/Directory.Build.props

@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyVersion>8.4.0.0</AssemblyVersion>
+    <FileVersion>8.4.0.0</FileVersion>
+    <Authors>danieljsummers</Authors>
+    <Company>Bit Badger Solutions</Company>
+    <Version>8.4.0</Version>
+    <DebugType>Embedded</DebugType>
+  </PropertyGroup>
+</Project>

src/Dockerfile

@@ -0,0 +1,25 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+WORKDIR /pt
+COPY ./PrayerTracker.sln                              ./
+COPY ./Directory.Build.props                          ./
+COPY ./PrayerTracker/PrayerTracker.fsproj             ./PrayerTracker/
+COPY ./PrayerTracker.Data/PrayerTracker.Data.fsproj   ./PrayerTracker.Data/
+COPY ./PrayerTracker.Tests/PrayerTracker.Tests.fsproj ./PrayerTracker.Tests/
+COPY ./PrayerTracker.UI/PrayerTracker.UI.fsproj       ./PrayerTracker.UI/
+RUN dotnet restore
+
+COPY . ./
+WORKDIR /pt/PrayerTracker.Tests
+RUN dotnet run
+
+WORKDIR /pt/PrayerTracker
+RUN dotnet publish -c Release -r linux-x64
+
+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 /pt/PrayerTracker/bin/Release/net8.0/linux-x64/publish/ ./
+
+EXPOSE 80
+CMD [ "dotnet", "/app/PrayerTracker.dll" ]

src/PrayerTracker.Data/Access.fs

@@ -0,0 +1,589 @@
+namespace PrayerTracker.Data
+
+open NodaTime
+open Npgsql
+open Npgsql.FSharp
+open PrayerTracker.Entities
+
+/// Helper functions for the PostgreSQL data implementation
+[<AutoOpen>]
+module private Helpers =
+    
+    /// Map a row to a Church instance
+    let mapToChurch (row : RowReader) =
+        {   Id               = ChurchId         (row.uuid "id")
+            Name             = row.string       "church_name"
+            City             = row.string       "city"
+            State            = row.string       "state"
+            HasVpsInterface  = row.bool         "has_vps_interface"
+            InterfaceAddress = row.stringOrNone "interface_address"
+        }
+    
+    /// Map a row to a ListPreferences instance
+    let mapToListPreferences (row : RowReader) =
+        {   SmallGroupId        = SmallGroupId (row.uuid "small_group_id")
+            DaysToKeepNew       = row.int      "days_to_keep_new"
+            DaysToExpire        = row.int      "days_to_expire"
+            LongTermUpdateWeeks = row.int      "long_term_update_weeks"
+            EmailFromName       = row.string   "email_from_name"
+            EmailFromAddress    = row.string   "email_from_address"
+            Fonts               = row.string   "fonts"
+            HeadingColor        = row.string   "heading_color"
+            LineColor           = row.string   "line_color"
+            HeadingFontSize     = row.int      "heading_font_size"
+            TextFontSize        = row.int      "text_font_size"
+            GroupPassword       = row.string   "group_password"
+            IsPublic            = row.bool     "is_public"
+            PageSize            = row.int      "page_size"
+            TimeZoneId          = TimeZoneId    (row.string "time_zone_id")
+            RequestSort         = RequestSort.fromCode     (row.string "request_sort")
+            DefaultEmailType    = EmailFormat.fromCode     (row.string "default_email_type")
+            AsOfDateDisplay     = AsOfDateDisplay.fromCode (row.string "as_of_date_display")
+        }
+    
+    /// Map a row to a Member instance
+    let mapToMember (row : RowReader) =
+        {   Id           = MemberId         (row.uuid "id")
+            SmallGroupId = SmallGroupId     (row.uuid "small_group_id")
+            Name         = row.string       "member_name"
+            Email        = row.string       "email"
+            Format       = row.stringOrNone "email_format" |> Option.map EmailFormat.fromCode
+        }
+    
+    /// Map a row to a Prayer Request instance
+    let mapToPrayerRequest (row : RowReader) =
+        {   Id             = PrayerRequestId         (row.uuid "id")
+            UserId         = UserId                  (row.uuid "user_id")
+            SmallGroupId   = SmallGroupId            (row.uuid "small_group_id")
+            EnteredDate    = row.fieldValue<Instant> "entered_date"
+            UpdatedDate    = row.fieldValue<Instant> "updated_date"
+            Requestor      = row.stringOrNone        "requestor"
+            Text           = row.string              "request_text"
+            NotifyChaplain = row.bool                "notify_chaplain"
+            RequestType    = PrayerRequestType.fromCode (row.string "request_type")
+            Expiration     = Expiration.fromCode        (row.string "expiration")
+        }
+    
+    /// Map a row to a Small Group instance
+    let mapToSmallGroup (row : RowReader) =
+        {   Id          = SmallGroupId (row.uuid "id")
+            ChurchId    = ChurchId     (row.uuid "church_id")
+            Name        = row.string   "group_name"
+            Preferences = ListPreferences.empty
+        }
+    
+    /// Map a row to a Small Group information set
+    let mapToSmallGroupInfo (row : RowReader) =
+        {   Id         = Giraffe.ShortGuid.fromGuid (row.uuid "id")
+            Name       = row.string "group_name"
+            ChurchName = row.string "church_name"
+            TimeZoneId = TimeZoneId (row.string "time_zone_id")
+            IsPublic   = row.bool   "is_public"
+        }
+    
+    /// Map a row to a Small Group list item
+    let mapToSmallGroupItem (row : RowReader) =
+        Giraffe.ShortGuid.fromGuid (row.uuid "id"), $"""{row.string "church_name"} | {row.string "group_name"}"""
+    
+    /// Map a row to a Small Group instance with populated list preferences    
+    let mapToSmallGroupWithPreferences (row : RowReader) =
+        { mapToSmallGroup row with
+            Preferences = mapToListPreferences row
+        }
+    
+    /// Map a row to a User instance
+    let mapToUser (row : RowReader) =
+        {   Id           = UserId     (row.uuid "id")
+            FirstName    = row.string "first_name"
+            LastName     = row.string "last_name"
+            Email        = row.string "email"
+            IsAdmin      = row.bool   "is_admin"
+            PasswordHash = row.string "password_hash"
+            LastSeen     = row.fieldValueOrNone<Instant> "last_seen"
+        }
+
+
+open BitBadger.Documents.Postgres
+
+/// Functions to manipulate churches
+module Churches =
+    
+    /// Get a list of all churches
+    let all () =
+        Custom.list "SELECT * FROM pt.church ORDER BY church_name" [] mapToChurch
+    
+    /// Delete a church by its ID
+    let deleteById (churchId : ChurchId) = backgroundTask {
+        let idParam = [ [ "@churchId", Sql.uuid churchId.Value ] ]
+        let where   = "WHERE small_group_id IN (SELECT id FROM pt.small_group WHERE church_id = @churchId)"
+        let! _ =
+            Configuration.dataSource ()
+            |> Sql.fromDataSource
+            |> Sql.executeTransactionAsync
+                [   $"DELETE FROM pt.prayer_request {where}", idParam
+                    $"DELETE FROM pt.user_small_group {where}", idParam
+                    $"DELETE FROM pt.list_preference {where}", idParam
+                    "DELETE FROM pt.small_group WHERE church_id = @churchId", idParam
+                    "DELETE FROM pt.church WHERE id = @churchId", idParam ]
+        ()
+    }
+    
+    /// Save a church's information
+    let save (church : Church) =
+        Custom.nonQuery
+            "INSERT INTO pt.church (
+                id, church_name, city, state, has_vps_interface, interface_address
+            ) VALUES (
+                @id, @name, @city, @state, @hasVpsInterface, @interfaceAddress
+            ) ON CONFLICT (id) DO UPDATE
+            SET church_name       = EXCLUDED.church_name,
+                city              = EXCLUDED.city,
+                state             = EXCLUDED.state,
+                has_vps_interface = EXCLUDED.has_vps_interface,
+                interface_address = EXCLUDED.interface_address"
+            [   "@id",               Sql.uuid         church.Id.Value
+                "@name",             Sql.string       church.Name
+                "@city",             Sql.string       church.City
+                "@state",            Sql.string       church.State
+                "@hasVpsInterface",  Sql.bool         church.HasVpsInterface
+                "@interfaceAddress", Sql.stringOrNone church.InterfaceAddress ]
+    
+    /// Find a church by its ID
+    let tryById (churchId : ChurchId) =
+        Custom.single "SELECT * FROM pt.church WHERE id = @id" [ "@id", Sql.uuid churchId.Value ] mapToChurch
+
+
+/// Functions to manipulate small group members
+module Members =
+    
+    /// Count members for the given small group
+    let countByGroup (groupId : SmallGroupId) =
+        Custom.scalar "SELECT COUNT(id) AS mbr_count FROM pt.member WHERE small_group_id = @groupId"
+                      [ "@groupId", Sql.uuid groupId.Value ] (fun row -> row.int "mbr_count")
+    
+    /// Delete a small group member by its ID
+    let deleteById (memberId : MemberId) =
+        Custom.nonQuery "DELETE FROM pt.member WHERE id = @id" [ "@id", Sql.uuid memberId.Value ]
+    
+    /// Retrieve all members for a given small group
+    let forGroup (groupId : SmallGroupId) =
+        Custom.list "SELECT * FROM pt.member WHERE small_group_id = @groupId ORDER BY member_name"
+                    [ "@groupId", Sql.uuid groupId.Value ] mapToMember
+    
+    /// Save a small group member
+    let save (mbr : Member) =
+        Custom.nonQuery
+            "INSERT INTO pt.member (
+                id, small_group_id, member_name, email, email_format
+            ) VALUES (
+                @id, @groupId, @name, @email, @format
+            ) ON CONFLICT (id) DO UPDATE
+            SET member_name  = EXCLUDED.member_name,
+                email        = EXCLUDED.email,
+                email_format = EXCLUDED.email_format"
+            [   "@id",      Sql.uuid         mbr.Id.Value
+                "@groupId", Sql.uuid         mbr.SmallGroupId.Value
+                "@name",    Sql.string       mbr.Name
+                "@email",   Sql.string       mbr.Email
+                "@format",  Sql.stringOrNone (mbr.Format |> Option.map EmailFormat.toCode) ]
+    
+    /// Retrieve a small group member by its ID
+    let tryById (memberId : MemberId) =
+        Custom.single "SELECT * FROM pt.member WHERE id = @id" [ "@id", Sql.uuid memberId.Value ] mapToMember
+
+
+/// Options to retrieve a list of requests
+type PrayerRequestOptions =
+    {   /// The small group for which requests should be retrieved
+        SmallGroup : SmallGroup
+        
+        /// The clock instance to use for date/time manipulation
+        Clock : IClock
+        
+        /// The date for which the list is being retrieved
+        ListDate : LocalDate option
+        
+        /// Whether only active requests should be retrieved
+        ActiveOnly : bool
+        
+        /// The page number, for paged lists
+        PageNumber : int
+    }
+
+
+/// Functions to manipulate prayer requests
+module PrayerRequests =
+    
+    /// Central place to append sort criteria for prayer request queries
+    let private orderBy sort =
+        match sort with
+        | SortByDate -> "updated_date DESC, entered_date DESC, requestor"
+        | SortByRequestor -> "requestor, updated_date DESC, entered_date DESC"
+    
+    /// Paginate a prayer request query
+    let private paginate (pageNbr : int) pageSize =
+        if pageNbr > 0 then $"LIMIT {pageSize} OFFSET {(pageNbr - 1) * pageSize}" else ""
+    
+    /// Count the number of prayer requests for a church
+    let countByChurch (churchId : ChurchId) =
+        Custom.scalar
+            "SELECT COUNT(id) AS req_count
+               FROM pt.prayer_request
+              WHERE small_group_id IN (SELECT id FROM pt.small_group WHERE church_id = @churchId)"
+            [ "@churchId", Sql.uuid churchId.Value ] (fun row -> row.int "req_count")
+    
+    /// Count the number of prayer requests for a small group
+    let countByGroup (groupId : SmallGroupId) =
+        Custom.scalar "SELECT COUNT(id) AS req_count FROM pt.prayer_request WHERE small_group_id = @groupId"
+                      [ "@groupId", Sql.uuid groupId.Value ] (fun row -> row.int "req_count")
+    
+    /// Delete a prayer request by its ID
+    let deleteById (reqId : PrayerRequestId) =
+        Custom.nonQuery "DELETE FROM pt.prayer_request WHERE id = @id" [ "@id", Sql.uuid reqId.Value ]
+    
+    /// Get all (or active) requests for a small group as of now or the specified date
+    let forGroup (opts : PrayerRequestOptions) =
+        let theDate = defaultArg opts.ListDate (SmallGroup.localDateNow opts.Clock opts.SmallGroup)
+        let where, parameters =
+            if opts.ActiveOnly then
+                let asOf = NpgsqlParameter (
+                    "@asOf",
+                    (theDate.AtStartOfDayInZone(SmallGroup.timeZone opts.SmallGroup)
+                            - Duration.FromDays opts.SmallGroup.Preferences.DaysToExpire)
+                        .ToInstant ())
+                "   AND (   updated_date > @asOf
+                         OR expiration   = @manual
+                         OR request_type = @longTerm
+                         OR request_type = @expecting)
+                    AND expiration <> @forced",
+                [   "@asOf",      Sql.parameter asOf
+                    "@manual",    Sql.string    (Expiration.toCode Manual)
+                    "@longTerm",  Sql.string    (PrayerRequestType.toCode LongTermRequest)
+                    "@expecting", Sql.string    (PrayerRequestType.toCode Expecting)
+                    "@forced",    Sql.string    (Expiration.toCode Forced) ]
+            else "", []
+        Custom.list
+            $"SELECT *
+                FROM pt.prayer_request
+               WHERE small_group_id = @groupId {where}
+               ORDER BY {orderBy opts.SmallGroup.Preferences.RequestSort}
+               {paginate opts.PageNumber opts.SmallGroup.Preferences.PageSize}"
+            (("@groupId", Sql.uuid opts.SmallGroup.Id.Value) :: parameters) mapToPrayerRequest
+    
+    /// Save a prayer request
+    let save (req : PrayerRequest) =
+        Custom.nonQuery
+            "INSERT into pt.prayer_request (
+                id, request_type, user_id, small_group_id, entered_date, updated_date, requestor, request_text,
+                notify_chaplain, expiration
+            ) VALUES (
+                @id, @type, @userId, @groupId, @entered, @updated, @requestor, @text,
+                @notifyChaplain, @expiration
+            ) ON CONFLICT (id) DO UPDATE
+            SET request_type    = EXCLUDED.request_type,
+                updated_date    = EXCLUDED.updated_date,
+                requestor       = EXCLUDED.requestor,
+                request_text    = EXCLUDED.request_text,
+                notify_chaplain = EXCLUDED.notify_chaplain,
+                expiration      = EXCLUDED.expiration"
+            [   "@id",             Sql.uuid         req.Id.Value
+                "@type",           Sql.string       (PrayerRequestType.toCode req.RequestType)
+                "@userId",         Sql.uuid         req.UserId.Value
+                "@groupId",        Sql.uuid         req.SmallGroupId.Value
+                "@entered",        Sql.parameter    (NpgsqlParameter ("@entered", req.EnteredDate))
+                "@updated",        Sql.parameter    (NpgsqlParameter ("@updated", req.UpdatedDate))
+                "@requestor",      Sql.stringOrNone req.Requestor
+                "@text",           Sql.string       req.Text
+                "@notifyChaplain", Sql.bool         req.NotifyChaplain
+                "@expiration",     Sql.string       (Expiration.toCode req.Expiration) ]
+    
+    /// Search prayer requests for the given term
+    let searchForGroup group searchTerm pageNbr =
+        Custom.list 
+            $"SELECT * FROM pt.prayer_request WHERE small_group_id = @groupId AND request_text ILIKE @search
+                  UNION
+              SELECT * FROM pt.prayer_request WHERE small_group_id = @groupId AND COALESCE(requestor, '') ILIKE @search
+              ORDER BY {orderBy group.Preferences.RequestSort}
+              {paginate pageNbr group.Preferences.PageSize}"
+            [ "@groupId", Sql.uuid group.Id.Value; "@search", Sql.string $"%%%s{searchTerm}%%" ] mapToPrayerRequest
+
+    /// Retrieve a prayer request by its ID
+    let tryById (reqId : PrayerRequestId) =
+        Custom.single "SELECT * FROM pt.prayer_request WHERE id = @id" [ "@id", Sql.uuid reqId.Value ]
+                      mapToPrayerRequest
+    
+    /// Update the expiration for the given prayer request
+    let updateExpiration (req : PrayerRequest) withTime =
+        let sql, parameters =
+            if withTime then
+                ", updated_date = @updated",
+                [ "@updated", Sql.parameter (NpgsqlParameter ("@updated", req.UpdatedDate)) ]
+            else "", []
+        Custom.nonQuery $"UPDATE pt.prayer_request SET expiration = @expiration{sql} WHERE id = @id"
+                        ([  "@expiration", Sql.string (Expiration.toCode req.Expiration)
+                            "@id",         Sql.uuid   req.Id.Value ]
+                        |> List.append parameters)
+
+
+/// Functions to retrieve small group information
+module SmallGroups =
+    
+    /// Count the number of small groups for a church
+    let countByChurch (churchId : ChurchId) =
+        Custom.scalar "SELECT COUNT(id) AS group_count FROM pt.small_group WHERE church_id = @churchId"
+                      [ "@churchId", Sql.uuid churchId.Value ] (fun row -> row.int "group_count")
+    
+    /// Delete a small group by its ID
+    let deleteById (groupId : SmallGroupId) = backgroundTask {
+        let idParam = [ [ "@groupId", Sql.uuid groupId.Value ] ]
+        let! _ =
+            Configuration.dataSource ()
+            |> Sql.fromDataSource
+            |> Sql.executeTransactionAsync
+                [   "DELETE FROM pt.prayer_request   WHERE small_group_id = @groupId", idParam
+                    "DELETE FROM pt.user_small_group WHERE small_group_id = @groupId", idParam
+                    "DELETE FROM pt.list_preference  WHERE small_group_id = @groupId", idParam
+                    "DELETE FROM pt.small_group      WHERE id             = @groupId", idParam ]
+        ()
+    }
+    
+    /// Get information for all small groups
+    let infoForAll () =
+        Custom.list
+            "SELECT sg.id, sg.group_name, c.church_name, lp.time_zone_id, lp.is_public
+               FROM pt.small_group sg
+                    INNER JOIN pt.church c ON c.id = sg.church_id
+                    INNER JOIN pt.list_preference lp ON lp.small_group_id = sg.id
+              ORDER BY sg.group_name"
+            [] mapToSmallGroupInfo
+    
+    /// Get a list of small group IDs along with a description that includes the church name
+    let listAll () =
+        Custom.list
+            "SELECT g.group_name, g.id, c.church_name
+               FROM pt.small_group g
+                    INNER JOIN pt.church c ON c.id = g.church_id
+              ORDER BY c.church_name, g.group_name"
+            [] mapToSmallGroupItem
+    
+    /// Get a list of small group IDs and descriptions for groups with a group password
+    let listProtected () =
+        Custom.list
+            "SELECT g.group_name, g.id, c.church_name, lp.is_public
+               FROM pt.small_group g
+                    INNER JOIN pt.church           c ON c.id = g.church_id
+                    INNER JOIN pt.list_preference lp ON lp.small_group_id = g.id
+              WHERE COALESCE(lp.group_password, '') <> ''
+              ORDER BY c.church_name, g.group_name"
+            [] mapToSmallGroupItem
+    
+    /// Get a list of small group IDs and descriptions for groups that are public or have a group password
+    let listPublicAndProtected () =
+        Custom.list
+            "SELECT g.group_name, g.id, c.church_name, lp.time_zone_id, lp.is_public
+               FROM pt.small_group g
+                    INNER JOIN pt.church           c ON c.id = g.church_id
+                    INNER JOIN pt.list_preference lp ON lp.small_group_id = g.id
+              WHERE lp.is_public = TRUE
+                 OR COALESCE(lp.group_password, '') <> ''
+              ORDER BY c.church_name, g.group_name"
+            [] mapToSmallGroupInfo
+    
+    /// Log on for a small group (includes list preferences)
+    let logOn (groupId : SmallGroupId) password =
+        Custom.single
+            "SELECT sg.*, lp.*
+               FROM pt.small_group sg
+                    INNER JOIN pt.list_preference lp ON lp.small_group_id = sg.id
+              WHERE sg.id             = @id
+                AND lp.group_password = @password"
+            [ "@id", Sql.uuid groupId.Value; "@password", Sql.string password ] mapToSmallGroupWithPreferences
+    
+    /// Save a small group
+    let save (group : SmallGroup) isNew = backgroundTask {
+        let! _ =
+            Configuration.dataSource ()
+            |> Sql.fromDataSource
+            |> Sql.executeTransactionAsync [
+                "INSERT INTO pt.small_group (
+                        id, church_id, group_name
+                ) VALUES (
+                    @id, @churchId, @name
+                ) ON CONFLICT (id) DO UPDATE
+                SET church_id  = EXCLUDED.church_id,
+                    group_name = EXCLUDED.group_name",
+                [ [ "@id",       Sql.uuid   group.Id.Value
+                    "@churchId", Sql.uuid   group.ChurchId.Value
+                    "@name",     Sql.string group.Name ] ]
+                if isNew then
+                    "INSERT INTO pt.list_preference (small_group_id) VALUES (@id)",
+                    [ [ "@id", Sql.uuid group.Id.Value ] ]
+            ]
+        ()
+    }
+    
+    /// Save a small group's list preferences
+    let savePreferences (pref : ListPreferences) =
+        Custom.nonQuery
+            "UPDATE pt.list_preference
+                SET days_to_keep_new       = @daysToKeepNew,
+                    days_to_expire         = @daysToExpire,
+                    long_term_update_weeks = @longTermUpdateWeeks,
+                    email_from_name        = @emailFromName,
+                    email_from_address     = @emailFromAddress,
+                    fonts                  = @fonts,
+                    heading_color          = @headingColor,
+                    line_color             = @lineColor,
+                    heading_font_size      = @headingFontSize,
+                    text_font_size         = @textFontSize,
+                    request_sort           = @requestSort,
+                    group_password         = @groupPassword,
+                    default_email_type     = @defaultEmailType,
+                    is_public              = @isPublic,
+                    time_zone_id           = @timeZoneId,
+                    page_size              = @pageSize,
+                    as_of_date_display     = @asOfDateDisplay
+              WHERE small_group_id = @groupId"
+            [   "@groupId",             Sql.uuid   pref.SmallGroupId.Value
+                "@daysToKeepNew",       Sql.int    pref.DaysToKeepNew
+                "@daysToExpire",        Sql.int    pref.DaysToExpire
+                "@longTermUpdateWeeks", Sql.int    pref.LongTermUpdateWeeks
+                "@emailFromName",       Sql.string pref.EmailFromName
+                "@emailFromAddress",    Sql.string pref.EmailFromAddress
+                "@fonts",               Sql.string pref.Fonts
+                "@headingColor",        Sql.string pref.HeadingColor
+                "@lineColor",           Sql.string pref.LineColor
+                "@headingFontSize",     Sql.int    pref.HeadingFontSize
+                "@textFontSize",        Sql.int    pref.TextFontSize
+                "@requestSort",         Sql.string (RequestSort.toCode pref.RequestSort)
+                "@groupPassword",       Sql.string pref.GroupPassword
+                "@defaultEmailType",    Sql.string (EmailFormat.toCode pref.DefaultEmailType)
+                "@isPublic",            Sql.bool   pref.IsPublic
+                "@timeZoneId",          Sql.string (TimeZoneId.toString pref.TimeZoneId)
+                "@pageSize",            Sql.int    pref.PageSize
+                "@asOfDateDisplay",     Sql.string (AsOfDateDisplay.toCode pref.AsOfDateDisplay) ]
+    
+    /// Get a small group by its ID
+    let tryById (groupId : SmallGroupId) =
+        Custom.single "SELECT * FROM pt.small_group WHERE id = @id" [ "@id", Sql.uuid groupId.Value ] mapToSmallGroup
+    
+    /// Get a small group by its ID with its list preferences populated
+    let tryByIdWithPreferences (groupId : SmallGroupId) =
+        Custom.single
+            "SELECT sg.*, lp.*
+               FROM pt.small_group sg
+                    INNER JOIN pt.list_preference lp ON lp.small_group_id = sg.id
+              WHERE sg.id = @id"
+            [ "@id", Sql.uuid groupId.Value ] mapToSmallGroupWithPreferences
+
+
+/// Functions to manipulate users
+module Users =
+    
+    /// Retrieve all PrayerTracker users
+    let all () =
+        Custom.list "SELECT * FROM pt.pt_user ORDER BY last_name, first_name" [] mapToUser
+    
+    /// Count the number of users for a church
+    let countByChurch (churchId : ChurchId) =
+        Custom.scalar
+            "SELECT COUNT(u.id) AS user_count
+               FROM pt.pt_user u
+              WHERE EXISTS (
+                    SELECT 1
+                      FROM pt.user_small_group usg
+                           INNER JOIN pt.small_group sg ON sg.id = usg.small_group_id
+                     WHERE usg.user_id = u.id
+                       AND sg.church_id = @churchId)"
+            [ "@churchId", Sql.uuid churchId.Value ] (fun row -> row.int "user_count")
+    
+    /// Count the number of users for a small group
+    let countByGroup (groupId : SmallGroupId) =
+        Custom.scalar "SELECT COUNT(user_id) AS user_count FROM pt.user_small_group WHERE small_group_id = @groupId"
+                      [ "@groupId", Sql.uuid groupId.Value ] (fun row -> row.int "user_count")
+    
+    /// Delete a user by its database ID
+    let deleteById (userId : UserId) =
+        Custom.nonQuery "DELETE FROM pt.pt_user WHERE id = @id" [ "@id", Sql.uuid userId.Value ]
+    
+    /// Get the IDs of the small groups for which the given user is authorized
+    let groupIdsByUserId (userId : UserId) =
+        Custom.list "SELECT small_group_id FROM pt.user_small_group WHERE user_id = @id"
+                   [ "@id", Sql.uuid userId.Value ] (fun row -> SmallGroupId (row.uuid "small_group_id"))
+    
+    /// Get a list of users authorized to administer the given small group
+    let listByGroupId (groupId : SmallGroupId) =
+        Custom.list
+            "SELECT u.*
+               FROM pt.pt_user u
+                    INNER JOIN pt.user_small_group usg ON usg.user_id = u.id
+              WHERE usg.small_group_id = @groupId
+              ORDER BY u.last_name, u.first_name"
+            [ "@groupId", Sql.uuid groupId.Value ] mapToUser
+    
+    /// Save a user's information
+    let save (user : User) = 
+        Custom.nonQuery
+            "INSERT INTO pt.pt_user (
+                id, first_name, last_name, email, is_admin, password_hash
+            ) VALUES (
+                @id, @firstName, @lastName, @email, @isAdmin, @passwordHash
+            ) ON CONFLICT (id) DO UPDATE
+            SET first_name    = EXCLUDED.first_name,
+                last_name     = EXCLUDED.last_name,
+                email         = EXCLUDED.email,
+                is_admin      = EXCLUDED.is_admin,
+                password_hash = EXCLUDED.password_hash"
+            [   "@id",           Sql.uuid   user.Id.Value
+                "@firstName",    Sql.string user.FirstName
+                "@lastName",     Sql.string user.LastName
+                "@email",        Sql.string user.Email
+                "@isAdmin",      Sql.bool   user.IsAdmin
+                "@passwordHash", Sql.string user.PasswordHash ]
+    
+    /// Find a user by its e-mail address and authorized small group
+    let tryByEmailAndGroup email (groupId : SmallGroupId) =
+        Custom.single
+            "SELECT u.*
+               FROM pt.pt_user u
+                    INNER JOIN pt.user_small_group usg ON usg.user_id = u.id AND usg.small_group_id = @groupId
+              WHERE u.email = @email"
+            [ "@email", Sql.string email; "@groupId", Sql.uuid groupId.Value ] mapToUser
+    
+    /// Find a user by their database ID
+    let tryById (userId : UserId) =
+        Custom.single "SELECT * FROM pt.pt_user WHERE id = @id" [ "@id", Sql.uuid userId.Value ] mapToUser
+    
+    /// Update a user's last seen date/time
+    let updateLastSeen (userId : UserId) (now : Instant) =
+        Custom.nonQuery "UPDATE pt.pt_user SET last_seen = @now WHERE id = @id"
+                        [ "@id", Sql.uuid userId.Value; "@now", Sql.parameter (NpgsqlParameter ("@now", now)) ]
+    
+    /// Update a user's password hash
+    let updatePassword (user : User) =
+        Custom.nonQuery "UPDATE pt.pt_user SET password_hash = @passwordHash WHERE id = @id"
+                        [ "@id", Sql.uuid user.Id.Value; "@passwordHash", Sql.string user.PasswordHash ]
+    
+    /// Update a user's authorized small groups
+    let updateSmallGroups (userId : UserId) groupIds = backgroundTask {
+        let! existingGroupIds = groupIdsByUserId userId
+        let toAdd =
+            groupIds |> List.filter (fun it -> existingGroupIds |> List.exists (fun grpId -> grpId = it) |> not)
+        let toDelete =
+            existingGroupIds |> List.filter (fun it -> groupIds |> List.exists (fun grpId -> grpId = it) |> not)
+        let queries = seq {
+            if not (List.isEmpty toAdd) then
+                "INSERT INTO pt.user_small_group VALUES (@userId, @smallGroupId)",
+                toAdd |> List.map (fun it -> [ "@userId", Sql.uuid userId.Value; "@smallGroupId", Sql.uuid it.Value ])
+            if not (List.isEmpty toDelete) then
+                "DELETE FROM pt.user_small_group WHERE user_id = @userId AND small_group_id = @smallGroupId",
+                toDelete
+                |> List.map (fun it -> [ "@userId", Sql.uuid userId.Value; "@smallGroupId", Sql.uuid it.Value ])
+        }
+        if not (Seq.isEmpty queries) then
+            let! _ =
+                Configuration.dataSource ()
+                |> Sql.fromDataSource
+                |> Sql.executeTransactionAsync (List.ofSeq queries)
+            ()
+    }

src/PrayerTracker.Data/AppDbContext.fs

@@ -1,86 +0,0 @@
-namespace PrayerTracker
-
-open Microsoft.EntityFrameworkCore
-open PrayerTracker.Entities
-
-/// EF Core data context for PrayerTracker
-[<AllowNullLiteral>]
-type AppDbContext (options : DbContextOptions<AppDbContext>) =
-  inherit DbContext (options)
-
-  [<DefaultValue>]
-  val mutable private churches       : DbSet<Church>
-  [<DefaultValue>]
-  val mutable private members        : DbSet<Member>
-  [<DefaultValue>]
-  val mutable private prayerRequests : DbSet<PrayerRequest>
-  [<DefaultValue>]
-  val mutable private preferences    : DbSet<ListPreferences>
-  [<DefaultValue>]
-  val mutable private smallGroups    : DbSet<SmallGroup>
-  [<DefaultValue>]
-  val mutable private timeZones      : DbSet<TimeZone>
-  [<DefaultValue>]
-  val mutable private users          : DbSet<User>
-  [<DefaultValue>]
-  val mutable private userGroupXref  : DbSet<UserSmallGroup>
-
-  /// Churches
-  member this.Churches
-    with get() = this.churches
-     and set v = this.churches <- v
-
-  /// Small group members
-  member this.Members
-    with get() = this.members
-     and set v = this.members <- v
-
-  /// Prayer requests
-  member this.PrayerRequests
-    with get() = this.prayerRequests
-     and set v = this.prayerRequests <- v
-
-  /// Request list preferences (by class)
-  member this.Preferences
-    with get() = this.preferences
-     and set v = this.preferences <- v
-
-  /// Small groups
-  member this.SmallGroups
-    with get() = this.smallGroups
-     and set v = this.smallGroups <- v
-
-  /// Time zones
-  member this.TimeZones
-    with get() = this.timeZones
-     and set v = this.timeZones <- v
-
-  /// Users
-  member this.Users
-    with get() = this.users
-     and set v = this.users <- v
-
-  /// User / small group cross-reference
-  member this.UserGroupXref
-    with get() = this.userGroupXref
-     and set v = this.userGroupXref <- v
-
-  /// F#-style async for saving changes
-  member this.AsyncSaveChanges () =
-    this.SaveChangesAsync () |> Async.AwaitTask
-
-  override __.OnModelCreating (modelBuilder : ModelBuilder) =
-    base.OnModelCreating modelBuilder
-
-    modelBuilder.HasDefaultSchema "pt" |> ignore
-
-    [ Church.configureEF
-      ListPreferences.configureEF
-      Member.configureEF
-      PrayerRequest.configureEF
-      SmallGroup.configureEF
-      TimeZone.configureEF
-      User.configureEF
-      UserSmallGroup.configureEF
-      ]
-    |> List.iter (fun x -> x modelBuilder)

src/PrayerTracker.Data/DataAccess.fs

@@ -1,300 +0,0 @@
-[<AutoOpen>]
-module PrayerTracker.DataAccess
-
-open FSharp.Control.Tasks.ContextInsensitive
-open Microsoft.EntityFrameworkCore
-open PrayerTracker.Entities
-open System.Collections.Generic
-open System.Linq
-
-/// EF can return null for record types with the CLIMutable attribute; this converts a possibly-null record type to an
-/// option
-let optRec<'T> (r : 'T) =
-  match box r with null -> None | _ -> Some r
-
-type AppDbContext with
-  
-  (*-- DISCONNECTED DATA EXTENSIONS --*)
-
-  /// Add an entity entry to the tracked data context with the status of Added
-  member this.AddEntry<'TEntity when 'TEntity : not struct> (e : 'TEntity) =
-    this.Entry<'TEntity>(e).State <- EntityState.Added
-  
-  /// Add an entity entry to the tracked data context with the status of Updated
-  member this.UpdateEntry<'TEntity when 'TEntity : not struct> (e : 'TEntity) =
-    this.Entry<'TEntity>(e).State <- EntityState.Modified
-
-  /// Add an entity entry to the tracked data context with the status of Deleted
-  member this.RemoveEntry<'TEntity when 'TEntity : not struct> (e : 'TEntity) =
-    this.Entry<'TEntity>(e).State <- EntityState.Deleted
-
-  (*-- CHURCH EXTENSIONS --*)
-
-  /// Find a church by its Id
-  member this.TryChurchById cId =
-    task {
-      let! church = this.Churches.AsNoTracking().FirstOrDefaultAsync (fun c -> c.churchId = cId)
-      return optRec church
-      }
-      
-  /// Find all churches
-  member this.AllChurches () =
-    task {
-      let! churches = this.Churches.AsNoTracking().OrderBy(fun c -> c.name).ToListAsync ()
-      return List.ofSeq churches
-      }
-
-  (*-- MEMBER EXTENSIONS --*)
-
-  /// Get a small group member by its Id
-  member this.TryMemberById mId =
-    task {
-      let! mbr = this.Members.AsNoTracking().FirstOrDefaultAsync (fun m -> m.memberId = mId)
-      return optRec mbr
-      }
-
-  /// Find all members for a small group
-  member this.AllMembersForSmallGroup gId =
-    task {
-      let! mbrs =
-        this.Members.AsNoTracking()
-          .Where(fun m -> m.smallGroupId = gId)
-          .OrderBy(fun m -> m.memberName)
-          .ToListAsync ()
-      return List.ofSeq mbrs
-      }
-
-  /// Count members for a small group
-  member this.CountMembersForSmallGroup gId =
-    this.Members.CountAsync (fun m -> m.smallGroupId = gId)
-
-  (*-- PRAYER REQUEST EXTENSIONS *)
-
-  /// Get a prayer request by its Id
-  member this.TryRequestById reqId =
-    task {
-      let! req = this.PrayerRequests.AsNoTracking().FirstOrDefaultAsync (fun pr -> pr.prayerRequestId = reqId)
-      return optRec req
-      }
-
-  /// Get all (or active) requests for a small group as of now or the specified date
-  member this.AllRequestsForSmallGroup (grp : SmallGroup) clock listDate activeOnly : PrayerRequest seq =
-    let theDate = match listDate with Some dt -> dt | _ -> grp.localDateNow clock
-    upcast (
-      this.PrayerRequests.AsNoTracking().Where(fun pr -> pr.smallGroupId = grp.smallGroupId)
-      |> function
-      // Filter
-      | query when activeOnly ->
-          let asOf = theDate.AddDays(-(float grp.preferences.daysToExpire)).Date
-          query.Where(fun pr ->
-              (pr.updatedDate > asOf
-                  || pr.doNotExpire
-                  || RequestType.Recurring = pr.requestType
-                  || RequestType.Expecting = pr.requestType)
-              && not pr.isManuallyExpired)
-      | query -> query
-      |> function
-      // Sort
-      | query when grp.preferences.requestSort = "D" ->
-          query.OrderByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate)
-              .ThenBy(fun pr -> pr.requestor)
-      | query ->
-          query.OrderBy(fun pr -> pr.requestor)
-              .ThenByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate))
-
-  /// Count prayer requests for the given small group Id
-  member this.CountRequestsBySmallGroup gId =
-    this.PrayerRequests.CountAsync (fun pr -> pr.smallGroupId = gId)
-
-  /// Count prayer requests for the given church Id
-  member this.CountRequestsByChurch cId =
-    this.PrayerRequests.CountAsync (fun pr -> pr.smallGroup.churchId = cId)
-
-  (*-- SMALL GROUP EXTENSIONS --*)
-
-  /// Find a small group by its Id
-  member this.TryGroupById gId =
-    task {
-      let! grp =
-        this.SmallGroups.AsNoTracking()
-          .Include(fun sg -> sg.preferences)
-          .FirstOrDefaultAsync (fun sg -> sg.smallGroupId = gId)
-      return optRec grp
-      }
-
-  /// Get small groups that are public or password protected
-  member this.PublicAndProtectedGroups () =
-    task {
-      let! grps = 
-        this.SmallGroups.AsNoTracking()
-          .Include(fun sg -> sg.preferences)
-          .Include(fun sg -> sg.church)
-          .Where(fun sg ->
-              sg.preferences.isPublic || (sg.preferences.groupPassword <> null && sg.preferences.groupPassword <> ""))
-          .OrderBy(fun sg -> sg.church.name)
-          .ThenBy(fun sg -> sg.name)
-          .ToListAsync ()
-      return List.ofSeq grps
-      }
-
-  /// Get small groups that are password protected
-  member this.ProtectedGroups () =
-    task {
-      let! grps =
-        this.SmallGroups.AsNoTracking()
-          .Include(fun sg -> sg.church)
-          .Where(fun sg -> sg.preferences.groupPassword <> null && sg.preferences.groupPassword <> "")
-          .OrderBy(fun sg -> sg.church.name)
-          .ThenBy(fun sg -> sg.name)
-          .ToListAsync ()
-      return List.ofSeq grps
-      }
-
-  /// Get all small groups
-  member this.AllGroups () =
-    task {
-      let! grps =
-        this.SmallGroups.AsNoTracking()
-          .Include(fun sg -> sg.church)
-          .Include(fun sg -> sg.preferences)
-          .Include(fun sg -> sg.preferences.timeZone)
-          .OrderBy(fun sg -> sg.name)
-          .ToListAsync ()
-      return List.ofSeq grps
-      }
-
-  /// Get a small group list by their Id, with their church prepended to their name
-  member this.GroupList () =
-    task {
-      let! grps =
-        this.SmallGroups.AsNoTracking()
-          .Include(fun sg -> sg.church)
-          .OrderBy(fun sg -> sg.church.name)
-          .ThenBy(fun sg -> sg.name)
-          .ToListAsync ()
-      return grps
-        |> Seq.map (fun grp -> grp.smallGroupId.ToString "N", sprintf "%s | %s" grp.church.name grp.name)
-        |> Map.ofSeq
-      }
-
-  /// Log on a small group
-  member this.TryGroupLogOnByPassword gId pw =
-    task {
-      let! grp = this.TryGroupById gId
-      match grp with
-      | None -> return None
-      | Some g ->
-          match pw = g.preferences.groupPassword with
-          | true -> return grp
-          | _ -> return None
-      }
-
-  /// Check a cookie log on for a small group
-  member this.TryGroupLogOnByCookie gId pwHash (hasher : string -> string) =
-    task {
-      let! grp = this.TryGroupById gId
-      match grp with
-      | None -> return None
-      | Some g ->
-          match pwHash = hasher g.preferences.groupPassword with
-          | true -> return grp
-          | _ -> return None
-      }
-
-  /// Count small groups for the given church Id
-  member this.CountGroupsByChurch cId =
-    this.SmallGroups.CountAsync (fun sg -> sg.churchId = cId)
-      
-  (*-- TIME ZONE EXTENSIONS --*)
-
-  /// Get a time zone by its Id
-  member this.TryTimeZoneById tzId =
-    task {
-      let! tz = this.TimeZones.FirstOrDefaultAsync (fun t -> t.timeZoneId = tzId)
-      return optRec tz
-      }
-
-  /// Get all time zones
-  member this.AllTimeZones () =
-    task {
-      let! tzs = this.TimeZones.OrderBy(fun t -> t.sortOrder).ToListAsync ()
-      return List.ofSeq tzs
-      }
-  
-  (*-- USER EXTENSIONS --*)
-
-  /// Find a user by its Id
-  member this.TryUserById uId =
-    task {
-      let! user = this.Users.AsNoTracking().FirstOrDefaultAsync (fun u -> u.userId = uId)
-      return optRec user
-      }
-
-  /// Find a user by its e-mail address and authorized small group
-  member this.TryUserByEmailAndGroup email gId =
-    task {
-      let! user =
-        this.Users.AsNoTracking().FirstOrDefaultAsync (fun u ->
-            u.emailAddress = email
-            && u.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
-      return optRec user
-      }
-
-  /// Find a user by its Id (tracked entity), eagerly loading the user's groups
-  member this.TryUserByIdWithGroups uId =
-    task {
-      let! user = this.Users.Include(fun u -> u.smallGroups).FirstOrDefaultAsync (fun u -> u.userId = uId)
-      return optRec user
-      }
-
-  /// Get a list of all users
-  member this.AllUsers () =
-    task {
-      let! usrs = this.Users.AsNoTracking().OrderBy(fun u -> u.lastName).ThenBy(fun u -> u.firstName).ToListAsync ()
-      return List.ofSeq usrs
-      }
-
-  /// Get all PrayerTracker users as members (used to send e-mails)
-  member this.AllUsersAsMembers () =
-    task {
-      let! usrs =
-        this.Users.AsNoTracking().OrderBy(fun u -> u.lastName).ThenBy(fun u -> u.firstName).ToListAsync ()
-      return usrs
-        |> Seq.map (fun u -> { Member.empty with email = u.emailAddress; memberName = u.fullName })
-        |> List.ofSeq
-      }
-
-  /// Find a user based on their credentials
-  member this.TryUserLogOnByPassword email pwHash gId =
-    task {
-      let! user =
-        this.Users.FirstOrDefaultAsync (fun u ->
-          u.emailAddress = email
-          && u.passwordHash = pwHash
-          && u.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
-      return optRec user
-      }
-
-  /// Find a user based on credentials stored in a cookie
-  member this.TryUserLogOnByCookie uId gId pwHash =
-    task {
-      let! user = this.TryUserByIdWithGroups uId
-      match user with
-      | None -> return None
-      | Some u ->
-          match pwHash = u.passwordHash && u.smallGroups |> Seq.exists (fun xref -> xref.smallGroupId = gId) with
-          | true ->
-              this.Entry<User>(u).State <- EntityState.Detached
-              return Some { u with passwordHash = ""; salt = None; smallGroups = List<UserSmallGroup>() }
-          | _ -> return None
-      }
-
-  /// Count the number of users for a small group
-  member this.CountUsersBySmallGroup gId =
-    this.Users.CountAsync (fun u -> u.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
-
-  /// Count the number of users for a church
-  member this.CountUsersByChurch cId =
-    this.Users.CountAsync (fun u -> u.smallGroups.Any (fun xref -> xref.smallGroup.churchId = cId))

src/PrayerTracker.Data/DistributedCache.fs

@@ -0,0 +1,193 @@
+namespace PrayerTracker.Data
+
+open System.Threading
+open System.Threading.Tasks
+open Microsoft.Extensions.Caching.Distributed
+open NodaTime
+open Npgsql
+open Npgsql.FSharp
+
+/// Helper types and functions for the cache
+[<AutoOpen>]
+module private CacheHelpers =
+    
+    open System
+    
+    /// The cache entry
+    type Entry =
+        {   /// The ID of the cache entry
+            Id : string
+            
+            /// The value to be cached
+            Payload : byte[]
+            
+            /// When this entry will expire
+            ExpireAt : Instant
+            
+            /// The duration by which the expiration should be pushed out when being refreshed
+            SlidingExpiration : Duration option
+            
+            /// The must-expire-by date/time for the cache entry
+            AbsoluteExpiration : Instant option
+        }
+    
+    /// Run a task synchronously
+    let sync<'T> (it : Task<'T>) = it |> (Async.AwaitTask >> Async.RunSynchronously)
+    
+    /// Get the current instant
+    let getNow () = SystemClock.Instance.GetCurrentInstant ()
+    
+    /// Create a parameter for the expire-at time
+    let expireParam (it : Instant) =
+        "@expireAt", Sql.parameter (NpgsqlParameter ("@expireAt", it))
+    
+    /// Create a parameter for a possibly-missing NodaTime type
+    let optParam<'T> name (it : 'T option) =
+        let p = NpgsqlParameter ($"@%s{name}", if Option.isSome it then box it.Value else DBNull.Value)
+        p.ParameterName, Sql.parameter p
+
+
+open BitBadger.Documents.Postgres
+
+/// A distributed cache implementation in PostgreSQL used to handle sessions for myWebLog
+type DistributedCache () =
+    
+    // ~~~ INITIALIZATION ~~~
+    
+    do
+        task {
+            let! exists =
+                Custom.scalar
+                    $"SELECT EXISTS
+                          (SELECT 1 FROM pg_tables WHERE schemaname = 'public' AND tablename = 'session')
+                        AS does_exist"
+                    [] (fun row -> row.bool "does_exist")
+            if not exists then
+                do! Custom.nonQuery
+                        "CREATE TABLE session (
+                            id                  TEXT        NOT NULL PRIMARY KEY,
+                            payload             BYTEA       NOT NULL,
+                            expire_at           TIMESTAMPTZ NOT NULL,
+                            sliding_expiration  INTERVAL,
+                            absolute_expiration TIMESTAMPTZ);
+                        CREATE INDEX idx_session_expiration ON session (expire_at)" []
+        } |> sync
+    
+    // ~~~ SUPPORT FUNCTIONS ~~~
+    
+    /// Get an entry, updating it for sliding expiration
+    let getEntry key = backgroundTask {
+        let idParam = "@id", Sql.string key
+        let! tryEntry =
+            Custom.single "SELECT * FROM session WHERE id = @id" [ idParam ]
+                          (fun row ->
+                              {   Id                 = row.string                     "id"
+                                  Payload            = row.bytea                      "payload"
+                                  ExpireAt           = row.fieldValue<Instant>        "expire_at"
+                                  SlidingExpiration  = row.fieldValueOrNone<Duration> "sliding_expiration"
+                                  AbsoluteExpiration = row.fieldValueOrNone<Instant>  "absolute_expiration"   })
+        match tryEntry with
+        | Some entry ->
+            let now      = getNow ()
+            let slideExp = defaultArg entry.SlidingExpiration  Duration.MinValue
+            let absExp   = defaultArg entry.AbsoluteExpiration Instant.MinValue
+            let needsRefresh, item =
+                if entry.ExpireAt = absExp then false, entry
+                elif slideExp = Duration.MinValue && absExp = Instant.MinValue then false, entry
+                elif absExp > Instant.MinValue && entry.ExpireAt.Plus slideExp > absExp then
+                    true, { entry with ExpireAt = absExp }
+                else true, { entry with ExpireAt = now.Plus slideExp }
+            if needsRefresh then
+                do! Custom.nonQuery "UPDATE session SET expire_at = @expireAt WHERE id = @id"
+                                    [ expireParam item.ExpireAt; idParam ]
+            return if item.ExpireAt > now then Some entry else None
+        | None -> return None
+    }
+    
+    /// The last time expired entries were purged (runs every 30 minutes)
+    let mutable lastPurge = Instant.MinValue
+    
+    /// Purge expired entries every 30 minutes
+    let purge () = backgroundTask {
+        let now = getNow ()
+        if lastPurge.Plus (Duration.FromMinutes 30L) < now then
+            do! Custom.nonQuery "DELETE FROM session WHERE expire_at < @expireAt" [ expireParam now ]
+            lastPurge <- now
+    }
+    
+    /// Remove a cache entry
+    let removeEntry key =
+        Custom.nonQuery "DELETE FROM session WHERE id = @id" [ "@id", Sql.string key ]
+    
+    /// Save an entry
+    let saveEntry (opts : DistributedCacheEntryOptions) key payload =
+        let now = getNow ()
+        let expireAt, slideExp, absExp =
+            if opts.SlidingExpiration.HasValue then
+                let slide = Duration.FromTimeSpan opts.SlidingExpiration.Value
+                now.Plus slide, Some slide, None
+            elif opts.AbsoluteExpiration.HasValue then
+                let exp = Instant.FromDateTimeOffset opts.AbsoluteExpiration.Value
+                exp, None, Some exp
+            elif opts.AbsoluteExpirationRelativeToNow.HasValue then
+                let exp = now.Plus (Duration.FromTimeSpan opts.AbsoluteExpirationRelativeToNow.Value)
+                exp, None, Some exp
+            else
+                // Default to 2 hour sliding expiration
+                let slide = Duration.FromHours 2
+                now.Plus slide, Some slide, None
+        Custom.nonQuery
+            "INSERT INTO session (
+                id, payload, expire_at, sliding_expiration, absolute_expiration
+            ) VALUES (
+                @id, @payload, @expireAt, @slideExp, @absExp
+            ) ON CONFLICT (id) DO UPDATE
+            SET payload             = EXCLUDED.payload,
+                expire_at           = EXCLUDED.expire_at,
+                sliding_expiration  = EXCLUDED.sliding_expiration,
+                absolute_expiration = EXCLUDED.absolute_expiration"
+            [   "@id",      Sql.string key
+                "@payload", Sql.bytea payload
+                expireParam expireAt
+                optParam "slideExp" slideExp
+                optParam "absExp"   absExp ]
+        
+    // ~~~ IMPLEMENTATION FUNCTIONS ~~~
+    
+    /// Retrieve the data for a cache entry
+    let get key (_ : CancellationToken) = backgroundTask {
+        match! getEntry key with
+        | Some entry ->
+            do! purge ()
+            return entry.Payload
+        | None -> return null
+    }
+    
+    /// Refresh an entry
+    let refresh key (cancelToken : CancellationToken) = backgroundTask {
+        let! _ = get key cancelToken
+        ()
+    }
+    
+    /// Remove an entry
+    let remove key (_ : CancellationToken) = backgroundTask {
+        do! removeEntry key
+        do! purge ()
+    }
+    
+    /// Set an entry
+    let set key value options (_ : CancellationToken) = backgroundTask {
+        do! saveEntry options key value
+        do! purge ()
+    }
+    
+    interface IDistributedCache with
+        member this.Get key = get key CancellationToken.None |> sync
+        member this.GetAsync (key, token) = get key token
+        member this.Refresh key = refresh key CancellationToken.None |> sync
+        member this.RefreshAsync (key, token) = refresh key token
+        member this.Remove key = remove key CancellationToken.None |> sync
+        member this.RemoveAsync (key, token) = remove key token
+        member this.Set (key, value, options) = set key value options CancellationToken.None |> sync
+        member this.SetAsync (key, value, options, token) = set key value options token
+

src/PrayerTracker.Data/Migrations/20161217153124_InitialDatabase.fs

@@ -1,510 +0,0 @@
-namespace PrayerTracker.Migrations
-
-open Microsoft.EntityFrameworkCore
-open Microsoft.EntityFrameworkCore.Infrastructure
-open Microsoft.EntityFrameworkCore.Migrations
-open Microsoft.EntityFrameworkCore.Migrations.Operations
-open Microsoft.EntityFrameworkCore.Migrations.Operations.Builders
-open Npgsql.EntityFrameworkCore.PostgreSQL.Metadata
-open PrayerTracker
-open PrayerTracker.Entities
-open System
-
-
-type ChurchTable =
-  { churchId         : OperationBuilder<AddColumnOperation>
-    city             : OperationBuilder<AddColumnOperation>
-    hasInterface     : OperationBuilder<AddColumnOperation>
-    interfaceAddress : OperationBuilder<AddColumnOperation>
-    name             : OperationBuilder<AddColumnOperation>
-    st               : OperationBuilder<AddColumnOperation>
-    }
-
-type ListPreferencesTable =
-  { smallGroupId        : OperationBuilder<AddColumnOperation>
-    daysToExpire        : OperationBuilder<AddColumnOperation>
-    daysToKeepNew       : OperationBuilder<AddColumnOperation>
-    defaultEmailType    : OperationBuilder<AddColumnOperation>
-    emailFromAddress    : OperationBuilder<AddColumnOperation>
-    emailFromName       : OperationBuilder<AddColumnOperation>
-    groupPassword       : OperationBuilder<AddColumnOperation>
-    headingColor        : OperationBuilder<AddColumnOperation>
-    headingFontSize     : OperationBuilder<AddColumnOperation>
-    isPublic            : OperationBuilder<AddColumnOperation>
-    lineColor           : OperationBuilder<AddColumnOperation>
-    listFonts           : OperationBuilder<AddColumnOperation>
-    longTermUpdateWeeks : OperationBuilder<AddColumnOperation>
-    requestSort         : OperationBuilder<AddColumnOperation>
-    textFontSize        : OperationBuilder<AddColumnOperation>
-    timeZoneId          : OperationBuilder<AddColumnOperation>
-    }
-
-type MemberTable =
-  { memberId     : OperationBuilder<AddColumnOperation>
-    email        : OperationBuilder<AddColumnOperation>
-    format       : OperationBuilder<AddColumnOperation>
-    memberName   : OperationBuilder<AddColumnOperation>
-    smallGroupId : OperationBuilder<AddColumnOperation>
-    }
-
-type PrayerRequestTable =
-  { prayerRequestId   : OperationBuilder<AddColumnOperation>
-    doNotExpire       : OperationBuilder<AddColumnOperation>
-    enteredDate       : OperationBuilder<AddColumnOperation>
-    isManuallyExpired : OperationBuilder<AddColumnOperation>
-    notifyChaplain    : OperationBuilder<AddColumnOperation>
-    requestType       : OperationBuilder<AddColumnOperation>
-    requestor         : OperationBuilder<AddColumnOperation>
-    smallGroupId      : OperationBuilder<AddColumnOperation>
-    text              : OperationBuilder<AddColumnOperation>
-    updatedDate       : OperationBuilder<AddColumnOperation>
-    userId            : OperationBuilder<AddColumnOperation>
-    }
-
-type SmallGroupTable =
-  { smallGroupId : OperationBuilder<AddColumnOperation>
-    churchId     : OperationBuilder<AddColumnOperation>
-    name         : OperationBuilder<AddColumnOperation>
-    }
-
-type TimeZoneTable =
-  { timeZoneId  : OperationBuilder<AddColumnOperation>
-    description : OperationBuilder<AddColumnOperation>
-    isActive    : OperationBuilder<AddColumnOperation>
-    sortOrder   : OperationBuilder<AddColumnOperation>
-    }
-
-type UserSmallGroupTable =
-  { userId       : OperationBuilder<AddColumnOperation>
-    smallGroupId : OperationBuilder<AddColumnOperation>
-    }
-
-type UserTable =
-  { userId       : OperationBuilder<AddColumnOperation>
-    emailAddress : OperationBuilder<AddColumnOperation>
-    firstName    : OperationBuilder<AddColumnOperation>
-    isAdmin      : OperationBuilder<AddColumnOperation>
-    lastName     : OperationBuilder<AddColumnOperation>
-    passwordHash : OperationBuilder<AddColumnOperation>
-    salt         : OperationBuilder<AddColumnOperation>
-    }
-
-[<DbContext (typeof<AppDbContext>)>]
-[<Migration "20161217153124_InitialDatabase">]
-type InitialDatabase () =
-  inherit Migration ()
-  override __.Up (migrationBuilder : MigrationBuilder) =
-    migrationBuilder.EnsureSchema (name = "pt")
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "Church",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { churchId         = table.Column<Guid>   (name = "ChurchId", nullable = false)
-              city             = table.Column<string> (name = "City", nullable = false)
-              hasInterface     = table.Column<bool>   (name = "HasVirtualPrayerRoomInterface", nullable = false)
-              interfaceAddress = table.Column<string> (name = "InterfaceAddress", nullable = true)
-              name             = table.Column<string> (name = "Name", nullable = false)
-              st               = table.Column<string> (name = "ST", maxLength = Nullable<int> 2, nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_Church", fun x -> upcast x.churchId) |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "TimeZone",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { timeZoneId  = table.Column<string> (name = "TimeZoneId", nullable = false)
-              description = table.Column<string> (name = "Description", nullable = false)
-              isActive    = table.Column<bool>   (name = "IsActive", nullable = false)
-              sortOrder   = table.Column<int>    (name = "SortOrder", nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_TimeZone", fun x -> upcast x.timeZoneId) |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "User",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { userId       = table.Column<Guid>   (name = "UserId", nullable = false)
-              emailAddress = table.Column<string> (name = "EmailAddress", nullable = false)
-              firstName    = table.Column<string> (name = "FirstName", nullable = false)
-              isAdmin      = table.Column<bool>   (name = "IsSystemAdmin", nullable = false)
-              lastName     = table.Column<string> (name = "LastName", nullable = false)
-              passwordHash = table.Column<string> (name = "PasswordHash", nullable = false)
-              salt         = table.Column<Guid>   (name = "Salt", nullable = true)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey("PK_User", fun x -> upcast x.userId) |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "SmallGroup",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { smallGroupId = table.Column<Guid>   (name = "SmallGroupId", nullable = false)
-              churchId     = table.Column<Guid>   (name = "ChurchId", nullable = false)
-              name         = table.Column<string> (name = "Name", nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_SmallGroup", fun x -> upcast x.smallGroupId) |> ignore
-          table.ForeignKey (
-            name            = "FK_SmallGroup_Church_ChurchId",
-            column          = (fun x -> upcast x.churchId),
-            principalSchema = "pt",
-            principalTable  = "Church",
-            principalColumn = "ChurchId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "ListPreference",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { smallGroupId        = table.Column<Guid>   (name = "SmallGroupId", nullable = false)
-              daysToExpire        = table.Column<int>    (name = "DaysToExpire", nullable = false, defaultValue = 14)
-              daysToKeepNew       = table.Column<int>    (name = "DaysToKeepNew", nullable = false, defaultValue = 7)
-              defaultEmailType    = table.Column<string> (name = "DefaultEmailType", nullable = false, defaultValue = "Html")
-              emailFromAddress    = table.Column<string> (name = "EmailFromAddress", nullable = false, defaultValue = "prayer@djs-consulting.com")
-              emailFromName       = table.Column<string> (name = "EmailFromName", nullable = false, defaultValue = "PrayerTracker")
-              groupPassword       = table.Column<string> (name = "GroupPassword", nullable = false, defaultValue = "")
-              headingColor        = table.Column<string> (name = "HeadingColor", nullable = false, defaultValue = "maroon")
-              headingFontSize     = table.Column<int>    (name = "HeadingFontSize", nullable = false, defaultValue = 16)
-              isPublic            = table.Column<bool>   (name = "IsPublic", nullable = false, defaultValue = false)
-              lineColor           = table.Column<string> (name = "LineColor", nullable = false, defaultValue = "navy")
-              listFonts           = table.Column<string> (name = "ListFonts", nullable = false, defaultValue = "Century Gothic,Tahoma,Luxi Sans,sans-serif")
-              longTermUpdateWeeks = table.Column<int>    (name = "LongTermUpdateWeeks", nullable = false, defaultValue = 4)
-              requestSort         = table.Column<string> (name = "RequestSort", maxLength = Nullable<int> 1, nullable = false, defaultValue = "D")
-              textFontSize        = table.Column<int>    (name = "TextFontSize", nullable = false, defaultValue = 12)
-              timeZoneId          = table.Column<string> (name = "TimeZoneId", nullable = false, defaultValue = "America/Denver")
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_ListPreference", fun x -> upcast x.smallGroupId) |> ignore
-          table.ForeignKey (
-            name            = "FK_ListPreference_SmallGroup_SmallGroupId",
-            column          = (fun x -> upcast x.smallGroupId),
-            principalSchema = "pt",
-            principalTable  = "SmallGroup",
-            principalColumn = "SmallGroupId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore
-          table.ForeignKey (
-            name            = "FK_ListPreference_TimeZone_TimeZoneId",
-            column          = (fun x -> upcast x.timeZoneId),
-            principalSchema = "pt",
-            principalTable  = "TimeZone",
-            principalColumn = "TimeZoneId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore)
-    |> ignore
-    
-    migrationBuilder.CreateTable (
-      name    = "Member",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { memberId     = table.Column<Guid>   (name = "MemberId", nullable = false)
-              email        = table.Column<string> (name = "Email", nullable = false)
-              format       = table.Column<string> (name = "Format", nullable = true)
-              memberName   = table.Column<string> (name = "MemberName", nullable = false)
-              smallGroupId = table.Column<Guid>   (name = "SmallGroupId", nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_Member", fun x -> upcast x.memberId) |> ignore
-          table.ForeignKey (
-            name            = "FK_Member_SmallGroup_SmallGroupId",
-            column          = (fun x -> upcast x.smallGroupId),
-            principalSchema = "pt",
-            principalTable  = "SmallGroup",
-            principalColumn = "SmallGroupId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateTable (
-      name    = "PrayerRequest",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { prayerRequestId   = table.Column<Guid>     (name = "PrayerRequestId", nullable = false)
-              doNotExpire       = table.Column<bool>     (name = "DoNotExpire", nullable = false)
-              enteredDate       = table.Column<DateTime> (name = "EnteredDate", nullable = false)
-              isManuallyExpired = table.Column<bool>     (name = "IsManuallyExpired", nullable = false)
-              notifyChaplain    = table.Column<bool>     (name = "NotifyChaplain", nullable = false)
-              requestType       = table.Column<string>   (name = "RequestType", nullable = false)
-              requestor         = table.Column<string>   (name = "Requestor", nullable = true)
-              smallGroupId      = table.Column<Guid>     (name = "SmallGroupId", nullable = false)
-              text              = table.Column<string>   (name = "Text", nullable = false)
-              updatedDate       = table.Column<DateTime> (name = "UpdatedDate", nullable = false)
-              userId            = table.Column<Guid>     (name = "UserId", nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_PrayerRequest", fun x -> upcast x.prayerRequestId) |> ignore
-          table.ForeignKey (
-            name            = "FK_PrayerRequest_SmallGroup_SmallGroupId",
-            column          = (fun x -> upcast x.smallGroupId),
-            principalSchema = "pt",
-            principalTable  = "SmallGroup",
-            principalColumn = "SmallGroupId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore
-          table.ForeignKey (
-            name            = "FK_PrayerRequest_User_UserId",
-            column          = (fun x -> upcast x.userId),
-            principalSchema = "pt",
-            principalTable  = "User",
-            principalColumn = "UserId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore)
-    |> ignore
-    
-    migrationBuilder.CreateTable(
-      name    = "User_SmallGroup",
-      schema  = "pt",
-      columns =
-        (fun table ->
-            { userId       = table.Column<Guid> (name = "UserId", nullable = false)
-              smallGroupId = table.Column<Guid> (name = "SmallGroupId", nullable = false)
-              }),
-      constraints =
-        fun table ->
-          table.PrimaryKey ("PK_User_SmallGroup", fun x -> upcast x) |> ignore
-          table.ForeignKey (
-            name            = "FK_User_SmallGroup_SmallGroup_SmallGroupId",
-            column          = (fun x -> upcast x.smallGroupId),
-            principalSchema = "pt",
-            principalTable  = "SmallGroup",
-            principalColumn = "SmallGroupId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore
-          table.ForeignKey (
-            name            = "FK_User_SmallGroup_User_UserId",
-            column          = (fun x -> upcast x.userId),
-            principalSchema = "pt",
-            principalTable  = "User",
-            principalColumn = "UserId",
-            onDelete        = ReferentialAction.Cascade)
-          |> ignore)
-    |> ignore
-
-    migrationBuilder.CreateIndex (name = "IX_ListPreference_TimeZoneId",    schema = "pt", table = "ListPreference",  column = "TimeZoneId")   |> ignore
-    migrationBuilder.CreateIndex (name = "IX_Member_SmallGroupId",          schema = "pt", table = "Member",          column = "SmallGroupId") |> ignore
-    migrationBuilder.CreateIndex (name = "IX_PrayerRequest_SmallGroupId",   schema = "pt", table = "PrayerRequest",   column = "SmallGroupId") |> ignore
-    migrationBuilder.CreateIndex (name = "IX_PrayerRequest_UserId",         schema = "pt", table = "PrayerRequest",   column = "UserId")       |> ignore
-    migrationBuilder.CreateIndex (name = "IX_SmallGroup_ChurchId",          schema = "pt", table = "SmallGroup",      column = "ChurchId")     |> ignore
-    migrationBuilder.CreateIndex (name = "IX_User_SmallGroup_SmallGroupId", schema = "pt", table = "User_SmallGroup", column = "SmallGroupId") |> ignore
-  
-  override __.Down (migrationBuilder : MigrationBuilder) =
-    migrationBuilder.DropTable (name = "ListPreference",  schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "Member",          schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "PrayerRequest",   schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "User_SmallGroup", schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "TimeZone",        schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "SmallGroup",      schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "User",            schema = "pt") |> ignore
-    migrationBuilder.DropTable (name = "Church",          schema = "pt") |> ignore
-
-
-  override __.BuildTargetModel (modelBuilder : ModelBuilder) =
-    modelBuilder
-      .HasDefaultSchema("pt")
-      .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
-      .HasAnnotation("ProductVersion", "1.1.0-rtm-22752")
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<Church>,
-      fun b ->
-          b.Property<Guid>("churchId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("city").IsRequired() |> ignore
-          b.Property<bool>("hasInterface") |> ignore
-          b.Property<string>("interfaceAddress") |> ignore
-          b.Property<string>("name").IsRequired() |> ignore
-          b.Property<string>("st").IsRequired().HasMaxLength(2) |> ignore
-          b.HasKey("churchId") |> ignore
-          b.ToTable("Church") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<ListPreferences>,
-      fun b ->
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.Property<int>("daysToExpire").ValueGeneratedOnAdd().HasDefaultValue(14) |> ignore
-          b.Property<int>("daysToKeepNew").ValueGeneratedOnAdd().HasDefaultValue(7) |> ignore
-          b.Property<string>("defaultEmailType").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("Html") |> ignore
-          b.Property<string>("emailFromAddress").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("prayer@djs-consulting.com") |> ignore
-          b.Property<string>("emailFromName").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("PrayerTracker") |> ignore
-          b.Property<string>("groupPassword").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("") |> ignore
-          b.Property<string>("headingColor").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("maroon") |> ignore
-          b.Property<int>("headingFontSize").ValueGeneratedOnAdd().HasDefaultValue(16) |> ignore
-          b.Property<bool>("isPublic").ValueGeneratedOnAdd().HasDefaultValue(false) |> ignore
-          b.Property<string>("lineColor").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("navy") |> ignore
-          b.Property<string>("listFonts").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("Century Gothic,Tahoma,Luxi Sans,sans-serif") |> ignore
-          b.Property<int>("longTermUpdateWeeks").ValueGeneratedOnAdd().HasDefaultValue(4) |> ignore
-          b.Property<string>("requestSort").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("D").HasMaxLength(1)  |> ignore
-          b.Property<int>("textFontSize").ValueGeneratedOnAdd().HasDefaultValue(12) |> ignore
-          b.Property<string>("timeZoneId").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("America/Denver") |> ignore
-          b.HasKey("smallGroupId") |> ignore
-          b.HasIndex("timeZoneId") |> ignore
-          b.ToTable("ListPreference") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<Member>,
-      fun b ->
-          b.Property<Guid>("memberId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("email").IsRequired() |> ignore
-          b.Property<string>("format") |> ignore
-          b.Property<string>("memberName").IsRequired() |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.HasKey("memberId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.ToTable("Member") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerRequest>,
-      fun b ->
-          b.Property<Guid>("prayerRequestId").ValueGeneratedOnAdd() |> ignore
-          b.Property<bool>("doNotExpire") |> ignore
-          b.Property<DateTime>("enteredDate") |> ignore
-          b.Property<bool>("isManuallyExpired") |> ignore
-          b.Property<bool>("notifyChaplain") |> ignore
-          b.Property<string>("requestType").IsRequired() |> ignore
-          b.Property<string>("requestor") |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.Property<string>("text").IsRequired() |> ignore
-          b.Property<DateTime>("updatedDate") |> ignore
-          b.Property<Guid>("userId") |> ignore
-          b.HasKey("prayerRequestId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.HasIndex("userId") |> ignore
-          b.ToTable("PrayerRequest") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<SmallGroup>,
-      fun b ->
-          b.Property<Guid>("smallGroupId").ValueGeneratedOnAdd() |> ignore
-          b.Property<Guid>("churchId") |> ignore
-          b.Property<string>("name").IsRequired() |> ignore
-          b.HasKey("smallGroupId") |> ignore
-          b.HasIndex("churchId") |> ignore
-          b.ToTable("SmallGroup") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerTracker.Entities.TimeZone>,
-      fun b ->
-          b.Property<string>("timeZoneId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("description").IsRequired() |> ignore
-          b.Property<bool>("isActive") |> ignore
-          b.Property<int>("sortOrder") |> ignore
-          b.HasKey("timeZoneId") |> ignore
-          b.ToTable("TimeZone") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<User>,
-      fun b ->
-          b.Property<Guid>("userId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("emailAddress").IsRequired() |> ignore
-          b.Property<string>("firstName").IsRequired() |> ignore
-          b.Property<bool>("isAdmin") |> ignore
-          b.Property<string>("lastName").IsRequired() |> ignore
-          b.Property<string>("passwordHash").IsRequired() |> ignore
-          b.Property<Guid>("salt") |> ignore
-          b.HasKey("userId") |> ignore
-          b.ToTable("User") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<UserSmallGroup>,
-      fun b ->
-          b.Property<Guid>("userId") |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.HasKey("userId", "smallGroupId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.ToTable("User_SmallGroup") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<ListPreferences>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup")
-            .WithOne("preferences")
-            .HasForeignKey("PrayerTracker.Entities.ListPreferences", "smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.TimeZone", "timeZone")
-            .WithMany()
-            .HasForeignKey("timeZoneId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-    
-    modelBuilder.Entity (
-      typeof<Member>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("members")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerRequest>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("prayerRequests")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.User", "user")
-            .WithMany()
-            .HasForeignKey("userId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<SmallGroup>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.Church", "Church")
-            .WithMany("SmallGroups")
-            .HasForeignKey("ChurchId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<UserSmallGroup>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("users")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.User", "user")
-            .WithMany("smallGroups")
-            .HasForeignKey("userId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore

src/PrayerTracker.Data/Migrations/AppDbContextModelSnapshot.fs

@@ -1,199 +0,0 @@
-namespace PrayerTracker.Migrations
-
-open Microsoft.EntityFrameworkCore
-open Microsoft.EntityFrameworkCore.Infrastructure
-open Npgsql.EntityFrameworkCore.PostgreSQL.Metadata
-open PrayerTracker
-open PrayerTracker.Entities
-open System
-
-[<DbContext (typeof<AppDbContext>)>]
-type AppDbContextModelSnapshot () =
-  inherit ModelSnapshot ()
-
-  override __.BuildModel (modelBuilder : ModelBuilder) =
-    modelBuilder
-      .HasDefaultSchema("pt")
-      .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
-      .HasAnnotation("ProductVersion", "1.1.0-rtm-22752")
-    |> ignore
-    modelBuilder.Entity (
-      typeof<Church>,
-      fun b ->
-          b.Property<Guid>("churchId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("city").IsRequired() |> ignore
-          b.Property<bool>("hasInterface") |> ignore
-          b.Property<string>("interfaceAddress") |> ignore
-          b.Property<string>("name").IsRequired() |> ignore
-          b.Property<string>("st").IsRequired().HasMaxLength(2) |> ignore
-          b.HasKey("churchId") |> ignore
-          b.ToTable("Church") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<ListPreferences>,
-      fun b ->
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.Property<int>("daysToExpire").ValueGeneratedOnAdd().HasDefaultValue(14) |> ignore
-          b.Property<int>("daysToKeepNew").ValueGeneratedOnAdd().HasDefaultValue(7) |> ignore
-          b.Property<string>("defaultEmailType").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("Html") |> ignore
-          b.Property<string>("emailFromAddress").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("prayer@djs-consulting.com") |> ignore
-          b.Property<string>("emailFromName").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("PrayerTracker") |> ignore
-          b.Property<string>("groupPassword").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("") |> ignore
-          b.Property<string>("headingColor").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("maroon") |> ignore
-          b.Property<int>("headingFontSize").ValueGeneratedOnAdd().HasDefaultValue(16) |> ignore
-          b.Property<bool>("isPublic").ValueGeneratedOnAdd().HasDefaultValue(false) |> ignore
-          b.Property<string>("lineColor").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("navy") |> ignore
-          b.Property<string>("listFonts").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("Century Gothic,Tahoma,Luxi Sans,sans-serif") |> ignore
-          b.Property<int>("longTermUpdateWeeks").ValueGeneratedOnAdd().HasDefaultValue(4) |> ignore
-          b.Property<string>("requestSort").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("D").HasMaxLength(1)  |> ignore
-          b.Property<int>("textFontSize").ValueGeneratedOnAdd().HasDefaultValue(12) |> ignore
-          b.Property<string>("timeZoneId").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("America/Denver") |> ignore
-          b.HasKey("smallGroupId") |> ignore
-          b.HasIndex("timeZoneId") |> ignore
-          b.ToTable("ListPreference") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<Member>,
-      fun b ->
-          b.Property<Guid>("memberId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("email").IsRequired() |> ignore
-          b.Property<string>("format") |> ignore
-          b.Property<string>("memberName").IsRequired() |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.HasKey("memberId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.ToTable("Member") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerRequest>,
-      fun b ->
-          b.Property<Guid>("prayerRequestId").ValueGeneratedOnAdd() |> ignore
-          b.Property<bool>("doNotExpire") |> ignore
-          b.Property<DateTime>("enteredDate") |> ignore
-          b.Property<bool>("isManuallyExpired") |> ignore
-          b.Property<bool>("notifyChaplain") |> ignore
-          b.Property<string>("requestType").IsRequired() |> ignore
-          b.Property<string>("requestor") |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.Property<string>("text").IsRequired() |> ignore
-          b.Property<DateTime>("updatedDate") |> ignore
-          b.Property<Guid>("userId") |> ignore
-          b.HasKey("prayerRequestId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.HasIndex("userId") |> ignore
-          b.ToTable("PrayerRequest") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<SmallGroup>,
-      fun b ->
-          b.Property<Guid>("smallGroupId").ValueGeneratedOnAdd() |> ignore
-          b.Property<Guid>("churchId") |> ignore
-          b.Property<string>("name").IsRequired() |> ignore
-          b.HasKey("smallGroupId") |> ignore
-          b.HasIndex("churchId") |> ignore
-          b.ToTable("SmallGroup") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerTracker.Entities.TimeZone>,
-      fun b ->
-          b.Property<string>("timeZoneId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("description").IsRequired() |> ignore
-          b.Property<bool>("isActive") |> ignore
-          b.Property<int>("sortOrder") |> ignore
-          b.HasKey("timeZoneId") |> ignore
-          b.ToTable("TimeZone") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<User>,
-      fun b ->
-          b.Property<Guid>("userId").ValueGeneratedOnAdd() |> ignore
-          b.Property<string>("emailAddress").IsRequired() |> ignore
-          b.Property<string>("firstName").IsRequired() |> ignore
-          b.Property<bool>("isAdmin") |> ignore
-          b.Property<string>("lastName").IsRequired() |> ignore
-          b.Property<string>("passwordHash").IsRequired() |> ignore
-          b.Property<Guid>("salt") |> ignore
-          b.HasKey("userId") |> ignore
-          b.ToTable("User") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<UserSmallGroup>,
-      fun b ->
-          b.Property<Guid>("userId") |> ignore
-          b.Property<Guid>("smallGroupId") |> ignore
-          b.HasKey("userId", "smallGroupId") |> ignore
-          b.HasIndex("smallGroupId") |> ignore
-          b.ToTable("User_SmallGroup") |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<ListPreferences>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup")
-            .WithOne("preferences")
-            .HasForeignKey("PrayerTracker.Entities.ListPreferences", "smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.TimeZone", "timeZone")
-            .WithMany()
-            .HasForeignKey("timeZoneId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-    
-    modelBuilder.Entity (
-      typeof<Member>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("members")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<PrayerRequest>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("prayerRequests")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.User", "user")
-            .WithMany()
-            .HasForeignKey("userId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<SmallGroup>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.Church", "Church")
-            .WithMany("SmallGroups")
-            .HasForeignKey("ChurchId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore
-
-    modelBuilder.Entity (
-      typeof<UserSmallGroup>,
-      fun b ->
-          b.HasOne("PrayerTracker.Entities.SmallGroup", "smallGroup")
-            .WithMany("users")
-            .HasForeignKey("smallGroupId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore
-          b.HasOne("PrayerTracker.Entities.User", "user")
-            .WithMany("smallGroups")
-            .HasForeignKey("userId")
-            .OnDelete(DeleteBehavior.Cascade)
-          |> ignore)
-    |> ignore

src/PrayerTracker.Data/PrayerTracker.Data.fsproj

@@ -1,28 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyVersion>7.0.0.0</AssemblyVersion>
-    <FileVersion>7.0.0.0</FileVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Entities.fs" />
-    <Compile Include="AppDbContext.fs" />
-    <Compile Include="DataAccess.fs" />
-    <Compile Include="Migrations\20161217153124_InitialDatabase.fs" />
-    <Compile Include="Migrations\AppDbContextModelSnapshot.fs" />
+    <Compile Include="Access.fs" />
+    <Compile Include="DistributedCache.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Include="BitBadger.Documents.Postgres" Version="3.1.0" />
+    <PackageReference Include="Giraffe" Version="6.4.0" />
+    <PackageReference Include="NodaTime" Version="3.1.11" />
+    <PackageReference Include="Npgsql.FSharp" Version="5.7.0" />
+    <PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
   </ItemGroup>
 
 </Project>

src/PrayerTracker.Tests/Data/EntitiesTests.fs

@@ -1,50 +1,134 @@
 module PrayerTracker.Entities.EntitiesTests
 
 open Expecto
-open System
-open System.Linq
 open NodaTime.Testing
 open NodaTime
+open System
+
+[<Tests>]
+let asOfDateDisplayTests =
+    testList "AsOfDateDisplay" [
+        test "NoDisplay code is correct" {
+            Expect.equal (AsOfDateDisplay.toCode NoDisplay) "N" "The code for NoDisplay should have been \"N\""
+        }
+        test "ShortDate code is correct" {
+            Expect.equal (AsOfDateDisplay.toCode ShortDate) "S" "The code for ShortDate should have been \"S\""
+        }
+        test "LongDate code is correct" {
+            Expect.equal (AsOfDateDisplay.toCode LongDate) "L" "The code for LongDate should have been \"N\""
+        }
+        test "fromCode N should return NoDisplay" {
+            Expect.equal (AsOfDateDisplay.fromCode "N") NoDisplay "\"N\" should have been converted to NoDisplay"
+        }
+        test "fromCode S should return ShortDate" {
+            Expect.equal (AsOfDateDisplay.fromCode "S") ShortDate "\"S\" should have been converted to ShortDate"
+        }
+        test "fromCode L should return LongDate" {
+            Expect.equal (AsOfDateDisplay.fromCode "L") LongDate "\"L\" should have been converted to LongDate"
+        }
+        test "fromCode X should raise" {
+            Expect.throws (fun () -> AsOfDateDisplay.fromCode "X" |> ignore)
+                "An unknown code should have raised an exception"
+        }
+    ]
 
 [<Tests>]
 let churchTests =
     testList "Church" [
         test "empty is as expected" {
             let mt = Church.empty
-      Expect.equal mt.churchId Guid.Empty "The church ID should have been an empty GUID"
-      Expect.equal mt.name "" "The name should have been blank"
-      Expect.equal mt.city "" "The city should have been blank"
-      Expect.equal mt.st "" "The state should have been blank"
-      Expect.isFalse mt.hasInterface "The church should not show that it has an interface"
-      Expect.isNone mt.interfaceAddress "The interface address should not exist"
-      Expect.isNotNull mt.smallGroups "The small groups navigation property should not be null"
-      Expect.isEmpty mt.smallGroups "There should be no small groups for an empty church"
+            Expect.equal mt.Id.Value Guid.Empty "The church ID should have been an empty GUID"
+            Expect.equal mt.Name "" "The name should have been blank"
+            Expect.equal mt.City "" "The city should have been blank"
+            Expect.equal mt.State "" "The state should have been blank"
+            Expect.isFalse mt.HasVpsInterface "The church should not show that it has an interface"
+            Expect.isNone mt.InterfaceAddress "The interface address should not exist"
+        }
+    ]
+
+[<Tests>]
+let emailFormatTests =
+    testList "EmailFormat" [
+        test "HtmlFormat code is correct" {
+            Expect.equal (EmailFormat.toCode HtmlFormat) "H" "The code for HtmlFormat should have been \"H\""
+        }
+        test "PlainTextFormat code is correct" {
+            Expect.equal (EmailFormat.toCode PlainTextFormat) "P" "The code for PlainTextFormat should have been \"P\""
+        }
+        test "fromCode H should return HtmlFormat" {
+            Expect.equal (EmailFormat.fromCode "H") HtmlFormat "\"H\" should have been converted to HtmlFormat"
+        }
+        test "fromCode P should return ShortDate" {
+            Expect.equal (EmailFormat.fromCode "P") PlainTextFormat
+                "\"P\" should have been converted to PlainTextFormat"
+        }
+        test "fromCode Z should raise" {
+            Expect.throws (fun () -> EmailFormat.fromCode "Z" |> ignore)
+                "An unknown code should have raised an exception"
+        }
+    ]
+
+[<Tests>]
+let expirationTests =
+    testList "Expiration" [
+        test "Automatic code is correct" {
+            Expect.equal (Expiration.toCode Automatic) "A" "The code for Automatic should have been \"A\""
+        }
+        test "Manual code is correct" {
+            Expect.equal (Expiration.toCode Manual) "M" "The code for Manual should have been \"M\""
+        }
+        test "Forced code is correct" {
+            Expect.equal (Expiration.toCode Forced) "F" "The code for Forced should have been \"F\""
+        }
+        test "fromCode A should return Automatic" {
+            Expect.equal (Expiration.fromCode "A") Automatic "\"A\" should have been converted to Automatic"
+        }
+        test "fromCode M should return Manual" {
+            Expect.equal (Expiration.fromCode "M") Manual "\"M\" should have been converted to Manual"
+        }
+        test "fromCode F should return Forced" {
+            Expect.equal (Expiration.fromCode "F") Forced "\"F\" should have been converted to Forced"
+        }
+        test "fromCode V should raise" {
+            Expect.throws (fun () -> Expiration.fromCode "V" |> ignore)
+                "An unknown code should have raised an exception"
         }
     ]
 
 [<Tests>]
 let listPreferencesTests =
     testList "ListPreferences" [
+        test "FontStack is correct for native fonts" {
+            Expect.equal ListPreferences.empty.FontStack
+                """system-ui,-apple-system,"Segoe UI",Roboto,Ubuntu,"Liberation Sans",Cantarell,"Helvetica Neue",sans-serif"""
+                "The expected native font stack was incorrect"
+        }
+        test "FontStack is correct for specific fonts" {
+            Expect.equal { ListPreferences.empty with Fonts = "Arial,sans-serif" }.FontStack "Arial,sans-serif"
+                "The specified fonts were not returned correctly"
+        }
         test "empty is as expected" {
             let mt = ListPreferences.empty
-      Expect.equal mt.smallGroupId Guid.Empty "The small group ID should have been an empty GUID"
-      Expect.equal mt.daysToExpire 14 "The default days to expire should have been 14"
-      Expect.equal mt.daysToKeepNew 7 "The default days to keep new should have been 7"
-      Expect.equal mt.longTermUpdateWeeks 4 "The default long term update weeks should have been 4"
-      Expect.equal mt.emailFromName "PrayerTracker" "The default e-mail from name should have been PrayerTracker"
-      Expect.equal mt.emailFromAddress "prayer@djs-consulting.com"
-        "The default e-mail from address should have been prayer@djs-consulting.com"
-      Expect.equal mt.listFonts "Century Gothic,Tahoma,Luxi Sans,sans-serif" "The default list fonts were incorrect"
-      Expect.equal mt.headingColor "maroon" "The default heading text color should have been maroon"
-      Expect.equal mt.lineColor "navy" "The default heding line color should have been navy"
-      Expect.equal mt.headingFontSize 16 "The default heading font size should have been 16"
-      Expect.equal mt.textFontSize 12 "The default text font size should have been 12"
-      Expect.equal mt.requestSort "D" "The default request sort should have been D (date)"
-      Expect.equal mt.groupPassword "" "The default group password should have been blank"
-      Expect.equal mt.defaultEmailType EmailType.Html "The default e-mail type should have been HTML"
-      Expect.isFalse mt.isPublic "The isPublic flag should not have been set"
-      Expect.equal mt.timeZoneId "America/Denver" "The default time zone should have been America/Denver"
-      Expect.equal mt.timeZone.timeZoneId "" "The default preferences should have included an empty time zone"
+            Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
+            Expect.equal mt.DaysToExpire 14 "The default days to expire should have been 14"
+            Expect.equal mt.DaysToKeepNew 7 "The default days to keep new should have been 7"
+            Expect.equal mt.LongTermUpdateWeeks 4 "The default long term update weeks should have been 4"
+            Expect.equal mt.EmailFromName "PrayerTracker" "The default e-mail from name should have been PrayerTracker"
+            Expect.equal mt.EmailFromAddress "prayer@bitbadger.solutions"
+                "The default e-mail from address should have been prayer@bitbadger.solutions"
+            Expect.equal mt.Fonts "native" "The default list fonts were incorrect"
+            Expect.equal mt.HeadingColor "maroon" "The default heading text color should have been maroon"
+            Expect.equal mt.LineColor "navy" "The default heading line color should have been navy"
+            Expect.equal mt.HeadingFontSize 16 "The default heading font size should have been 16"
+            Expect.equal mt.TextFontSize 12 "The default text font size should have been 12"
+            Expect.equal mt.RequestSort SortByDate "The default request sort should have been by date"
+            Expect.equal mt.GroupPassword "" "The default group password should have been blank"
+            Expect.equal mt.DefaultEmailType HtmlFormat "The default e-mail type should have been HTML"
+            Expect.isFalse mt.IsPublic "The isPublic flag should not have been set"
+            Expect.equal (TimeZoneId.toString mt.TimeZoneId) "America/Denver"
+                "The default time zone should have been America/Denver"
+            Expect.equal mt.PageSize 100 "The default page size should have been 100"
+            Expect.equal mt.AsOfDateDisplay NoDisplay "The as-of date display should have been No Display"
         }
     ]
 
@@ -53,135 +137,198 @@ let memberTests =
     testList "Member" [
         test "empty is as expected" {
             let mt = Member.empty
-      Expect.equal mt.memberId Guid.Empty "The member ID should have been an empty GUID"
-      Expect.equal mt.smallGroupId Guid.Empty "The small group ID should have been an empty GUID"
-      Expect.equal mt.memberName "" "The member name should have been blank"
-      Expect.equal mt.email "" "The member e-mail address should have been blank"
-      Expect.isNone mt.format "The preferred e-mail format should not exist"
-      Expect.equal mt.smallGroup.smallGroupId Guid.Empty "The small group should have been an empty one"
+            Expect.equal mt.Id.Value Guid.Empty "The member ID should have been an empty GUID"
+            Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
+            Expect.equal mt.Name "" "The member name should have been blank"
+            Expect.equal mt.Email "" "The member e-mail address should have been blank"
+            Expect.isNone mt.Format "The preferred e-mail format should not exist"
         }
     ]
 
 [<Tests>]
 let prayerRequestTests =
+    let instantNow      = SystemClock.Instance.GetCurrentInstant
+    let localDateNow () = (instantNow ()).InUtc().Date
     testList "PrayerRequest" [
         test "empty is as expected" {
             let mt = PrayerRequest.empty
-      Expect.equal mt.prayerRequestId Guid.Empty "The request ID should have been an empty GUID"
-      Expect.equal mt.requestType RequestType.Current "The request type should have been Current"
-      Expect.equal mt.userId Guid.Empty "The user ID should have been an empty GUID"
-      Expect.equal mt.smallGroupId Guid.Empty "The small group ID should have been an empty GUID"
-      Expect.equal mt.enteredDate DateTime.MinValue "The entered date should have been the minimum"
-      Expect.equal mt.updatedDate DateTime.MinValue "The updated date should have been the minimum"
-      Expect.isNone mt.requestor "The requestor should not exist"
-      Expect.equal mt.text "" "The request text should have been blank"
-      Expect.isFalse mt.doNotExpire "The do not expire flag should not have been set"
-      Expect.isFalse mt.notifyChaplain "The notify chaplain flag should not have been set"
-      Expect.isFalse mt.isManuallyExpired "The is manually expired flag should not have been set"
-      Expect.equal mt.user.userId Guid.Empty "The user should have been an empty one"
-      Expect.equal mt.smallGroup.smallGroupId Guid.Empty "The small group should have been an empty one"
+            Expect.equal mt.Id.Value Guid.Empty "The request ID should have been an empty GUID"
+            Expect.equal mt.RequestType CurrentRequest "The request type should have been Current"
+            Expect.equal mt.UserId.Value Guid.Empty "The user ID should have been an empty GUID"
+            Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
+            Expect.equal mt.EnteredDate Instant.MinValue "The entered date should have been the minimum"
+            Expect.equal mt.UpdatedDate Instant.MinValue "The updated date should have been the minimum"
+            Expect.isNone mt.Requestor "The requestor should not exist"
+            Expect.equal mt.Text "" "The request text should have been blank"
+            Expect.isFalse mt.NotifyChaplain "The notify chaplain flag should not have been set"
+            Expect.equal mt.Expiration Automatic "The expiration should have been Automatic"
         }
         test "isExpired always returns false for expecting requests" {
-      let req = { PrayerRequest.empty with requestType = RequestType.Expecting }
-      Expect.isFalse (req.isExpired DateTime.Now 0) "An expecting request should never be considered expired"
+            PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with RequestType = Expecting }
+            |> Flip.Expect.isFalse "An expecting request should never be considered expired"
         }
-    test "isExpired always returns false for never-expired requests" {
-      let req = { PrayerRequest.empty with updatedDate = DateTime.Now.AddMonths -1; doNotExpire = true }
-      Expect.isFalse (req.isExpired DateTime.Now 4) "A never-expired request should never be considered expired"
+        test "isExpired always returns false for manually-expired requests" {
+            PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty 
+                { PrayerRequest.empty with UpdatedDate = (instantNow ()) - Duration.FromDays 1; Expiration = Manual }
+            |> Flip.Expect.isFalse "A never-expired request should never be considered expired"
         }
-    test "isExpired always returns false for recurring requests" {
-      let req = { PrayerRequest.empty with requestType = RequestType.Recurring }
-      Expect.isFalse (req.isExpired DateTime.Now 0) "A recurring/long-term request should never be considered expired"
+        test "isExpired always returns false for long term/recurring requests" {
+            PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with RequestType = LongTermRequest }
+            |> Flip.Expect.isFalse "A recurring/long-term request should never be considered expired"
         }
-    test "isExpired always returns true for manually expired requests" {
-      let req = { PrayerRequest.empty with updatedDate = DateTime.Now; isManuallyExpired = true }
-      Expect.isTrue (req.isExpired DateTime.Now 5) "A manually expired request should always be considered expired"
+        test "isExpired always returns true for force-expired requests" {
+            PrayerRequest.isExpired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with UpdatedDate = (instantNow ()); Expiration = Forced }
+            |> Flip.Expect.isTrue "A force-expired request should always be considered expired"
         }
         test "isExpired returns false for non-expired requests" {
-      let req = { PrayerRequest.empty with updatedDate = DateTime.Now.AddDays -5. }
-      Expect.isFalse (req.isExpired DateTime.Now 7) "A request updated 5 days ago should not be considered expired"
+            let now = instantNow ()
+            PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
+                { PrayerRequest.empty with UpdatedDate = now - Duration.FromDays 5 }
+            |> Flip.Expect.isFalse "A request updated 5 days ago should not be considered expired"
         }
         test "isExpired returns true for expired requests" {
-      let req = { PrayerRequest.empty with updatedDate = DateTime.Now.AddDays -8. }
-      Expect.isTrue (req.isExpired DateTime.Now 7) "A request updated 8 days ago should be considered expired"
+            let now = instantNow ()
+            PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
+                { PrayerRequest.empty with UpdatedDate = now - Duration.FromDays 15 }
+            |> Flip.Expect.isTrue "A request updated 15 days ago should be considered expired"
+        }
+        test "isExpired returns true for same-day expired requests" {
+            let now = instantNow ()
+            PrayerRequest.isExpired (now.InUtc().Date) SmallGroup.empty
+                { PrayerRequest.empty with UpdatedDate = now - (Duration.FromDays 14) - (Duration.FromSeconds 1L) }
+            |> Flip.Expect.isTrue  "A request entered a second before midnight should be considered expired"
         }
         test "updateRequired returns false for expired requests" {
-      let req = { PrayerRequest.empty with isManuallyExpired = true }
-      Expect.isFalse (req.updateRequired DateTime.Now 7 4) "An expired request should not require an update"
+            PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with Expiration = Forced }
+            |> Flip.Expect.isFalse "An expired request should not require an update"
         }
         test "updateRequired returns false when an update is not required for an active request" {
-      let req =
-        { PrayerRequest.empty with
-            requestType = RequestType.Recurring
-            updatedDate = DateTime.Now.AddDays -14.
+            let now = instantNow ()
+            PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with RequestType = LongTermRequest; UpdatedDate = now - Duration.FromDays 14 }
+            |> Flip.Expect.isFalse "An active request updated 14 days ago should not require an update until 28 days"
         }
-      Expect.isFalse (req.updateRequired DateTime.Now 7 4)
-        "An active request updated 14 days ago should not require an update until 28 days"
+        test "UpdateRequired returns true when an update is required for an active request" {
+            let now = instantNow ()
+            PrayerRequest.updateRequired (localDateNow ()) SmallGroup.empty
+                { PrayerRequest.empty with RequestType = LongTermRequest; UpdatedDate = now - Duration.FromDays 34 }
+            |> Flip.Expect.isTrue "An active request updated 34 days ago should require an update (past 28 days)"
         }
-    test "updateRequired returns true when an update is required for an active request" {
-      let req =
-        { PrayerRequest.empty with
-            requestType = RequestType.Recurring
-            updatedDate = DateTime.Now.AddDays -34.
+    ]
+
+[<Tests>]
+let prayerRequestTypeTests =
+    testList "PrayerRequestType" [
+        test "CurrentRequest code is correct" {
+            Expect.equal (PrayerRequestType.toCode CurrentRequest) "C"
+                "The code for CurrentRequest should have been \"C\""
         }
-      Expect.isTrue (req.updateRequired DateTime.Now 7 4)
-        "An active request updated 34 days ago should require an update (past 28 days)"
+        test "LongTermRequest code is correct" {
+            Expect.equal (PrayerRequestType.toCode LongTermRequest) "L"
+                "The code for LongTermRequest should have been \"L\""
+        }
+        test "PraiseReport code is correct" {
+            Expect.equal (PrayerRequestType.toCode PraiseReport) "P" "The code for PraiseReport should have been \"P\""
+        }
+        test "Expecting code is correct" {
+            Expect.equal (PrayerRequestType.toCode Expecting) "E" "The code for Expecting should have been \"E\""
+        }
+        test "Announcement code is correct" {
+            Expect.equal (PrayerRequestType.toCode Announcement) "A" "The code for Announcement should have been \"A\""
+        }
+        test "fromCode C should return CurrentRequest" {
+            Expect.equal (PrayerRequestType.fromCode "C") CurrentRequest
+                "\"C\" should have been converted to CurrentRequest"
+        }
+        test "fromCode L should return LongTermRequest" {
+            Expect.equal (PrayerRequestType.fromCode "L") LongTermRequest
+                "\"L\" should have been converted to LongTermRequest"
+        }
+        test "fromCode P should return PraiseReport" {
+            Expect.equal (PrayerRequestType.fromCode "P") PraiseReport
+                "\"P\" should have been converted to PraiseReport"
+        }
+        test "fromCode E should return Expecting" {
+            Expect.equal (PrayerRequestType.fromCode "E") Expecting "\"E\" should have been converted to Expecting"
+        }
+        test "fromCode A should return Announcement" {
+            Expect.equal (PrayerRequestType.fromCode "A") Announcement
+                "\"A\" should have been converted to Announcement"
+        }
+        test "fromCode R should raise" {
+            Expect.throws (fun () -> PrayerRequestType.fromCode "R" |> ignore)
+                "An unknown code should have raised an exception"
+        }
+    ]
+
+[<Tests>]
+let requestSortTests =
+    testList "RequestSort" [
+        test "SortByDate code is correct" {
+            Expect.equal (RequestSort.toCode SortByDate) "D" "The code for SortByDate should have been \"D\""
+        }
+        test "SortByRequestor code is correct" {
+            Expect.equal (RequestSort.toCode SortByRequestor) "R" "The code for SortByRequestor should have been \"R\""
+        }
+        test "fromCode D should return SortByDate" {
+            Expect.equal (RequestSort.fromCode "D") SortByDate "\"D\" should have been converted to SortByDate"
+        }
+        test "fromCode R should return SortByRequestor" {
+            Expect.equal (RequestSort.fromCode "R") SortByRequestor
+                "\"R\" should have been converted to SortByRequestor"
+        }
+        test "fromCode Q should raise" {
+            Expect.throws (fun () -> RequestSort.fromCode "Q" |> ignore)
+                "An unknown code should have raised an exception"
         }
     ]
 
 [<Tests>]
 let smallGroupTests =
     testList "SmallGroup" [
-    let now = DateTime (2017, 5, 12, 12, 15, 0, DateTimeKind.Utc)
+        let now = Instant.FromDateTimeUtc (DateTime (2017, 5, 12, 12, 15, 0, DateTimeKind.Utc))
         let withFakeClock f () =
-      FakeClock (Instant.FromDateTimeUtc now) |> f
+            FakeClock now |> f
         yield test "empty is as expected" {
             let mt = SmallGroup.empty
-      Expect.equal mt.smallGroupId Guid.Empty "The small group ID should have been an empty GUID"
-      Expect.equal mt.churchId Guid.Empty "The church ID should have been an empty GUID"
-      Expect.equal mt.name "" "The name should have been blank"
-      Expect.equal mt.church.churchId Guid.Empty "The church should have been an empty one"
-      Expect.isNotNull mt.members "The members navigation property should not be null"
-      Expect.isEmpty mt.members "There should be no members for an empty small group"
-      Expect.isNotNull mt.prayerRequests "The prayer requests navigation property should not be null"
-      Expect.isEmpty mt.prayerRequests "There should be no prayer requests for an empty small group"
-      Expect.isNotNull mt.users "The users navigation property should not be null"
-      Expect.isEmpty mt.users "There should be no users for an empty small group"
+            Expect.equal mt.Id.Value Guid.Empty "The small group ID should have been an empty GUID"
+            Expect.equal mt.ChurchId.Value Guid.Empty "The church ID should have been an empty GUID"
+            Expect.equal mt.Name "" "The name should have been blank"
         }
         yield! testFixture withFakeClock [
-      "localTimeNow adjusts the time ahead of UTC",
+            "LocalTimeNow adjusts the time ahead of UTC",
             fun clock ->
-          let grp = { SmallGroup.empty with preferences = { ListPreferences.empty with timeZoneId = "Europe/Berlin" } }
-          Expect.isGreaterThan (grp.localTimeNow clock) now "UTC to Europe/Berlin should have added hours"
-      "localTimeNow adjusts the time behind UTC",
+                let grp =
+                    { SmallGroup.empty with
+                        Preferences = { ListPreferences.empty with TimeZoneId = TimeZoneId "Europe/Berlin" }
+                    }
+                Expect.isGreaterThan (SmallGroup.localTimeNow clock grp) (now.InUtc().LocalDateTime)
+                    "UTC to Europe/Berlin should have added hours"
+            "LocalTimeNow adjusts the time behind UTC",
             fun clock ->
-          Expect.isLessThan (SmallGroup.empty.localTimeNow clock) now
+                Expect.isLessThan (SmallGroup.localTimeNow clock SmallGroup.empty) (now.InUtc().LocalDateTime)
                     "UTC to America/Denver should have subtracted hours"
-      "localTimeNow returns UTC when the time zone is invalid",
+            "LocalTimeNow returns UTC when the time zone is invalid",
             fun clock ->
-          let grp = { SmallGroup.empty with preferences = { ListPreferences.empty with timeZoneId = "garbage" } }
-          Expect.equal (grp.localTimeNow clock) now "UTC should have been returned for an invalid time zone"
+                let grp =
+                    { SmallGroup.empty with
+                        Preferences = { ListPreferences.empty with TimeZoneId = TimeZoneId "garbage" }
+                    }
+                Expect.equal (SmallGroup.localTimeNow clock grp) (now.InUtc().LocalDateTime)
+                    "UTC should have been returned for an invalid time zone"
         ]
         yield test "localTimeNow fails when clock is not passed" {
-      Expect.throws (fun () -> (SmallGroup.empty.localTimeNow >> ignore) null)
+            Expect.throws (fun () -> (SmallGroup.localTimeNow null SmallGroup.empty |> ignore))
                 "Should have raised an exception for null clock"
         }
-    yield test "localDateNow returns the date portion" {
-      let now'  = DateTime (2017, 5, 12, 1, 15, 0, DateTimeKind.Utc)
-      let clock = FakeClock (Instant.FromDateTimeUtc now')
-      Expect.isLessThan (SmallGroup.empty.localDateNow clock) now.Date "The date should have been a day earlier"
-      }
-    ]
-
-[<Tests>]
-let timeZoneTests =
-  testList "TimeZone" [
-    test "empty is as expected" {
-      let mt = TimeZone.empty
-      Expect.equal mt.timeZoneId "" "The time zone ID should have been blank"
-      Expect.equal mt.description "" "The description should have been blank"
-      Expect.equal mt.sortOrder 0 "The sort order should have been zero"
-      Expect.isFalse mt.isActive "The is-active flag should not have been set"
+        yield test "LocalDateNow returns the date portion" {
+            let clock = FakeClock (Instant.FromDateTimeUtc (DateTime (2017, 5, 12, 1, 15, 0, DateTimeKind.Utc)))
+            Expect.isLessThan (SmallGroup.localDateNow clock SmallGroup.empty) (now.InUtc().Date)
+                "The date should have been a day earlier"
         }
     ]
 
@@ -190,19 +337,16 @@ let userTests =
     testList "User" [
         test "empty is as expected" {
             let mt = User.empty
-      Expect.equal mt.userId Guid.Empty "The user ID should have been an empty GUID"
-      Expect.equal mt.firstName "" "The first name should have been blank"
-      Expect.equal mt.lastName "" "The last name should have been blank"
-      Expect.equal mt.emailAddress "" "The e-mail address should have been blank"
-      Expect.isFalse mt.isAdmin "The is admin flag should not have been set"
-      Expect.equal mt.passwordHash "" "The password hash should have been blank"
-      Expect.isNone mt.salt "The password salt should not exist"
-      Expect.isNotNull mt.smallGroups "The small groups navigation property should not have been null"
-      Expect.isEmpty mt.smallGroups "There should be no small groups for an empty user"
+            Expect.equal mt.Id.Value Guid.Empty "The user ID should have been an empty GUID"
+            Expect.equal mt.FirstName "" "The first name should have been blank"
+            Expect.equal mt.LastName "" "The last name should have been blank"
+            Expect.equal mt.Email "" "The e-mail address should have been blank"
+            Expect.isFalse mt.IsAdmin "The is admin flag should not have been set"
+            Expect.equal mt.PasswordHash "" "The password hash should have been blank"
         }
-    test "fullName concatenates first and last names" {
-      let user = { User.empty with firstName = "Unit"; lastName = "Test" }
-      Expect.equal user.fullName "Unit Test" "The full name should be the first and last, separated by a space"
+        test "Name concatenates first and last names" {
+            let user = { User.empty with FirstName = "Unit"; LastName = "Test" }
+            Expect.equal user.Name "Unit Test" "The full name should be the first and last, separated by a space"
         }
     ]
 
@@ -211,9 +355,7 @@ let userSmallGroupTests =
     testList "UserSmallGroup" [
         test "empty is as expected" {
             let mt = UserSmallGroup.empty
-      Expect.equal mt.userId Guid.Empty "The user ID should have been an empty GUID"
-      Expect.equal mt.smallGroupId Guid.Empty "The small group ID should have been an empty GUID"
-      Expect.equal mt.user.userId Guid.Empty "The user should have been an empty one"
-      Expect.equal mt.smallGroup.smallGroupId Guid.Empty "The small group should have been an empty one"
+            Expect.equal mt.UserId.Value Guid.Empty "The user ID should have been an empty GUID"
+            Expect.equal mt.SmallGroupId.Value Guid.Empty "The small group ID should have been an empty GUID"
         }
     ]

src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="8.4.2" />
-    <PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="10.0.0" />
-    <PackageReference Include="NodaTime.Testing" Version="2.4.0" />
+    <PackageReference Include="Expecto" Version="10.2.1" />
+    <PackageReference Include="NodaTime.Testing" Version="3.1.11" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,8 +25,4 @@
     <ProjectReference Include="..\PrayerTracker\PrayerTracker.fsproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
-  </ItemGroup>
-
 </Project>

src/PrayerTracker.Tests/Program.fs

@@ -2,4 +2,4 @@
 
 [<EntryPoint>]
 let main argv =
-  runTestsInAssembly defaultConfig argv
+    runTestsInAssemblyWithCLIArgs [] argv

src/PrayerTracker.Tests/UI/CommonFunctionsTests.fs

@@ -1,29 +1,20 @@
 module PrayerTracker.UI.CommonFunctionsTests
 
+open System.IO
 open Expecto
-open Giraffe.GiraffeViewEngine
+open Giraffe.ViewEngine
 open Microsoft.AspNetCore.Mvc.Localization
 open Microsoft.Extensions.Localization
 open PrayerTracker.Tests.TestLocalization
 open PrayerTracker.Views
-open System.IO
 
 
-[<Tests>]
-let encLocTextTests =
-  testList "encLocText" [
-    test "succeeds" {
-      let enc = encLocText (LocalizedString ("test", "test&")) |> renderHtmlNode
-      Expect.equal enc "test&amp;" "string not encoded correctly"
-      }
-    ]
-
 [<Tests>]
 let iconSizedTests =
     testList "iconSized" [
         test "succeeds" {
             let ico = iconSized 18 "tom-&-jerry" |> renderHtmlNode
-      Expect.equal ico "<i class=\"material-icons md-18\">tom-&-jerry</i>" "icon HTML not correct"
+            Expect.equal ico """<i class="material-icons md-18">tom-&-jerry</i>""" "icon HTML not correct"
         }
     ]
 
@@ -32,7 +23,16 @@ let iconTests =
     testList "icon" [
         test "succeeds" {
             let ico = icon "bob-&-tom" |> renderHtmlNode
-      Expect.equal ico "<i class=\"material-icons\">bob-&-tom</i>" "icon HTML not correct"
+            Expect.equal ico """<i class="material-icons">bob-&-tom</i>""" "icon HTML not correct"
+        }
+    ]
+
+[<Tests>]
+let locStrTests =
+    testList "locStr" [
+        test "succeeds" {
+            let enc = locStr (LocalizedString ("test", "test&")) |> renderHtmlNode
+            Expect.equal enc "test&amp;" "string not encoded correctly"
         }
     ]
 
@@ -41,23 +41,23 @@ let namedColorListTests =
     testList "namedColorList" [
         test "succeeds with default values" {
             let expected =
-        [ "<select name=\"the-name\">"
-          "<option value=\"aqua\" style=\"background-color:aqua;color:black;\">aqua</option>"
-          "<option value=\"black\" style=\"background-color:black;color:white;\">black</option>"
-          "<option value=\"blue\" style=\"background-color:blue;color:white;\">blue</option>"
-          "<option value=\"fuchsia\" style=\"background-color:fuchsia;color:black;\">fuchsia</option>"
-          "<option value=\"gray\" style=\"background-color:gray;color:white;\">gray</option>"
-          "<option value=\"green\" style=\"background-color:green;color:white;\">green</option>"
-          "<option value=\"lime\" style=\"background-color:lime;color:black;\">lime</option>"
-          "<option value=\"maroon\" style=\"background-color:maroon;color:white;\">maroon</option>"
-          "<option value=\"navy\" style=\"background-color:navy;color:white;\">navy</option>"
-          "<option value=\"olive\" style=\"background-color:olive;color:white;\">olive</option>"
-          "<option value=\"purple\" style=\"background-color:purple;color:white;\">purple</option>"
-          "<option value=\"red\" style=\"background-color:red;color:black;\">red</option>"
-          "<option value=\"silver\" style=\"background-color:silver;color:black;\">silver</option>"
-          "<option value=\"teal\" style=\"background-color:teal;color:white;\">teal</option>"
-          "<option value=\"white\" style=\"background-color:white;color:black;\">white</option>"
-          "<option value=\"yellow\" style=\"background-color:yellow;color:black;\">yellow</option>"
+                [ """<select name="the-name">"""
+                  """<option value="aqua" style="background-color:aqua;color:black;">aqua</option>"""
+                  """<option value="black" style="background-color:black;color:white;">black</option>"""
+                  """<option value="blue" style="background-color:blue;color:white;">blue</option>"""
+                  """<option value="fuchsia" style="background-color:fuchsia;color:black;">fuchsia</option>"""
+                  """<option value="gray" style="background-color:gray;color:white;">gray</option>"""
+                  """<option value="green" style="background-color:green;color:white;">green</option>"""
+                  """<option value="lime" style="background-color:lime;color:black;">lime</option>"""
+                  """<option value="maroon" style="background-color:maroon;color:white;">maroon</option>"""
+                  """<option value="navy" style="background-color:navy;color:white;">navy</option>"""
+                  """<option value="olive" style="background-color:olive;color:white;">olive</option>"""
+                  """<option value="purple" style="background-color:purple;color:white;">purple</option>"""
+                  """<option value="red" style="background-color:red;color:black;">red</option>"""
+                  """<option value="silver" style="background-color:silver;color:black;">silver</option>"""
+                  """<option value="teal" style="background-color:teal;color:white;">teal</option>"""
+                  """<option value="white" style="background-color:white;color:black;">white</option>"""
+                  """<option value="yellow" style="background-color:yellow;color:black;">yellow</option>"""
                   "</select>"
                 ]
                 |> String.concat ""
@@ -70,7 +70,7 @@ let namedColorListTests =
         }
         test "succeeds with extra attributes" {
             let selectList = namedColorList "the-name" "" [ _id "myId" ] _s |> renderHtmlNode
-      Expect.stringStarts selectList "<select name=\"the-name\" id=\"myId\">" "Attributes not included correctly"
+            Expect.stringStarts selectList """<select name="the-name" id="myId">""" "Attributes not included correctly"
         }
     ]
 
@@ -79,12 +79,12 @@ let radioTests =
     testList "radio" [
         test "succeeds when not selected" {
             let rad = radio "a-name" "anId" "test" "unit" |> renderHtmlNode
-      Expect.equal rad "<input type=\"radio\" name=\"a-name\" id=\"anId\" value=\"test\">"
+            Expect.equal rad """<input type="radio" name="a-name" id="anId" value="test">"""
                 "Unselected radio button not generated correctly"
         }
         test "succeeds when selected" {
             let rad = radio "a-name" "anId" "unit" "unit" |> renderHtmlNode
-      Expect.equal rad "<input type=\"radio\" name=\"a-name\" id=\"anId\" value=\"unit\" checked>"
+            Expect.equal rad """<input type="radio" name="a-name" id="anId" value="unit" checked>"""
                 "Selected radio button not generated correctly"
         }
     ]
@@ -112,7 +112,8 @@ let selectListTests =
     testList "selectList" [
         test "succeeds with minimum options" {
             let theList = selectList "a-list" "" [] [] |> renderHtmlNode
-      Expect.equal theList "<select name=\"a-list\" id=\"a-list\"></select>" "Empty select list not generated correctly"
+            Expect.equal theList """<select name="a-list" id="a-list"></select>"""
+                "Empty select list not generated correctly"
         }
         test "succeeds with all options" {
             let theList =
@@ -123,11 +124,11 @@ let selectListTests =
                 |> selectList "the-list" "bob" [ _style "ugly" ]
                 |> renderHtmlNode
             let expected =
-        [ "<select name=\"the-list\" id=\"the-list\" style=\"ugly\">"
-          "<option value=\"tom\">Tom&amp;</option>"
-          "<option value=\"bob\" selected>Bob</option>"
-          "<option value=\"jan\">Jan</option>"
-          "</select>"
+                [ """<select name="the-list" id="the-list" style="ugly">"""
+                  """<option value="tom">Tom&amp;</option>"""
+                  """<option value="bob" selected>Bob</option>"""
+                  """<option value="jan">Jan</option>"""
+                  """</select>"""
                 ]
                 |> String.concat ""
             Expect.equal theList expected "Filled select list not generated correctly"
@@ -147,10 +148,10 @@ let spaceTests =
 let submitTests =
     testList "submit" [
         test "succeeds" {
-      let btn = submit [ _class "slick" ] "file-ico" _s.["a&b"] |> renderHtmlNode
+            let btn = submit [ _class "slick" ] "file-ico" _s["a&b"] |> renderHtmlNode
             Expect.equal
                 btn
-        "<button type=\"submit\" class=\"slick\"><i class=\"material-icons\">file-ico</i> &nbsp;a&amp;b</button>"
+                """<button type="submit" class="slick"><i class="material-icons">file-ico</i> &nbsp;a&amp;b</button>"""
                 "Submit button not generated correctly"
         }
     ]
@@ -160,49 +161,55 @@ let tableSummaryTests =
     testList "tableSummary" [
         test "succeeds for no entries" {
             let sum = tableSummary 0 _s |> renderHtmlNode
-      Expect.equal sum "<div class=\"pt-center-text\"><small>No Entries to Display</small></div>"
+            Expect.equal sum """<div class="pt-center-text"><small>No Entries to Display</small></div>"""
                 "Summary for no items is incorrect"
         }
         test "succeeds for one entry" {
             let sum = tableSummary 1 _s |> renderHtmlNode
-      Expect.equal sum "<div class=\"pt-center-text\"><small>Displaying 1 Entry</small></div>"
+            Expect.equal sum """<div class="pt-center-text"><small>Displaying 1 Entry</small></div>"""
                 "Summary for one item is incorrect"
         }
         test "succeeds for many entries" {
             let sum = tableSummary 5 _s |> renderHtmlNode
-      Expect.equal sum "<div class=\"pt-center-text\"><small>Displaying 5 Entries</small></div>"
+            Expect.equal sum """<div class="pt-center-text"><small>Displaying 5 Entries</small></div>"""
                 "Summary for many items is incorrect"
         }
     ]
 
 module TimeZones =
   
+    open PrayerTracker.Entities
     open PrayerTracker.Views.CommonFunctions.TimeZones
 
     [<Tests>]
     let nameTests =
         testList "TimeZones.name" [
             test "succeeds for US Eastern time" {
-        Expect.equal (name "America/New_York" _s |> string) "Eastern" "US Eastern time zone not returned correctly"
+                Expect.equal (name (TimeZoneId "America/New_York") _s |> string) "Eastern"
+                    "US Eastern time zone not returned correctly"
             }
             test "succeeds for US Central time" {
-        Expect.equal (name "America/Chicago" _s |> string) "Central" "US Central time zone not returned correctly"
+                Expect.equal (name (TimeZoneId "America/Chicago") _s |> string) "Central"
+                    "US Central time zone not returned correctly"
             }
             test "succeeds for US Mountain time" {
-        Expect.equal (name "America/Denver" _s |> string) "Mountain" "US Mountain time zone not returned correctly"
+                Expect.equal (name (TimeZoneId "America/Denver") _s |> string) "Mountain"
+                    "US Mountain time zone not returned correctly"
             }
             test "succeeds for US Mountain (AZ) time" {
-        Expect.equal (name "America/Phoenix" _s |> string) "Mountain (Arizona)"
+                Expect.equal (name (TimeZoneId "America/Phoenix") _s |> string) "Mountain (Arizona)"
                     "US Mountain (AZ) time zone not returned correctly"
             }
             test "succeeds for US Pacific time" {
-        Expect.equal (name "America/Los_Angeles" _s |> string) "Pacific" "US Pacific time zone not returned correctly"
+                Expect.equal (name (TimeZoneId "America/Los_Angeles") _s |> string) "Pacific"
+                    "US Pacific time zone not returned correctly"
             }
             test "succeeds for Central European time" {
-        Expect.equal (name "Europe/Berlin" _s |> string) "Central European"
+                Expect.equal (name (TimeZoneId "Europe/Berlin") _s |> string) "Central European"
                     "Central European time zone not returned correctly"
             }
             test "fails for unexpected time zone" {
-        Expect.equal (name "Wakanda" _s |> string) "Wakanda" "Unexpected time zone should have returned the original ID"
+                Expect.equal (name (TimeZoneId "Wakanda") _s |> string) "Wakanda"
+                    "Unexpected time zone should have returned the original ID"
             }
         ]

src/PrayerTracker.Tests/UI/UtilsTests.fs

@@ -53,7 +53,8 @@ let htmlToPlainTextTests =
                 "Non-breaking spaces should have been replaced with spaces"
         }
         test "does all replacements at one time" {
-      Expect.equal (htmlToPlainText " &lt;&nbsp;&lt;<br>test") "< <\ntest" "All replacements were not made correctly"
+            Expect.equal (htmlToPlainText " &lt;&nbsp;&lt;<br>test") "< <\ntest"
+                "All replacements were not made correctly"
         }
         test "does not fail when passed null" {
             Expect.equal (htmlToPlainText null) "" "Should return an empty string for null input"
@@ -61,11 +62,45 @@ let htmlToPlainTextTests =
         test "does not fail when passed an empty string" {
             Expect.equal (htmlToPlainText "") "" "Should return an empty string when given an empty string"
         }
+        test "preserves blank lines for two consecutive line breaks" {
+            let expected = "Paragraph 1\n\nParagraph 2\n\n...and paragraph 3"
+            Expect.equal
+                (htmlToPlainText "Paragraph 1<br><br>Paragraph 2<br><br>...and <strong>paragraph</strong> <i>3</i>")
+                expected "Blank lines not preserved for consecutive line breaks"
+        }
     ]
 
 [<Tests>]
-let replaceFirstTests =
-  testList "replaceFirst" [
+let makeUrlTests =
+    testList "makeUrl" [
+        test "returns the URL when there are no parameters" {
+            Expect.equal (makeUrl "/test" []) "/test" "The URL should not have had any query string parameters added"
+        }
+        test "returns the URL with one query string parameter" {
+            Expect.equal (makeUrl "/test" [ "unit", "true" ]) "/test?unit=true" "The URL was not constructed properly"
+        }
+        test "returns the URL with multiple encoded query string parameters" {
+            let url = makeUrl "/test" [ "space", "a space"; "turkey", "=" ]
+            Expect.equal url "/test?space=a+space&turkey=%3D" "The URL was not constructed properly"
+        }
+    ]
+
+[<Tests>]
+let sndAsStringTests =
+    testList "sndAsString" [
+        test "converts the second item to a string" {
+            Expect.equal (sndAsString ("a", 5)) "5"
+                "The second part of the tuple should have been converted to a string"
+        }
+    ]
+
+module StringTests =
+  
+    open PrayerTracker.Utils.String
+
+    [<Tests>]
+    let replaceFirstTests =
+        testList "String.replaceFirst" [
             test "replaces the first occurrence when it is found at the beginning of the string" {
                 let testString = "unit unit unit"
                 Expect.equal (replaceFirst "unit" "test" testString) "test unit unit"
@@ -83,17 +118,25 @@ let replaceFirstTests =
             }
         ]
    
-[<Tests>]
-let sndAsStringTests =
-  testList "sndAsString" [
-    test "converts the second item to a string" {
-      Expect.equal (sndAsString ("a", 5)) "5" "The second part of the tuple should have been converted to a string"
+    [<Tests>]
+    let replaceTests =
+        testList "String.replace" [
+            test "succeeds" {
+                Expect.equal (replace "a" "b" "abacab") "bbbcbb" "String did not replace properly"
+            }
+        ]
+
+    [<Tests>]
+    let trimTests =
+        testList "String.trim" [
+            test "succeeds" {
+                Expect.equal (trim " abc ") "abc" "Space not trimmed from string properly"
             }
         ]
 
 [<Tests>]
 let stripTagsTests =
-  let testString = "<p class=\"testing\">Here is some text<br> <br />and some more</p>"
+    let testString = """<p class="testing">Here is some text<br> <br />and some more</p>"""
     testList "stripTags" [
         test "does nothing if all tags are allowed" {
             Expect.equal (stripTags [ "p"; "br" ] testString) testString
@@ -127,3 +170,27 @@ let wordWrapTests =
             Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
         }
     ]
+
+[<Tests>]
+let wordWrapBTests =
+    testList "wordWrapB" [
+        test "breaks where it is supposed to" {
+            let testString = "The quick brown fox jumps over the lazy dog\nIt does!"
+            Expect.equal (wordWrap 20 testString) "The quick brown fox\njumps over the lazy\ndog\nIt does!\n"
+                "Line not broken correctly"
+        }
+        test "wraps long line without a space and a line with exact length" {
+            let testString = "Asamatteroffact, the dog does too"
+            Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n"
+                "Longer line not broken correctly"
+        }
+        test "wraps long line without a space and a line with non-exact length" {
+            let testString = "Asamatteroffact, that dog does too"
+            Expect.equal (wordWrap 10 testString) "Asamattero\nffact,\nthat dog\ndoes too\n"
+                "Longer line not broken correctly"
+        }
+        test "preserves blank lines" {
+            let testString = "Here is\n\na string with blank lines"
+            Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
+        }
+    ]

src/PrayerTracker.UI/Church.fs

@@ -1,106 +1,122 @@
 module PrayerTracker.Views.Church
 
-open Giraffe.GiraffeViewEngine
+open Giraffe.ViewEngine
+open Giraffe.ViewEngine.Accessibility
+open Giraffe.ViewEngine.Htmx
+open PrayerTracker
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Collections.Generic
 
 /// View for the church edit page
-let edit (m : EditChurch) ctx vi =
-  let pageTitle = match m.isNew () with true -> "Add a New Church" | false -> "Edit Church"
+let edit (model : EditChurch) ctx viewInfo =
+    let pageTitle = if model.IsNew then "Add a New Church" else "Edit Church"
     let s         = I18N.localizer.Force ()
-  [ form [ _action "/church/save"; _method "post"; _class "pt-center-columns" ] [
-      style [ _scoped ]
-        [ rawText "#name { width: 20rem; } #city { width: 10rem; } #st { width: 3rem; } #interfaceAddress { width: 30rem; }" ]
+    let vi        =
+        viewInfo
+        |> AppViewInfo.withScopedStyles [
+            $"#{nameof model.Name} {{ width: 20rem; }}"
+            $"#{nameof model.City} {{ width: 10rem; }}"
+            $"#{nameof model.State} {{ width: 3rem; }}"
+            $"#{nameof model.InterfaceAddress} {{ width: 30rem; }}"
+        ]
+        |> AppViewInfo.withOnLoadScript "PT.church.edit.onPageLoad"
+    form [ _action "/church/save"; _method "post"; _class "pt-center-columns"; Target.content ] [
         csrfToken ctx
-      input [ _type "hidden"; _name "churchId"; _value (m.churchId.ToString "N") ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "name" ] [ encLocText s.["Church Name"] ]
-          input [ _type "text"; _name "name"; _id "name"; _required; _autofocus; _value m.name ]
+        input [ _type "hidden"; _name (nameof model.ChurchId); _value model.ChurchId ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Name) ] [ locStr s["Church Name"] ]
+                inputField "text" (nameof model.Name) model.Name [ _required; _autofocus ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "City"] [ encLocText s.["City"] ]
-          input [ _type "text"; _name "city"; _id "city"; _required; _value m.city ]
+            div [ _inputField ] [
+                label [ _for (nameof model.City) ] [ locStr s["City"] ]
+                inputField "text" (nameof model.City) model.City [ _required ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "ST" ] [ encLocText s.["State"] ]
-          input [ _type "text"; _name "st"; _id "st"; _required; _minlength "2"; _maxlength "2"; _value m.st ]
+            div [ _inputField ] [
+                label [ _for (nameof model.State) ] [ locStr s["State or Province"] ]
+                inputField "text" (nameof model.State) model.State [ _minlength "2"; _maxlength "2"; _required ]
             ]
         ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-checkbox-field" ] [
-          input [ yield _type "checkbox"
-                  yield _name "hasInterface"
-                  yield _id "hasInterface"
-                  yield _value "True"
-                  match m.hasInterface with Some x when x -> yield _checked | _ -> () ]
-          label [ _for "hasInterface" ] [ encLocText s.["Has an interface with Virtual Prayer Room"] ]
+        div [ _fieldRow ] [
+            div [ _checkboxField ] [
+                inputField "checkbox" (nameof model.HasInterface) "True"
+                           [ if defaultArg model.HasInterface false then _checked ]
+                label [ _for (nameof model.HasInterface) ] [
+                    locStr s["Has an Interface with “{0}”", "Virtual Prayer Space"]
                 ]
             ]
-      div [ _class "pt-field-row pt-fadeable"; _id "divInterfaceAddress" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "interfaceAddress" ] [ encLocText s.["VPR Interface URL"] ]
-          input [ _type "url"; _name "interfaceAddress"; _id "interfaceAddress";
-                  _value (match m.interfaceAddress with Some ia -> ia | None -> "") ]
+        ]
+        div [ _fieldRowWith [ "pt-fadeable" ]; _id "divInterfaceAddress" ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.InterfaceAddress) ] [ locStr s["Interface URL"] ]
+                inputField "url" (nameof model.InterfaceAddress) (defaultArg model.InterfaceAddress "") []
             ]
         ]
-      div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Church"] ]
-      ]
-    script [] [ rawText "PT.onLoad(PT.church.edit.onPageLoad)" ]
+        div [ _fieldRow ] [ submit [] "save" s["Save Church"] ]
     ]
+    |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi pageTitle
 
 
 /// View for church maintenance page
-let maintain (churches : Church list) (stats : Map<string, ChurchStats>) ctx vi =
+let maintain (churches : Church list) (stats : Map<string, ChurchStats>) ctx viewInfo =
     let s  = I18N.localizer.Force ()
+    let vi = AppViewInfo.withScopedStyles [ "#churchList { grid-template-columns: repeat(7, auto); }" ] viewInfo
+    let churchTable =
+        match churches with
+        | [] -> space
+        | _ ->
+            section [ _id "churchList"; _class "pt-table"; _ariaLabel "Church list" ] [
+                div [ _class "row head" ] [
+                    header [ _class "cell" ] [ locStr s["Actions"] ]
+                    header [ _class "cell" ] [ locStr s["Name"] ]
+                    header [ _class "cell" ] [ locStr s["Location"] ]
+                    header [ _class "cell" ] [ locStr s["Groups"] ]
+                    header [ _class "cell" ] [ locStr s["Requests"] ]
+                    header [ _class "cell" ] [ locStr s["Users"] ]
+                    header [ _class "cell" ] [ locStr s["Interface?"] ]
+                ]
+                for church in churches do
+                    let churchId  = shortGuid church.Id.Value
+                    let delAction = $"/church/{churchId}/delete"
+                    let delPrompt = s["Are you sure you want to delete this {0}?  This action cannot be undone.",
+                                      $"""{s["Church"].Value.ToLower ()} ({church.Name})"""]
+                    div [ _class "row" ] [
+                        div [ _class "cell actions" ] [
+                            a [ _href $"/church/{churchId}/edit"; _title s["Edit This Church"].Value ] [
+                                iconSized 18 "edit"
+                            ]
+                            a [ _href      delAction
+                                _title     s["Delete This Church"].Value
+                                _hxPost    delAction
+                                _hxConfirm delPrompt.Value ] [
+                                iconSized 18 "delete_forever"
+                            ]
+                        ]
+                        div [ _class "cell" ] [ str church.Name ]
+                        div [ _class "cell" ] [ str church.City; rawText ", "; str church.State ]
+                        div [ _class "cell pt-right-text" ] [ rawText (stats[churchId].SmallGroups.ToString "N0") ]
+                        div [ _class "cell pt-right-text" ] [ rawText (stats[churchId].PrayerRequests.ToString "N0") ]
+                        div [ _class "cell pt-right-text" ] [ rawText (stats[churchId].Users.ToString "N0") ]
+                        div [ _class "cell pt-center-text" ] [
+                            locStr s[if church.HasVpsInterface then "Yes" else "No"]
+                        ]
+                    ]
+            ]
     [   div [ _class "pt-center-text" ] [
             br []
-      a [ _href (sprintf "/church/%s/edit" emptyGuid); _title s.["Add a New Church"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Church"] ]
+            a [ _href $"/church/{emptyGuid}/edit"; _title s["Add a New Church"].Value ] [
+                icon "add_circle"; rawText " &nbsp;"; locStr s["Add a New Church"]
+            ]
             br []
             br []
         ]
         tableSummary churches.Length s
-    table [ _class "pt-table pt-action-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Location"] ]
-          th [] [ encLocText s.["Groups"] ]
-          th [] [ encLocText s.["Requests"] ]
-          th [] [ encLocText s.["Users"] ]
-          th [] [ encLocText s.["Interface?"] ]
+        form [ _method "post" ] [
+            csrfToken ctx
+            churchTable
         ]
     ]
-      churches
-      |> List.map (fun ch ->
-          let chId = ch.churchId.ToString "N"
-          let delAction = sprintf "/church/%s/delete" chId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                              sprintf "%s (%s)" (s.["Church"].Value.ToLower ()) ch.name]
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/church/%s/edit" chId); _title s.["Edit This Church"].Value ] [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Church"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%A')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText ch.name ]
-            td [] [ encodedText ch.city; rawText ", "; encodedText ch.st ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].smallGroups.ToString "N0") ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].prayerRequests.ToString "N0") ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].users.ToString "N0") ]
-            td [ _class "pt-center-text" ] [ encLocText s.[match ch.hasInterface with true -> "Yes" | false -> "No"] ]
-            ])
-      |> tbody []
-      ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
-    ]
     |> Layout.Content.wide
     |> Layout.standard vi "Maintain Churches"

src/PrayerTracker.UI/CommonFunctions.fs

@@ -1,17 +1,17 @@
 [<AutoOpen>]
 module PrayerTracker.Views.CommonFunctions
 
+open System.IO
+open System.Text.Encodings.Web
 open Giraffe
-open Giraffe.GiraffeViewEngine
+open Giraffe.ViewEngine
 open Microsoft.AspNetCore.Antiforgery
 open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Mvc.Localization
 open Microsoft.Extensions.Localization
-open System.IO
-open System.Text.Encodings.Web
 
 /// Encoded text for a localized string
-let encLocText (text : LocalizedString) = encodedText text.Value
+let locStr (text : LocalizedString) = str text.Value
 
 /// Raw text for a localized HTML string
 let rawLocText (writer : StringWriter) (text : LocalizedHtmlString) =
@@ -27,7 +27,7 @@ let space = rawText " "
 let icon name = i [ _class "material-icons" ] [ rawText name ]
 
 /// Generate a Material Design icon, specifying the point size (must be defined in CSS)
-let iconSized size name = i [ _class (sprintf "material-icons md-%i" size) ] [ rawText name ]
+let iconSized size name = i [ _class $"material-icons md-%i{size}" ] [ rawText name ]
 
 /// Generate a CSRF prevention token
 let csrfToken (ctx : HttpContext) =
@@ -40,104 +40,178 @@ let tableSummary itemCount (s : IStringLocalizer) =
     div [ _class "pt-center-text" ] [
         small [] [
             match itemCount with
-      | 0 -> s.["No Entries to Display"]
-      | 1 -> s.["Displaying {0} Entry", itemCount]
-      | _ -> s.["Displaying {0} Entries", itemCount]
-      |> encLocText
+            | 0 -> s["No Entries to Display"]
+            | 1 -> s["Displaying {0} Entry", itemCount]
+            | _ -> s["Displaying {0} Entries", itemCount]
+            |> locStr
         ]
     ]
      
 /// Generate a list of named HTML colors
 let namedColorList name selected attrs (s : IStringLocalizer) =
-  /// The list of HTML named colors (name, display, text color)
+    // The list of HTML named colors (name, display, text color)
     seq {
-    yield ("aqua",    s.["Aqua"],    "black")
-    yield ("black",   s.["Black"],   "white")
-    yield ("blue",    s.["Blue"],    "white")
-    yield ("fuchsia", s.["Fuchsia"], "black")
-    yield ("gray",    s.["Gray"],    "white")
-    yield ("green",   s.["Green"],   "white")
-    yield ("lime",    s.["Lime"],    "black")
-    yield ("maroon",  s.["Maroon"],  "white")
-    yield ("navy",    s.["Navy"],    "white")
-    yield ("olive",   s.["Olive"],   "white")
-    yield ("purple",  s.["Purple"],  "white")
-    yield ("red",     s.["Red"],     "black")
-    yield ("silver",  s.["Silver"],  "black")
-    yield ("teal",    s.["Teal"],    "white")
-    yield ("white",   s.["White"],   "black")
-    yield ("yellow",  s.["Yellow"],  "black")
+        ("aqua",    s["Aqua"],    "black")
+        ("black",   s["Black"],   "white")
+        ("blue",    s["Blue"],    "white")
+        ("fuchsia", s["Fuchsia"], "black")
+        ("gray",    s["Gray"],    "white")
+        ("green",   s["Green"],   "white")
+        ("lime",    s["Lime"],    "black")
+        ("maroon",  s["Maroon"],  "white")
+        ("navy",    s["Navy"],    "white")
+        ("olive",   s["Olive"],   "white")
+        ("purple",  s["Purple"],  "white")
+        ("red",     s["Red"],     "black")
+        ("silver",  s["Silver"],  "black")
+        ("teal",    s["Teal"],    "white")
+        ("white",   s["White"],   "black")
+        ("yellow",  s["Yellow"],  "black")
     }
     |> Seq.map (fun color ->
-      let (colorName, dispText, txtColor) = color
-      option [ yield _value colorName
-               yield _style (sprintf "background-color:%s;color:%s;" colorName txtColor)
-               match colorName = selected with true -> yield _selected | false -> () ] [
-        encodedText (dispText.Value.ToLower ())
-        ])
+        let colorName, text, txtColor = color
+        option
+            [ _value colorName
+              _style $"background-color:{colorName};color:{txtColor};"
+              if colorName = selected then _selected
+            ] [ encodedText (text.Value.ToLower ()) ])
     |> List.ofSeq
     |> select (_name name :: attrs)
 
+/// Convert a named color to its hex notation
+let colorToHex (color : string) =
+    match color with
+    | it when it.StartsWith "#" -> color
+    | "aqua"    -> "#00ffff"
+    | "black"   -> "#000000"
+    | "blue"    -> "#0000ff"
+    | "fuchsia" -> "#ff00ff"
+    | "gray"    -> "#808080"
+    | "green"   -> "#008000"
+    | "lime"    -> "#00ff00"
+    | "maroon"  -> "#800000"
+    | "navy"    -> "#000080"
+    | "olive"   -> "#808000"
+    | "purple"  -> "#800080"
+    | "red"     -> "#ff0000"
+    | "silver"  -> "#c0c0c0"
+    | "teal"    -> "#008080"
+    | "white"   -> "#ffffff"
+    | "yellow"  -> "#ffff00"
+    | it        -> it
+    
 /// Generate an input[type=radio] that is selected if its value is the current value
 let radio name domId value current =
-  input [ yield _type "radio"
-          yield _name name
-          yield _id domId
-          yield _value value
-          match value = current with true -> yield _checked | false -> () ]
+    input [ _type "radio"
+            _name name
+            if domId <> "" then _id domId
+            _value value
+            if value = current then _checked ]
 
 /// Generate a select list with the current value selected
 let selectList name selected attrs items =
     items
     |> Seq.map (fun (value, text) ->
-      option [ yield _value value
-               match value = selected with true -> yield _selected | false -> () ] [ encodedText text ])
+        option
+            [ _value value
+              if value = selected then _selected
+            ] [ encodedText text ])
     |> List.ofSeq
     |> select (List.concat [ [ _name name; _id name ]; attrs ])
 
 /// Generate the text for a default entry at the top of a select list
-let selectDefault text = sprintf "— %s —" text
+let selectDefault text = $"— %s{text} —"
 
 /// Generate a standard submit button with icon and text
-let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText " &nbsp;"; encLocText text ]
+let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText " &nbsp;"; locStr text ]
 
-/// An empty GUID string (used for "add" actions)
-let emptyGuid = System.Guid.Empty.ToString "N"
-
-
-/// blockquote tag
-let blockquote = tag "blockquote"
-
-/// role attribute
-let _role = attr "role"
-/// aria-* attribute
-let _aria typ = attr (sprintf "aria-%s" typ)
-/// onclick attribute
-let _onclick = attr "onclick"
-/// onsubmit attribute
+/// Create an HTML onsubmit event handler
 let _onsubmit = attr "onsubmit"
 
-/// scoped flag (used for <style> tag)
-let _scoped = flag "scoped"
+/// A "rel='noopener'" attribute
+let _relNoOpener = _rel "noopener"
+
+/// A class attribute that designates a row of fields, with the additional classes passed
+let _fieldRowWith classes =
+    let extraClasses = if List.isEmpty classes then "" else $""" {classes |> String.concat " "}"""
+    _class $"pt-field-row{extraClasses}"
+
+/// The class that designates a row of fields
+let _fieldRow = _fieldRowWith []
+
+/// A class attribute that designates an input field, with the additional classes passed
+let _inputFieldWith classes =
+    let extraClasses = if List.isEmpty classes then "" else $""" {classes |> String.concat " "}"""
+    _class $"pt-field{extraClasses}"
+
+/// The class that designates an input field / label pair
+let _inputField = _inputFieldWith []
+
+/// The class that designates a checkbox / label pair
+let _checkboxField = _class "pt-checkbox-field"
+
+/// A group of related fields, inputs, links, etc., displayed in a row
+let _group = _class "pt-group"
+
+/// Create an input field of the given type, with matching name and ID and the given value
+let inputField typ name value attrs =
+    List.concat [ [ _type typ; _name name; _id name; if value <> "" then _value value ]; attrs ] |> input
+
+/// Generate a table heading with the given localized column names
+let tableHeadings (s : IStringLocalizer) (headings : string list) =
+    headings
+    |> List.map (fun heading -> th [ _scope "col" ] [ locStr s[heading] ])
+    |> tr []
+    |> List.singleton
+    |> thead []
+
+/// For a list of strings, prepend a pound sign and string them together with commas (CSS selector by ID)
+let toHtmlIds it = it |> List.map (fun x -> $"#%s{x}") |> String.concat ", "
+
+/// The name this function used to have when the view engine was part of Giraffe
+let renderHtmlNode = RenderView.AsString.htmlNode
+
+
+open Microsoft.AspNetCore.Html
+
+/// Render an HTML node, then return the value as an HTML string
+let renderHtmlString = renderHtmlNode >> HtmlString
 
 
 /// Utility methods to help with time zones (and localization of their names)
 module TimeZones =
   
-  open System.Collections.Generic
+    open PrayerTracker.Entities
 
     /// Cross-reference between time zone Ids and their English names
-  let private xref =
-    [ "America/Chicago",     "Central"
-      "America/Denver",      "Mountain"
-      "America/Los_Angeles", "Pacific"
-      "America/New_York",    "Eastern"
-      "America/Phoenix",     "Mountain (Arizona)"
-      "Europe/Berlin",       "Central European"
+    let private xref = [
+        TimeZoneId "America/Chicago",     "Central"
+        TimeZoneId "America/Denver",      "Mountain"
+        TimeZoneId "America/Los_Angeles", "Pacific"
+        TimeZoneId "America/New_York",    "Eastern"
+        TimeZoneId "America/Phoenix",     "Mountain (Arizona)"
+        TimeZoneId "Europe/Berlin",       "Central European"
     ]
-    |> Map.ofList
 
     /// Get the name of a time zone, given its Id
-  let name tzId (s : IStringLocalizer) =
-    try s.[xref.[tzId]]
-    with :? KeyNotFoundException -> LocalizedString (tzId, tzId)
+    let name timeZoneId (s : IStringLocalizer) =
+        match xref |> List.tryFind (fun it -> fst it = timeZoneId) with
+        | Some tz -> s[snd tz]
+        | None ->
+            let tzId = TimeZoneId.toString timeZoneId
+            LocalizedString (tzId, tzId)
+    
+    /// All known time zones in their defined order
+    let all = xref |> List.map fst
+
+
+open Giraffe.ViewEngine.Htmx
+
+/// Known htmx targets
+module Target =
+    
+    /// htmx links target the body element
+    let body = _hxTarget "body"
+    
+    /// htmx links target the #pt-body element
+    let content = _hxTarget "#pt-body"

src/PrayerTracker.UI/Help.fs

@@ -1,472 +1,300 @@
-module PrayerTracker.Views.Help
+/// Help content for PrayerTracker
+module PrayerTracker.Views.Help
 
-open Giraffe.GiraffeViewEngine
-open Microsoft.AspNetCore.Html
-open PrayerTracker
 open System.IO
+open Giraffe.ViewEngine
+open PrayerTracker.ViewModels
 
-
-/// View for the add/edit request help page
-let editRequest () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Requests/Edit"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to enter or update a new prayer request."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request Type"] ]
-      br []
-      raw l.["There are 5 request types in {0}.", s.["PrayerTracker"]]
-      space
-      raw l.["“{0}” are your regular requests that people may have regarding things happening over the next week or so.",
-              s.["Current Requests"]]
-      space
-      raw l.["“{0}” are requests that may occur repeatedly or continue indefinitely.", s.["Long-Term Requests"]]
-      space
-      raw l.["“{0}” are like “{1}”, but they are answers to prayer to share with your group.",
-              s.["Praise Reports"], s.["Current Requests"]]
-      space
-      raw l.["“{0}” is for those who are pregnant.", s.["Expecting"]]
-      space
-      raw l.["“{0}” are like “{1}”, but instead of a request, they are simply passing information along about something coming up.",
-              s.["Announcements"], s.["Current Requests"]]
-      ]
-    p [] [
-      raw l.["The order above is the order in which the request types appear on the list."]
-      space
-      raw l.["“{0}” and “{1}” are not subject to the automatic expiration (set on the “{2}” page) that the other requests are.",
-              s.["Long-Term Requests"], s.["Expecting"], s.["Change Preferences"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Date"] ]
-      br []
-      raw l.["For new requests, this is a box with a calendar date picker."]
-      space
-      raw l.["Click or tab into the box to display the calendar, which will be preselected to today's date."]
-      space
-      raw l.["For existing requests, there will be a check box labeled “{0}”.", s.["Check to not update the date"]]
-      space
-      raw l.["This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requestor / Subject"] ]
-      br []
-      raw l.["For requests or praises, this field is for the name of the person who made the request or offered the praise report."]
-      space
-      raw l.["For announcements, this should contain the subject of the announcement."]
-      space
-      raw l.["For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Expiration"] ]
-      br []
-      raw l.["“{0}” means that the request is subject to the expiration days in the group preferences.",
-              s.["Expire Normally"]]
-      space
-      raw l.["“{0}” can be used to make a request never expire (note that this is redundant for “{1}” and “{2}”).",
-              s.["Request Never Expires"], s.["Long-Term Requests"], s.["Expecting"]]
-      space
-      raw l.["If you are editing an existing request, a third option appears."]
-      space
-      raw l.["“{0}” will make the request expire when it is saved.", s.["Expire Immediately"]]
-      space
-      raw l.["Apart from the icons on the request maintenance page, this is the only way to expire “{0}” and “{1}” requests, but it can be used for any request type.",
-              s.["Long-Term Requests"], s.["Expecting"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request"] ]
-      br []
-      raw l.["This is the text of the request."]
-      space
-      raw l.["The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself."]
-      space
-      raw l.["It also supports undo and redo, and the editor supports full-screen mode."]
-      space
-      raw l.["Hover over each icon to see what each button does."]
-      ]
-    ]
-  |> Layout.help "Add / Edit a Request"
-
-
-/// View for the small group member maintenance help
-let groupMembers () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Members"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["From this page, you can add, edit, and delete the e-mail addresses for your group."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Add a New Group Member"] ]
-      br []
-      raw l.["To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Edit Group Member"] ]
-      br []
-      raw l.["To edit an e-mail address, click the blue pencil icon; it's the first icon under the “{0}” column heading.",
-              s.["Actions"]]
-      space
-      raw l.["This will allow you to update the name and/or the e-mail address for that member."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Delete a Group Member"] ]
-      br []
-      raw l.["To delete an e-mail address, click the blue trash can icon in the “{0}” column.", s.["Actions"]]
-      space
-      raw l.["Note that once an e-mail address has been deleted, it is gone."]
-      space
-      raw l.["(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)"]
-      ]
-    ]
-  |> Layout.help "Maintain Group Members"
-
-
-/// View for the log on help page
-let logOn () =
-  let s = I18N.localizer.Force ()
-  let l = I18N.forView "Help/User/LogOn"
-  use sw = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to log on to {0}.", s.["PrayerTracker"]]
-      space
-      raw l.["There are two different levels of access for {0} - user and group.", s.["PrayerTracker"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["User Log On"] ]
-      br []
-      raw l.["Select your group, then enter your e-mail address and password into the appropriate boxes."]
-      space
-      raw l.["If you want {0} to remember you on your computer, click the “{1}” box before clicking the “{2}” button.",
-              s.["PrayerTracker"], s.["Remember Me"], s.["Log On"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Group Log On"] ]
-      br []
-      raw l.["If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box."]
-      space
-      raw l.["If you want {0} to remember your group, click the “{1}” box before clicking the “{2}” button.",
-              s.["PrayerTracker"], s.["Remember Me"], s.["Log On"]]
-      ]
-    ]
-  |> Layout.help "Log On"
-
-/// Help index page
-let index vi =
-  let s = I18N.localizer.Force ()
+/// The help index page
+let index () =
+    let s   = I18N.localizer.Force()
     let l   = I18N.forView "Help/Index"
-  use sw = new StringWriter ()
+    use sw  = new StringWriter()
     let raw = rawLocText sw
-
-  let helpRows =
-    Help.all
-    |> List.map (fun h ->
-        tr [] [
-          td [] [
-            a [ _href (sprintf "/help/%s" h.Url)
-                _onclick (sprintf "return PT.showHelp('%s')" h.Url) ]
-              [ encLocText s.[h.linkedText] ]
-            ]
-          ])
-    
     [ p [] [
-      raw l.["Throughout {0}, you'll see this icon {1} next to the title on each page.",
-              s.["PrayerTracker"], icon "help_outline" |> (renderHtmlNode >> HtmlString)]
-      space
-      raw l.["Clicking this will open a new, small window with directions on using that page."]
-      space
-      raw l.["If you are looking for a quick overview of {0}, start with the “{1}” and “{2}” entries.",
-              s.["PrayerTracker"], s.["Edit Request"], s.["Change Preferences"]]
-      ]
+          raw l["Throughout PrayerTracker, you'll see an icon (a question mark in a circle) next to the title on each page."]; space
+          raw l["Clicking this will open a new, small window with directions on using that page."]; space
+          raw l["If you are looking for a quick overview of PrayerTracker, start with the “Add / Edit a Request” and “Change Preferences” entries."] ]
       hr []
-    p [ _class "pt-center-text" ] [ strong [] [ encLocText s.["Help Topics"] ] ]
-    table [ _class "pt-table" ] [ tbody [] helpRows ]
-    ]
-  |> Layout.Content.standard
-  |> Layout.standard vi "Help"
+      p [ _class "pt-center-text" ] [ strong [] [ locStr s["Help Topics"] ] ]
+      p [] [ a [ _href "/help/small-group/preferences"  ] [ locStr s["Change Preferences"]     ] ]
+      p [] [ a [ _href "/help/small-group/announcement" ] [ locStr s["Send Announcement"]      ] ]
+      p [] [ a [ _href "/help/small-group/members"      ] [ locStr s["Maintain Group Members"] ] ]
+      p [] [ a [ _href "/help/requests/edit"            ] [ locStr s["Add / Edit a Request"]   ] ]
+      p [] [ a [ _href "/help/requests/maintain"        ] [ locStr s["Maintain Requests"]      ] ]
+      p [] [ a [ _href "/help/requests/view"            ] [ locStr s["View Request List"]      ] ]
+      p [] [ a [ _href "/help/user/log-on"              ] [ locStr s["Log On"]                 ] ]
+      p [] [ a [ _href "/help/user/password"            ] [ locStr s["Change Your Password"]   ] ] ]
 
 
-let password () =
-  let s = I18N.localizer.Force ()
-  let l = I18N.forView "Help/User/Password"
-  use sw = new StringWriter ()
+/// Help for prayer requests
+module Requests =
+    
+    /// Add / Edit a Request
+    let edit () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/Requests/Edit"
+        use sw  = new StringWriter()
         let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page will let you change your password."]
-      space
-      raw l.["Enter your existing password in the top box, then enter your new password in the bottom two boxes."]
-      space
-      raw l.["Entering your existing password is a security measure; with the “{0}” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password.",
-              s.["Remember Me"]]
-      ]
+        [ p [] [ raw l["This page allows you to enter or update a new prayer request."] ]
+          h2 [ _id "request-type" ] [ locStr s["Request Type"] ]
           p [] [
-      raw l.["If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password."]
-      space
-      raw l.["<a href=\"mailto:daniel@djs-consulting.com?subject={0}%20Password%20Help\">Click here to request help resetting your password</a>.",
-              s.["PrayerTracker"]]
+              raw l["There are 5 request types in PrayerTracker."]; space
+              raw l["“Current Requests” are your regular requests that people may have regarding things happening over the next week or so."]; space
+              raw l["“Long-Term Requests” are requests that may occur repeatedly or continue indefinitely."]; space
+              raw l["“Praise Reports” are like “Current Requests”, but they are answers to prayer to share with your group."]; space
+              raw l["“Expecting” is for those who are pregnant."]; space
+              raw l["“Announcements” are like “Current Requests”, but instead of a request, they are simply passing information along about something coming up."] ]
+          p [] [
+              raw l["The order above is the order in which the request types appear on the list."]; space
+              raw l["“Long-Term Requests” and “Expecting” are not subject to the automatic expiration (set on the “Change Preferences” page) that the other requests are."] ]
+          h2 [ _id "date" ] [ locStr s["Date"] ]
+          p [] [
+              raw l["For new requests, this is a box with a calendar date picker."]; space
+              raw l["Click or tab into the box to display the calendar, which will be preselected to today's date."]; space
+              raw l["For existing requests, there will be a check box labeled “Check to not update the date”."]; space
+              raw l["This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request."]
           ]
-    ]
-  |> Layout.help "Change Your Password"
+          h2 [ _id "requestor-subject" ] [ locStr s["Requestor / Subject"] ]
+          p [] [
+              raw l["For requests or praises, this field is for the name of the person who made the request or offered the praise report."]; space
+              raw l["For announcements, this should contain the subject of the announcement."]; space
+              raw l["For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates."] ]
+          h2 [ _id "expiration" ] [ locStr s["Expiration"] ]
+          p [] [
+              raw l["“Expire Normally” means that the request is subject to the expiration days in the group preferences."]; space
+              raw l["“Request Never Expires” can be used to make a request never expire (note that this is redundant for “Long-Term Requests” and “Expecting”)."]; space
+              raw l["If you are editing an existing request, a third option appears."]; space
+              raw l["“Expire Immediately” will make the request expire when it is saved."]; space
+              raw l["Apart from the icons on the request maintenance page, this is the only way to expire “Long-Term Requests” and “Expecting” requests, but it can be used for any request type."] ]
+          h2 [ _id "request" ] [ locStr s["Request"] ]
+          p [] [
+              raw l["This is the text of the request."]; space
+              raw l["The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself."]; space
+              raw l["It also supports undo and redo, and the editor supports full-screen mode. Hover over each icon to see what each button does."] ] ]
     
-
-/// View for the small group preferences help page
-let preferences () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Preferences"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to change how your prayer request list looks and behaves."]
-      space
-      raw l.["Each section is addressed below."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requests Expire After"] ]
-      br []
-      raw l.["When a regular request goes this many days without being updated, it expires and no longer appears on the request list."]
-      space
-      raw l.["Note that the categories “{0}” and “{1}” never expire automatically.", s.["Long-Term Requests"], s.["Expecting"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requests “New” For"] ]
-      br []
-      raw l.["Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests."]
-      space
-      raw l.["All categories respect this setting."]
-      space
-      raw l.["If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet."]
-      space
-      raw l.["(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)"]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Long-Term Requests Alerted for Update"] ]
-      br []
-      raw l.["Requests that have not been updated in this many weeks are identified by an italic font on the “{0}” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current.",
-              s.["Maintain Requests"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request Sorting"] ]
-      br []
-      raw l.["By default, requests are sorted within each group by the last updated date, with the most recent on top."]
-      space
-      raw l.["If you would prefer to have the list sorted by requestor or subject rather than by date, select “{0}” instead.",
-              s.["Sort by Requestor Name"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["E-mail “From” Name and Address"] ]
-      br []
-      raw l.["{0} must put an name and e-mail address in the “from” position of each e-mail it sends.", s.["PrayerTracker"]]
-      space
-      raw l.["The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”."]
-      space
-      raw l.["This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)."]
-      space
-      raw l.["Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["E-mail Format"] ]
-      br []
-      raw l.["This is the default e-mail format for your group."]
-      space
-      raw l.["The {0} default is HTML, which sends the list just as you see it online.", s.["PrayerTracker"]]
-      space
-      raw l.["However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting."]
-      space
-      raw l.["The setting on this page is the group default; you can select a format for each recipient on the “{0}” page.",
-              s.["Maintain Group Members"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Colors"] ]
-      br []
-      raw l.["You can customize the colors that are used for the headings and lines in your request list."]
-      space
-      raw l.["You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255."]
-      space
-      raw l.["There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic."]
-      space
-      raw l.["The background color cannot be changed."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Fonts{0} for List", ""] ]
-      br []
-      raw l.["This is a comma-separated list of fonts that will be used for your request list."]
-      space
-      raw l.["A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font."]
-      space
-      raw l.["It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”."]
-      space
-      raw l.["You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Heading / List Text Size"] ]
-      br []
-      raw l.["This is the point size to use for each."]
-      space
-      raw l.["The default for the heading is 16pt, and the default for the text is 12pt."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Making a “Large Print” List"] ]
-      br []
-      raw l.["If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:"]
-      br []
-      blockquote [] [
-        em [] [ encLocText s.["Fonts"] ]
-        rawText " &#8212; 'Times New Roman',serif"
-        br []
-        em [] [ encLocText s.["Heading Text Size"] ]
-        rawText " &#8212; 18pt"
-        br []
-        em [] [ encLocText s.["List Text Size"] ]
-        rawText " &#8212; 16pt"
-        ]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Time Zone"] ]
-      br []
-      raw l.["This is the time zone that you would like to use for your group."]
-      space
-      raw l.["If you do not see your time zone listed, just <a href=\"mailto:daniel@djs-consulting.com?subject={0}%20{1}\">contact Daniel</a> and tell him what time zone you need.",
-              s.["PrayerTracker"], s.["Time Zone"].Value.Replace(" ", "%20")]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request List Visibility"] ]
-      br []
-      raw l.["The group's request list can be either public, private, or password-protected."]
-      space
-      raw l.["Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)."]
-      space
-      raw l.["Password-protected lists allow group members to log in and view the current request list online, using the “{0}” link and providing this password.",
-              s.["Group Log On"]]
-      raw l.["As this is a shared password, it is stored in plain text, so you can easily see what it is."]
-      space
-      raw l.["If you select “{0}” but do not enter a password, the list remains private, which is also the default value.",
-              s.["Password Protected"]]
-      space
-      raw l.["(Changing this password will force all members of the group who logged in with the “{0}” box checked to provide the new password.)",
-        s.["Remember Me"]]
-      ]
-    ]
-  |> Layout.help "Change Preferences"
-
-
-/// View for the request maintenance help page
-let requests () =
-  let s   = I18N.localizer.Force ()
+    /// Maintain Requests
+    let maintain () =
+        let s   = I18N.localizer.Force()
         let l   = I18N.forView "Help/Requests/Maintain"
-  use sw  = new StringWriter ()
+        use sw  = new StringWriter()
         let raw = rawLocText sw
         [ p [] [
-      raw l.["From this page, you can add, edit, and delete your current requests."]
-      raw l.["You can also restore requests that may have expired, but should be made active once again."]
-      ]
+              raw l["From this page, you can add, edit, and delete your current requests."]; space
+              raw l["You can also restore requests that may have expired, but should be made active once again."] ]
+          h2 [ _id "add-a-new-request" ] [ locStr s["Add a New Request"] ]
           p [] [
-      strong [] [ encLocText s.["Add a New Request"] ]
-      br []
-      raw l.["To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group."]
-      ]
+              raw l["To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group."] ]
+          h2 [ _id "search-requests" ] [ locStr s["Search Requests"] ]
           p [] [
-      strong [] [ encLocText s.["Edit Request"] ]
-      br []
-      raw l.["To edit a request, click the blue pencil icon; it's the first icon under the “{0}” column heading.",
-              s.["Actions"]]
-      ]
+              raw l["If you are looking for a particular requests, enter some text in the search box and click “Search”."]; space
+              raw l["PrayerTracker will search the Requestor/Subject and Request Text fields (case-insensitively) of both active and inactive requests."]; space
+              raw l["The results will be displayed in the same format as the original Maintain Requests page, so the buttons described below will work the same for those requests as well."]; space
+              raw l["They will also be displayed in pages, if there are a lot of results; the number per page is configurable by small group."] ]
+          h2 [ _id "edit-request" ] [ locStr s["Edit Request"] ]
           p [] [
-      strong [] [ encLocText s.["Expire a Request"] ]
-      br []
-      raw l.["For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately."]
-      space
-      raw l.["This is equivalent to editing the request, selecting “{0}”, and saving it.", s.["Expire Immediately"]]
-      ]
+              raw l["To edit a request, click the pencil icon; it's the first icon under the “Actions” column heading."] ]
+          h2 [ _id "expire-a-request" ] [ locStr s["Expire a Request"] ]
           p [] [
-      strong [] [ encLocText s.["Restore an Inactive Request"] ]
-      br []
-      raw l.["When the page is first displayed, it does not display inactive requests."]
-      space
-      raw l.["However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown."]
-      space
-      raw l.["The middle icon will look like an eye; clicking it will restore the request as an active request."]
-      space
-      raw l.["The last updated date will be current, and the request is set to expire normally."]
-      ]
+              raw l["For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately."]; space
+              raw l["This is equivalent to editing the request, selecting “Expire Immediately”, and saving it."] ]
+          h2 [ _id "restore-an-inactive-request" ] [ locStr s["Restore an Inactive Request"] ]
           p [] [
-      strong [] [ encLocText s.["Delete a Request"] ]
-      br []
-      raw l.["Deleting a request is contrary to the intent of {0}, as you can retrieve requests that have expired.",
-              s.["PrayerTracker"]]
-      space
-      raw l.["However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “{0}” column will allow you to do it.",
-              s.["Actions"]]
-      space
-      raw l.["Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good."]
-      ]
-    ]
-  |> Layout.help "Maintain Requests"
+              raw l["When the page is first displayed, it does not display inactive requests."]; space
+              raw l["However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown."]; space
+              raw l["The middle icon will look like an eye; clicking it will restore the request as an active request."]; space
+              raw l["The last updated date will be current, and the request is set to expire normally."] ]
+          h2 [ _id "delete-a-request" ] [ locStr s["Delete a Request"] ]
+          p [] [
+              raw l["Deleting a request is contrary to the intent of PrayerTracker, as you can retrieve requests that have expired."]; space
+              raw l["However, if there is a request that needs to be deleted, clicking the trash can icon in the “Actions” column will allow you to do it."]; space
+              raw l["Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good."] ] ]
     
-/// View for the Send Announcement page help
-let sendAnnouncement () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Announcement"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      strong [] [ encLocText s.["Announcement Text"] ]
-      br []
-      raw l.["This is the text of the announcement you would like to send."]
-      space
-      raw l.["It functions the same way as the text box on the “<a href=\"{0}\">{1}</a>” page.",
-              (sprintf "/help/%s/%s" Help.editRequest.``module`` Help.editRequest.topic), s.["Edit Request"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Add to Request List"] ]
-      br []
-      raw l.["Without this box checked, the text of the announcement will only be e-mailed to your group members."]
-      space
-      raw l.["If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected."]
-      ]
-    ]
-  |> Layout.help "Send Announcement"
-
-let viewRequests () =
-  let s   = I18N.localizer.Force ()
+    /// View Request List
+    let view () =
+        let s   = I18N.localizer.Force()
         let l   = I18N.forView "Help/Requests/View"
-  use sw  = new StringWriter ()
+        use sw  = new StringWriter()
         let raw = rawLocText sw
         [ p [] [
-      raw l.["From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group."]
-      space
-      raw l.["(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)"]
-      ]
+              raw l["From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group."]; space
+              raw l["(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)"] ]
+          h2 [ _id "list-for-next-sunday" ] [ locStr s["List for Next Sunday"] ]
           p [] [
-      strong [] [ encLocText s.["List for Next Sunday"] ]
-      br []
-      raw l.["This will modify the date for the list, so it will look like it is currently next Sunday."]
-      space
-      raw l.["This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening."]
-      space
-      raw l.["Note that this link does not appear if it is Sunday."]
-      ]
+              raw l["This will modify the date for the list, so it will look like it is currently next Sunday."]; space
+              raw l["This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening."]; space
+              raw l["Note that this link does not appear if it is Sunday."] ]
+          h2 [ _id "view-printable" ] [ locStr s["View Printable"] ]
           p [] [
-      strong [] [ encLocText s.["View Printable"] ]
-      br []
-      raw l.["Clicking this link will display the list in a format that is suitable for printing; it does not have the normal {0} header across the top.",
-              s.["PrayerTracker"]]
-      space
-      raw l.["Once you have clicked the link, you can print it using your browser's standard “Print” functionality."]
-      ]
+              raw l["Clicking this link will display the list in a format that is suitable for printing; it does not have the normal PrayerTracker header across the top."]; space
+              raw l["Once you have clicked the link, you can print it using your browser's standard “Print” functionality."] ]
+          h2 [ _id "send-via-e-mail" ] [ locStr s["Send via E-mail"] ]
           p [] [
-      strong [] [ encLocText s.["Send Via E-mail"] ]
-      br []
-      raw l.["Clicking this link will send the list you are currently viewing to your group members."]
-      space
-      raw l.["The page will remind you that you are about to do that, and ask for your confirmation."]
-      space
-      raw l.["If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like."]
-      space
-      raw l.["You may safely use your browser's “Back” button to navigate away from the page."]
-      ]
-    ]
-  |> Layout.help "View Request List"
+              raw l["Clicking this link will send the list you are currently viewing to your group members."]; space
+              raw l["The page will remind you that you are about to do that, and ask for your confirmation."]; space
+              raw l["If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like."]; space
+              raw l["You may safely use your browser's “Back” button to navigate away from the page."] ] ]
+
+
+/// Help for small group pages
+module SmallGroup =
+    
+    /// Send an Announcement
+    let announcement () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/SmallGroup/Announcement"
+        use sw  = new StringWriter()
+        let raw = rawLocText sw
+        [ h2 [ _id "announcement-text" ] [ locStr s["Announcement Text"] ]
+          p [] [
+              raw l["This is the text of the announcement you would like to send."]; space
+              raw l["""It functions the same way as the text box on the <a href="../requests/edit#request">“Edit Request” page</a>."""] ]
+          h2 [ _id "add-to-request-list" ] [ locStr s["Add to Request List"] ]
+          p [] [
+              raw l["Without this box checked, the text of the announcement will only be e-mailed to your group members."]; space
+              raw l["If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected."] ] ]
+    
+    /// Maintain Group Members
+    let members () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/SmallGroup/Members"
+        use sw  = new StringWriter()
+        let raw = rawLocText sw
+        [ p [] [ raw l["From this page, you can add, edit, and delete the e-mail addresses for your group."] ]
+          h2 [ _id "add-a-new-group-member" ] [ locStr s["Add a New Group Member"] ]
+          p [] [
+              raw l["To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group."] ]
+          h2 [ _id "edit-group-member" ] [ locStr s["Edit Group Member"] ]
+          p [] [
+              raw l["To edit an e-mail address, click the pencil icon; it's the first icon under the “Actions” column heading."]; space
+              raw l["This will allow you to update the name and/or the e-mail address for that member."] ]
+          h2 [ _id "delete-a-group-member" ] [ locStr s["Delete a Group Member"] ]
+          p [] [
+              raw l["To delete an e-mail address, click the trash can icon in the “Actions” column."]; space
+              raw l["Note that once an e-mail address has been deleted, it is gone."]; space
+              raw l["(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)"] ] ]
+    
+    /// Change Preferences
+    let preferences () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/SmallGroup/Preferences"
+        use sw  = new StringWriter()
+        let raw = rawLocText sw
+        [ p [] [
+              raw l["This page allows you to change how your prayer request list looks and behaves."]; space
+              raw l["Each section is addressed below."] ]
+          h2 [ _id "requests-expire-after" ] [ locStr s["Requests Expire After"] ]
+          p [] [
+              raw l["When a regular request goes this many days without being updated, it expires and no longer appears on the request list."]; space
+              raw l["Note that the categories “Long-Term Requests” and “Expecting” never expire automatically."] ]
+          h2 [ _id "requests-new-for" ] [ locStr s["Requests “New” For"] ]
+          p [] [
+              raw l["Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests."]; space
+              raw l["All categories respect this setting."]; space
+              raw l["If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet."]; space
+              raw l["(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)"] ]
+          h2 [ _id "long-term-requests-alerted-for-update" ] [ locStr s["Long-Term Requests Alerted for Update"] ]
+          p [] [
+              raw l["Requests that have not been updated in this many weeks are identified by an italic font on the “Maintain Requests” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current."] ]
+          h2 [ _id "request-sorting" ] [ locStr s["Request Sorting"] ]
+          p [] [
+              raw l["By default, requests are sorted within each group by the last updated date, with the most recent on top."]; space
+              raw l["If you would prefer to have the list sorted by requestor or subject rather than by date, select “Sort by Requestor Name” instead."] ]
+          h2 [ _id "e-mail-from-name-and-address" ] [ locStr s["E-mail “From” Name and Address"] ]
+          p [] [
+              raw l["PrayerTracker must put an name and e-mail address in the “from” position of each e-mail it sends."]; space
+              raw l["The default name is “PrayerTracker”, and the default e-mail address is “prayer@bitbadger.solutions”."]; space
+              raw l["This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)."]; space
+              raw l["Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly."] ]
+          h2 [ _id "e-mail-format" ] [ locStr s["E-mail Format"] ]
+          p [] [
+              raw l["This is the default e-mail format for your group."]; space
+              raw l["The PrayerTracker default is HTML, which sends the list just as you see it online."]; space
+              raw l["However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting."]; space
+              raw l["The setting on this page is the group default; you can select a format for each recipient on the “Maintain Group Members” page."] ]
+          h2 [ _id "colors" ] [ locStr s["Colors"] ]
+          p [] [
+              raw l["You can customize the colors that are used for the headings and lines in your request list."]; space
+              raw l["You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255."]; space
+              raw l["There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic."]; space
+              raw l["The background color cannot be changed."] ]
+          h2 [ _id "fonts-for-list" ] [ locStr s["Fonts for List"] ]
+          p [] [ raw l["There are two options for fonts that will be used in the prayer request list."] ]
+          ul [] [
+              li [] [
+                  raw l["“Native Fonts” uses a list of fonts that will render the prayer requests in the best available font for their device, whether that is a desktop or laptop computer, mobile device, or tablet."]; space
+                  raw l["(This is the default for new small groups.)"] ]
+              li [] [
+                  raw l["“Named Fonts” uses a comma-separated list of fonts that you specify."]; space
+                  raw l["A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font."]; space
+                  raw l["It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”."]; space
+                  raw l["You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font."] ] ]
+          h2 [ _id "heading-list-text-size" ] [ locStr s["Heading / List Text Size"] ]
+          p [] [
+              raw l["This is the point size to use for each."]; space
+              raw l["The default for the heading is 16pt, and the default for the text is 12pt."] ]
+          h2 [ _id "making-a-large-print-list" ] [ locStr s["Making a “Large Print” List"] ]
+          p [] [
+              raw l["If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:"] ]
+          blockquote [] [
+              p [] [ strong [] [ locStr s["Fonts"] ]; br []; raw l["""Named Fonts: "Times New Roman",serif"""] ]
+              p [] [ strong [] [ locStr s["Heading Text Size"] ]; br []; rawText "18pt" ]
+              p [] [ strong [] [ locStr s["List Text Size"] ]; br []; rawText "16pt" ] ]
+          h2 [ _id "request-list-visibility" ] [ locStr s["Request List Visibility"] ]
+          p [] [
+              raw l["The group's request list can be either public, private, or password-protected."]; space
+              raw l["Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)."]; space
+              raw l["Password-protected lists allow group members to log in and view the current request list online, using the “Group Log On” link and providing this password."]; space
+              raw l["As this is a shared password, it is stored in plain text, so you can easily see what it is."]; space
+              raw l["If you select “Password Protected” but do not enter a password, the list remains private, which is also the default value."]; space
+              raw l["(Changing this password will force all members of the group who logged in with the “Remember Me” box checked to provide the new password.)"] ]
+          h2 [ _id "time-zone" ] [ locStr s["Time Zone"] ]
+          p [] [
+              raw l["This is the time zone that you would like to use for your group."]; space
+              raw l["""If you do not see your time zone listed, just <a href="mailto:daniel@bitbadger.solutions?subject=PrayerTracker+Time+Zone">contact Daniel</a> and tell him what time zone you need."""] ]
+          h2 [ _id "page-size" ] [ locStr s["Page Size"] ]
+          p [] [
+              raw l["As small groups use PrayerTracker, they accumulate many expired requests."]; space
+              raw l["When lists of requests include expired requests, the results will be broken up into pages."]; space
+              raw l["The default value is 100 requests per page, but may be set as low as 10 or as high as 255."] ]
+          h2 [ _id "as-of-date-display" ] [ locStr s["“As of” Date Display"] ]
+          p [] [
+              raw l["PrayerTracker can display the last date a request was updated, at the end of the request text."]; space
+              raw l["By default, it does not."]; space
+              raw l["If you select a short date, it will show “(as of 10/11/2015)” (for October 11, 2015); if you select a long date, it will show “(as of Sunday, October 11, 2015)”."] ] ]
+
+/// Help for user pages
+module User =
+    
+    /// Log On
+    let logOn () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/User/LogOn"
+        use sw  = new StringWriter()
+        let raw = rawLocText sw
+        [ p [] [
+              raw l["This page allows you to log on to PrayerTracker."]; space
+              raw l["There are two different levels of access for PrayerTracker - user and group."] ]
+          h2 [ _id "user-log-on" ] [ locStr s["User Log On"] ]
+          p [] [
+              raw l["Enter your e-mail address and password into the appropriate boxes, then select your group."]; space
+              raw l["If you want PrayerTracker to remember you on your computer, click the “Remember Me” box before clicking the “Log On” button."] ]
+          h2 [ _id "group-log-on" ] [ locStr s["Group Log On"] ]
+          p [] [
+              raw l["If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box."]; space
+              raw l["If you want PrayerTracker to remember your group, click the “Remember Me” box before clicking the “Log On” button."] ] ]
+    
+    /// Change Your Password
+    let password () =
+        let s   = I18N.localizer.Force()
+        let l   = I18N.forView "Help/User/Password"
+        use sw  = new StringWriter()
+        let raw = rawLocText sw
+        [ p [] [
+              raw l["This page will let you change your password."]; space
+              raw l["Enter your existing password in the top box, then enter your new password in the bottom two boxes."]; space
+              raw l["Entering your existing password is a security measure; with the “Remember Me” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password."] ]
+          p [] [
+              raw l["If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password."]; space
+              a [ _href $"""mailto:daniel@bitbadger.solutions?subject={l["PrayerTracker+Password+Help"].Value}""" ] [
+                  raw l["Click here to request help resetting your password."] ] ] ]

src/PrayerTracker.UI/Home.fs

@@ -1,45 +1,43 @@
 /// Views associated with the home page, or those that don't fit anywhere else
 module PrayerTracker.Views.Home
 
-open Giraffe.GiraffeViewEngine
-open Microsoft.AspNetCore.Html
-open PrayerTracker.ViewModels
 open System.IO
+open Giraffe.ViewEngine
+open PrayerTracker.ViewModels
 
 /// The error page
-let error code vi =
+let error code viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "Home/Error"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
     let is404 = "404" = code
-  let pageTitle = match is404 with true -> "Page Not Found" | false -> "Server Error"
+    let pageTitle = if is404 then "Page Not Found" else "Server Error"
     [   yield!
-      match is404 with
-      | true ->
+            if is404 then
                 [   p [] [
-              raw l.["The page you requested cannot be found."]
-              raw l.["Please use your “Back” button to return to {0}.", s.["PrayerTracker"]]
+                        raw l["The page you requested cannot be found."]
+                        raw l["Please use your “Back” button to return to {0}.", s["PrayerTracker"]]
                     ]
                     p [] [
-              raw l.["If you reached this page from a link within {0}, please copy the link from the browser's address bar, and send it to support, along with the group for which you were currently authenticated (if any).",
-                      s.["PrayerTracker"]]
+                        raw l["If you reached this page from a link within {0}, please copy the link from the browser's address bar, and send it to support, along with the group for which you were currently authenticated (if any).",
+                            s["PrayerTracker"]]
                     ]
                 ]
-      | false ->
+            else
                 [   p [] [
-              raw l.["An error ({0}) has occurred.", code]
-              raw l.["Please use your “Back” button to return to {0}.", s.["PrayerTracker"]]
+                        raw l["An error ({0}) has occurred.", code]
+                        raw l["Please use your “Back” button to return to {0}.", s["PrayerTracker"]]
                     ]
                 ]
-    yield br []
-    yield hr []
-    yield div [ _style "font-size:70%;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',sans-serif" ] [
-      img [ _src (sprintf "/img/%A.png" s.["footer_en"])
-            _alt (sprintf "%A %A" s.["PrayerTracker"] s.["from Bit Badger Solutions"])
-            _title (sprintf "%A %A" s.["PrayerTracker"] s.["from Bit Badger Solutions"])
+        br []
+        hr []
+        div [ _style "font-size:70%;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',sans-serif" ] [
+            img [ _src   $"""/img/%A{s["footer_en"]}.png"""
+                  _alt   $"""%A{s["PrayerTracker"]} %A{s["from Bit Badger Solutions"]}"""
+                  _title $"""%A{s["PrayerTracker"]} %A{s["from Bit Badger Solutions"]}"""
                   _style "vertical-align:text-bottom;" ]
-      encodedText vi.version
+            str viewInfo.Version
         ]
     ]
     |> div []
@@ -47,216 +45,215 @@ let error code vi =
 
 
 /// The home page
-let index vi =
+let index viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "Home/Index"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
-
     [   p [] [
-      raw l.["Welcome to <strong>{0}</strong>!", s.["PrayerTracker"]]
+            raw l["Welcome to <strong>{0}</strong>!", s["PrayerTracker"]]
             space
-      raw l.["{0} is an interactive website that provides churches, Sunday School classes, and other organizations an easy way to keep up with their prayer requests.",
-              s.["PrayerTracker"]]
+            raw l["{0} is an interactive website that provides churches, Sunday School classes, and other organizations an easy way to keep up with their prayer requests.",
+                s["PrayerTracker"]]
             space
-      raw l.["It is provided at no charge, as a ministry and a community service."]
+            raw l["It is provided at no charge, as a ministry and a community service."]
         ]
-    h4 [] [ raw l.["What Does It Do?"] ]
+        h4 [] [ raw l["What Does It Do?"] ]
         p [] [
-      raw l.["{0} has what you need to make maintaining a prayer request list a breeze.", s.["PrayerTracker"]]
+            raw l["{0} has what you need to make maintaining a prayer request list a breeze.", s["PrayerTracker"]]
             space
-      raw l.["Some of the things it can do..."]
+            raw l["Some of the things it can do..."]
         ]
         ul [] [
             li [] [
-        raw l.["It drops old requests off the list automatically."]
+                raw l["It drops old requests off the list automatically."]
                 space
-        raw l.["Requests other than “{0}” requests will expire at 14 days, though this can be changed by the organization.",
-                s.["Long-Term Requests"]]
+                raw l["Requests other than “{0}” requests will expire at 14 days, though this can be changed by the organization.",
+                    s["Long-Term Requests"]]
                 space
-        raw l.["This expiration is based on the last update, not the initial request."]
+                raw l["This expiration is based on the last update, not the initial request."]
                 space
-        raw l.["(And, once requests do “drop off”, they are not gone - they may be recovered if needed.)"]
+                raw l["(And, once requests do “drop off”, they are not gone - they may be recovered if needed.)"]
             ]
             li [] [
-        raw l.["Requests can be viewed any time."]
+                raw l["Requests can be viewed any time."]
                 space
-        raw l.["Lists can be made public, or they can be secured with a password, if desired."]
+                raw l["Lists can be made public, or they can be secured with a password, if desired."]
             ]
             li [] [
-        raw l.["Lists can be e-mailed to a pre-defined list of members."]
+                raw l["Lists can be e-mailed to a pre-defined list of members."]
                 space
-        raw l.["This can be useful for folks who may not be able to write down all the requests during class, but want a list so that they can pray for them the rest of week."]
+                raw l["This can be useful for folks who may not be able to write down all the requests during class, but want a list so that they can pray for them the rest of week."]
                 space
-        raw l.["E-mails are sent individually to each person, which keeps the e-mail list private and keeps the messages from being flagged as spam."]
+                raw l["E-mails are sent individually to each person, which keeps the e-mail list private and keeps the messages from being flagged as spam."]
             ]
             li [] [
-        raw l.["The look and feel of the list can be configured for each group."]
+                raw l["The look and feel of the list can be configured for each group."]
                 space
-        raw l.["All fonts, colors, and sizes can be customized."]
+                raw l["All fonts, colors, and sizes can be customized."]
                 space
-        raw l.["This allows for configuration of large-print lists, among other things."]
+                raw l["This allows for configuration of large-print lists, among other things."]
             ]
         ]
-    h4 [] [ raw l.["How Can Your Organization Use {0}?", s.["PrayerTracker"]] ]
+        h4 [] [ raw l["How Can Your Organization Use {0}?", s["PrayerTracker"]] ]
         p [] [
-      raw l.["Like God’s gift of salvation, {0} is free for the asking for any church, Sunday School class, or other organization who wishes to use it.",
-              s.["PrayerTracker"]]
+            raw l["Like God’s gift of salvation, {0} is free for the asking for any church, Sunday School class, or other organization who wishes to use it.",
+                s["PrayerTracker"]]
             space
-      raw l.["If your organization would like to get set up, just <a href=\"mailto:daniel@djs-consulting.com?subject=New%20{0}%20Class\">e-mail</a> Daniel and let him know.",
-              s.["PrayerTracker"]]
+            raw l["If your organization would like to get set up, just <a href=\"mailto:daniel@djs-consulting.com?subject=New%20{0}%20Class\">e-mail</a> Daniel and let him know.",
+                s["PrayerTracker"]]
         ]
-    h4 [] [ raw l.["Do I Have to Register to See the Requests?"] ]
+        h4 [] [ raw l["Do I Have to Register to See the Requests?"] ]
         p [] [
-      raw l.["This depends on the group."]
+            raw l["This depends on the group."]
             space
-      raw l.["Lists can be configured to be password-protected, but they do not have to be."]
+            raw l["Lists can be configured to be password-protected, but they do not have to be."]
             space
-      raw l.["If you click on the “{0}” link above, you will see a list of groups - those that do not indicate that they require logging in are publicly viewable.",
-              s.["View Request List"]]
+            raw l["If you click on the “{0}” link above, you will see a list of groups - those that do not indicate that they require logging in are publicly viewable.",
+                s["View Request List"]]
         ]
-    h4 [] [ raw l.["How Does It Work?"] ]
+        h4 [] [ raw l["How Does It Work?"] ]
         p [] [
-      raw l.["Check out the “{0}” link above - it details each of the processes and how they work.", s.["Help"]]
+            raw l["Check out the “{0}” link above - it details each of the processes and how they work.", s["Help"]]
         ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "Welcome!"
+    |> Layout.standard viewInfo "Welcome!"
 
 
 /// Privacy Policy page
-let privacyPolicy vi =
+let privacyPolicy viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "Home/PrivacyPolicy"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
-
-  [ p [ _class "pt-right-text" ] [ small[] [ em [] [ raw l.["(as of July 31, 2018)"] ] ] ]
+    [   p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l["(as of July 31, 2018)"] ] ] ]
         p [] [
-      raw l.["The nature of the service is one where privacy is a must."]
+            raw l["The nature of the service is one where privacy is a must."]
             space
-      raw l.["The items below will help you understand the data we collect, access, and store on your behalf as you use this service."]
+            raw l["The items below will help you understand the data we collect, access, and store on your behalf as you use this service."]
         ]
-    h3 [] [ raw l.["What We Collect"] ]
+        h3 [] [ raw l["What We Collect"] ]
         ul [] [
             li [] [
-        strong [] [ raw l.["Identifying Data"] ]
+                strong [] [ raw l["Identifying Data"] ]
                 rawText " &ndash; "
-        raw l.["{0} stores the first and last names, e-mail addresses, and hashed passwords of all authorized users.", s.["PrayerTracker"]]
+                raw l["{0} stores the first and last names, e-mail addresses, and hashed passwords of all authorized users.",
+                    s["PrayerTracker"]]
                 space
-        raw l.["Users are also associated with one or more small groups."]
+                raw l["Users are also associated with one or more small groups."]
             ]
             li [] [
-        strong [] [ raw l.["User Provided Data"] ]
+                strong [] [ raw l["User Provided Data"] ]
                 rawText " &ndash; "
-        raw l.["{0} stores the text of prayer requests.", s.["PrayerTracker"]]
+                raw l["{0} stores the text of prayer requests.", s["PrayerTracker"]]
                 space
-        raw l.["It also stores names and e-mail addreses of small group members, and plain-text passwords for small groups with password-protected lists."]
+                raw l["It also stores names and e-mail addresses of small group members, and plain-text passwords for small groups with password-protected lists."]
             ]
         ]
-    h3 [] [ raw l.["How Your Data Is Accessed / Secured"] ]
+        h3 [] [ raw l["How Your Data Is Accessed / Secured"] ]
         ul [] [
             li [] [
-        raw l.["While you are signed in, {0} utilizes a session cookie, and transmits that cookie to the server to establish your identity.",
-                s.["PrayerTracker"]]
+                raw l["While you are signed in, {0} utilizes a session cookie, and transmits that cookie to the server to establish your identity.",
+                    s["PrayerTracker"]]
                 space
-        raw l.["If you utilize the “{0}” box on sign in, a second cookie is stored, and transmitted to establish a session; this cookie is removed by clicking the “{1}” link.",
-                s.["Remember Me"], s.["Log Off"]]
+                raw l["If you utilize the “{0}” box on sign in, a second cookie is stored, and transmitted to establish a session; this cookie is removed by clicking the “{1}” link.",
+                    s["Remember Me"], s["Log Off"]]
                 space
-        raw l.["Both of these cookies are encrypted, both in your browser and in transit."]
+                raw l["Both of these cookies are encrypted, both in your browser and in transit."]
                 space
-        raw l.["Finally, a third cookie is used to maintain your currently selected language, so that this selection is maintained across browser sessions."]
+                raw l["Finally, a third cookie is used to maintain your currently selected language, so that this selection is maintained across browser sessions."]
             ]
             li [] [
-        raw l.["Data for your small group is returned to you, as required, to display and edit."]
+                raw l["Data for your small group is returned to you, as required, to display and edit."]
                 space
-        raw l.["{0} also sends e-mails on behalf of the configured owner of a small group; these e-mails are sent from prayer@djs-consulting.com, with the “Reply To” header set to the configured owner of the small group.",
-                s.["PrayerTracker"]]
+                raw l["{0} also sends e-mails on behalf of the configured owner of a small group; these e-mails are sent from prayer@djs-consulting.com, with the “Reply To” header set to the configured owner of the small group.",
+                    s["PrayerTracker"]]
                 space
-        raw l.["Distinct e-mails are sent to each user, as to not disclose the other recipients."]
+                raw l["Distinct e-mails are sent to each user, as to not disclose the other recipients."]
                 space
-        raw l.["On the server, all data is stored in a controlled-access database."]
+                raw l["On the server, all data is stored in a controlled-access database."]
             ]
             li [] [
-        raw l.["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 1st and 15th are preserved for 3 months."]
+                raw l["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 1st and 15th are preserved for 3 months."]
                 space
-        raw l.["These backups are stored in a private cloud data repository."]
+                raw l["These backups are stored in a private cloud data repository."]
             ]
             li [] [
-        raw l.["Access to servers and backups is strictly controlled and monitored for unauthorized access attempts."]
+                raw l["Access to servers and backups is strictly controlled and monitored for unauthorized access attempts."]
             ]
         ]
-    h3 [] [ raw l.["Removing Your Data"] ]
+        h3 [] [ raw l["Removing Your Data"] ]
         p [] [
-      raw l.["At any time, you may choose to discontinue using {0}; just e-mail Daniel, as you did to register, and request deletion of your small group.",
-              s.["PrayerTracker"]]
+            raw l["At any time, you may choose to discontinue using {0}; just e-mail Daniel, as you did to register, and request deletion of your small group.",
+                s["PrayerTracker"]]
         ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "Privacy Policy"
+    |> Layout.standard viewInfo "Privacy Policy"
 
 
 /// Terms of Service page
-let termsOfService vi =
+let termsOfService viewInfo =
     let s      = I18N.localizer.Force ()
     let l      = I18N.forView "Home/TermsOfService"
     use sw     = new StringWriter ()
     let raw    = rawLocText sw
     let ppLink =
-    a [ _href "/legal/privacy-policy" ] [ encodedText (s.["Privacy Policy"].Value.ToLower ()) ]
-    |> (renderHtmlNode >> HtmlString)
+        a [ _href "/legal/privacy-policy" ] [ str (s["Privacy Policy"].Value.ToLower ()) ]
+        |> renderHtmlString
 
-  [ p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l.["(as of May 24, 2018)"] ] ] ]
-    h3 [] [ encodedText "1. "; raw l.["Acceptance of Terms"] ]
+    [   p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l["(as of May 24, 2018)"] ] ] ]
+        h3 [] [ str "1. "; raw l["Acceptance of Terms"] ]
         p [] [
-      raw l.["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."]
+            raw l["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."]
             space
-      raw l.["Your continued use of this site implies your acceptance of these terms."]
+            raw l["Your continued use of this site implies your acceptance of these terms."]
         ]
-    h3 [] [ encodedText "2. "; raw l.["Description of Service and Registration"] ]
+        h3 [] [ str "2. "; raw l["Description of Service and Registration"] ]
         p [] [
-      raw l.["{0} is a service that allows individuals to enter and amend prayer requests on behalf of organizations.",
-              s.["PrayerTracker"]]
+            raw l["{0} is a service that allows individuals to enter and amend prayer requests on behalf of organizations.",
+                s["PrayerTracker"]]
             space
-      raw l.["Registration is accomplished via e-mail to Daniel Summers (daniel at bitbadger dot solutions, substituting punctuation)."]
+            raw l["Registration is accomplished via e-mail to Daniel Summers (daniel at bitbadger dot solutions, substituting punctuation)."]
             space
-      raw l.["See our {0} for details on the personal (user) information we maintain.", ppLink]
+            raw l["See our {0} for details on the personal (user) information we maintain.", ppLink]
         ]
-    h3 [] [ encodedText "3. "; raw l.["Liability"] ]
+        h3 [] [ str "3. "; raw l["Liability"] ]
         p [] [
-      raw l.["This service is provided “as is”, and no warranty (express or implied) exists."]
+            raw l["This service is provided “as is”, and no warranty (express or implied) exists."]
             space
-      raw l.["The service and its developers may not be held liable for any damages that may arise through the use of this service."]
+            raw l["The service and its developers may not be held liable for any damages that may arise through the use of this service."]
         ]
-    h3 [] [ encodedText "4. "; raw l.["Updates to Terms"] ]
+        h3 [] [ str "4. "; raw l["Updates to Terms"] ]
         p [] [
-      raw l.["These terms and conditions may be updated at any time."]
+            raw l["These terms and conditions may be updated at any time."]
             space
-      raw l.["When these terms are updated, users will be notified by a system-generated announcement."]
+            raw l["When these terms are updated, users will be notified by a system-generated announcement."]
             space
-      raw l.["Additionally, the date at the top of this page will be updated."]
+            raw l["Additionally, the date at the top of this page will be updated."]
         ]
         hr []
-    p [] [ raw l.["You may also wish to review our {0} to learn how we handle your data.", ppLink] ]
+        p [] [ raw l["You may also wish to review our {0} to learn how we handle your data.", ppLink] ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "Terms of Service"
+    |> Layout.standard viewInfo "Terms of Service"
 
 
 /// View for unauthorized page
-let unauthorized vi =
+let unauthorized viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "Home/Unauthorized"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
     [   p [] [
-      raw l.["If you feel you have reached this page in error, please <a href=\"mailto:daniel@djs-consulting.com?Subject={0}%20Unauthorized%20Access\">contact Daniel</a> and provide the details as to what you were doing (i.e., what link did you click, where had you been, etc.).",
-              s.["PrayerTracker"]]
+            raw l["If you feel you have reached this page in error, please <a href=\"mailto:daniel@djs-consulting.com?Subject={0}%20Unauthorized%20Access\">contact Daniel</a> and provide the details as to what you were doing (i.e., what link did you click, where had you been, etc.).",
+                s["PrayerTracker"]]
         ]
         p [] [
-      raw l.["Otherwise, you may select one of the links above to get back into an authorized portion of {0}.",
-              s.["PrayerTracker"]]
+            raw l["Otherwise, you may select one of the links above to get back into an authorized portion of {0}.",
+                s["PrayerTracker"]]
         ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "Unauthorized Access"
+    |> Layout.standard viewInfo "Unauthorized Access"

src/PrayerTracker.UI/I18N.fs

@@ -19,4 +19,4 @@ let localizer = lazy (stringLocFactory.Create ("Common", resAsmName))
   
 /// Get a view localizer
 let forView (view : string) =
-  htmlLocFactory.Create (sprintf "Views.%s" (view.Replace ('/', '.')), resAsmName)
+    htmlLocFactory.Create ($"Views.{view.Replace ('/', '.')}", resAsmName)

src/PrayerTracker.UI/Layout.fs

@@ -1,153 +1,143 @@
 /// Layout items for PrayerTracker
 module PrayerTracker.Views.Layout
 
-open Giraffe.GiraffeViewEngine
-open PrayerTracker
+open Giraffe.ViewEngine
+open Giraffe.ViewEngine.Accessibility
 open PrayerTracker.ViewModels
-open System
+open System.Globalization
+
+/// Get the two-character language code for the current request
+let langCode () = if CultureInfo.CurrentCulture.Name.StartsWith "es" then "es" else "en"
+
 
 /// Navigation items
 module Navigation =
   
-  open System.Globalization
-    
     /// Top navigation bar
     let top m =
-    let s = PrayerTracker.Views.I18N.localizer.Force ()
+        let s          = I18N.localizer.Force()
         let menuSpacer = rawText "  "
+        let _dropdown  = _class "dropdown-btn"
         let leftLinks  = [
-      match m.user with
+            match m.User with
             | Some u ->
-          yield li [ _class "dropdown" ] [
-            a [ _class "dropbtn"; _role "button"; _aria "label" s.["Requests"].Value; _title s.["Requests"].Value ]
-              [ icon "question_answer"; space; encLocText s.["Requests"]; space; icon "keyboard_arrow_down" ]
-            div [ _class "dropdown-content"; _role "menu" ] [
-              a [ _href "/prayer-requests" ]      [ icon "compare_arrows"; menuSpacer; encLocText s.["Maintain"] ]
-              a [ _href "/prayer-requests/view" ] [ icon "list";           menuSpacer; encLocText s.["View List"] ]
-              ]
-            ]
-          yield li [ _class "dropdown" ] [
-            a [ _class "dropbtn"; _role "button"; _aria "label" s.["Group"].Value; _title s.["Group"].Value ]
-              [ icon "group"; space; encLocText s.["Group"]; space; icon "keyboard_arrow_down" ]
-            div [ _class "dropdown-content"; _role "menu" ] [
-              a [ _href "/small-group/members" ]      [ icon "email"; menuSpacer; encLocText s.["Maintain Group Members"] ]
-              a [ _href "/small-group/announcement" ] [ icon "send";  menuSpacer; encLocText s.["Send Announcement"] ]
-              a [ _href "/small-group/preferences" ]  [ icon "build"; menuSpacer; encLocText s.["Change Preferences"] ]
-              ]
-            ]
-          match u.isAdmin with
-          | true ->
-              yield li [ _class "dropdown" ] [
-                a [ _class "dropbtn"; _role "button"; _aria "label" s.["Administration"].Value; _title s.["Administration"].Value ]
-                  [ icon "settings"; space; encLocText s.["Administration"]; space; icon "keyboard_arrow_down" ]
-                div [ _class "dropdown-content"; _role "menu" ] [
-                  a [ _href "/churches" ]     [ icon "home";  menuSpacer; encLocText s.["Churches"] ]
-                  a [ _href "/small-groups" ] [ icon "send";  menuSpacer; encLocText s.["Groups"] ]
-                  a [ _href "/users" ]        [ icon "build"; menuSpacer; encLocText s.["Users"] ]
-                  ]
-                ]
-          | false -> ()
+                li [ _class "dropdown" ] [
+                    a [ _dropdown; _ariaLabel s["Requests"].Value; _title s["Requests"].Value; _roleButton ] [
+                        icon "question_answer"; space; locStr s["Requests"]; space; icon "keyboard_arrow_down" ]
+                    div [ _class "dropdown-content"; _roleMenuBar ] [
+                        a [ _href "/prayer-requests"; _roleMenuItem ] [
+                            icon "compare_arrows"; menuSpacer; locStr s["Maintain"] ]
+                        a [ _href "/prayer-requests/view"; _roleMenuItem ] [
+                            icon "list"; menuSpacer; locStr s["View List"] ] ] ]
+                li [ _class "dropdown" ] [
+                    a [ _dropdown; _ariaLabel s["Group"].Value; _title s["Group"].Value; _roleButton ] [
+                        icon "group"; space; locStr s["Group"]; space; icon "keyboard_arrow_down" ]
+                    div [ _class "dropdown-content"; _roleMenuBar ] [
+                        a [ _href "/small-group/members"; _roleMenuItem ] [
+                            icon "email"; menuSpacer; locStr s["Maintain Group Members"] ]
+                        a [ _href "/small-group/announcement"; _roleMenuItem ] [
+                            icon "send";  menuSpacer; locStr s["Send Announcement"] ]
+                        a [ _href "/small-group/preferences"; _roleMenuItem ] [
+                            icon "build"; menuSpacer; locStr s["Change Preferences"] ] ] ]
+                if u.IsAdmin then
+                    li [ _class "dropdown" ] [
+                        a [ _dropdown
+                            _ariaLabel s["Administration"].Value
+                            _title     s["Administration"].Value
+                            _roleButton ] [
+                            icon "settings"; space; locStr s["Administration"]; space; icon "keyboard_arrow_down" ]
+                        div [ _class "dropdown-content"; _roleMenuBar ] [
+                            a [ _href "/churches"; _roleMenuItem ] [ icon "home";  menuSpacer; locStr s["Churches"] ]
+                            a [ _href "/small-groups"; _roleMenuItem ] [
+                                icon "send";  menuSpacer; locStr s["Groups"] ]
+                            a [ _href "/users"; _roleMenuItem ] [ icon "build"; menuSpacer; locStr s["Users"] ] ] ]
             | None ->
-          match m.group with
+                match m.Group with
                 | Some _ ->
-              yield li [] [
+                    li [] [
                         a [ _href      "/prayer-requests/view"
-                    _aria "label" s.["View Request List"].Value
-                    _title s.["View Request List"].Value ]
-                  [ icon "list"; space; encLocText s.["View Request List"] ]
-                ]
+                            _ariaLabel s["View Request List"].Value
+                            _title     s["View Request List"].Value ] [
+                            icon "list"; space; locStr s["View Request List"] ] ]
                 | None ->
-              yield li [ _class "dropdown" ] [
-                a [ _class "dropbtn"; _role "button"; _aria "label" s.["Log On"].Value; _title s.["Log On"].Value ]
-                  [ icon "security"; space; encLocText s.["Log On"]; space; icon "keyboard_arrow_down" ]
-                div [ _class "dropdown-content"; _role "menu" ] [
-                  a [ _href "/user/log-on" ] [ icon "person"; menuSpacer; encLocText s.["User"] ]
-                  a [ _href "/small-group/log-on" ] [ icon "group"; menuSpacer; encLocText s.["Group"] ]
-                  ]
-                ]
-              yield li [] [
+                    li [ _class "dropdown" ] [
+                        a [ _dropdown; _ariaLabel s["Log On"].Value; _title s["Log On"].Value; _roleButton ] [
+                            icon "security"; space; locStr s["Log On"]; space; icon "keyboard_arrow_down" ]
+                        div [ _class "dropdown-content"; _roleMenuBar ] [
+                            a [ _href "/user/log-on"; _roleMenuItem ] [ icon "person"; menuSpacer; locStr s["User"] ]
+                            a [ _href "/small-group/log-on"; _roleMenuItem ] [
+                                icon "group";  menuSpacer; locStr s["Group"] ] ] ]
+                    li [] [
                         a [ _href      "/prayer-requests/lists"
-                    _aria "label" s.["View Request List"].Value
-                    _title s.["View Request List"].Value ]
-                  [ icon "list"; space; encLocText s.["View Request List"] ]
-                ]
-      yield li [] [
-        a [ _href "/help"; _aria "label" s.["Help"].Value; _title s.["View Help"].Value ]
-          [ icon "help"; space; encLocText s.["Help"] ]
-        ]
-      ]
+                            _ariaLabel s["View Request List"].Value
+                            _title     s["View Request List"].Value ] [
+                            icon "list"; space; locStr s["View Request List"] ] ]
+            li [] [
+                a [ _href "/help"; _ariaLabel s["Help"].Value; _title s["View Help"].Value; _target "_blank" ] [
+                    icon "help"; space; locStr s["Help"] ] ] ]
         let rightLinks =
-      match m.group with
+            match m.Group with
+            | Some _ -> [
+                match m.User with
                 | Some _ ->
-          [ match m.user with
-            | Some _ ->
-                yield li [] [
+                    li [] [
                         a [ _href      "/user/password"
-                      _aria "label" s.["Change Your Password"].Value
-                      _title s.["Change Your Password"].Value ]
-                    [ icon "lock"; space; encLocText s.["Change Your Password"] ]
-                  ]
+                            _ariaLabel s["Change Your Password"].Value
+                            _title     s["Change Your Password"].Value ] [
+                            icon "lock"; space; locStr s["Change Your Password"] ] ]
                 | None -> ()
-            yield li [] [
-              a [ _href "/log-off"; _aria "label" s.["Log Off"].Value; _title s.["Log Off"].Value ]
-                [ icon "power_settings_new"; space; encLocText s.["Log Off"] ]
-              ]
-            ]
-      | None -> List.empty
-    header [ _class "pt-title-bar" ] [
-      section [ _class "pt-title-bar-left" ] [
+                li [] [
+                    a [ _href "/log-off"; _ariaLabel s["Log Off"].Value; _title s["Log Off"].Value; Target.body ] [
+                        icon "power_settings_new"; space; locStr s["Log Off"] ] ] ]
+            | None -> []
+        header [ _class "pt-title-bar"; Target.content ] [
+            section [ _class "pt-title-bar-left"; _ariaLabel "Left side of top menu" ] [
                 span [ _class "pt-title-bar-home" ] [
-          a [ _href "/"; _title s.["Home"].Value ] [ encLocText s.["PrayerTracker"] ]
-          ]
-        ul [] leftLinks
-        ]
-      section [ _class "pt-title-bar-center" ] []
-      section [ _class "pt-title-bar-right"; _role "toolbar" ] [
-        ul [] rightLinks
-        ]
-      ]
+                    a [ _href "/"; _title s["Home"].Value ] [ locStr s["PrayerTracker"] ] ]
+                ul [] leftLinks ]
+            section [ _class "pt-title-bar-center"; _ariaLabel "Empty center space in top menu" ] []
+            section [ _class "pt-title-bar-right"; _roleToolBar; _ariaLabel "Right side of top menu" ] [
+                ul [] rightLinks ] ]
     
     /// Identity bar (below top nav)
     let identity m =
-    let s = I18N.localizer.Force ()
-    header [ _id "pt-language" ] [
+        let s = I18N.localizer.Force()
+        header [ _id "pt-language"; Target.body ] [
             div [] [
-        yield span [ _class "u" ] [ encLocText s.["Language"]; rawText ": " ]
-        match CultureInfo.CurrentCulture.Name.StartsWith "es" with
-        | true -> 
-            yield encLocText s.["Spanish"]
-            yield rawText "   •   "
-            yield a [ _href "/language/en" ] [ encLocText s.["Change to English"] ]
-        | false ->
-            yield encLocText s.["English"]
-            yield rawText "   •   "
-            yield a [ _href "/language/es" ] [ encLocText s.["Cambie a Español"] ]
-        ]
-      match m.group with
+                span [ _title s["Language"].Value ] [ icon "record_voice_over"; space ]
+                match langCode () with
+                | "es" -> 
+                    strong [] [ locStr s["Spanish"] ]
+                    rawText "     "
+                    a [ _href "/language/en" ] [ locStr s["Change to English"] ]
+                | _ ->
+                    strong [] [ locStr s["English"] ]
+                    rawText "     "
+                    a [ _href "/language/es" ] [ locStr s["Cambie a Español"] ] ]
+            match m.Group with
             | Some g ->
-          [ match m.user with
+                [ match m.User with
                   | Some u ->
-                yield span [ _class "u" ] [ encLocText s.["Currently Logged On"] ]
-                yield rawText "   "
-                yield icon "person"
-                yield strong [] [ encodedText u.fullName ]
-                yield rawText "    "
+                      span [ _class "u" ] [ locStr s["Currently Logged On"] ]
+                      rawText "   "
+                      icon "person"
+                      strong [] [ str u.Name ]
+                      rawText "    "
                   | None ->
-                yield encLocText s.["Logged On as a Member of"]
-                yield rawText "  "
-            yield icon "group"
-            yield space
-            match m.user with
-            | Some _ -> yield  a [ _href "/small-group" ] [ strong [] [ encodedText g.name ] ]
-            | None -> yield strong [] [ encodedText g.name ]
-            yield rawText "  "
-            ]
+                      locStr s["Logged On as a Member of"]
+                      rawText "  "
+                  icon "group"
+                  space
+                  match m.User with
+                  | Some _ -> a [ _href "/small-group"; Target.content ] [ strong [] [ str g.Name ] ]
+                  | None -> strong [] [ str g.Name ] ]
             | None -> []
-      |> div []
-      ]
+            |> div [] ]
+
 
 /// Content layouts
 module Content =
+  
     /// Content layout that tops at 60rem
     let standard = div [ _class "pt-content" ]
 
@@ -158,158 +148,205 @@ module Content =
 /// Separator for parts of the title
 let private titleSep = rawText " « "
 
-let private commonHead =
-  [ meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
+/// Common HTML head tag items
+let private commonHead = [
+    meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
     meta [ _name "generator"; _content "Giraffe" ]
     link [ _rel "stylesheet"; _href "https://fonts.googleapis.com/icon?family=Material+Icons" ]
-    link [ _rel "stylesheet"; _href "/css/app.css" ]
-    script [ _src "/js/app.js" ] []
-    ]
+    link [ _rel "stylesheet"; _href "/css/app.css" ] ]
 
 /// Render the <head> portion of the page
-let private htmlHead m pageTitle =
-  let s = I18N.localizer.Force ()
+let private htmlHead viewInfo pgTitle =
+    let s = I18N.localizer.Force()
     head [] [
-    yield meta [ _charset "UTF-8" ]
-    yield title [] [ encLocText pageTitle; titleSep; encLocText s.["PrayerTracker"] ]
+        meta [ _charset "UTF-8" ]
+        title [] [ locStr pgTitle; titleSep; locStr s["PrayerTracker"] ]
         yield! commonHead
-    for cssFile in m.style do
-      yield link [ _rel "stylesheet"; _href (sprintf "/css/%s.css" cssFile); _type "text/css" ]
-    for jsFile in m.script do
-      yield script [ _src (sprintf "/js/%s.js" jsFile) ] []
-    ]
+        for cssFile in viewInfo.Style do
+            link [ _rel "stylesheet"; _href $"/css/{cssFile}.css"; _type "text/css" ] ]
+
+
+open Giraffe.ViewEngine.Htmx
 
 /// Render a link to the help page for the current page
 let private helpLink link =
-  let s = I18N.localizer.Force ()
-  sup [] [
-    a [ _href (sprintf "/help/%s" link)
-        _title s.["Click for Help on This Page"].Value
-        _onclick (sprintf "return PT.showHelp('%s')" link) ] [
-      icon "help_outline"
-      ]
-    ]
+    let s = I18N.localizer.Force()
+    sup [ _class "pt-help-link" ] [
+        a [ _href    link
+            _title   s["Click for Help on This Page"].Value
+            _onclick $"return PT.showHelp('{link}')"
+            _hxNoBoost ] [ iconSized 18 "help_outline" ] ]
 
 /// Render the page title, and optionally a help link
-let private renderPageTitle m pageTitle =
+let private renderPageTitle viewInfo pgTitle =
     h2 [ _id "pt-page-title" ] [
-    match m.helpLink with
-    | x when x = HelpPage.None -> ()
-    | _ -> yield helpLink m.helpLink.Url
-    yield encLocText pageTitle
-    ]
+        match viewInfo.HelpLink with
+        | Some link -> helpLink $"/help/{link}"
+        | None -> ()
+        locStr pgTitle ]
 
 /// Render the messages that may need to be displayed to the user
-let private messages m =
-  let s = I18N.localizer.Force ()
-  m.messages
+let private messages viewInfo =
+    let s = I18N.localizer.Force()
+    if List.isEmpty viewInfo.Messages then []
+    else
+        viewInfo.Messages
         |> List.map (fun msg ->
-      table [ _class (sprintf "pt-msg %s" (msg.level.ToLower ())) ] [
-        tr [] [
-          td [] [
-            match msg.level with
-            | "Info" -> ()
+            div [ _class $"pt-msg {MessageLevel.toCssClass msg.Level}" ] [
+                match msg.Level with
+                | Info -> ()
                 | lvl ->
-                yield strong [] [ encLocText s.[lvl] ]
-                yield rawText " &#xbb; "
-            yield rawText msg.text.Value
-            match msg.description with
+                    strong [] [ locStr s[MessageLevel.toString lvl] ]
+                    rawText " &#xbb; "
+                rawText msg.Text.Value
+                match msg.Description with
                 | Some desc ->
-                yield br []
-                yield div [ _class "description" ] [ rawText desc.Value ]
-            | None -> ()
-            ]
-          ]
-        ])
+                    br []
+                    div [ _class "description" ] [ rawText desc.Value ]
+                | None -> () ])
+        |> div [ _class "pt-messages" ]
+        |> List.singleton
+
+
+open NodaTime
 
 /// Render the <footer> at the bottom of the page
-let private htmlFooter m =
-  let s = I18N.localizer.Force ()
-  let imgText = sprintf "%O %O" s.["PrayerTracker"] s.["from Bit Badger Solutions"]
-  let resultTime = TimeSpan(DateTime.Now.Ticks - m.requestStart).TotalSeconds
-  footer [] [
+let private htmlFooter viewInfo =
+    let s          = I18N.localizer.Force()
+    let imgText    = $"""%O{s["PrayerTracker"]} %O{s["from Bit Badger Solutions"]}"""
+    let resultTime = (SystemClock.Instance.GetCurrentInstant() - viewInfo.RequestStart).TotalSeconds
+    footer [ _class "pt-footer" ] [
         div [ _id "pt-legal" ] [
-      a [ _href "/legal/privacy-policy" ] [ encLocText s.["Privacy Policy"] ]
-      rawText " &bull; "
-      a [ _href "/legal/terms-of-service" ] [ encLocText s.["Terms of Service"] ]
-      rawText " &bull; "
-      a [ _href "https://github.com/bit-badger/PrayerTracker"
-          _title s.["View source code and get technical support"].Value
+            a [ _href "/legal/privacy-policy" ] [ locStr s["Privacy Policy"] ]
+            rawText " &nbsp; "
+            a [ _href "/legal/terms-of-service" ] [ locStr s["Terms of Service"] ]
+            rawText " &nbsp; "
+            a [ _href   "https://git.bitbadger.solutions/bit-badger/PrayerTracker"
+                _title  s["View source code and get technical support"].Value
                 _target "_blank"
-          _rel "noopener" ] [
-        encLocText s.["Source & Support"]
-        ]
-      ]
+                _relNoOpener ] [
+                locStr s["Source & Support"] ] ]
         div [ _id "pt-footer" ] [
             a [ _href "/"; _style "line-height:28px;" ] [
-        img [ _src (sprintf "/img/%O.png" s.["footer_en"]); _alt imgText; _title imgText ]
-        ]
-      encodedText m.version
+                img [ _src   $"""/img/%O{s["footer_en"]}.png"""
+                      _alt   imgText
+                      _title imgText
+                      _width "331"; _height "28" ] ]
+            span [ _id "pt-version" ] [ str viewInfo.Version ]
             space
-      i [ _title s.["This page loaded in {0:N3} seconds", resultTime].Value; _class "material-icons md-18" ] [
-        encodedText "schedule"
-        ]
-      ]
-    ]
+            i [ _title s["This page loaded in {0:N3} seconds", resultTime].Value; _class "material-icons md-18" ] [
+                str "schedule" ] ] ]
 
-/// The standard layout for PrayerTracker
-let standard m pageTitle content =
-  let s   = I18N.localizer.Force ()
-  let ttl = s.[pageTitle]
-  html [ _lang "" ] [
-    htmlHead m ttl
-    body [] [
-      Navigation.top m
-      div [ _id "pt-body" ] [
-        yield  Navigation.identity m
-        yield  renderPageTitle m ttl
-        yield! messages m
-        yield  content
-        yield  htmlFooter m
-        ]
-      ]
-    ]
+/// The content portion of the PrayerTracker layout
+let private contentSection viewInfo pgTitle (content: XmlNode) =
+    [ Navigation.identity viewInfo
+      renderPageTitle viewInfo pgTitle
+      yield! messages viewInfo
+      match viewInfo.ScopedStyle with
+      | [] -> ()
+      | styles -> style [] [ rawText (styles |> String.concat " ") ]
+      content
+      htmlFooter viewInfo
+      match viewInfo.OnLoadScript with
+      | Some onLoad ->
+          let doCall = if onLoad.EndsWith ")" then "" else "()"
+          script [] [
+              rawText $"
+                  window.doOnLoad = () => {{
+                      if (window.PT) {{
+                          {onLoad}{doCall}
+                          delete window.doOnLoad
+                      }} else {{ setTimeout(window.doOnLoad, 500) }}
+                  }}
+                  window.doOnLoad()" ]
+      | None -> () ]
+
+/// The HTML head element for partial responses
+let private partialHead pgTitle =
+    let s = I18N.localizer.Force()
+    head [] [
+        meta [ _charset "UTF-8" ]
+        title [] [ locStr pgTitle; titleSep; locStr s["PrayerTracker"] ] ]
+
+open Giraffe.Htmx.Common
+
+/// The body of the PrayerTracker layout
+let private pageLayout viewInfo pgTitle content =
+    body [ _hxBoost ] [
+        Navigation.top viewInfo
+        div [ _id "pt-body"; Target.content; _hxSwap $"{HxSwap.InnerHtml} show:window:top" ]
+            (contentSection viewInfo pgTitle content)
+        match viewInfo.Layout with
+        | FullPage ->
+            Script.minified
+            script [ _src "/js/ckeditor/ckeditor.js" ] []
+            script [ _src "/js/app.js" ] []
+        | _ -> () ]
+    
+/// The standard layout(s) for PrayerTracker
+let standard viewInfo pageTitle content =
+    let s       = I18N.localizer.Force()
+    let pgTitle = s[pageTitle]
+    html [ _lang (langCode ()) ] [
+        match viewInfo.Layout with
+        | FullPage ->
+            htmlHead   viewInfo pgTitle
+            pageLayout viewInfo pgTitle content
+        | PartialPage ->
+            partialHead pgTitle
+            pageLayout viewInfo pgTitle content
+        | ContentOnly ->
+            partialHead pgTitle
+            body [] (contentSection viewInfo pgTitle content) ]
 
 /// A layout with nothing but a title and content
 let bare pageTitle content =
-  let s   = I18N.localizer.Force ()
-  let ttl = s.[pageTitle]
-  html [ _lang "" ] [
+    let s = I18N.localizer.Force()
+    html [ _lang (langCode ()) ] [
+        partialHead s[pageTitle]
+        body [] [ content ] ]
+
+/// Help page layout
+let help pageTitle isHome content =
+    let s       = I18N.localizer.Force()
+    let pgTitle = s[pageTitle]
+    html [ _lang (langCode ()) ] [
         head [] [
             meta [ _charset "UTF-8" ]
-      title [] [ encLocText ttl; titleSep; encLocText s.["PrayerTracker"] ]
-      ]
-    body [] [
-      content
-      ]
-    ]
-
-/// Help layout
-let help pageTitle content =
-  let s   = I18N.localizer.Force ()
-  let ttl = s.[pageTitle]
-  html [ _lang "" ] [
-    head [] [
-      yield meta [ _charset "UTF-8" ]
-      yield title [] [ encLocText ttl; titleSep; encLocText s.["Help"]; titleSep; encLocText s.["PrayerTracker"] ]
-      yield! commonHead
-      yield link [ _rel "stylesheet"; _href "/css/help.css" ]
-      ]
+            meta [ _name "viewport"; _content "width=device-width, initial-scale=1" ]
+            title [] [ locStr pgTitle; titleSep; locStr s["PrayerTracker Help"] ]
+            link [ _href "https://fonts.googleapis.com/icon?family=Material+Icons"; _rel "stylesheet" ]
+            link [ _href "/css/app.css"; _rel "stylesheet" ]
+            link [ _href "/css/help.css"; _rel "stylesheet" ] ]
         body [] [
             header [ _class "pt-title-bar" ] [
-        section [ _class "pt-title-bar-left" ] [ encLocText s.["PrayerTracker"] ]
-        section [ _class "pt-title-bar-right" ] [ encLocText s.["Help"] ]
-        ]
+                section [ _class "pt-title-bar-left" ] [
+                    span [ _class "pt-title-bar-home" ] [
+                        a [ _href "/help"; _title "Home" ] [ locStr s["PrayerTracker"] ] ] ]
+                section [ _class "pt-title-bar-right" ] [ locStr s["Help"] ] ]
+            div [ _id "pt-body" ] [
+                header [ _id "pt-language" ] [
+                    div [] [
+                        locStr s["Language"]; rawText ": "
+                        match langCode () with
+                        | "es" -> 
+                            locStr s["Spanish"]; rawText " &bull; "
+                            a [ _href "/language/en" ] [ locStr s["Change to English"] ]
+                        | _ ->
+                            locStr s["English"]; rawText " &bull; "
+                            a [ _href "/language/es" ] [ locStr s["Cambie a Español"] ] ] ]
+                h2 [ _id "pt-page-title" ] [ locStr pgTitle ]
                 div [ _class "pt-content" ] [
-        yield h2 [] [ encLocText ttl ]
                     yield! content
-        yield p [ _class "pt-center-text" ] [
-          a [ _href "#"
-              _title s.["Click to Close This Window"].Value
-              _onclick "window.close();return false" ] [
-            tag "big" [] [ icon "cancel"; space; encLocText s.["Close Window"] ]
-            ]
-          ]
-        ]
-      ]
-    ]
+                    div [ _class "pt-close-window" ] [
+                        p [ _class "pt-center-text" ] [
+                            a [ _href "#"; _title s["Click to Close This Window"].Value
+                                _onclick "window.close(); return false" ] [
+                                i [ _class "material-icons"] [ rawText "cancel" ]
+                                space; locStr s["Close Window"] ] ] ]
+                    if not isHome then
+                        div [ _class "pt-help-index" ] [
+                            p [ _class "pt-center-text" ] [
+                                a [ _href "/help"; _title s["Help Index"].Value ] [
+                                    rawText "&#xab; "; locStr s["Back to Help Index"] ] ] ] ] ] ] ]
+    

src/PrayerTracker.UI/PrayerRequest.fs

@@ -1,158 +1,148 @@
 module PrayerTracker.Views.PrayerRequest
 
+open System.Globalization
+open System.IO
 open Giraffe
-open Giraffe.GiraffeViewEngine
+open Giraffe.ViewEngine
+open Giraffe.ViewEngine.Accessibility
+open Giraffe.ViewEngine.Htmx
 open Microsoft.AspNetCore.Http
 open NodaTime
 open PrayerTracker
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.IO
-open System.Text
 
 /// View for the prayer request edit page
-let edit (m : EditRequest) today ctx vi =
+let edit (model : EditRequest) today ctx viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = match m.isNew () with true -> "Add a New Request" | false -> "Edit Request"
-  [ form [ _action "/prayer-request/save"; _method "post"; _class "pt-center-columns" ] [
+    let pageTitle = if model.IsNew then "Add a New Request" else "Edit Request"
+    let vi        = AppViewInfo.withOnLoadScript "PT.initCKEditor" viewInfo
+    form [ _action   "/prayer-request/save"
+           _method   "post"
+           _class    "pt-center-columns"
+           _onsubmit "PT.updateCKEditor()"
+           Target.content ] [
         csrfToken ctx
-      input [ _type "hidden"; _name "requestId"; _value (m.requestId.ToString "N") ]
-      div [ _class "pt-field-row" ] [
-        yield div [ _class "pt-field" ] [
-          label [ _for "requestType" ] [ encLocText s.["Request Type"] ]
+        inputField "hidden" (nameof model.RequestId) model.RequestId []
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.RequestType) ] [ locStr s["Request Type"] ]
                 ReferenceList.requestTypeList s
                 |> Seq.ofList
-          |> Seq.map (fun item -> fst item, (snd item).Value)
-          |> selectList "requestType" m.requestType [ _required; _autofocus ]
+                |> Seq.map (fun (typ, desc) -> PrayerRequestType.toCode typ, desc.Value)
+                |> selectList (nameof model.RequestType) model.RequestType [ _required; _autofocus ]
             ]
-        yield div [ _class "pt-field" ] [
-          label [ _for "requestor" ] [ encLocText s.["Requestor / Subject"] ]
-          input [ _type "text"
-                  _name "requestor"
-                  _id "requestor"
-                  _value (match m.requestor with Some x -> x | None -> "") ]
+            div [ _inputField ] [
+                label [ _for (nameof model.Requestor) ] [ locStr s["Requestor / Subject"] ]
+                inputField "text" (nameof model.Requestor) (defaultArg model.Requestor "") []
             ]
-        match m.isNew () with
-        | true ->
-            yield div [ _class "pt-field" ] [
-              label [ _for "enteredDate" ] [ encLocText s.["Date"] ]
-              input [ _type "date"; _name "enteredDate"; _id "enteredDate"; _placeholder today ]
+            if model.IsNew then
+                div [ _inputField ] [
+                    label [ _for (nameof model.EnteredDate) ] [ locStr s["Date"] ]
+                    inputField "date" (nameof model.EnteredDate) "" [ _placeholder today ]
                 ]
-        | false ->
-            yield div [ _class "pt-field" ] [
-              div [ _class "pt-checkbox-field" ] [
+            else
+                div [ _inputField ] [
                     br []
-                input [ _type "checkbox"; _name "skipDateUpdate"; _id "skipDateUpdate"; _value "True" ]
-                label [ _for "skipDateUpdate" ] [ encLocText s.["Check to not update the date"] ]
-                br []
-                small [] [ em [] [ encodedText (s.["Typo Corrections"].Value.ToLower ()); rawText ", etc." ] ]
+                    div [ _checkboxField ] [
+                        inputField "checkbox" (nameof model.SkipDateUpdate) "True" []
+                        label [ _for (nameof model.SkipDateUpdate) ] [ locStr s["Check to not update the date"] ]
+                    ]
+                    small [] [ em [] [ str (s["Typo Corrections"].Value.ToLower ()); rawText ", etc." ] ]
+                ]
+        ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [] [ locStr s["Expiration"] ]
+                span [ _group ] [
+                    for code, name in ReferenceList.expirationList s (not model.IsNew) do
+                        label [] [ radio (nameof model.Expiration) "" code model.Expiration; locStr name ]
                 ]
             ]
         ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [] [ encLocText s.["Expiration"] ]
-          ReferenceList.expirationList s ((m.isNew >> not) ())
-          |> List.map (fun exp ->
-              let radioId = sprintf "expiration_%s" (fst exp)
-              span [ _class "text-nowrap" ] [
-                radio "expiration" radioId (fst exp) m.expiration
-                label [ _for radioId ] [ encLocText (snd exp) ]
-                rawText "     "
-                ])
-          |> div [ _class "pt-center-text" ]
+        div [ _fieldRow ] [
+            div [ _inputFieldWith [ "pt-editor" ] ] [
+                label [ _for (nameof model.Text) ] [ locStr s["Request"] ]
+                textarea [ _name (nameof model.Text); _id (nameof model.Text) ] [ str model.Text ]
             ]
         ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field pt-editor" ] [
-          label [ _for "text" ] [ encLocText s.["Request"] ]
-          textarea [ _name "text"; _id "text" ] [ encodedText m.text ]
-          ]
-        ]
-      div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Request"] ]
-      ]
-    script [] [ rawText "PT.onLoad(PT.initCKEditor)" ]
+        div [ _fieldRow ] [ submit [] "save" s["Save Request"] ]
     ]
+    |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi pageTitle
 
 /// View for the request e-mail results page
-let email m vi =
+let email model viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = sprintf "%s • %s" s.["Prayer Requests"].Value m.listGroup.name
-  let prefs     = m.listGroup.preferences
-  let addresses =
-    m.recipients
-    |> List.fold (fun (acc : StringBuilder) mbr -> acc.AppendFormat(", {0} <{1}>", mbr.memberName, mbr.email))
-                 (StringBuilder ())
-  [ p [ _style (sprintf "font-family:%s;font-size:%ipt;" prefs.listFonts prefs.textFontSize) ] [
-      encLocText s.["The request list was sent to the following people, via individual e-mails"]
+    let pageTitle = $"""{s["Prayer Requests"].Value} • {model.SmallGroup.Name}"""
+    let prefs     = model.SmallGroup.Preferences
+    let addresses = model.Recipients |> List.map (fun mbr -> $"{mbr.Name} <{mbr.Email}>") |> String.concat ", "
+    [   p [ _style $"font-family:{prefs.FontStack};font-size:%i{prefs.TextFontSize}pt;" ] [
+            locStr s["The request list was sent to the following people, via individual e-mails"]
             rawText ":"
             br []
-      small [] [ encodedText (addresses.Remove(0, 2).ToString ()) ]
+            small [] [ str addresses ]
         ]
-    span [ _class "pt-email-heading" ] [ encLocText s.["HTML Format"]; rawText ":" ]
-    div [ _class "pt-email-canvas" ] [ rawText (m.asHtml s) ]
+        span [ _class "pt-email-heading" ] [ locStr s["HTML Format"]; rawText ":" ]
+        div [ _class "pt-email-canvas" ] [ rawText (model.AsHtml s) ]
         br []
         br []
-    span [ _class "pt-email-heading" ] [ encLocText s.["Plain-Text Format"]; rawText ":" ]
-    div[ _class "pt-email-canvas" ] [ pre [] [ encodedText (m.asText s) ] ]
+        span [ _class "pt-email-heading" ] [ locStr s["Plain-Text Format"]; rawText ":" ]
+        div [ _class "pt-email-canvas" ] [ pre [] [ str (model.AsText s) ] ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi pageTitle
+    |> Layout.standard viewInfo pageTitle
 
 
 /// View for a small group's public prayer request list
-let list (m : RequestList) vi =
+let list (model : RequestList) viewInfo =
     [   br []
-    I18N.localizer.Force () |> (m.asHtml >> rawText) 
+        I18N.localizer.Force () |> (model.AsHtml >> rawText) 
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "View Request List"
+    |> Layout.standard viewInfo "View Request List"
 
 
 /// View for the prayer request lists page
-let lists (grps : SmallGroup list) vi =
+let lists (groups : SmallGroupInfo list) viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "Requests/Lists"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
-  [ yield p [] [
-      raw l.["The groups listed below have either public or password-protected request lists."]
+    let vi  = AppViewInfo.withScopedStyles [ "#groupList { grid-template-columns: repeat(3, auto); }" ] viewInfo
+    [   p [] [
+            raw l["The groups listed below have either public or password-protected request lists."]
             space
-      raw l.["Those with list icons are public, and those with log on icons are password-protected."]
+            raw l["Those with list icons are public, and those with log on icons are password-protected."]
             space
-      raw l.["Click the appropriate icon to log on or view the request list."]
+            raw l["Click the appropriate icon to log on or view the request list."]
         ]
-    match grps.Length with
-    | 0 -> yield p [] [ raw l.["There are no groups with public or password-protected request lists."] ]
+        match groups.Length with
+        | 0 -> p [] [ raw l["There are no groups with public or password-protected request lists."] ]
         | count ->
-        yield tableSummary count s
-        yield table [ _class "pt-table pt-action-table" ] [
-          thead [] [
-            tr [] [
-              th [] [ encLocText s.["Actions"] ]
-              th [] [ encLocText s.["Church"] ]
-              th [] [ encLocText s.["Group"] ]
+            tableSummary count s
+            section [ _id "groupList"; _class "pt-table"; _ariaLabel "Small group list" ] [
+                div [ _class "row head" ] [
+                    header [ _class "cell" ] [ locStr s["Actions"] ]
+                    header [ _class "cell" ] [ locStr s["Church"] ]
+                    header [ _class "cell" ] [ locStr s["Group"] ]
+                ]
+                for group in groups do
+                    div [ _class "row" ] [
+                        div [ _class "cell actions" ] [
+                            if group.IsPublic then
+                                a [ _href $"/prayer-requests/{group.Id}/list"; _title s["View"].Value ] [
+                                    iconSized 18 "list"
+                                ]
+                            else
+                                a [ _href $"/small-group/log-on/{group.Id}"; _title s["Log On"].Value ] [
+                                    iconSized 18 "verified_user"
                                 ]
                         ]
-          grps
-          |> List.map (fun grp ->
-              let grpId = grp.smallGroupId.ToString "N"
-              tr [] [
-                match grp.preferences.isPublic with
-                | true ->
-                    a [ _href (sprintf "/prayer-requests/%s/list" grpId); _title s.["View"].Value ] [ icon "list" ]
-                | false ->
-                    a [ _href (sprintf "/small-group/log-on/%s" grpId); _title s.["Log On"].Value ]
-                      [ icon "verified_user" ]
-                |> List.singleton
-                |> td []
-                td [] [ encodedText grp.church.name ]
-                td [] [ encodedText grp.name ]
-                ])
-          |> tbody []
+                        div [ _class "cell" ] [ str group.ChurchName ]
+                        div [ _class "cell" ] [ str group.Name ]
+                    ]
             ]
     ]
     |> Layout.Content.standard
@@ -160,163 +150,204 @@ let lists (grps : SmallGroup list) vi =
 
 
 /// View for the prayer request maintenance page
-let maintain (reqs : PrayerRequest seq) (grp : SmallGroup) onlyActive (ctx : HttpContext) vi =
+let maintain (model : MaintainRequests) (ctx : HttpContext) viewInfo =
     let s     = I18N.localizer.Force ()
-  let now  = grp.localDateNow (ctx.GetService<IClock> ())
-  let typs = ReferenceList.requestTypeList s |> Map.ofList
-  let updReq (req : PrayerRequest) =
-    match req.updateRequired now grp.preferences.daysToExpire grp.preferences.longTermUpdateWeeks with
-    | true -> "pt-request-update"
-    | false -> ""
-    |> _class 
-  let reqExp (req : PrayerRequest) =
-    _class (match req.isExpired now grp.preferences.daysToExpire with true -> "pt-request-expired" | false -> "")
+    let l     = I18N.forView "Requests/Maintain"
+    use sw    = new StringWriter ()
+    let raw   = rawLocText sw
+    let group = model.SmallGroup
+    let now   = SmallGroup.localDateNow (ctx.GetService<IClock> ()) group
+    let types = ReferenceList.requestTypeList s |> Map.ofList
+    let vi    = AppViewInfo.withScopedStyles [ "#requestList { grid-template-columns: repeat(5, auto); }" ] viewInfo
     /// Iterate the sequence once, before we render, so we can get the count of it at the top of the table
     let requests =
-    reqs
-    |> Seq.map (fun req ->
-        let reqId     = req.prayerRequestId.ToString "N"
-        let reqText   = Utils.htmlToPlainText req.text
-        let delAction = sprintf "/prayer-request/%s/delete" reqId
-        let delPrompt = s.["Are you want to delete this prayer request?  This action cannot be undone.\\n(If the prayer request has been answered, or an event has passed, consider inactivating it instead.)"].Value
-        tr [] [
-          td [] [
-            yield a [ _href (sprintf "/prayer-request/%s/edit" reqId); _title s.["Edit This Prayer Request"].Value ]
-              [ icon "edit" ]
-            match req.isExpired now grp.preferences.daysToExpire with
-            | true ->
-                yield a [ _href (sprintf "/prayer-request/%s/restore" reqId)
-                          _title s.["Restore This Inactive Request"].Value ]
-                  [ icon "visibility" ]
-            | false ->
-                yield a [ _href (sprintf "/prayer-request/%s/expire" reqId)
-                          _title s.["Expire This Request Immediately"].Value ]
-                  [ icon "visibility_off" ]
-            yield a [ _href delAction; _title s.["Delete This Request"].Value;
-                      _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-              [ icon "delete_forever" ]
+        model.Requests
+        |> List.map (fun req ->
+            let updateClass  =
+                _class (if PrayerRequest.updateRequired now group req then "cell pt-request-update" else "cell")
+            let isExpired    = PrayerRequest.isExpired now group req
+            let expiredClass = _class (if isExpired then "cell pt-request-expired" else "cell")
+            let reqId        = shortGuid req.Id.Value
+            let reqText      = htmlToPlainText req.Text
+            let delAction    = $"/prayer-request/{reqId}/delete"
+            let delPrompt    =
+                [   s["Are you sure you want to delete this {0}?  This action cannot be undone.",
+                        s["Prayer Request"].Value.ToLower() ].Value
+                    "\\n"
+                    l["(If the prayer request has been answered, or an event has passed, consider inactivating it instead.)"]
+                        .Value
                 ]
-          td [ updReq req ] [
-            encodedText (req.updatedDate.ToString(s.["MMMM d, yyyy"].Value,
-                            System.Globalization.CultureInfo.CurrentUICulture))
+                |> String.concat ""
+            div [ _class "row" ] [
+                div [ _class "cell actions" ] [
+                    a [ _href $"/prayer-request/{reqId}/edit"; _title l["Edit This Prayer Request"].Value ] [
+                        iconSized 18 "edit"
                     ]
-          td [] [ encLocText typs.[req.requestType] ]
-          td [ reqExp req ] [ encodedText (match req.requestor with Some r -> r | None -> " ") ]
-          td [] [
-            yield
-              match 60 > reqText.Length with
-              | true -> rawText reqText
-              | false -> rawText (sprintf "%s&hellip;" (reqText.Substring (0, 60)))
+                    if isExpired then
+                        a [ _href  $"/prayer-request/{reqId}/restore"
+                            _title l["Restore This Inactive Request"].Value ] [
+                            iconSized 18 "visibility"
+                        ]
+                    else
+                        a [ _href  $"/prayer-request/{reqId}/expire"
+                            _title l["Expire This Request Immediately"].Value ] [
+                            iconSized 18 "visibility_off"
+                        ]
+                    a [ _href      delAction
+                        _title     l["Delete This Request"].Value
+                        _hxPost    delAction
+                        _hxConfirm delPrompt ] [
+                        iconSized 18 "delete_forever"
+                    ]
+                ]
+                div [ updateClass ] [
+                    str (req.UpdatedDate.ToString(s["MMMM d, yyyy"].Value, CultureInfo.CurrentUICulture))
+                ]
+                div [ _class "cell" ] [ locStr types[req.RequestType] ]
+                div [ expiredClass ] [ str (match req.Requestor with Some r -> r | None -> " ") ]
+                div [ _class "cell" ] [
+                    match reqText.Length with
+                    | len when len < 60 -> rawText reqText
+                    | _ -> rawText $"{reqText[0..59]}&hellip;"
                 ]
             ])
         |> List.ofSeq
-  [ div [ _class "pt-center-text" ] [
-      br []
-      a [ _href (sprintf "/prayer-request/%s/edit" emptyGuid); _title s.["Add a New Request"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Request"] ]
-      rawText " &nbsp; &nbsp; &nbsp; "
-      a [ _href "/prayer-requests/view"; _title s.["View Prayer Request List"].Value ]
-        [ icon "list"; rawText " &nbsp;"; encLocText s.["View Prayer Request List"] ]
-      br []
-      br []
+    [   br []
+        div [ _fieldRow ] [
+            span [ _group ] [
+                a [ _href $"/prayer-request/{emptyGuid}/edit"; _title s["Add a New Request"].Value ] [
+                    icon "add_circle"; rawText " &nbsp;"; locStr s["Add a New Request"]
                 ]
+                a [ _href "/prayer-requests/view"; _title s["View Prayer Request List"].Value ] [
+                    icon "list"; rawText " &nbsp;"; locStr s["View Prayer Request List"]
+                ]
+                match model.SearchTerm with
+                | Some _ ->
+                    a [ _href "/prayer-requests"; _title l["Clear Search Criteria"].Value ] [
+                        icon "highlight_off"; rawText " &nbsp;"; raw l["Clear Search Criteria"]
+                    ]
+                | None -> ()
+            ]
+        ]
+        form [ _action "/prayer-requests"; _method "get"; _class "pt-center-text pt-search-form"; Target.content ] [
+            inputField "text" "search" (defaultArg model.SearchTerm "") [ _placeholder l["Search requests..."].Value ]
+            space
+            submit [] "search" s["Search"]
+        ]
+        br []
         tableSummary requests.Length s
-    table [ _class "pt-table pt-action-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Updated Date"] ]
-          th [] [ encLocText s.["Type"] ]
-          th [] [ encLocText s.["Requestor"] ]
-          th [] [ encLocText s.["Request"] ]
+        match requests.Length with
+        | 0 -> ()
+        | _ ->
+            form [ _method "post" ] [
+                csrfToken ctx
+                section [ _id "requestList"; _class "pt-table"; _ariaLabel "Prayer request list" ] [
+                    div [ _class "row head" ] [
+                        header [ _class "cell" ] [ locStr s["Actions"] ]
+                        header [ _class "cell" ] [ locStr s["Updated Date"] ]
+                        header [ _class "cell" ] [ locStr s["Type"] ]
+                        header [ _class "cell" ] [ locStr s["Requestor"] ]
+                        header [ _class "cell" ] [ locStr s["Request"] ]
                     ]
+                    yield! requests
                 ]
-      tbody [] requests
             ]
         div [ _class "pt-center-text" ] [
-      yield br []
-      match onlyActive with
+            br []
+            match model.OnlyActive with
+            | Some true ->
+                raw l["Inactive requests are currently not shown"]
+                br []
+                a [ _href "/prayer-requests/inactive" ] [ raw l["Show Inactive Requests"] ]
+            | _ ->
+                if Option.isSome model.OnlyActive then
+                    raw l["Inactive requests are currently shown"]
+                    br []
+                    a [ _href "/prayer-requests" ] [ raw l["Do Not Show Inactive Requests"] ]
+                    br []
+                    br []
+                let search = [ match model.SearchTerm with Some s -> "search", s | None -> () ]
+                let pg     = defaultArg model.PageNbr 1
+                let url    =
+                    match model.OnlyActive with Some true | None -> "" | _ -> "/inactive"
+                    |> sprintf "/prayer-requests%s"
+                match pg with
+                | 1 -> ()
+                | _ ->
+                    // button (_type "submit" :: attrs) [ icon ico; rawText " &nbsp;"; locStr text ]
+                    let withPage = match pg with 2 -> search | _ -> ("page", string (pg - 1)) :: search
+                    a [ _href (makeUrl url withPage) ] [ icon "keyboard_arrow_left"; space; raw l["Previous Page"] ]
+                rawText " &nbsp; &nbsp; "
+                match requests.Length = model.SmallGroup.Preferences.PageSize with
                 | true ->
-          yield encLocText s.["Inactive requests are currently not shown"]
-          yield br []
-          yield a [ _href "/prayer-requests/inactive" ] [ encLocText s.["Show Inactive Requests"] ]
-      | false ->
-          yield encLocText s.["Inactive requests are currently shown"]
-          yield br []
-          yield a [ _href "/prayer-requests" ] [ encLocText s.["Do Not Show Inactive Requests"] ]
+                    a [ _href (makeUrl url (("page", string (pg + 1)) :: search)) ] [
+                        raw l["Next Page"]; space; icon "keyboard_arrow_right"
+                    ]
+                | false -> ()
         ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
     |> Layout.Content.wide
-  |> Layout.standard vi "Maintain Requests"
+    |> Layout.standard vi (match model.SearchTerm with Some _ -> "Search Results" | None -> "Maintain Requests")
 
 
 /// View for the printable prayer request list
-let print m version =
+let print model version =
     let s         = I18N.localizer.Force ()
-  let pageTitle = sprintf "%s • %s" s.["Prayer Requests"].Value m.listGroup.name
-  let imgAlt    = sprintf "%s %s" s.["PrayerTracker"].Value s.["from Bit Badger Solutions"].Value
+    let pageTitle = $"""{s["Prayer Requests"].Value} • {model.SmallGroup.Name}"""
+    let imgAlt    = $"""{s["PrayerTracker"].Value} {s["from Bit Badger Solutions"].Value}"""
     article [] [
-    rawText (m.asHtml s)
+        rawText (model.AsHtml s)
         br []
         hr []
-    div [ _style "font-size:70%;font-family:@Model.ListGroup.preferences.listFonts;" ] [
-      img [ _src (sprintf "/img/%s.png" s.["footer_en"].Value)
+        div [ _style $"font-size:70%%;font-family:{model.SmallGroup.Preferences.FontStack};" ] [
+            img [ _src   $"""/img/{s["footer_en"].Value}.png"""
                   _style "vertical-align:text-bottom;"
                   _alt   imgAlt
                   _title imgAlt ]
             space
-      encodedText version
+            str version
         ]
     ]
     |> Layout.bare pageTitle
 
 
 /// View for the prayer request list
-let view m vi =
+let view model viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = sprintf "%s • %s" s.["Prayer Requests"].Value m.listGroup.name
-  let spacer    = rawText " &nbsp; &nbsp; &nbsp; "
-  let dtString  = m.date.ToString "yyyy-MM-dd"
-  [ div [ _class "pt-center-text" ] [
-      yield br []
-      yield a [ _class "pt-icon-link"
-                _href (sprintf "/prayer-requests/print/%s" dtString)
-                _title s.["View Printable"].Value ] [
-        icon "print"; rawText " &nbsp;"; encLocText s.["View Printable"]
+    let pageTitle = $"""{s["Prayer Requests"].Value} • {model.SmallGroup.Name}"""
+    let dtString  = model.Date.ToString ("yyyy-MM-dd", CultureInfo.InvariantCulture)
+    [   br []
+        div [ _fieldRow ] [
+            span [ _group ] [
+                a [ _class  "pt-icon-link"
+                    _href   $"/prayer-requests/print/{dtString}"
+                    _target "_blank"
+                    _title  s["View Printable"].Value ] [
+                    icon "print"; rawText " &nbsp;"; locStr s["View Printable"]
                 ]
-      match m.canEmail with
-      | true ->
-          yield spacer
-          match m.date.DayOfWeek = DayOfWeek.Sunday with
-          | true -> ()
-          | false ->
-              let rec findSunday (date : DateTime) =
-                match date.DayOfWeek = DayOfWeek.Sunday with
-                | true -> date
-                | false -> findSunday (date.AddDays 1.)
-              let sunday = findSunday m.date
-              yield a [ _class "pt-icon-link"
-                        _href (sprintf "/prayer-requests/view/%s" (sunday.ToString "yyyy-MM-dd"))
-                        _title s.["List for Next Sunday"].Value ] [
-                icon "update"; rawText " &nbsp;"; encLocText s.["List for Next Sunday"]
+                if model.CanEmail then
+                    if model.Date.DayOfWeek <> IsoDayOfWeek.Sunday then
+                        let rec findSunday (date : LocalDate) =
+                            if date.DayOfWeek = IsoDayOfWeek.Sunday then date else findSunday (date.PlusDays 1)
+                        let sunday = findSunday model.Date
+                        a [ _class "pt-icon-link"
+                            _href  $"""/prayer-requests/view/{sunday.ToString ("yyyy-MM-dd", CultureInfo.InvariantCulture)}"""
+                            _title s["List for Next Sunday"].Value ] [
+                            icon "update"; rawText " &nbsp;"; locStr s["List for Next Sunday"]
                         ]
-              yield spacer
-          let emailPrompt = s.["This will e-mail the current list to every member of your class, without further prompting.  Are you sure this is what you are ready to do?"].Value
-          yield a [ _class "pt-icon-link"
-                    _href (sprintf "/prayer-requests/email/%s" dtString)
-                    _title s.["Send via E-mail"].Value
-                    _onclick (sprintf "return PT.requests.view.promptBeforeEmail('%s')" emailPrompt) ] [
-            icon "mail_outline"; rawText " &nbsp;"; encLocText s.["Send via E-mail"]
+                    a [ _class     "pt-icon-link"
+                        _href      $"/prayer-requests/email/{dtString}"
+                        _title     s["Send via E-mail"].Value
+                        _hxConfirm s["This will e-mail the current list to every member of your group, without further prompting.  Are you sure this is what you are ready to do?"].Value ] [
+                        icon "mail_outline"; rawText " &nbsp;"; locStr s["Send via E-mail"]
+                    ]
+                    a [ _class "pt-icon-link"; _href "/prayer-requests"; _title s["Maintain Prayer Requests"].Value ] [
+                        icon "compare_arrows"; rawText " &nbsp;"; locStr s["Maintain Prayer Requests"]
                     ]
-          yield spacer
-          yield a [ _class "pt-icon-link"; _href "/prayer-requests"; _title s.["Maintain Prayer Requests"].Value ] [
-            icon "compare_arrows"; rawText " &nbsp;"; encLocText s.["Maintain Prayer Requests"]
             ]
-      | false -> ()
         ]
         br []
-    rawText (m.asHtml s)
+        rawText (model.AsHtml s)
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi pageTitle
+    |> Layout.standard viewInfo pageTitle

src/PrayerTracker.UI/PrayerTracker.UI.fsproj

@@ -1,11 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyVersion>7.0.0.0</AssemblyVersion>
-    <FileVersion>7.0.0.0</FileVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="Utils.fs" />
     <Compile Include="ViewModels.fs" />
@@ -21,13 +15,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="3.1.0" />
-    <PackageReference Include="MailKit" Version="2.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="2.0.0" />
+    <PackageReference Include="MailKit" Version="4.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,31 +34,31 @@
     <EmbeddedResource Update="Resources\Common.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Announcement.es.resx">
+    <EmbeddedResource Update="Resources\Help\Index.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Members.es.resx">
+    <EmbeddedResource Update="Resources\Help\Requests\Edit.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Preferences.es.resx">
+    <EmbeddedResource Update="Resources\Help\Requests\Maintain.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\Edit.es.resx">
+    <EmbeddedResource Update="Resources\Help\Requests\View.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\Maintain.es.resx">
+    <EmbeddedResource Update="Resources\Help\SmallGroup\Announcement.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\View.es.resx">
+    <EmbeddedResource Update="Resources\Help\SmallGroup\Members.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\User\LogOn.es.resx">
+    <EmbeddedResource Update="Resources\Help\SmallGroup\Preferences.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\User\Password.es.resx">
+    <EmbeddedResource Update="Resources\Help\User\LogOn.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Index.es.resx">
+    <EmbeddedResource Update="Resources\Help\User\Password.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Resources\Views\Home\Error.es.resx">
@@ -83,13 +79,12 @@
     <EmbeddedResource Update="Resources\Views\Requests\Lists.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Views\Requests\Maintain.es.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Views\SmallGroup\Preferences.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
-  </ItemGroup>
-
 </Project>

src/PrayerTracker.UI/Resources/Common.es.resx

@@ -120,9 +120,6 @@
   <data name="Actions" xml:space="preserve">
     <value>Acciones</value>
   </data>
-  <data name="Add / Edit a Request" xml:space="preserve">
-    <value>Agregar / Editar una Petición</value>
-  </data>
   <data name="Add a New Church" xml:space="preserve">
     <value>Agregar una Iglesia Nueva</value>
   </data>
@@ -147,8 +144,8 @@
   <data name="Aqua" xml:space="preserve">
     <value>Verde Azulado Brillante</value>
   </data>
-  <data name="Are you want to delete this {0}?  This action cannot be undone." xml:space="preserve">
-    <value>¿Está desea eliminar este {0}? Esta acción no se puede deshacer.</value>
+  <data name="Are you sure you want to delete this {0}?  This action cannot be undone." xml:space="preserve">
+    <value>¿Seguro que desea eliminar este {0}? Esta acción no se puede deshacer.</value>
   </data>
   <data name="Attached PDF" xml:space="preserve">
     <value>PDF Adjunto</value>
@@ -177,15 +174,6 @@
   <data name="Churches" xml:space="preserve">
     <value>Iglesias</value>
   </data>
-  <data name="Click for Help on This Page" xml:space="preserve">
-    <value>Haga Clic para Obtener Ayuda en Esta Página</value>
-  </data>
-  <data name="Click to Close This Window" xml:space="preserve">
-    <value>Haga Clic para Cerrar Esta Ventana</value>
-  </data>
-  <data name="Close Window" xml:space="preserve">
-    <value>Cerrar Esta Ventana</value>
-  </data>
   <data name="Current Requests" xml:space="preserve">
     <value>Peticiones Actuales</value>
   </data>
@@ -408,8 +396,8 @@
   <data name="The group member “{0}” was deleted successfully" xml:space="preserve">
     <value>El miembro del grupo “{0}” se eliminó con éxito</value>
   </data>
-  <data name="The group {0} and its {1} prayer request(s) was deleted successfully (revoked access from {2} user(s))" xml:space="preserve">
-    <value>El grupo {0} y sus {1} peticion(es) de oración se ha eliminado correctamente (acceso revocada por {2} usuario(s))</value>
+  <data name="The group “{0}” and its {1} prayer request(s) were deleted successfully; revoked access from {2} user(s)" xml:space="preserve">
+    <value>El grupo “{0}” y sus {1} peticion(es) de oración se ha eliminado correctamente; acceso revocada por {2} usuario(s)</value>
   </data>
   <data name="The old password was incorrect - your password was NOT changed" xml:space="preserve">
     <value>La contraseña antigua es incorrecta - la contraseña NO ha cambiado</value>
@@ -429,8 +417,8 @@
   <data name="There are no classes with passwords defined" xml:space="preserve">
     <value>No hay clases con contraseñas se define</value>
   </data>
-  <data name="This is likely due to one of the following reasons:&lt;ul&gt;&lt;li&gt;The e-mail address “{0}” is invalid.&lt;/li&gt;&lt;li&gt;The password entered does not match the password for the given e-mail address.&lt;/li&gt;&lt;li&gt;You are not authorized to administer the group “{1}”.&lt;/li&gt;&lt;/ul&gt;" xml:space="preserve">
-    <value>Esto es probablemente debido a una de las siguientes razones:&lt;ul&gt;&lt;li&gt;La dirección de correo electrónico “{0}” no es válida.&lt;/li&gt;&lt;li&gt;La contraseña introducida no coincide con la contraseña de la determinada dirección de correo electrónico.&lt;/li&gt;&lt;li&gt;Usted no está autorizado para administrar el grupo “{1}”.&lt;/li&gt;&lt;/ul&gt;</value>
+  <data name="This is likely due to one of the following reasons:&lt;ul&gt;&lt;li&gt;The e-mail address “{0}” is invalid.&lt;/li&gt;&lt;li&gt;The password entered does not match the password for the given e-mail address.&lt;/li&gt;&lt;li&gt;You are not authorized to administer the selected group.&lt;/li&gt;&lt;/ul&gt;" xml:space="preserve">
+    <value>Esto es probablemente debido a una de las siguientes razones:&lt;ul&gt;&lt;li&gt;La dirección de correo electrónico “{0}” no es válida.&lt;/li&gt;&lt;li&gt;La contraseña introducida no coincide con la contraseña de la determinada dirección de correo electrónico.&lt;/li&gt;&lt;li&gt;Usted no está autorizado para administrar el grupo seleccionado.&lt;/li&gt;&lt;/ul&gt;</value>
   </data>
   <data name="This page loaded in {0:N3} seconds" xml:space="preserve">
     <value>Esta página cargada en {0:N3} segundos</value>
@@ -441,9 +429,6 @@
   <data name="To make it active again, update it as necessary, leave “{0}” and “{1}” unchecked, and it will return as an active request." xml:space="preserve">
     <value>Para que sea más activa de nuevo, que se actualizará cuando sea necesario, salir de “{0}” y “{1}” no seleccionado, y volverá como una petición activa.</value>
   </data>
-  <data name="Toggle Navigation" xml:space="preserve">
-    <value>Navegación de Palanca</value>
-  </data>
   <data name="Updated" xml:space="preserve">
     <value>Actualizaron</value>
   </data>
@@ -519,9 +504,6 @@
   <data name="E-mail Format" xml:space="preserve">
     <value>Formato de Correo Electrónico</value>
   </data>
-  <data name="E-mail “From” Name and Address" xml:space="preserve">
-    <value>Correo Electrónico “De” Nombre y Dirección</value>
-  </data>
   <data name="Edit Group Member" xml:space="preserve">
     <value>Editar el Miembro del Grupo</value>
   </data>
@@ -531,9 +513,6 @@
   <data name="Fonts" xml:space="preserve">
     <value>Fuentes</value>
   </data>
-  <data name="Fonts{0} for List" xml:space="preserve">
-    <value>Fuentes{0} de la Lista</value>
-  </data>
   <data name="Group Log On" xml:space="preserve">
     <value>Iniciar Sesión como Grupo</value>
   </data>
@@ -549,9 +528,6 @@
   <data name="Long-Term Requests Alerted for Update" xml:space="preserve">
     <value>Peticiones a Largo Plazo Alertó para la Actualización</value>
   </data>
-  <data name="Making a “Large Print” List" xml:space="preserve">
-    <value>Realización de una Lista de “Letra Grande”</value>
-  </data>
   <data name="Password Protected" xml:space="preserve">
     <value>Protegido por Contraseña</value>
   </data>
@@ -588,9 +564,6 @@
   <data name="List for Next Sunday" xml:space="preserve">
     <value>Lista para el Próximo Domingo</value>
   </data>
-  <data name="Restore an Inactive Request" xml:space="preserve">
-    <value>Restaurar una Petición Inactivo</value>
-  </data>
   <data name="Send via E-mail" xml:space="preserve">
     <value>Enviar por correo electrónico</value>
   </data>
@@ -639,9 +612,6 @@
   <data name="Delete This Group" xml:space="preserve">
     <value>Eliminar Este Grupo</value>
   </data>
-  <data name="Do Not Show Inactive Requests" xml:space="preserve">
-    <value>No Muestran las Peticiones Inactivos</value>
-  </data>
   <data name="E-mail" xml:space="preserve">
     <value>Correo Electrónico</value>
   </data>
@@ -660,12 +630,6 @@
   <data name="Group Preferences" xml:space="preserve">
     <value>Las Preferencias del Grupo</value>
   </data>
-  <data name="Inactive requests are currently not shown" xml:space="preserve">
-    <value>Peticiones inactivas no se muestra actualmente</value>
-  </data>
-  <data name="Inactive requests are currently shown" xml:space="preserve">
-    <value>Peticiones inactivas se muestra actualmente</value>
-  </data>
   <data name="Maintain Groups" xml:space="preserve">
     <value>Mantener los Grupos</value>
   </data>
@@ -723,9 +687,6 @@
   <data name="Send Announcement to" xml:space="preserve">
     <value>Enviar anuncio a</value>
   </data>
-  <data name="Show Inactive Requests" xml:space="preserve">
-    <value>Muestran las Peticiones Inactivos</value>
-  </data>
   <data name="Sort by Last Updated Date" xml:space="preserve">
     <value>Ordenar por Fecha de Última Actualización</value>
   </data>
@@ -736,7 +697,7 @@
     <value>Este Grupo</value>
   </data>
   <data name="This will e-mail the current list to every member of your class, without further prompting.  Are you sure this is what you are ready to do?" xml:space="preserve">
-    <value>Esto enviará un correo electrónico la lista actual de todos los miembros de su clase, sin más indicaciones. ¿Estás seguro de que esto es lo que están dispuestos a hacer?</value>
+    <value>Esto enviará un correo electrónico la lista actual de todos los miembros de su grupo, sin más indicaciones. ¿Estás seguro de que esto es lo que están dispuestos a hacer?</value>
   </data>
   <data name="To change your password, enter your current password in the specified box below, then enter your new password twice." xml:space="preserve">
     <value>Para cambiar su contraseña, introduzca su contraseña actual en el cuadro se especifica a continuación, introduzca su nueva contraseña dos veces.</value>
@@ -756,18 +717,6 @@
   <data name="Active Requests" xml:space="preserve">
     <value>Peticiones Activas</value>
   </data>
-  <data name="Delete This Request" xml:space="preserve">
-    <value>Eliminar esta petición</value>
-  </data>
-  <data name="Edit This Prayer Request" xml:space="preserve">
-    <value>Editar esta petición de oración</value>
-  </data>
-  <data name="Expire a Request" xml:space="preserve">
-    <value>Expirar una petición</value>
-  </data>
-  <data name="Expire This Request Immediately" xml:space="preserve">
-    <value>Expirar esta petición de oración de inmediato</value>
-  </data>
   <data name="Maintain Prayer Requests" xml:space="preserve">
     <value>Mantener las Peticiones de Oración</value>
   </data>
@@ -777,9 +726,6 @@
   <data name="Quick Actions" xml:space="preserve">
     <value>Acciones Rápidas</value>
   </data>
-  <data name="Restore This Inactive Request" xml:space="preserve">
-    <value>Restaurar esta petición inactiva</value>
-  </data>
   <data name="Save" xml:space="preserve">
     <value>Guardar</value>
   </data>
@@ -796,7 +742,7 @@
     <value>Este</value>
   </data>
   <data name="MMMM d, yyyy" xml:space="preserve">
-    <value>d \de MMMM yyyy</value>
+    <value>d \d\e MMMM yyyy</value>
   </data>
   <data name="Mountain" xml:space="preserve">
     <value>Montaña</value>
@@ -846,4 +792,130 @@
   <data name="View source code and get technical support" xml:space="preserve">
     <value>Ver código fuente y obtener soporte técnico</value>
   </data>
+  <data name="Click for Help on This Page" xml:space="preserve">
+    <value>Haga Clic para Obtener Ayuda en Esta Página</value>
+  </data>
+  <data name="Search" xml:space="preserve">
+    <value>Buscar</value>
+  </data>
+  <data name="Display a full “as of” date" xml:space="preserve">
+    <value>Mostrar una fecha “como de” completa</value>
+  </data>
+  <data name="Display a short “as of” date" xml:space="preserve">
+    <value>Mostrar una fecha “como de” corta</value>
+  </data>
+  <data name="Do not display the “as of” date" xml:space="preserve">
+    <value>No se muestran la fecha “como de”</value>
+  </data>
+  <data name="Page Size" xml:space="preserve">
+    <value>Tamaño de Página</value>
+  </data>
+  <data name="Prayer Request" xml:space="preserve">
+    <value>Petición de Oración</value>
+  </data>
+  <data name="Search Results" xml:space="preserve">
+    <value>Resultados de la Búsqueda</value>
+  </data>
+  <data name="“As of” Date Display" xml:space="preserve">
+    <value>Visualización de la Fecha “Como de”</value>
+  </data>
+  <data name="as of" xml:space="preserve">
+    <value>como de</value>
+  </data>
+  <data name="State or Province" xml:space="preserve">
+    <value>Estado o Provincia</value>
+  </data>
+  <data name="Last Seen" xml:space="preserve">
+    <value>Ultima vez Visto</value>
+  </data>
+  <data name="Administrators" xml:space="preserve">
+      <value>Administradores</value>
+  </data>
+  <data name="Native Fonts" xml:space="preserve">
+    <value>Fuentes Nativas</value>
+  </data>
+  <data name="Named Fonts" xml:space="preserve">
+    <value>Fuentes con Nombre</value>
+  </data>
+  <data name="Select Church" xml:space="preserve">
+    <value>Seleccione una Iglesia</value>
+  </data>
+  <data name="Select Group" xml:space="preserve">
+    <value>Seleccione un Grupo</value>
+  </data>
+  <data name="Member Name" xml:space="preserve">
+    <value>Nombre de Miembro</value>
+  </data>
+  <data name="Custom Color" xml:space="preserve">
+    <value>Color Personalizado</value>
+  </data>
+  <data name="Church Name" xml:space="preserve">
+    <value>Nombre de la Iglesia</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>Ciudad</value>
+  </data>
+  <data name="Has an Interface with “{0}”" xml:space="preserve">
+    <value>Tiene una Interfaz con “{0}”</value>
+  </data>
+  <data name="Interface URL" xml:space="preserve">
+    <value>URL de la Interfaz</value>
+  </data>
+  <data name="Successfully {0} church “{1}”" xml:space="preserve">
+    <value>Iglesia “{1}” {0} con éxito</value>
+  </data>
+  <data name="The church “{0}” and its {1} small group(s) (with {2} prayer request(s)) were deleted successfully; revoked access from {3} user(s)" xml:space="preserve">
+    <value>La iglesia "{0}" y sus {1} grupo(s) (con {2} peticion(es) de oración) se eliminaron correctamente; acceso revocado de {3} usuario(s)</value>
+  </data>
+  <data name="Successfully {0} group “{1}”" xml:space="preserve">
+    <value>El grupo “{1}” {0} con éxito</value>
+  </data>
+  <data name="First Name" xml:space="preserve">
+    <value>Primer Nombre</value>
+  </data>
+  <data name="Last Name" xml:space="preserve">
+    <value>Apellido</value>
+  </data>
+  <data name="Password Again" xml:space="preserve">
+    <value>Contraseña otra Vez</value>
+  </data>
+  <data name="This User Is a {0} Administrator" xml:space="preserve">
+    <value>Este Usuario Es un Administrador de {0}</value>
+  </data>
+  <data name="PrayerTracker Help" xml:space="preserve">
+    <value>Ayuda de SeguidorOración</value>
+  </data>
+  <data name="Click to Close This Window" xml:space="preserve">
+    <value>Haga Clic para Cerrar Esta Ventana</value>
+  </data>
+  <data name="Close Window" xml:space="preserve">
+    <value>Cerrar Esta Ventana</value>
+  </data>
+  <data name="Help Index" xml:space="preserve">
+    <value>Índice de Ayuda</value>
+  </data>
+  <data name="Back to Help Index" xml:space="preserve">
+    <value>Volver al Índice de Ayuda</value>
+  </data>
+  <data name="Add / Edit a Request" xml:space="preserve">
+    <value>Agregar o Editar una Petición</value>
+  </data>
+  <data name="Search Requests" xml:space="preserve">
+    <value>Peticiones de Búsqueda</value>
+  </data>
+  <data name="Expire a Request" xml:space="preserve">
+    <value>Expirar un Petición</value>
+  </data>
+  <data name="Restore an Inactive Request" xml:space="preserve">
+    <value>Restaurar un Petición Inactiva</value>
+  </data>
+  <data name="E-mail “From” Name and Address" xml:space="preserve">
+    <value>Correo Electrónico “De” Nombre y Dirección</value>
+  </data>
+  <data name="Fonts for List" xml:space="preserve">
+    <value>Fuentes de la Lista</value>
+  </data>
+  <data name="Making a “Large Print” List" xml:space="preserve">
+    <value>Realización de una Lista de “Letra Grande”</value>
+  </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/Group/Members.es.resx

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)" xml:space="preserve">
-    <value>(Por supuesto, si usted lo elimine por error, se puede entrar de nuevo utilizando la opción “Agregar” instrucciones de arriba.)</value>
-  </data>
-  <data name="From this page, you can add, edit, and delete the e-mail addresses for your group." xml:space="preserve">
-    <value>Desde esta página, usted puede agregar, editar y eliminar las direcciones de correo electrónico para su grupo.</value>
-  </data>
-  <data name="Note that once an e-mail address has been deleted, it is gone." xml:space="preserve">
-    <value>Tenga en cuenta que una vez que la dirección de correo electrónico se ha eliminado, se ha ido.</value>
-  </data>
-  <data name="This will allow you to update the name and/or the e-mail address for that member." xml:space="preserve">
-    <value>Esto le permitirá actualizar el nombre y / o la dirección de correo electrónico para ese miembro.</value>
-  </data>
-  <data name="To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group." xml:space="preserve">
-    <value>Para agregar una dirección de correo electrónico, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de direcciones para su grupo.</value>
-  </data>
-  <data name="To delete an e-mail address, click the blue trash can icon in the “{0}” column." xml:space="preserve">
-    <value>Para eliminar una dirección de correo electrónico, haga clic en el icono azul de la papelera en la columna “{0}”.</value>
-  </data>
-  <data name="To edit an e-mail address, click the blue pencil icon; it's the first icon under the “{0}” column heading." xml:space="preserve">
-    <value>Para editar una dirección de correo electrónico, haga clic en el icono de lápiz azul, es el primer icono bajo el título de columna “{0}”.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Group/Preferences.es.resx

@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="(Changing this password will force all members of the group who logged in with the “{0}” box checked to provide the new password.)" xml:space="preserve">
-    <value>(Cambiar esta contraseña obligará a todos los miembros del grupo que se iniciar sesión en el "{0}" caja marcada para proporcionar la nueva contraseña.)</value>
-  </data>
-  <data name="(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)" xml:space="preserve">
-    <value>(NOTA: En el texto sin formato de correo electrónico, las nuevas solicitudes se identifican con un símbolo “+”, y pide a los viejos se identifican con un símbolo “-”.)</value>
-  </data>
-  <data name="A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font." xml:space="preserve">
-    <value>Una advertencia de que es bueno aquí, sólo porque usted tiene una fuente oscura y gusta la forma en que se vea no significa que los demás tienen de que la misma fuente.</value>
-  </data>
-  <data name="All categories respect this setting." xml:space="preserve">
-    <value>Todas las categorías respetar esta opción.</value>
-  </data>
-  <data name="As this is a shared password, it is stored in plain text, so you can easily see what it is." xml:space="preserve">
-    <value>Como se trata de una contraseña compartida, se almacena en texto plano, así que usted puede ver fácilmente lo que es.</value>
-  </data>
-  <data name="By default, requests are sorted within each group by the last updated date, with the most recent on top." xml:space="preserve">
-    <value>De forma predeterminada, las solicitudes se ordenan dentro de cada grupo por la última fecha de actualización, con el más reciente en la parte superior.</value>
-  </data>
-  <data name="Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly." xml:space="preserve">
-    <value>Cambiar por lo menos la dirección de correo electrónico a su dirección se asegurará de que usted recibe estos correos electrónicos, y se puede podar su lista de correo electrónico en consecuencia.</value>
-  </data>
-  <data name="Each section is addressed below." xml:space="preserve">
-    <value>Cada sección se aborda más adelante.</value>
-  </data>
-  <data name="However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting." xml:space="preserve">
-    <value>Sin embargo, algunos clientes de correo electrónico no puede mostrar esto correctamente, para que pueda elegir el correo electrónico a un formato de texto plano predeterminadas, que no tiene colores, cursiva, u otro formato.</value>
-  </data>
-  <data name="If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet." xml:space="preserve">
-    <value>Si usted hace una corrección de errata en una petición, si no marque la caja para actualizar la fecha, este valor va a cambiar la bala.</value>
-  </data>
-  <data name="If you do not see your time zone listed, just &lt;a href=\&quot;mailto:daniel@djs-consulting.com?subject={0}%20{1}\&quot;&gt;contact Daniel&lt;/a&gt; and tell him what time zone you need." xml:space="preserve">
-    <value>Si no puede ver la zona horaria en la lista, ponte en &lt;a href="mailto:daniel@djs-consulting.com?subject={1}%20por%20{0}"&gt;contacto con Daniel&lt;/a&gt; y decirle lo que la zona horaria que usted necesita.</value>
-  </data>
-  <data name="If you select “{0}” but do not enter a password, the list remains private, which is also the default value." xml:space="preserve">
-    <value>Si selecciona "{0}" pero no introduce una contraseña, la lista sigue siendo privado, que también es el valor predeterminado.</value>
-  </data>
-  <data name="If you would prefer to have the list sorted by requestor or subject rather than by date, select “{0}” instead." xml:space="preserve">
-    <value>Si prefiere tener la lista ordenada por el solicitante o el sujeto en vez de por fecha, seleccione “{0}” en su lugar.</value>
-  </data>
-  <data name="If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:" xml:space="preserve">
-    <value>Si el grupo está compuesta en su mayoría de la gente que prefiere letras grandes, los siguientes ajustes harán que su lista de parecerse a la típica la publicación “Letra Grande”:</value>
-  </data>
-  <data name="It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”." xml:space="preserve">
-    <value>Generalmente es mejor quedarse con las fuentes que vienen con Windows - Fuentes como “Arial”, “Times New Roman”, “Tahoma”, y “Comic Sans MS”.</value>
-  </data>
-  <data name="Note that the categories “{0}” and “{1}” never expire automatically." xml:space="preserve">
-    <value>Tenga en cuenta que las categorías “{0}” y “{1}” no expirará automáticamente.</value>
-  </data>
-  <data name="Password-protected lists allow group members to log in and view the current request list online, using the “{0}” link and providing this password." xml:space="preserve">
-    <value>Protegidos con contraseña listas permiten miembros del grupo iniciar sesión y ver la lista de peticiones actual en el sito, utilizando el "{0}" enlace y proporcionar la contraseña.</value>
-  </data>
-  <data name="Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)." xml:space="preserve">
-    <value>Las listas públicas están disponibles sin iniciar sesión, y listas privadas sólo están disponibles en línea a los administradores (aunque la lista todavía puede ser enviado por correo electrónico por el administrador).</value>
-  </data>
-  <data name="Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests." xml:space="preserve">
-    <value>Peticiones que han sido actualizadas dentro de esta cantidad de días se identifican por un círculo hueco para su bala, en oposición a un círculo relleno para otras peticiones.</value>
-  </data>
-  <data name="Requests that have not been updated in this many weeks are identified by an italic font on the “{0}” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current." xml:space="preserve">
-    <value>Peticiones que no han sido actualizados en esta semana muchos se identifican con un tipo de letra cursiva en la página “{0}”, para recordarle que debe buscar novedades en estas peticiones para que vuestras oraciones pueden permanecer relevante y actual.</value>
-  </data>
-  <data name="The background color cannot be changed." xml:space="preserve">
-    <value>El color de fondo no puede ser cambiado.</value>
-  </data>
-  <data name="The default for the heading is 16pt, and the default for the text is 12pt." xml:space="preserve">
-    <value>El valor predeterminado para el título es 16 puntos, y el valor por defecto para el texto es 12 puntos.</value>
-  </data>
-  <data name="The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”." xml:space="preserve">
-    <value>El nombre predeterminado es “PrayerTracker”, y el valor predeterminado dirección de correo electrónico es “prayer@djs-consulting.com”.</value>
-  </data>
-  <data name="The group's request list can be either public, private, or password-protected." xml:space="preserve">
-    <value>La lista de peticiones del grupo puede ser pública, privada o protegida por contraseña.</value>
-  </data>
-  <data name="The setting on this page is the group default; you can select a format for each recipient on the “{0}” page." xml:space="preserve">
-    <value>La configuración en esta página es el valor predeterminado del grupo, se puede seleccionar un formato para cada destinatario de la página “{0}”.</value>
-  </data>
-  <data name="The {0} default is HTML, which sends the list just as you see it online." xml:space="preserve">
-    <value>El valor predeterminado de {0} es HTML, el cual envía la lista al igual que usted lo ve en el sitio.</value>
-  </data>
-  <data name="There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic." xml:space="preserve">
-    <value>Hay un enlace en la parte inferior de la página para una lista de colores con más nombres y sus valores RGB, si realmente estás sintiendo artística.</value>
-  </data>
-  <data name="This is a comma-separated list of fonts that will be used for your request list." xml:space="preserve">
-    <value>Esta es una lista separada por comas de fuentes que se utilizarán para su lista de peticiones.</value>
-  </data>
-  <data name="This is the default e-mail format for your group." xml:space="preserve">
-    <value>Este es el valor predeterminado formato de correo electrónico para su grupo.</value>
-  </data>
-  <data name="This is the point size to use for each." xml:space="preserve">
-    <value>Este es el tamaño de punto a utilizar para cada uno.</value>
-  </data>
-  <data name="This is the time zone that you would like to use for your group." xml:space="preserve">
-    <value>Esta es la zona horaria que desea utilizar para su clase.</value>
-  </data>
-  <data name="This page allows you to change how your prayer request list looks and behaves." xml:space="preserve">
-    <value>Esta página le permite cambiar la forma en que su lista de peticiones de la oración se ve y se comporta.</value>
-  </data>
-  <data name="This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)." xml:space="preserve">
-    <value>Esto funciona, pero los mensajes devueltos, y las respuestas de fuera de la oficina serán enviados a esa dirección (que no es ni siquiera una dirección real).</value>
-  </data>
-  <data name="When a regular request goes this many days without being updated, it expires and no longer appears on the request list." xml:space="preserve">
-    <value>Cuando una petición regular va esta cantidad de días sin actualizar, caduca y ya no aparece en la lista de peticiones.</value>
-  </data>
-  <data name="You can customize the colors that are used for the headings and lines in your request list." xml:space="preserve">
-    <value>Usted puede personalizar los colores que se utilizan para las partidas y líneas en su lista de peticiones.</value>
-  </data>
-  <data name="You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255." xml:space="preserve">
-    <value>Puede seleccionar uno de los 16 colores con nombre en las listas desplegables, o puede “mezclar su propia” en colores rojo, verde y azul (RGB) valores entre 0 y 255.</value>
-  </data>
-  <data name="You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font." xml:space="preserve">
-    <value>También debe poner fin a la lista de fuentes, ya sea con “serif” o el “sans-serif”, que utilizará el fuente serif predeterminado (como “Times New Roman”) o el fuente sans-serif predeterminado (como “Arial”).</value>
-  </data>
-  <data name="{0} must put an name and e-mail address in the “from” position of each e-mail it sends." xml:space="preserve">
-    <value>{0} debe poner el nombre y la dirección de correo electrónico en el “de” posición de cada correo electrónico que envía.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Index.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,13 +58,13 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
+    <data name="Throughout PrayerTracker, you'll see an icon (a question mark in a circle) next to the title on each page." xml:space="preserve">
+        <value>En todo el sistema, verá un icono (un signo de interrogación en un círculo) junto al título de cada página.</value>
+    </data>
     <data name="Clicking this will open a new, small window with directions on using that page." xml:space="preserve">
         <value>Al hacer clic en esta opción, se abrirá una nueva y pequeña ventana con instrucciones sobre cómo usar esa página.</value>
     </data>
-  <data name="If you are looking for a quick overview of {0}, start with the “{1}” and “{2}” entries." xml:space="preserve">
-    <value>Si está buscando una descripción rápida de {0}, comience con las entradas "{1}" y "{2}".</value>
-  </data>
-  <data name="Throughout {0}, you'll see this icon&amp;#xa0;&lt;i class=&quot;material-icons&quot; title=&quot;{1}&quot;&gt;help_outline&lt;/i&gt;&amp;#xa0;next to the title on each page." xml:space="preserve">
-    <value>En todo el sistema, verá este icono&amp;#xa0;&lt;i class="material-icons" title="{1}"&gt;help_outline&lt;/i&gt;&amp;#xa0;junto al título de cada página.</value>
+    <data name="If you are looking for a quick overview of PrayerTracker, start with the “Add / Edit a Request” and “Change Preferences” entries." xml:space="preserve">
+        <value>Si está buscando una descripción rápida de SeguidorOración, comience con las entradas “Agregar o Editar una Petición” y “Cambiar las Preferencias”.</value>
     </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/Edit.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,79 +58,76 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-  <data name="Apart from the icons on the request maintenance page, this is the only other way to expire “{0}” and “{1}” requests, but it can be used for any request type." xml:space="preserve">
-    <value>Aparte de los iconos de la página de mantenimiento de las peticiones, ésta es la única otra forma de expirar peticiones del tipos “{0}” y “{1}”, pero puede ser utilizada para cualquier tipo de petición.</value>
+    <data name="This page allows you to enter or update a new prayer request." xml:space="preserve">
+        <value>Esta página le permite introducir o actualizar una petición de oración nueva.</value>
     </data>
-  <data name="Click or tab into the box to display the calendar, which will be preselected to today's date." xml:space="preserve">
-    <value>Haga clic en la pestaña o en la caja para mostrar el calendario, que será preseleccionada para la fecha de hoy.</value>
+    <data name="There are 5 request types in PrayerTracker." xml:space="preserve">
+        <value>Hay 5 tipos de peticiones en SeguidorOración.</value>
     </data>
-  <data name="For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates." xml:space="preserve">
-    <value>Para todos los tipos, es opcional, yo solía tener un anuncio con ningún tema que iba todas las semanas, diciendo a dónde enviar peticiones y actualizaciones.</value>
+    <data name="“Current Requests” are your regular requests that people may have regarding things happening over the next week or so." xml:space="preserve">
+        <value>“Peticiones Actuales” son sus peticiones habituales que la gente pueda tener acerca de las cosas que suceden durante la próxima semana o así.</value>
     </data>
-  <data name="For announcements, this should contain the subject of the announcement." xml:space="preserve">
-    <value>Para los anuncios, este debe contener el objeto del anuncio.</value>
+    <data name="“Long-Term Requests” are requests that may occur repeatedly or continue indefinitely." xml:space="preserve">
+        <value>“Peticiones a Largo Plazo” son peticiones que pueden ocurrir varias veces, o continuar indefinidamente.</value>
     </data>
-  <data name="For existing requests, there will be a check box labeled “{0}”." xml:space="preserve">
-    <value>Para peticiones existentes, habrá una casilla de verificación “{0}”.</value>
+    <data name="“Praise Reports” are like “Current Requests”, but they are answers to prayer to share with your group." xml:space="preserve">
+        <value>“Informes de Alabanza” son como “Peticiones Actuales”, pero son respuestas a la oración para compartir con su grupo.</value>
     </data>
-  <data name="For new requests, this is a box with a calendar date picker." xml:space="preserve">
-    <value>Para nuevas peticiones, se trata de una caja con un selector de fechas del calendario.</value>
+    <data name="“Expecting” is for those who are pregnant." xml:space="preserve">
+        <value>“Embarazada” es para aquellos que están embarazadas.</value>
     </data>
-  <data name="For requests or praises, this field is for the name of the person who made the request or offered the praise report." xml:space="preserve">
-    <value>Para las peticiones o alabanzas, este campo es el nombre de la persona que hizo la petición o que ofrece el informe de alabanza.</value>
-  </data>
-  <data name="Hover over each icon to see what each button does." xml:space="preserve">
-    <value>Pase el ratón sobre cada icono para ver qué hace cada botón.</value>
-  </data>
-  <data name="If you are editing an existing request, a third option appears." xml:space="preserve">
-    <value>Si está editando una petición existente, aparece una tercera opción.</value>
-  </data>
-  <data name="It also supports undo and redo, and the editor supports full-screen mode." xml:space="preserve">
-    <value>También es compatible con deshacer y rehacer, y el editor soporta modo de pantalla completa.</value>
-  </data>
-  <data name="The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself." xml:space="preserve">
-    <value>El editor ofrece muchas capacidades de formato, como "El Corrector Ortográfico al Escribir" (habilitado predeterminado), "Pegar desde Word" y "Pegar sin formato", así como "Código Fuente" punto de vista, si quieres editar el código HTML usted mismo.</value>
+    <data name="“Announcements” are like “Current Requests”, but instead of a request, they are simply passing information along about something coming up." xml:space="preserve">
+        <value>“Anuncios” son como “Peticiones Actuales”, pero en lugar de una petición, simplemente se pasa la información a lo largo de algo por venir.</value>
     </data>
     <data name="The order above is the order in which the request types appear on the list." xml:space="preserve">
         <value>El orden anterior es el orden en que los tipos de peticiones aparecen en la lista.</value>
     </data>
-  <data name="There are 5 request types in {0}." xml:space="preserve">
-    <value>Hay 5 tipos de peticiones en {0}.</value>
+    <data name="“Long-Term Requests” and “Expecting” are not subject to the automatic expiration (set on the “Change Preferences” page) that the other requests are." xml:space="preserve">
+        <value>“Peticiones a Largo Plazo” y “Embarazada” no están sujetos a la caducidad automática (establecida en el “Cambiar las Preferencias” de la página) que las peticiones son otros.</value>
+    </data>
+    <data name="For new requests, this is a box with a calendar date picker." xml:space="preserve">
+        <value>Para nuevas peticiones, se trata de una caja con un selector de fechas del calendario.</value>
+    </data>
+    <data name="Click or tab into the box to display the calendar, which will be preselected to today's date." xml:space="preserve">
+        <value>Haga clic en la pestaña o en la caja para mostrar el calendario, que será preseleccionada para la fecha de hoy.</value>
+    </data>
+    <data name="For existing requests, there will be a check box labeled “Check to not update the date”." xml:space="preserve">
+        <value>Para peticiones existentes, habrá una casilla de verificación “Seleccionar para no actualizar la fecha”.</value>
     </data>
     <data name="This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request." xml:space="preserve">
         <value>Esto puede ser usado si corrige la ortografía ni la puntuacion, y no tienen una actualización real de hacer la petición.</value>
     </data>
+    <data name="For requests or praises, this field is for the name of the person who made the request or offered the praise report." xml:space="preserve">
+        <value>Para las peticiones o alabanzas, este campo es el nombre de la persona que hizo la petición o que ofrece el informe de alabanza.</value>
+    </data>
+    <data name="For announcements, this should contain the subject of the announcement." xml:space="preserve">
+        <value>Para los anuncios, este debe contener el objeto del anuncio.</value>
+    </data>
+    <data name="For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates." xml:space="preserve">
+        <value>Para todos los tipos, es opcional, yo solía tener un anuncio con ningún tema que iba todas las semanas, diciendo a dónde enviar peticiones y actualizaciones.</value>
+    </data>
+    <data name="“Expire Normally” means that the request is subject to the expiration days in the group preferences." xml:space="preserve">
+        <value>“Expirará Normalmente” significa que la petición está sujeta a los días de vencimiento de las preferencias del grupo.</value>
+    </data>
+    <data name="“Request Never Expires” can be used to make a request never expire (note that this is redundant for “Long-Term Requests” and “Expecting”)." xml:space="preserve">
+        <value>“Petición no Expira Nunca” se puede utilizar para hacer una petición que no caduque nunca (nótese que esto es redundante para los tipos “Peticiones a Largo Plazo” y “Embarazada”).</value>
+    </data>
+    <data name="If you are editing an existing request, a third option appears." xml:space="preserve">
+        <value>Si está editando una petición existente, aparece una tercera opción.</value>
+    </data>
+    <data name="“Expire Immediately” will make the request expire when it is saved." xml:space="preserve">
+        <value>“Expirará Inmediatamente” hará que la petición expirará cuando se guarda.</value>
+    </data>
+    <data name="Apart from the icons on the request maintenance page, this is the only way to expire “Long-Term Requests” and “Expecting” requests, but it can be used for any request type." xml:space="preserve">
+        <value>Aparte de los iconos de la página de mantenimiento de las peticiones, ésta es la única otra forma de expirar peticiones del tipos “Peticiones a Largo Plazo” y “Embarazada”, pero puede ser utilizada para cualquier tipo de petición.</value>
+    </data>
     <data name="This is the text of the request." xml:space="preserve">
         <value>Este es el texto de la petición.</value>
     </data>
-  <data name="This page allows you to enter or update a new prayer request." xml:space="preserve">
-    <value>Esta página le permite introducir o actualizar una petición de oración nueva.</value>
+    <data name="The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself." xml:space="preserve">
+        <value>El editor ofrece muchas capacidades de formato, como "El Corrector Ortográfico al Escribir" (habilitado predeterminado), "Pegar desde Word" y "Pegar sin formato", así como "Código Fuente" punto de vista, si quieres editar el código HTML usted mismo.</value>
     </data>
-  <data name="“{0}” and “{1}” are not subject to the automatic expiration (set on the “{2}” page) that the other requests are." xml:space="preserve">
-    <value>“{0}” y “{1}” no están sujetos a la caducidad automática (establecida en el “{2}” de la página) que las peticiones son otros.</value>
-  </data>
-  <data name="“{0}” are like “{1}”, but instead of a request, they are simply passing information along about something coming up." xml:space="preserve">
-    <value>“{0}” son como “{1}”, pero en lugar de una petición, simplemente se pasa la información a lo largo de algo por venir.</value>
-  </data>
-  <data name="“{0}” are like “{1}”, but they are answers to prayer to share with your group." xml:space="preserve">
-    <value>“{0}” son como “{1}”, pero son respuestas a la oración para compartir con su grupo.</value>
-  </data>
-  <data name="“{0}” are requests that may occur repeatedly or continue indefinitely." xml:space="preserve">
-    <value>“{0}” son peticiones que pueden ocurrir varias veces, o continuar indefinidamente.</value>
-  </data>
-  <data name="“{0}” are your regular requests that people may have regarding things happening over the next week or so." xml:space="preserve">
-    <value>“{0}” son sus peticiones habituales que la gente pueda tener acerca de las cosas que suceden durante la próxima semana o así.</value>
-  </data>
-  <data name="“{0}” can be used to make a request never expire (note that this is redundant for “{1}” and “{2}”)." xml:space="preserve">
-    <value>“{0}” se puede utilizar para hacer una petición que no caduque nunca (nótese que esto es redundante para los tipos “{1}” y “{2}”).</value>
-  </data>
-  <data name="“{0}” is for those who are pregnant.&quot;" xml:space="preserve">
-    <value>“{0}” es para aquellos que están embarazadas.</value>
-  </data>
-  <data name="“{0}” means that the request is subject to the expiration days in the group preferences." xml:space="preserve">
-    <value>“{0}” significa que la petición está sujeta a los días de vencimiento de las preferencias del grupo.</value>
-  </data>
-  <data name="“{0}” will make the request expire when it is saved." xml:space="preserve">
-    <value>“{0}” hará que la petición expirará cuando se guarda.</value>
+    <data name="It also supports undo and redo, and the editor supports full-screen mode. Hover over each icon to see what each button does." xml:space="preserve">
+        <value>También es compatible con deshacer y rehacer, y el editor soporta modo de pantalla completa. Pase el ratón sobre cada icono para ver qué hace cada botón.</value>
     </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/Maintain.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,43 +58,55 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-  <data name="Deleting a request is contrary to the intent of {0}, as you can retrieve requests that have expired." xml:space="preserve">
-    <value>Eliminación de una petición es contraria a la intención de {0}, como se puede recuperar peticiones que han expirado.</value>
-  </data>
-  <data name="For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately." xml:space="preserve">
-    <value>Para las peticiones activas, el segundo icono es un ojo con una barra a través de él; Si hace clic en este icono, la petición se cancelará inmediatamente.</value>
-  </data>
     <data name="From this page, you can add, edit, and delete your current requests." xml:space="preserve">
         <value>Desde esta página, usted puede agregar, editar y borrar sus peticiones actuales.</value>
     </data>
-  <data name="However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown." xml:space="preserve">
-    <value>Sin embargo, al hacer clic en el vínculo en la parte inferior de la página se actualizará la página con las peticiones se muestran inactivos.</value>
-  </data>
-  <data name="However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “{0}” column will allow you to do it." xml:space="preserve">
-    <value>Sin embargo, si hay una solicitud que debe ser eliminado, haga clic en el icono azul de la papelera en la columna “{0}” le permitirá hacerlo.</value>
-  </data>
-  <data name="The last updated date will be current, and the request is set to expire normally." xml:space="preserve">
-    <value>La última fecha actualizada será actual, y la petición se establece para caducar normalmente.</value>
-  </data>
-  <data name="The middle icon will look like an eye; clicking it will restore the request as an active request." xml:space="preserve">
-    <value>El icono del centro se verá como un ojo; Haciendo clic en él, restaurará la petición como una petición activa.</value>
-  </data>
-  <data name="This is equivalent to editing the request, selecting “{0}”, and saving it." xml:space="preserve">
-    <value>Esto equivale a editar la petición, seleccionar "{0}" y guardarla.</value>
-  </data>
-  <data name="To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group." xml:space="preserve">
-    <value>Para agregar una petición, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de peticiones para su grupo.</value>
-  </data>
-  <data name="To edit a request, click the blue pencil icon; it's the first icon under the “{0}” column heading." xml:space="preserve">
-    <value>Para editar una petición, haga clic en el icono de lápiz azul, el primer icono bajo el título de columna “{0}”.</value>
-  </data>
-  <data name="Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good." xml:space="preserve">
-    <value>Utilice esta opción con cuidado, ya que estas supresiones no se puede deshacer, una vez a la petición se ha borrado, ha desaparecido para siempre.</value>
-  </data>
-  <data name="When the page is first displayed, it does not display inactive requests." xml:space="preserve">
-    <value>Cuando la página se muestra por primera vez, que no muestra peticiones inactivos.</value>
-  </data>
     <data name="You can also restore requests that may have expired, but should be made active once again." xml:space="preserve">
         <value>También puede restaurar peticiones que han caducado, sino que debe ser activa, una vez más.</value>
     </data>
+    <data name="To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group." xml:space="preserve">
+        <value>Para agregar una petición, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de peticiones para su grupo.</value>
+    </data>
+    <data name="If you are looking for a particular requests, enter some text in the search box and click “Search”." xml:space="preserve">
+        <value>Si está buscando una solicitud en particular, ingrese un texto en el cuadro de búsqueda y haga clic en “Buscar”.</value>
+    </data>
+    <data name="PrayerTracker will search the Requestor/Subject and Request Text fields (case-insensitively) of both active and inactive requests." xml:space="preserve">
+        <value>SeguidorOración buscará los campos de Solicitante / Asunto y Texto de solicitud (sin distinción de mayúsculas y minúsculas) de solicitudes activas e inactivas.</value>
+    </data>
+    <data name="The results will be displayed in the same format as the original Maintain Requests page, so the buttons described below will work the same for those requests as well." xml:space="preserve">
+        <value>Los resultados se mostrarán en el mismo formato que la página de solicitudes de mantenimiento original, por lo que los botones que se describen a continuación funcionarán igual para esas solicitudes.</value>
+    </data>
+    <data name="They will also be displayed in pages, if there are a lot of results; the number per page is configurable by small group." xml:space="preserve">
+        <value>También se mostrarán en las páginas, si hay muchos resultados; el número por página es configurable por grupos pequeños.</value>
+    </data>
+    <data name="To edit a request, click the pencil icon; it's the first icon under the “Actions” column heading." xml:space="preserve">
+        <value>Para editar una petición, haga clic en el icono de lápiz, el primer icono bajo el título de columna “Acciones”.</value>
+    </data>
+    <data name="For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately." xml:space="preserve">
+        <value>Para las peticiones activas, el segundo icono es un ojo con una barra a través de él; Si hace clic en este icono, la petición se cancelará inmediatamente.</value>
+    </data>
+    <data name="This is equivalent to editing the request, selecting “Expire Immediately”, and saving it." xml:space="preserve">
+        <value>Esto equivale a editar la petición, seleccionar "Expirará Inmediatamente" y guardarla.</value>
+    </data>
+    <data name="When the page is first displayed, it does not display inactive requests." xml:space="preserve">
+        <value>Cuando la página se muestra por primera vez, que no muestra peticiones inactivos.</value>
+    </data>
+    <data name="However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown." xml:space="preserve">
+        <value>Sin embargo, al hacer clic en el vínculo en la parte inferior de la página se actualizará la página con las peticiones se muestran inactivos.</value>
+    </data>
+    <data name="The middle icon will look like an eye; clicking it will restore the request as an active request." xml:space="preserve">
+        <value>El icono del centro se verá como un ojo; Haciendo clic en él, restaurará la petición como una petición activa.</value>
+    </data>
+    <data name="The last updated date will be current, and the request is set to expire normally." xml:space="preserve">
+        <value>La última fecha actualizada será actual, y la petición se establece para caducar normalmente.</value>
+    </data>
+    <data name="Deleting a request is contrary to the intent of PrayerTracker, as you can retrieve requests that have expired." xml:space="preserve">
+        <value>Eliminación de una petición es contraria a la intención de SeguidorOración, como se puede recuperar peticiones que han expirado.</value>
+    </data>
+    <data name="However, if there is a request that needs to be deleted, clicking the trash can icon in the “Actions” column will allow you to do it." xml:space="preserve">
+        <value>Sin embargo, si hay una solicitud que debe ser eliminado, haga clic en el icono de la papelera en la columna “Acciones” le permitirá hacerlo.</value>
+    </data>
+    <data name="Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good." xml:space="preserve">
+        <value>Utilice esta opción con cuidado, ya que estas supresiones no se puede deshacer, una vez a la petición se ha borrado, ha desaparecido para siempre.</value>
+    </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/View.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,35 +58,35 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-  <data name="(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)" xml:space="preserve">
-    <value>(NOTA: Si usted está registrado como miembro de la clase, la única opción que se ve es para ver una lista para imprimir.)</value>
-  </data>
-  <data name="Clicking this link will display the list in a format that is suitable for printing; it does not have the normal {0} header across the top." xml:space="preserve">
-    <value>Hacer clic en este vínculo, se muestra la lista en un formato que sea adecuado para imprimir, sino que no tiene el encabezado normal de {0} en la parte superior.</value>
-  </data>
-  <data name="Clicking this link will send the list you are currently viewing to your group members." xml:space="preserve">
-    <value>Al hacer clic en este enlace le enviará la lista que está viendo en ese momento a los miembros del grupo.</value>
-  </data>
     <data name="From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group." xml:space="preserve">
         <value>Desde esta página, puede ver la lista de peticiones (para hoy o para el próximo Domingo), ver una versión imprimible de la lista, y por correo electrónico la lista de los miembros de su grupo.</value>
     </data>
-  <data name="If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like." xml:space="preserve">
-    <value>Si continúa, usted verá una página que muestra a la que la lista fue enviado, y lo que la lista parecía.</value>
+    <data name="(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)" xml:space="preserve">
+        <value>(NOTA: Si usted está registrado como miembro de la clase, la única opción que se ve es para ver una lista para imprimir.)</value>
     </data>
-  <data name="Note that this link does not appear if it is Sunday." xml:space="preserve">
-    <value>Tenga en cuenta que este enlace no aparece si es Domingo.</value>
-  </data>
-  <data name="Once you have clicked the link, you can print it using your browser's standard “Print” functionality." xml:space="preserve">
-    <value>Una vez que haya hecho clic en el enlace, se puede imprimir con el navegador estándar de “Imprimir” funcionalidad.</value>
-  </data>
-  <data name="The page will remind you that you are about to do that, and ask for your confirmation." xml:space="preserve">
-    <value>La página te recordará que estás a punto de hacerlo, y pedir su confirmación.</value>
+    <data name="This will modify the date for the list, so it will look like it is currently next Sunday." xml:space="preserve">
+        <value>Esto modificará la fecha de la lista, por lo que se verá como es en la actualidad el próximo Domingo.</value>
     </data>
     <data name="This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening." xml:space="preserve">
         <value>Esto puede ser usado, por ejemplo, para ver lo que peticiones de caducidad, ni le permite imprimir una lista con la fecha del Domingo en la noche del Sábado.</value>
     </data>
-  <data name="This will modify the date for the list, so it will look like it is currently next Sunday." xml:space="preserve">
-    <value>Esto modificará la fecha de la lista, por lo que se verá como es en la actualidad el próximo Domingo.</value>
+    <data name="Note that this link does not appear if it is Sunday." xml:space="preserve">
+        <value>Tenga en cuenta que este enlace no aparece si es Domingo.</value>
+    </data>
+    <data name="Clicking this link will display the list in a format that is suitable for printing; it does not have the normal PrayerTracker header across the top." xml:space="preserve">
+        <value>Hacer clic en este vínculo, se muestra la lista en un formato que sea adecuado para imprimir, sino que no tiene el encabezado normal de SeguidorOración en la parte superior.</value>
+    </data>
+    <data name="Once you have clicked the link, you can print it using your browser's standard “Print” functionality." xml:space="preserve">
+        <value>Una vez que haya hecho clic en el enlace, se puede imprimir con el navegador estándar de “Imprimir” funcionalidad.</value>
+    </data>
+    <data name="Clicking this link will send the list you are currently viewing to your group members." xml:space="preserve">
+        <value>Al hacer clic en este enlace le enviará la lista que está viendo en ese momento a los miembros del grupo.</value>
+    </data>
+    <data name="The page will remind you that you are about to do that, and ask for your confirmation." xml:space="preserve">
+        <value>La página te recordará que estás a punto de hacerlo, y pedir su confirmación.</value>
+    </data>
+    <data name="If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like." xml:space="preserve">
+        <value>Si continúa, usted verá una página que muestra a la que la lista fue enviado, y lo que la lista parecía.</value>
     </data>
     <data name="You may safely use your browser's “Back” button to navigate away from the page." xml:space="preserve">
         <value>Usted puede utilizar con seguridad de su navegador botón “Atrás” para navegar fuera de la página.</value>

src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Announcement.es.resx

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="metadata">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" use="required" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="assembly">
+                        <xsd:complexType>
+                            <xsd:attribute name="alias" type="xsd:string" />
+                            <xsd:attribute name="name" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>2.0</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="This is the text of the announcement you would like to send." xml:space="preserve">
+        <value>Este es el texto del anuncio que desea enviar.</value>
+    </data>
+    <data name="It functions the same way as the text box on the &lt;a href=&quot;../requests/edit#request&quot;&gt;“Edit Request” page&lt;/a&gt;." xml:space="preserve">
+        <value>Funciona de la misma forma que el cuadro de texto en &lt;a href="../requests/edit#request"&gt;la página “Editar la Petición”&lt;/a&gt;.</value>
+    </data>
+    <data name="Without this box checked, the text of the announcement will only be e-mailed to your group members." xml:space="preserve">
+        <value>Sin esta caja marcada, el texto del anuncio sólo será por correo electrónico a los miembros del su grupo.</value>
+    </data>
+    <data name="If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected." xml:space="preserve">
+        <value>Si marca esta caja, sin embargo, el texto del anuncio será añadido a su lista de oración en la sección que ha seleccionado.</value>
+    </data>
+</root>

src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Members.es.resx

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="metadata">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" use="required" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="assembly">
+                        <xsd:complexType>
+                            <xsd:attribute name="alias" type="xsd:string" />
+                            <xsd:attribute name="name" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>2.0</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="From this page, you can add, edit, and delete the e-mail addresses for your group." xml:space="preserve">
+        <value>Desde esta página, usted puede agregar, editar y eliminar las direcciones de correo electrónico para su grupo.</value>
+    </data>
+    <data name="To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group." xml:space="preserve">
+        <value>Para agregar una dirección de correo electrónico, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de direcciones para su grupo.</value>
+    </data>
+    <data name="To edit an e-mail address, click the pencil icon; it's the first icon under the “Actions” column heading." xml:space="preserve">
+        <value>Para editar una dirección de correo electrónico, haga clic en el icono de lápiz, es el primer icono bajo el título de columna “Acciones”.</value>
+    </data>
+    <data name="This will allow you to update the name and/or the e-mail address for that member." xml:space="preserve">
+        <value>Esto le permitirá actualizar el nombre y / o la dirección de correo electrónico para ese miembro.</value>
+    </data>
+    <data name="To delete an e-mail address, click the trash can icon in the “Actions” column." xml:space="preserve">
+        <value>Para eliminar una dirección de correo electrónico, haga clic en el icono de la papelera en la columna “Acciones”.</value>
+    </data>
+    <data name="Note that once an e-mail address has been deleted, it is gone." xml:space="preserve">
+        <value>Tenga en cuenta que una vez que la dirección de correo electrónico se ha eliminado, se ha ido.</value>
+    </data>
+    <data name="(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)" xml:space="preserve">
+        <value>(Por supuesto, si usted lo elimine por error, se puede entrar de nuevo utilizando la opción “Agregar” instrucciones de arriba.)</value>
+    </data>
+</root>

src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Preferences.es.resx

@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="metadata">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" use="required" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="assembly">
+                        <xsd:complexType>
+                            <xsd:attribute name="alias" type="xsd:string" />
+                            <xsd:attribute name="name" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                            <xsd:attribute ref="xml:space" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>2.0</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="This page allows you to change how your prayer request list looks and behaves." xml:space="preserve">
+        <value>Esta página le permite cambiar la forma en que su lista de peticiones de la oración se ve y se comporta.</value>
+    </data>
+    <data name="Each section is addressed below." xml:space="preserve">
+        <value>Cada sección se aborda más adelante.</value>
+    </data>
+    <data name="When a regular request goes this many days without being updated, it expires and no longer appears on the request list." xml:space="preserve">
+        <value>Cuando una petición regular va esta cantidad de días sin actualizar, caduca y ya no aparece en la lista de peticiones.</value>
+    </data>
+    <data name="Note that the categories “Long-Term Requests” and “Expecting” never expire automatically." xml:space="preserve">
+        <value>Tenga en cuenta que las categorías “Peticiones a Largo Plazo” y “Embarazada” no expirará automáticamente.</value>
+    </data>
+    <data name="Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests." xml:space="preserve">
+        <value>Peticiones que han sido actualizadas dentro de esta cantidad de días se identifican por un círculo hueco para su bala, en oposición a un círculo relleno para otras peticiones.</value>
+    </data>
+    <data name="All categories respect this setting." xml:space="preserve">
+        <value>Todas las categorías respetar esta opción.</value>
+    </data>
+    <data name="If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet." xml:space="preserve">
+        <value>Si usted hace una corrección de errata en una petición, si no marque la caja para actualizar la fecha, este valor va a cambiar la bala.</value>
+    </data>
+    <data name="(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)" xml:space="preserve">
+        <value>(NOTA: En el texto sin formato de correo electrónico, las nuevas solicitudes se identifican con un símbolo “+”, y pide a los viejos se identifican con un símbolo “-”.)</value>
+    </data>
+    <data name="Requests that have not been updated in this many weeks are identified by an italic font on the “Maintain Requests” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current." xml:space="preserve">
+        <value>Peticiones que no han sido actualizados en esta semana muchos se identifican con un tipo de letra cursiva en la página “Mantener las Peticiones”, para recordarle que debe buscar novedades en estas peticiones para que vuestras oraciones pueden permanecer relevante y actual.</value>
+    </data>
+    <data name="By default, requests are sorted within each group by the last updated date, with the most recent on top." xml:space="preserve">
+        <value>De forma predeterminada, las solicitudes se ordenan dentro de cada grupo por la última fecha de actualización, con el más reciente en la parte superior.</value>
+    </data>
+    <data name="If you would prefer to have the list sorted by requestor or subject rather than by date, select “Sort by Requestor Name” instead." xml:space="preserve">
+        <value>Si prefiere tener la lista ordenada por el solicitante o el sujeto en vez de por fecha, seleccione “Ordenar por Nombre del Solicitante” en su lugar.</value>
+    </data>
+    <data name="PrayerTracker must put an name and e-mail address in the “from” position of each e-mail it sends." xml:space="preserve">
+        <value>SeguidorOración debe poner el nombre y la dirección de correo electrónico en el “de” posición de cada correo electrónico que envía.</value>
+    </data>
+    <data name="The default name is “PrayerTracker”, and the default e-mail address is “prayer@bitbadger.solutions”." xml:space="preserve">
+        <value>El nombre predeterminado es “PrayerTracker”, y el valor predeterminado dirección de correo electrónico es “prayer@bitbadger.solutions”.</value>
+    </data>
+    <data name="This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)." xml:space="preserve">
+        <value>Esto funciona, pero los mensajes devueltos, y las respuestas de fuera de la oficina serán enviados a esa dirección (que no es ni siquiera una dirección real).</value>
+    </data>
+    <data name="Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly." xml:space="preserve">
+        <value>Cambiar por lo menos la dirección de correo electrónico a su dirección se asegurará de que usted recibe estos correos electrónicos, y se puede podar su lista de correo electrónico en consecuencia.</value>
+    </data>
+    <data name="This is the default e-mail format for your group." xml:space="preserve">
+        <value>Este es el valor predeterminado formato de correo electrónico para su grupo.</value>
+    </data>
+    <data name="The PrayerTracker default is HTML, which sends the list just as you see it online." xml:space="preserve">
+        <value>El valor predeterminado de SeguidorOración es HTML, el cual envía la lista al igual que usted lo ve en el sitio.</value>
+    </data>
+    <data name="However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting." xml:space="preserve">
+        <value>Sin embargo, algunos clientes de correo electrónico no puede mostrar esto correctamente, para que pueda elegir el correo electrónico a un formato de texto plano predeterminadas, que no tiene colores, cursiva, u otro formato.</value>
+    </data>
+    <data name="The setting on this page is the group default; you can select a format for each recipient on the “Maintain Group Members” page." xml:space="preserve">
+        <value>La configuración en esta página es el valor predeterminado del grupo, se puede seleccionar un formato para cada destinatario de la página “Mantener los Miembros del Grupo”.</value>
+    </data>
+    <data name="You can customize the colors that are used for the headings and lines in your request list." xml:space="preserve">
+        <value>Usted puede personalizar los colores que se utilizan para las partidas y líneas en su lista de peticiones.</value>
+    </data>
+    <data name="You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255." xml:space="preserve">
+        <value>Puede seleccionar uno de los 16 colores con nombre en las listas desplegables, o puede “mezclar su propia” en colores rojo, verde y azul (RGB) valores entre 0 y 255.</value>
+    </data>
+    <data name="There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic." xml:space="preserve">
+        <value>Hay un enlace en la parte inferior de la página para una lista de colores con más nombres y sus valores RGB, si realmente estás sintiendo artística.</value>
+    </data>
+    <data name="The background color cannot be changed." xml:space="preserve">
+        <value>El color de fondo no puede ser cambiado.</value>
+    </data>
+    <data name="There are two options for fonts that will be used in the prayer request list." xml:space="preserve">
+        <value>Hay dos opciones para las fuentes que se utilizarán en la lista de peticiones de oración.</value>
+    </data>
+    <data name="“Native Fonts” uses a list of fonts that will render the prayer requests in the best available font for their device, whether that is a desktop or laptop computer, mobile device, or tablet." xml:space="preserve">
+        <value>“Fuentes Nativas” utiliza una lista de fuentes que representarán las peticiones de oración en la mejor fuente disponible para su dispositivo, ya sea una computadora de escritorio o portátil, un dispositivo móvil o una tableta.</value>
+    </data>
+    <data name="(This is the default for new small groups.)" xml:space="preserve">
+        <value>(Este es el valor predeterminado para los nuevos grupos pequeños).</value>
+    </data>
+    <data name="“Named Fonts” uses a comma-separated list of fonts that you specify." xml:space="preserve">
+        <value>“Fuentes con Nombre” utiliza una lista de fuentes separadas por comas que usted especifica.</value>
+    </data>
+    <data name="A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font." xml:space="preserve">
+        <value>Una advertencia de que es bueno aquí, sólo porque usted tiene una fuente oscura y gusta la forma en que se vea no significa que los demás tienen de que la misma fuente.</value>
+    </data>
+    <data name="It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”." xml:space="preserve">
+        <value>Generalmente es mejor quedarse con las fuentes que vienen con Windows - Fuentes como “Arial”, “Times New Roman”, “Tahoma”, y “Comic Sans MS”.</value>
+    </data>
+    <data name="You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font." xml:space="preserve">
+        <value>También debe poner fin a la lista de fuentes, ya sea con “serif” o el “sans-serif”, que utilizará el fuente serif predeterminado (como “Times New Roman”) o el fuente sans-serif predeterminado (como “Arial”).</value>
+    </data>
+    <data name="This is the point size to use for each." xml:space="preserve">
+        <value>Este es el tamaño de punto a utilizar para cada uno.</value>
+    </data>
+    <data name="The default for the heading is 16pt, and the default for the text is 12pt." xml:space="preserve">
+        <value>El valor predeterminado para el título es 16 puntos, y el valor por defecto para el texto es 12 puntos.</value>
+    </data>
+    <data name="If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:" xml:space="preserve">
+        <value>Si el grupo está compuesta en su mayoría de la gente que prefiere letras grandes, los siguientes ajustes harán que su lista de parecerse a la típica la publicación “Letra Grande”:</value>
+    </data>
+    <data name="Named Fonts: &quot;Times New Roman&quot;,serif" xml:space="preserve">
+        <value>Fuentes con Nombre: "Times New Roman",serif</value>
+    </data>
+    <data name="The group's request list can be either public, private, or password-protected." xml:space="preserve">
+        <value>La lista de peticiones del grupo puede ser pública, privada o protegida por contraseña.</value>
+    </data>
+    <data name="Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)." xml:space="preserve">
+        <value>Las listas públicas están disponibles sin iniciar sesión, y listas privadas sólo están disponibles en línea a los administradores (aunque la lista todavía puede ser enviado por correo electrónico por el administrador).</value>
+    </data>
+    <data name="Password-protected lists allow group members to log in and view the current request list online, using the “Group Log On” link and providing this password." xml:space="preserve">
+        <value>Protegidos con contraseña listas permiten miembros del grupo iniciar sesión y ver la lista de peticiones actual en el sito, utilizando el "Iniciar Sesión como Grupo" enlace y proporcionar la contraseña.</value>
+    </data>
+    <data name="As this is a shared password, it is stored in plain text, so you can easily see what it is." xml:space="preserve">
+        <value>Como se trata de una contraseña compartida, se almacena en texto plano, así que usted puede ver fácilmente lo que es.</value>
+    </data>
+    <data name="If you select “Password Protected” but do not enter a password, the list remains private, which is also the default value." xml:space="preserve">
+        <value>Si selecciona "Protegido por Contraseña" pero no introduce una contraseña, la lista sigue siendo privado, que también es el valor predeterminado.</value>
+    </data>
+    <data name="(Changing this password will force all members of the group who logged in with the “Remember Me” box checked to provide the new password.)" xml:space="preserve">
+        <value>(Cambiar esta contraseña obligará a todos los miembros del grupo que se iniciar sesión en el "Acuérdate de Mí" caja marcada para proporcionar la nueva contraseña.)</value>
+    </data>
+    <data name="This is the time zone that you would like to use for your group." xml:space="preserve">
+        <value>Esta es la zona horaria que desea utilizar para su clase.</value>
+    </data>
+    <data name="If you do not see your time zone listed, just &lt;a href=&quot;mailto:daniel@bitbadger.solutions?subject=PrayerTracker+Time+Zone&quot;&gt;contact Daniel&lt;/a&gt; and tell him what time zone you need." xml:space="preserve">
+        <value>Si no puede ver la zona horaria en la lista, ponte en &lt;a href="daniel@bitbadger.solutions?subject=Zona+Horaria+por+SeguidorOración"&gt;contacto con Daniel&lt;/a&gt; y decirle lo que la zona horaria que usted necesita.</value>
+    </data>
+    <data name="As small groups use PrayerTracker, they accumulate many expired requests." xml:space="preserve">
+        <value>A medida que los grupos pequeños utilizan SeguidorOración, acumulan muchas solicitudes caducadas.</value>
+    </data>
+    <data name="When lists of requests include expired requests, the results will be broken up into pages." xml:space="preserve">
+        <value>Cuando las listas de solicitudes que incluyen solicitudes caducadas, los resultados se dividirán en páginas.</value>
+    </data>
+    <data name="The default value is 100 requests per page, but may be set as low as 10 or as high as 255." xml:space="preserve">
+        <value>El valor predeterminado es de 100 solicitudes por página, pero se puede establecer tan bajo como 10 o tan alto como 255.</value>
+    </data>
+    <data name="PrayerTracker can display the last date a request was updated, at the end of the request text." xml:space="preserve">
+        <value>SeguidorOración puede mostrar la última fecha en que se actualizó una solicitud, al final del texto de solicitud.</value>
+    </data>
+    <data name="By default, it does not." xml:space="preserve">
+        <value>Por defecto, no lo hace.</value>
+    </data>
+    <data name="If you select a short date, it will show “(as of 10/11/2015)” (for October 11, 2015); if you select a long date, it will show “(as of Sunday, October 11, 2015)”." xml:space="preserve">
+        <value>Si selecciona una fecha corta, se mostrará “(como de 11/10/2015)” (para el 11 de octubre de 2015); si selecciona una fecha larga, se mostrará “(como de domingo, 11 de octubre de 2015)”.</value>
+    </data>
+</root>

src/PrayerTracker.UI/Resources/Views/Help/User/LogOn.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,22 +58,22 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-  <data name="If you want {0} to remember you on your computer, click the “{1}” box before clicking the “{2}” button." xml:space="preserve">
-    <value>Si desea que {0} que le recuerde en su ordenador, haga clic en “{1}” caja antes de pulsar el “{2}” botón.</value>
+    <data name="This page allows you to log on to PrayerTracker." xml:space="preserve">
+        <value>Esta página le permite acceder a SeguidorOración.</value>
     </data>
-  <data name="If you want {0} to remember your group, click the “{1}” box before clicking the “{2}” button." xml:space="preserve">
-    <value>Si desea que {0} recuerde su grupo, haga clic en “{1}” caja antes de pulsar el “{2}” botón.</value>
+    <data name="There are two different levels of access for PrayerTracker - user and group." xml:space="preserve">
+        <value>Hay dos diferentes niveles de acceso para SeguidorOración - el usuario y el grupo.</value>
+    </data>
+    <data name="Enter your e-mail address and password into the appropriate boxes, then select your group." xml:space="preserve">
+        <value>Introduzca su dirección de correo electrónico y contraseña en las cajas apropiadas y seleccione su grupo.</value>
+    </data>
+    <data name="If you want PrayerTracker to remember you on your computer, click the “Remember Me” box before clicking the “Log On” button." xml:space="preserve">
+        <value>Si desea que SeguidorOración que le recuerde en su ordenador, haga clic en “Acuérdate de Mí” caja antes de pulsar el “Iniciar Sesión” botón.</value>
     </data>
     <data name="If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box." xml:space="preserve">
         <value>Si el grupo se ha definido una contraseña para usar que le permite ver su lista de peticiones en línea, seleccionar el grupo en la lista desplegable y introduzca la contraseña del grupo en la caja correspondiente.</value>
     </data>
-  <data name="Select your group, then enter your e-mail address and password into the appropriate boxes." xml:space="preserve">
-    <value>Seleccione su grupo y introduzca su dirección de correo electrónico y contraseña en las cajas apropiadas.</value>
-  </data>
-  <data name="There are two different levels of access for {0} - user and group." xml:space="preserve">
-    <value>Hay dos diferentes niveles de acceso para {0} - el usuario y el grupo.</value>
-  </data>
-  <data name="This page allows you to log on to {0}." xml:space="preserve">
-    <value>Esta página le permite acceder a {0}.</value>
+    <data name="If you want PrayerTracker to remember your group, click the “Remember Me” box before clicking the “Log On” button." xml:space="preserve">
+        <value>Si desea que SeguidorOración recuerde su grupo, haga clic en “Acuérdate de Mí” caja antes de pulsar el “Iniciar Sesión” botón.</value>
     </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/User/Password.es.resx

@@ -1,64 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
     <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
         <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
         <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,19 +58,22 @@
     <resheader name="writer">
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
-  <data name="&lt;a href=&quot;mailto:daniel@djs-consulting.com?subject={0}%20Password%20Help&quot;&gt;Click here to request help resetting your password&lt;/a&gt;." xml:space="preserve">
-    <value>&lt;a href="mailto:daniel@djs-consulting.com?subject=Ayuda%20de%20Contraseña%20de%20{0}"&gt;Haga clic aquí para solicitar ayuda para restablecer su contraseña&lt;/a&gt;.</value>
+    <data name="This page will let you change your password." xml:space="preserve">
+        <value>Esta página le permitirá cambiar su contraseña.</value>
     </data>
     <data name="Enter your existing password in the top box, then enter your new password in the bottom two boxes." xml:space="preserve">
         <value>Ingrese su contraseña actual en la caja superior y introduzca la nueva contraseña en la parte inferior dos cajas.</value>
     </data>
-  <data name="Entering your existing password is a security measure; with the “{0}” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password." xml:space="preserve">
-    <value>Al entrar su contraseña actual es una medida de seguridad, con el “{0}” caja de la página inicio de sesión, esto evitará que otra persona que pueda estar usando su computadora de la posibilidad de simplemente ir a el sitio y cambiar la contraseña.</value>
+    <data name="Entering your existing password is a security measure; with the “Remember Me” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password." xml:space="preserve">
+        <value>Al entrar su contraseña actual es una medida de seguridad, con el “Acuérdate de Mí” caja de la página inicio de sesión, esto evitará que otra persona que pueda estar usando su computadora de la posibilidad de simplemente ir a el sitio y cambiar la contraseña.</value>
     </data>
     <data name="If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password." xml:space="preserve">
         <value>Si no recuerdas tu contraseña actual, no podemos recuperar, pero podemos ponerlo en algo que se conoce de modo que usted puede cambiarlo a su contraseña.</value>
     </data>
-  <data name="This page will let you change your password." xml:space="preserve">
-    <value>Esta página le permitirá cambiar su contraseña.</value>
+    <data name="PrayerTracker+Password+Help" xml:space="preserve">
+        <value>Ayuda+de+Contraseña+de+SeguidorOración</value>
+    </data>
+    <data name="Click here to request help resetting your password." xml:space="preserve">
+        <value>Haga clic aquí para solicitar ayuda para restablecer su contraseña.</value>
     </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Home/PrivacyPolicy.es.resx

@@ -147,7 +147,7 @@
   <data name="If you utilize the “{0}” box on sign in, a second cookie is stored, and transmitted to establish a session; this cookie is removed by clicking the “{1}” link." xml:space="preserve">
     <value>Si utilizas el cuadro "{0}" al iniciar sesión, se almacena una segunda cookie y se transmite para establecer una sesión; esta cookie se elimina haciendo clic en el enlace "{1}".</value>
   </data>
-  <data name="It also stores names and e-mail addreses of small group members, and plain-text passwords for small groups with password-protected lists." xml:space="preserve">
+  <data name="It also stores names and e-mail addresses of small group members, and plain-text passwords for small groups with password-protected lists." xml:space="preserve">
     <value>También almacena nombres y direcciones de correo electrónico de miembros de grupos pequeños, y contraseñas de texto sin formato para grupos pequeños con listas protegidas por contraseña.</value>
   </data>
   <data name="On the server, all data is stored in a controlled-access database." xml:space="preserve">

src/PrayerTracker.UI/Resources/Views/Requests/Maintain.es.resx

@@ -117,16 +117,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected." xml:space="preserve">
-    <value>Si marca esta caja, sin embargo, el texto del anuncio será añadido a su lista de oración en la sección que ha seleccionado.</value>
+  <data name="(If the prayer request has been answered, or an event has passed, consider inactivating it instead.)" xml:space="preserve">
+    <value>(Si la solicitud de oración ha sido respondida o si un evento ha pasado, considere desactivarla.)</value>
   </data>
-  <data name="It functions the same way as the text box on the “&lt;a href=\&quot;{0}\&quot;&gt;{1}&lt;/a&gt;” page." xml:space="preserve">
-    <value>Funciona de la misma forma que el cuadro de texto en la página “&lt;a href="{0}"&gt;{1}&lt;/a&gt;”.</value>
+  <data name="Clear Search Criteria" xml:space="preserve">
+    <value>Borrar los Criterios de Búsqueda</value>
   </data>
-  <data name="This is the text of the announcement you would like to send." xml:space="preserve">
-    <value>Este es el texto del anuncio que desea enviar.</value>
+  <data name="Delete This Request" xml:space="preserve">
+    <value>Eliminar esta petición</value>
   </data>
-  <data name="Without this box checked, the text of the announcement will only be e-mailed to your group members." xml:space="preserve">
-    <value>Sin esta caja marcada, el texto del anuncio sólo será por correo electrónico a los miembros del su grupo.</value>
+  <data name="Do Not Show Inactive Requests" xml:space="preserve">
+    <value>No Muestran las Peticiones Inactivos</value>
+  </data>
+  <data name="Edit This Prayer Request" xml:space="preserve">
+    <value>Editar esta petición de oración</value>
+  </data>
+  <data name="Expire This Request Immediately" xml:space="preserve">
+    <value>Expirar esta petición de oración de inmediato</value>
+  </data>
+  <data name="Inactive requests are currently not shown" xml:space="preserve">
+    <value>Peticiones inactivas no se muestra actualmente</value>
+  </data>
+  <data name="Inactive requests are currently shown" xml:space="preserve">
+    <value>Peticiones inactivas se muestra actualmente</value>
+  </data>
+  <data name="Next Page" xml:space="preserve">
+    <value>Siguiente Página</value>
+  </data>
+  <data name="Previous Page" xml:space="preserve">
+    <value>Página Anterior</value>
+  </data>
+  <data name="Restore This Inactive Request" xml:space="preserve">
+    <value>Restaurar esta petición inactiva</value>
+  </data>
+  <data name="Search requests..." xml:space="preserve">
+    <value>Busca las peticiones...</value>
+  </data>
+  <data name="Show Inactive Requests" xml:space="preserve">
+    <value>Muestran las Peticiones Inactivos</value>
   </data>
 </root>

src/PrayerTracker.UI/Resources/Views/SmallGroup/Preferences.es.resx

@@ -117,16 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Ending with either “serif” or “sans-serif” will cause the user's browser to use the default “serif” font (“Times New Roman” on Windows) or “sans-serif” font (“Arial” on Windows) if no other fonts in the list are found." xml:space="preserve">
-    <value>Con la extensión “serif” o el “sans-serif” hará que el navegador del usuario para utilizar el valor predeterminado “serif” de la fuente (“Times New Roman” en Windows) o “sans-serif” de la fuente (“Arial” en Windows) si no otras fuentes en la lista se encuentran.</value>
+  <data name="Ending this list with either “serif” or “sans-serif” will cause the user's browser to use the default “serif” font (“Times New Roman” on Windows) or “sans-serif” font (“Arial” on Windows) if no other fonts in the list are found." xml:space="preserve">
+    <value>Terminar esta lista con “serif” o “sans-serif” hará que el navegador del usuario utilice la fuente predeterminado “serif” (“Times New Roman” en Windows) o “sans-serif” (“Arial” en Windows) si no se encuentran otras fuentes en la lista.</value>
   </data>
   <data name="If you want a custom color, you may be able to get some ideas (and a list of RGB values for those colors) from the W3 School's &lt;a href=&quot;http://www.w3schools.com/html/html_colornames.asp&quot; title=&quot;HTML Color List - W3 School&quot;&gt;HTML color name list&lt;/a&gt;." xml:space="preserve">
     <value>Si desea un color personalizado, que puede ser capaz de obtener algunas ideas (y una lista de valores RGB para los colores) de la lista de la Escuela de W3 de &lt;a href="http://www.w3schools.com/html/html_colornames.asp" title="La Lista de Nombres de Colores HTML - La Escuela de W3"&gt;nombres de colores HTML&lt;/a&gt;.</value>
   </data>
-  <data name="List font names, separated by commas." xml:space="preserve">
-    <value>Lista de nombres de fuentes separados por comas.</value>
+  <data name="Native fonts match the default font based on the user's device (computer, phone, tablet, etc.)." xml:space="preserve">
+    <value>Las fuentes nativas coinciden con la fuente predeterminada según el dispositivo del usuario (computadora, teléfono, tableta, etc.).</value>
   </data>
-  <data name="The first font that is matched is the one that is used." xml:space="preserve">
-    <value>La primera fuente que se corresponde es el que se utiliza.</value>
+  <data name="Named fonts should be separated by commas, and will be displayed using the first one the user has in the list." xml:space="preserve">
+    <value>Las fuentes con nombre deben estar separadas por comas y se mostrarán usando la primera que el usuario tenga en la lista.</value>
   </data>
 </root>

src/PrayerTracker.UI/SmallGroup.fs

@@ -1,133 +1,145 @@
 module PrayerTracker.Views.SmallGroup
 
-open Giraffe.GiraffeViewEngine
+open Giraffe.ViewEngine
+open Giraffe.ViewEngine.Accessibility
+open Giraffe.ViewEngine.Htmx
 open Microsoft.Extensions.Localization
 open PrayerTracker
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System.IO
 
 /// View for the announcement page
-let announcement isAdmin ctx vi =
+let announcement isAdmin ctx viewInfo =
     let s        = I18N.localizer.Force ()
+    let model    = { SendToClass = ""; Text = ""; AddToRequestList = None; RequestType = None }
     let reqTypes = ReferenceList.requestTypeList s
-  [ form [ _action "/small-group/announcement/send"; _method "post"; _class "pt-center-columns" ] [
-      yield csrfToken ctx
-      yield div [ _class "pt-field-row" ] [
-        div [ _class "pt-field pt-editor" ] [
-          label [ _for "text" ] [ encLocText s.["Announcement Text"] ]
-          textarea [ _name "text"; _id "text"; _autofocus ] []
+    let vi       = AppViewInfo.withOnLoadScript "PT.smallGroup.announcement.onPageLoad" viewInfo
+    form [ _action "/small-group/announcement/send"
+           _method "post"
+           _class "pt-center-columns"
+           _onsubmit "PT.updateCKEditor()"
+           Target.content ] [
+        csrfToken ctx
+        div [ _fieldRow ] [
+            div [ _inputFieldWith [ "pt-editor" ] ] [
+                label [ _for (nameof model.Text) ] [ locStr s["Announcement Text"] ]
+                textarea [ _name (nameof model.Text); _id (nameof model.Text); _autofocus ] []
             ]
         ]
-      match isAdmin with
-      | true -> 
-          yield div [ _class "pt-field-row" ] [
-            div [ _class "pt-field" ] [
-              label [] [ encLocText s.["Send Announcement to"]; rawText ":" ]
-              div [ _class "pt-center-text" ] [
-                radio "sendToClass" "sendY" "Y" "Y"
-                label [ _for "sendY" ] [ encLocText s.["This Group"]; rawText "     " ]
-                radio "sendToClass" "sendN" "N" "Y"
-                label [ _for "sendN" ] [ encLocText s.["All {0} Users", s.["PrayerTracker"]] ]
+        if isAdmin then
+            div [ _fieldRow ] [
+                div [ _inputField ] [
+                    label [] [ locStr s["Send Announcement to"]; rawText ":" ]
+                    div [ _group ] [
+                        label [] [
+                            radio (nameof model.SendToClass) $"{nameof model.SendToClass}_Y" "Y" "Y"
+                            locStr s["This Group"]
+                        ]
+                        label [] [
+                            radio (nameof model.SendToClass) $"{nameof model.SendToClass}_N" "N" "Y"
+                            locStr s["All {0} Users", s["PrayerTracker"]]
                         ]
                     ]
                 ]
-      | false ->
-          yield input [ _type "hidden"; _name "sendToClass"; _value "Y" ]
-      yield div [ _class "pt-field-row pt-fadeable pt-shown"; _id "divAddToList" ] [
-        div [ _class "pt-checkbox-field" ] [
-          input [ _type "checkbox"; _name "addToRequestList"; _id "addToRequestList"; _value "True" ]
-          label [ _for "addToRequestList" ] [ encLocText s.["Add to Request List"] ]
+            ]
+        else input [ _type "hidden"; _name (nameof model.SendToClass); _value "Y" ]
+        div [ _fieldRowWith [ "pt-fadeable"; "pt-shown" ]; _id "divAddToList" ] [
+            div [ _checkboxField ] [
+                inputField "checkbox" (nameof model.AddToRequestList) "True" []
+                label [ _for (nameof model.AddToRequestList) ] [ locStr s["Add to Request List"] ]
             ]
         ]
-      yield div [ _class "pt-field-row pt-fadeable"; _id "divCategory" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "requestType" ] [ encLocText s.["Request Type"] ]
+        div [ _fieldRowWith [ "pt-fadeable" ]; _id "divCategory" ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.RequestType) ] [ locStr s["Request Type"] ]
                 reqTypes
                 |> Seq.ofList
-          |> Seq.map (fun item -> fst item, (snd item).Value)
-          |> selectList "requestType" "Announcement" []
+                |> Seq.map (fun (typ, desc) -> PrayerRequestType.toCode typ, desc.Value)
+                |> selectList (nameof model.RequestType) (PrayerRequestType.toCode Announcement) []
             ]
         ]
-      yield div [ _class "pt-field-row" ] [ submit [] "send" s.["Send Announcement"] ]
-      ]
-    script [] [ rawText "PT.onLoad(PT.smallGroup.announcement.onPageLoad)" ]
+        div [ _fieldRow ] [ submit [] "send" s["Send Announcement"] ]
     ]
+    |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi "Send Announcement"
 
 
 /// View for once an announcement has been sent
-let announcementSent (m : Announcement) vi =
+let announcementSent (model : Announcement) viewInfo =
     let s = I18N.localizer.Force ()
-  [ span [ _class "pt-email-heading" ] [ encLocText s.["HTML Format"]; rawText ":" ]
-    div [ _class "pt-email-canvas" ] [ rawText m.text ]
+    [   span [ _class "pt-email-heading" ] [ locStr s["HTML Format"]; rawText ":" ]
+        div [ _class "pt-email-canvas" ] [ rawText model.Text ]
         br []
         br []
-    span [ _class "pt-email-heading" ] [ encLocText s.["Plain-Text Format"]; rawText ":" ]
-    div [ _class "pt-email-canvas" ] [ pre [] [ encodedText (m.plainText ()) ] ]
+        span [ _class "pt-email-heading" ] [ locStr s["Plain-Text Format"]; rawText ":" ]
+        div [ _class "pt-email-canvas" ] [ pre [] [ str model.PlainText ] ]
     ]
     |> Layout.Content.standard
-  |> Layout.standard vi "Announcement Sent"
+    |> Layout.standard viewInfo "Announcement Sent"
 
 
 /// View for the small group add/edit page
-let edit (m : EditSmallGroup) (churches : Church list) ctx vi =
+let edit (model : EditSmallGroup) (churches : Church list) ctx viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = match m.isNew () with true -> "Add a New Group" | false -> "Edit Group"
-  form [ _action "/small-group/save"; _method "post"; _class "pt-center-columns" ] [
+    let pageTitle = if model.IsNew then "Add a New Group" else "Edit Group"
+    form [ _action "/small-group/save"; _method "post"; _class "pt-center-columns"; Target.content ] [
         csrfToken ctx
-    input [ _type "hidden"; _name "smallGroupId"; _value (m.smallGroupId.ToString "N") ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "name" ] [ encLocText s.["Group Name"] ]
-        input [ _type "text"; _name "name"; _id "name"; _value m.name; _required; _autofocus ]
+        inputField "hidden" (nameof model.SmallGroupId) model.SmallGroupId []
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Name) ] [ locStr s["Group Name"] ]
+                inputField "text" (nameof model.Name) model.Name [ _required; _autofocus ]
             ]
         ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "churchId" ] [ encLocText s.["Church"] ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.ChurchId) ] [ locStr s["Church"] ]
                 seq {
-          yield  "", selectDefault s.["Select Church"].Value
-          yield! churches |> List.map (fun c -> c.churchId.ToString "N", c.name)
+                    "", selectDefault s["Select Church"].Value
+                    yield! churches |> List.map (fun c -> shortGuid c.Id.Value, c.Name)
                 }
-        |> selectList "churchId" (m.churchId.ToString "N") [ _required ] 
+                |> selectList (nameof model.ChurchId) model.ChurchId [ _required ] 
             ]
         ]
-    div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Group"] ]
+        div [ _fieldRow ] [ submit [] "save" s["Save Group"] ]
     ]
     |> List.singleton
     |> Layout.Content.standard
-  |> Layout.standard vi pageTitle
+    |> Layout.standard viewInfo pageTitle
 
 
 /// View for the member edit page
-let editMember (m : EditMember) (typs : (string * LocalizedString) seq) ctx vi =
+let editMember (model : EditMember) (types : (string * LocalizedString) seq) ctx viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = match m.isNew () with true -> "Add a New Group Member" | false -> "Edit Group Member"
-  form [ _action "/small-group/member/save"; _method "post"; _class "pt-center-columns" ] [
-    style [ _scoped ] [ rawText "#memberName { width: 15rem; } #emailAddress { width: 20rem; }" ]
+    let pageTitle = if model.IsNew then "Add a New Group Member" else "Edit Group Member"
+    let vi        =
+        AppViewInfo.withScopedStyles [
+            $"#{nameof model.Name} {{ width: 15rem; }}"
+            $"#{nameof model.Email} {{ width: 20rem; }}"
+        ] viewInfo
+    form [ _action "/small-group/member/save"; _method "post"; _class "pt-center-columns"; Target.content ] [
         csrfToken ctx
-    input [ _type "hidden"; _name "memberId"; _value (m.memberId.ToString "N") ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "memberName" ] [ encLocText s.["Member Name"] ]
-        input [ _type "text"; _name "memberName"; _id "memberName"; _required; _autofocus; _value m.memberName ]
+        inputField "hidden" (nameof model.MemberId) model.MemberId []
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Name) ] [ locStr s["Member Name"] ]
+                inputField "text" (nameof model.Name) model.Name [ _required; _autofocus ]
             ]
-      div [ _class "pt-field" ] [
-        label [ _for "emailAddress" ] [ encLocText s.["E-mail Address"] ]
-        input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _required; _value m.emailAddress ]
+            div [ _inputField ] [
+                label [ _for (nameof model.Email) ] [ locStr s["E-mail Address"] ]
+                inputField "email" (nameof model.Email) model.Email [ _required ]
             ]
         ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "emailType" ] [ encLocText s.["E-mail Format"] ]
-        typs
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Format) ] [ locStr s["E-mail Format"] ]
+                types
                 |> Seq.map (fun typ -> fst typ, (snd typ).Value)
-        |> selectList "emailType" m.emailType []
+                |> selectList (nameof model.Format) model.Format []
             ]
         ]
-    div [ _class "pt-field-row" ] [ submit [] "save" s.["Save"] ]
+        div [ _fieldRow ] [ submit [] "save" s["Save"] ]
     ]
     |> List.singleton
     |> Layout.Content.standard
@@ -135,386 +147,480 @@ let editMember (m : EditMember) (typs : (string * LocalizedString) seq) ctx vi =
 
 
 /// View for the small group log on page
-let logOn (grps : SmallGroup list) grpId ctx vi =
+let logOn (groups : (string * string) list) grpId ctx viewInfo =
     let s     = I18N.localizer.Force ()
-  [ form [ _action "/small-group/log-on/submit"; _method "post"; _class "pt-center-columns" ] [
+    let model = { SmallGroupId = emptyGuid; Password = ""; RememberMe = None }
+    let vi    = AppViewInfo.withOnLoadScript "PT.smallGroup.logOn.onPageLoad" viewInfo
+    form [ _action "/small-group/log-on/submit"; _method "post"; _class "pt-center-columns"; Target.body ] [
         csrfToken ctx
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "smallGroupId" ] [ encLocText s.["Group"] ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.SmallGroupId) ] [ locStr s["Group"] ]
                 seq {
-            match grps.Length with
-            | 0 -> yield "", s.["There are no classes with passwords defined"].Value
-            | _ ->
-                yield "", selectDefault s.["Select Group"].Value
-                yield! grps
-                  |> List.map (fun grp -> grp.smallGroupId.ToString "N", sprintf "%s | %s" grp.church.name grp.name)
+                    if groups.Length = 0 then "", s["There are no classes with passwords defined"].Value
+                    else
+                        "", selectDefault s["Select Group"].Value
+                        yield! groups
                 }
-          |> selectList "smallGroupId" grpId [ _required ]
+                |> selectList (nameof model.SmallGroupId) grpId [ _required ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "password" ] [ encLocText s.["Password"] ]
-          input [ _type "password"; _name "password"; _id "password"; _required;
-                  _placeholder (s.["Case-Sensitive"].Value.ToLower ()) ]
+            div [ _inputField ] [
+                label [ _for (nameof model.Password) ] [ locStr s["Password"] ]
+                inputField "password" (nameof model.Password) ""
+                           [ _placeholder (s["Case-Sensitive"].Value.ToLower ()); _required ]
             ]
         ]
-      div [ _class "pt-checkbox-field" ] [
-        input [ _type "checkbox"; _name "rememberMe"; _id "rememberMe"; _value "True" ]
-        label [ _for "rememberMe" ] [ encLocText s.["Remember Me"] ]
+        div [ _checkboxField ] [
+            inputField "checkbox" (nameof model.RememberMe) "True" []
+            label [ _for (nameof model.RememberMe) ] [ locStr s["Remember Me"] ]
             br []
-        small [] [ em [] [ encodedText (s.["Requires Cookies"].Value.ToLower ()) ] ]
+            small [] [ em [] [ str (s["Requires Cookies"].Value.ToLower ()) ] ]
         ]
-      div [ _class "pt-field-row" ] [ submit [] "account_circle" s.["Log On"] ]
-      ]
-    script [] [ rawText "PT.onLoad(PT.smallGroup.logOn.onPageLoad)" ]
+        div [ _fieldRow ] [ submit [] "account_circle" s["Log On"] ]
     ]
+    |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi "Group Log On"
 
 
 /// View for the small group maintenance page
-let maintain (grps : SmallGroup list) ctx vi =
+let maintain (groups : SmallGroupInfo list) ctx viewInfo =
     let s  = I18N.localizer.Force ()
+    let vi = AppViewInfo.withScopedStyles [ "#groupList { grid-template-columns: repeat(4, auto); }" ] viewInfo
+    let groupTable =
+        match groups with
+        | [] -> space
+        | _ ->
+            section [ _id "groupList"; _class "pt-table"; _ariaLabel "Small group list" ] [
+                div [ _class "row head" ] [
+                    header [ _class "cell" ] [ locStr s["Actions"] ]
+                    header [ _class "cell" ] [ locStr s["Name"] ]
+                    header [ _class "cell" ] [ locStr s["Church"] ]
+                    header [ _class "cell" ] [ locStr s["Time Zone"] ]
+                ]
+                for group in groups do
+                    let delAction = $"/small-group/{group.Id}/delete"
+                    let delPrompt = s["Are you sure you want to delete this {0}?  This action cannot be undone.",
+                                         $"""{s["Small Group"].Value.ToLower ()} ({group.Name})""" ].Value
+                    div [ _class "row" ] [
+                        div [ _class "cell actions" ] [
+                            a [ _href $"/small-group/{group.Id}/edit"; _title s["Edit This Group"].Value ] [
+                                iconSized 18 "edit"
+                            ]
+                            a [ _href      delAction
+                                _title     s["Delete This Group"].Value
+                                _hxPost    delAction
+                                _hxConfirm delPrompt ] [
+                                iconSized 18 "delete_forever"
+                            ]
+                        ]
+                        div [ _class "cell" ] [ str group.Name ]
+                        div [ _class "cell" ] [ str group.ChurchName ]
+                        div [ _class "cell" ] [ locStr (TimeZones.name group.TimeZoneId s) ]
+                    ]
+            ]
     [   div [ _class "pt-center-text" ] [
             br []
-      a [ _href (sprintf "/small-group/%s/edit" emptyGuid); _title s.["Add a New Group"].Value ] [
-        icon "add_circle"
-        rawText "  "
-        encLocText s.["Add a New Group"]
+            a [ _href $"/small-group/{emptyGuid}/edit"; _title s["Add a New Group"].Value ] [
+                icon "add_circle"; rawText "  "; locStr s["Add a New Group"]
             ]
             br []
             br []
         ]
-    tableSummary grps.Length s
-    table [ _class "pt-table pt-action-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Church"] ]
-          th [] [ encLocText s.["Time Zone"] ]
+        tableSummary groups.Length s
+        form [ _method "post" ] [
+            csrfToken ctx
+            groupTable
         ]
     ]
-      grps
-      |> List.map (fun g ->
-          let grpId     = g.smallGroupId.ToString "N"
-          let delAction = sprintf "/small-group/%s/delete" grpId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                               sprintf "%s (%s)" (s.["Small Group"].Value.ToLower ()) g.name].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/small-group/%s/edit" grpId); _title s.["Edit This Group"].Value ] [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Group"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText g.name ]
-            td [] [ encodedText g.church.name ]
-            td [] [ encLocText (TimeZones.name g.preferences.timeZoneId s) ]
-            ])
-      |> tbody []
-      ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
-    ]
     |> Layout.Content.standard
     |> Layout.standard vi "Maintain Groups"
 
 
 /// View for the member maintenance page
-let members (mbrs : Member list) (emailTyps : Map<string, LocalizedString>) ctx vi =
+let members (members : Member list) (emailTypes : Map<string, LocalizedString>) ctx viewInfo =
     let s  = I18N.localizer.Force ()
+    let vi = AppViewInfo.withScopedStyles [ "#memberList { grid-template-columns: repeat(4, auto); }" ] viewInfo
+    let memberTable =
+        match members with
+        | [] -> space
+        | _ ->
+            section [ _id "memberList"; _class "pt-table"; _ariaLabel "Small group member list" ] [
+                div [ _class "row head" ] [
+                    header [ _class "cell"] [ locStr s["Actions"] ]
+                    header [ _class "cell"] [ locStr s["Name"] ]
+                    header [ _class "cell"] [ locStr s["E-mail Address"] ]
+                    header [ _class "cell"] [ locStr s["Format"] ]
+                ]
+                for mbr in members do
+                    let mbrId     = shortGuid mbr.Id.Value
+                    let delAction = $"/small-group/member/{mbrId}/delete"
+                    let delPrompt =
+                        s["Are you sure you want to delete this {0}?  This action cannot be undone.", s["group member"]]
+                            .Value.Replace("?", $" ({mbr.Name})?")
+                    div [ _class "row" ] [
+                        div [ _class "cell actions" ] [
+                            a [ _href $"/small-group/member/{mbrId}/edit"; _title s["Edit This Group Member"].Value ] [
+                                iconSized 18 "edit"
+                            ]
+                            a [ _href      delAction
+                                _title     s["Delete This Group Member"].Value
+                                _hxPost    delAction
+                                _hxConfirm delPrompt ] [
+                                iconSized 18 "delete_forever"
+                            ]
+                        ]
+                        div [ _class "cell" ] [ str mbr.Name ]
+                        div [ _class "cell" ] [ str mbr.Email ]
+                        div [ _class "cell" ] [
+                            locStr emailTypes[defaultArg (mbr.Format |> Option.map EmailFormat.toCode) ""]
+                        ]
+                    ]
+            ]
     [   div [ _class"pt-center-text" ] [
             br []
-      a [ _href (sprintf "/small-group/member/%s/edit" emptyGuid); _title s.["Add a New Group Member"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Group Member"] ]
+            a [ _href $"/small-group/member/{emptyGuid}/edit"; _title s["Add a New Group Member"].Value ] [
+                icon "add_circle"; rawText " &nbsp;"; locStr s["Add a New Group Member"]
+            ]
             br []
             br []
         ]
-    tableSummary mbrs.Length s
-    table [ _class "pt-table pt-action-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["E-mail Address"] ]
-          th [] [ encLocText s.["Format"] ]
+        tableSummary members.Length s
+        form [ _method "post" ] [
+            csrfToken ctx
+            memberTable
         ]
     ]
-      mbrs
-      |> List.map (fun mbr ->
-          let mbrId = mbr.memberId.ToString "N"
-          let delAction = sprintf "/small-group/member/%s/delete" mbrId
-          let delPrompt = s.["Are you want to delete this {0} ({1})?  This action cannot be undone.",
-                              s.["group member"], mbr.memberName].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/small-group/member/%s/edit" mbrId); _title s.["Edit This Group Member"].Value ]
-                [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Group Member"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText mbr.memberName ]
-            td [] [ encodedText mbr.email ]
-            td [] [ encLocText emailTyps.[defaultArg mbr.format ""] ]
-            ])
-      |> tbody []
-      ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
-    ]
     |> Layout.Content.standard
     |> Layout.standard vi "Maintain Group Members"
 
 
 /// View for the small group overview page
-let overview m vi =
+let overview model viewInfo =
     let s          = I18N.localizer.Force ()
     let linkSpacer = rawText "&nbsp; "
-  let typs       = ReferenceList.requestTypeList s |> Map.ofList
+    let types      = ReferenceList.requestTypeList s |> dict
     article [ _class "pt-overview" ] [
-    section [] [
-      header [ _role "heading" ] [
-        iconSized 72 "bookmark_border"
-        encLocText s.["Quick Actions"]
-        ]
+        section [ _ariaLabel "Quick actions" ] [
+            header [ _roleHeading ] [ iconSized 72 "bookmark_border"; locStr s["Quick Actions"] ]
             div [] [
-        a [ _href "/prayer-requests/view" ] [ icon "list"; linkSpacer; encLocText s.["View Prayer Request List"] ]
+                a [ _href "/prayer-requests/view" ] [ icon "list"; linkSpacer; locStr s["View Prayer Request List"] ]
                 hr []
-        a [ _href "/small-group/announcement" ] [ icon "send"; linkSpacer; encLocText s.["Send Announcement"] ]
+                a [ _href "/small-group/announcement" ] [ icon "send"; linkSpacer; locStr s["Send Announcement"] ]
                 hr []
-        a [ _href "/small-group/preferences" ] [ icon "build"; linkSpacer; encLocText s.["Change Preferences"] ]
+                a [ _href "/small-group/preferences" ] [ icon "build"; linkSpacer; locStr s["Change Preferences"] ]
             ]
         ]
-    section [] [
-      header [ _role "heading" ] [
-        iconSized 72 "question_answer"
-        encLocText s.["Prayer Requests"]
-        ]
+        section [ _ariaLabel "Prayer requests" ] [
+            header [ _roleHeading ] [ iconSized 72 "question_answer"; locStr s["Prayer Requests"] ]
             div [] [
-        yield p [ _class "pt-center-text" ] [
-          strong [] [ encodedText (m.totalActiveReqs.ToString "N0"); space; encLocText s.["Active Requests"] ]
+                p [ _class "pt-center-text" ] [
+                      strong [] [ str (model.TotalActiveReqs.ToString "N0"); space; locStr s["Active Requests"] ]
                 ]
-        yield hr []
-        for cat in m.activeReqsByCat do
-          yield encodedText (cat.Value.ToString "N0")
-          yield space
-          yield encLocText typs.[cat.Key]
-          yield br []
-        yield br []
-        yield encodedText (m.allReqs.ToString "N0")
-        yield space
-        yield encLocText s.["Total Requests"]
-        yield hr []
-        yield a [ _href "/prayer-requests/maintain" ] [
-          icon "compare_arrows"
-          linkSpacer
-          encLocText s.["Maintain Prayer Requests"]
+                hr []
+                for cat in model.ActiveReqsByType do
+                    str (cat.Value.ToString "N0")
+                    space
+                    locStr types[cat.Key]
+                    br []
+                br []
+                str (model.AllReqs.ToString "N0")
+                space
+                locStr s["Total Requests"]
+                hr []
+                a [ _href "/prayer-requests/maintain" ] [
+                    icon "compare_arrows"; linkSpacer; locStr s["Maintain Prayer Requests"]
                 ]
             ]
         ]
-    section [] [
-      header [ _role "heading" ] [
-        iconSized 72 "people_outline"
-        encLocText s.["Group Members"]
-        ]
+        section [ _ariaLabel "Small group members" ] [
+            header [ _roleHeading ] [ iconSized 72 "people_outline"; locStr s["Group Members"] ]
             div [ _class "pt-center-text" ] [
-        strong [] [ encodedText (m.totalMbrs.ToString "N0"); space; encLocText s.["Members"] ]
+                strong [] [ str (model.TotalMembers.ToString "N0"); space; locStr s["Members"] ]
                 hr []
-        a [ _href "/small-group/members" ] [ icon "email"; linkSpacer; encLocText s.["Maintain Group Members"] ]
+                a [ _href "/small-group/members" ] [ icon "email"; linkSpacer; locStr s["Maintain Group Members"] ]
+                hr []
+                strong [] [ str ((List.length model.Admins).ToString "N0"); space; locStr s["Administrators"] ]
+                for admin in model.Admins do
+                    hr []
+                    str admin.Name
+                    br []
+                    small [] [ a [ _href $"mailto:{admin.Email}" ] [ str admin.Email ] ]
             ]
         ]
     ]
     |> List.singleton
     |> Layout.Content.wide
-  |> Layout.standard vi "Small Group Overview"
+    |> Layout.standard viewInfo "Small Group Overview"
 
 
+open System.IO
+
 /// View for the small group preferences page
-let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
+let preferences (model : EditPreferences) ctx viewInfo =
     let s   = I18N.localizer.Force ()
     let l   = I18N.forView "SmallGroup/Preferences"
     use sw  = new StringWriter ()
     let raw = rawLocText sw
-  [ form [ _action "/small-group/preferences/save"; _method "post"; _class "pt-center-columns" ] [
-      style [ _scoped ] [ rawText "#expireDays, #daysToKeepNew, #longTermUpdateWeeks, #headingFontSize, #listFontSize { width: 3rem; } #emailFromAddress { width: 20rem; } #listFonts { width: 40rem; } @media screen and (max-width: 40rem) { #listFonts { width: 100%; } }" ]
+    let vi  =
+        viewInfo
+        |> AppViewInfo.withScopedStyles [
+            let numberFields =
+                [   nameof model.ExpireDays;      nameof model.DaysToKeepNew; nameof model.LongTermUpdateWeeks
+                    nameof model.HeadingFontSize; nameof model.ListFontSize;  nameof model.PageSize
+                ]
+                |> toHtmlIds
+            let fontsId = $"#{nameof model.Fonts}"
+            $"{numberFields} {{ width: 3rem; }}"
+            $"#{nameof model.EmailFromName} {{ width: 15rem; }}"
+            $"#{nameof model.EmailFromAddress} {{ width: 20rem; }}"
+            $"{fontsId} {{ width: 40rem; }}"
+            $"@media screen and (max-width: 40rem) {{ {fontsId} {{ width: 100%%; }} }}"
+        ]
+        |> AppViewInfo.withOnLoadScript "PT.smallGroup.preferences.onPageLoad"
+    [   form [ _action "/small-group/preferences/save"; _method "post"; _class "pt-center-columns"; Target.content ] [
             csrfToken ctx
             fieldset [] [
-        legend [] [ strong [] [ icon "date_range"; rawText " &nbsp;"; encLocText s.["Dates"] ] ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _for "expireDays" ] [ encLocText s.["Requests Expire After"] ]
+                legend [] [ strong [] [ icon "date_range"; rawText " &nbsp;"; locStr s["Dates"] ] ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.ExpireDays) ] [ locStr s["Requests Expire After"] ]
                         span [] [
-              input [ _type "number"; _name "expireDays"; _id "expireDays"; _min "1"; _max "30"; _required; _autofocus
-                      _value (string m.expireDays) ]
-              space; encodedText (s.["Days"].Value.ToLower ())
+                            inputField "number" (nameof model.ExpireDays) (string model.ExpireDays) [
+                                _min "1"; _max "30"; _required; _autofocus
+                            ]
+                            space
+                            str (s["Days"].Value.ToLower ())
                         ]
                     ]
-          div [ _class "pt-field" ] [
-            label [ _for "daysToKeepNew" ] [ encLocText s.["Requests “New” For"] ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.DaysToKeepNew) ] [ locStr s["Requests “New” For"] ]
                         span [] [
-              input [ _type "number"; _name "daysToKeepNew"; _id "daysToKeepNew"; _min "1"; _max "30"; _required
-                      _value (string m.daysToKeepNew) ]
-              space; encodedText (s.["Days"].Value.ToLower ())
+                            inputField "number" (nameof model.DaysToKeepNew) (string model.DaysToKeepNew) [
+                                _min "1"; _max "30"; _required
+                            ]
+                            space; str (s["Days"].Value.ToLower ())
                         ]
                     ]
-          div [ _class "pt-field" ] [
-            label [ _for "longTermUpdateWeeks" ] [ encLocText s.["Long-Term Requests Alerted for Update"] ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.LongTermUpdateWeeks) ] [
+                            locStr s["Long-Term Requests Alerted for Update"]
+                        ]
                         span [] [
-              input [ _type "number"; _name "longTermUpdateWeeks"; _id "longTermUpdateWeeks"; _min "1"; _max "30"
-                      _required; _value (string m.longTermUpdateWeeks) ]
-              space; encodedText (s.["Weeks"].Value.ToLower ())
+                            inputField "number" (nameof model.LongTermUpdateWeeks) (string model.LongTermUpdateWeeks) [
+                                _min "1"; _max "30"; _required
+                            ]
+                            space; str (s["Weeks"].Value.ToLower ())
                         ]
                     ]
                 ]
             ]
+            fieldset [ _fieldRow ] [
+                legend [] [ strong [] [ icon "sort"; rawText " &nbsp;"; locStr s["Request Sorting"] ] ]
+                label [] [
+                    radio (nameof model.RequestSort) "" "D" model.RequestSort
+                    locStr s["Sort by Last Updated Date"]
+                ]
+                label [] [
+                    radio (nameof model.RequestSort) "" "R" model.RequestSort
+                    locStr s["Sort by Requestor Name"]
+                ]
+            ]
             fieldset [] [
-        legend [] [ strong [] [ icon "sort"; rawText " &nbsp;"; encLocText s.["Request Sorting"] ] ]
-        radio "requestSort" "requestSort_D" "D" m.requestSort
-        label [ _for "requestSort_D" ] [ encLocText s.["Sort by Last Updated Date"] ]
-        rawText " &nbsp; "
-        radio "requestSort" "requestSort_R" "R" m.requestSort
-        label [ _for "requestSort_R" ] [ encLocText s.["Sort by Requestor Name"] ]
+                legend [] [ strong [] [ icon "mail_outline"; rawText " &nbsp;"; locStr s["E-mail"] ] ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.EmailFromName) ] [ locStr s["From Name"] ]
+                        inputField "text" (nameof model.EmailFromName) model.EmailFromName [ _required ]
                     ]
-      fieldset [] [
-        legend [] [ strong [] [ icon "mail_outline"; rawText " &nbsp;"; encLocText s.["E-mail"] ] ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _for "emailFromName" ] [ encLocText s.["From Name"] ]
-            input [ _type "text"; _name "emailFromName"; _id "emailFromName"; _required; _value m.emailFromName ]
-            ]
-          div [ _class "pt-field" ] [
-            label [ _for "emailFromAddress" ] [ encLocText s.["From Address"] ]
-            input [ _type "email"; _name "emailFromAddress"; _id "emailFromAddress"; _required
-                    _value m.emailFromAddress ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.EmailFromAddress) ] [ locStr s["From Address"] ]
+                        inputField "email" (nameof model.EmailFromAddress) model.EmailFromAddress [ _required ]
                     ]
                 ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _for "defaultEmailType" ] [ encLocText s.["E-mail Format"] ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.DefaultEmailType) ] [ locStr s["E-mail Format"] ]
                         seq {
-              yield "", selectDefault s.["Select"].Value
-              yield! ReferenceList.emailTypeList "" s |> Seq.skip 1 |> Seq.map (fun typ -> fst typ, (snd typ).Value)
+                            "", selectDefault s["Select"].Value
+                            yield!
+                                ReferenceList.emailTypeList HtmlFormat s
+                                |> Seq.skip 1
+                                |> Seq.map (fun typ -> fst typ, (snd typ).Value)
                         }
-            |> selectList "defaultEmailType" m.defaultEmailType [ _required ]
+                        |> selectList (nameof model.DefaultEmailType) model.DefaultEmailType [ _required ]
                     ]
                 ]
             ]
             fieldset [] [
-        legend [] [ strong [] [ icon "color_lens"; rawText " &nbsp;"; encLocText s.["Colors"] ]; rawText " ***" ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _class "pt-center-text" ] [ encLocText s.["Color of Heading Lines"] ]
+                legend [] [ strong [] [ icon "color_lens"; rawText " &nbsp;"; locStr s["Colors"] ]; rawText " ***" ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [] [ locStr s["Color of Heading Lines"] ]
+                        span [ _group ] [
                             span [] [
-              radio "headingLineType" "headingLineType_Name" "Name" m.headingLineType
-              label [ _for "headingLineType_Name" ] [ encLocText s.["Named Color"] ]
-              namedColorList "headingLineColor" m.headingLineColor
-                [ yield _id "headingLineColor_Select"
-                  match m.headingLineColor.StartsWith "#" with true -> yield _disabled | false -> () ] s
-              rawText "&nbsp; &nbsp; "; encodedText (s.["or"].Value.ToUpper ())
-              radio "headingLineType" "headingLineType_RGB" "RGB" m.headingLineType
-              label [ _for "headingLineType_RGB" ] [ encLocText s.["Custom Color"] ]
-              input [ yield _type "color" 
-                      yield _name "headingLineColor"
-                      yield _id "headingLineColor_Color"
-                      yield _value m.headingLineColor
-                      match m.headingLineColor.StartsWith "#" with true -> () | false -> yield _disabled ]
+                                label [] [
+                                    radio (nameof model.LineColorType) $"{nameof model.LineColorType}_Name" "Name"
+                                          model.LineColorType
+                                    locStr s["Named Color"]
                                 ]
+                                space
+                                namedColorList (nameof model.LineColor) model.LineColor [
+                                    _id $"{nameof model.LineColor}_Select"
+                                    if model.LineColor.StartsWith "#" then _disabled ] s
                             ]
-          ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _class "pt-center-text" ] [ encLocText s.["Color of Heading Text"] ]
                             span [] [
-              radio "headingTextType" "headingTextType_Name" "Name" m.headingTextType
-              label [ _for "headingTextType_Name" ] [ encLocText s.["Named Color"] ]
-              namedColorList "headingTextColor" m.headingTextColor
-                [ yield _id "headingTextColor_Select"
-                  match m.headingTextColor.StartsWith "#" with true -> yield _disabled | false -> () ] s
-              rawText "&nbsp; &nbsp; "; encodedText (s.["or"].Value.ToUpper ())
-              radio "headingTextType" "headingTextType_RGB" "RGB" m.headingTextType
-              label [ _for "headingTextType_RGB" ] [ encLocText s.["Custom Color"] ]
-              input [ yield _type "color"
-                      yield _name "headingTextColor"
-                      yield _id "headingTextColor_Color"
-                      yield _value m.headingTextColor
-                      match m.headingTextColor.StartsWith "#" with true -> () | false -> yield _disabled ]
+                                label [ _for $"{nameof model.LineColorType}_RGB" ] [
+                                    radio (nameof model.LineColorType) $"{nameof model.LineColorType}_RGB" "RGB"
+                                          model.LineColorType
+                                    locStr s["Custom Color"]
+                                ]
+                                space
+                                input [ _type  "color" 
+                                        _name  (nameof model.LineColor)
+                                        _id    $"{nameof model.LineColor}_Color"
+                                        _value (colorToHex model.LineColor)
+                                        if not (model.LineColor.StartsWith "#") then _disabled ]
+                            ]
+                        ]
+                    ]
+                ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [] [ locStr s["Color of Heading Text"] ]
+                        span [ _group ] [
+                            span [] [
+                                label [] [
+                                    radio (nameof model.HeadingColorType) $"{nameof model.HeadingColorType}_Name" "Name"
+                                          model.HeadingColorType
+                                    locStr s["Named Color"]
+                                ]
+                                space
+                                namedColorList (nameof model.HeadingColor) model.HeadingColor [
+                                    _id $"{nameof model.HeadingColor}_Select"
+                                    if model.HeadingColor.StartsWith "#" then _disabled ] s
+                            ]
+                            span [] [
+                                label [] [
+                                    radio (nameof model.HeadingColorType) $"{nameof model.HeadingColorType}_RGB" "RGB"
+                                          model.HeadingColorType
+                                    locStr s["Custom Color"]
+                                ]
+                                space
+                                input [ _type  "color"
+                                        _name  (nameof model.HeadingColor)
+                                        _id    $"{nameof model.HeadingColor}_Color"
+                                        _value (colorToHex model.HeadingColor)
+                                        if not (model.HeadingColor.StartsWith "#") then _disabled ]
+                            ]
                         ]
                     ]
                 ]
             ]
             fieldset [] [
-        legend [] [ strong [] [ icon "font_download"; rawText " &nbsp;"; encLocText s.["Fonts"] ] ]
-        div [ _class "pt-field" ] [
-          label [ _for "listFonts" ] [ encLocText s.["Fonts** for List"] ]
-          input [ _type "text"; _name "listFonts"; _id "listFonts"; _required; _value m.listFonts ]
+                legend [] [ strong [] [ icon "font_download"; rawText " &nbsp;"; locStr s["Fonts"] ] ]
+                div [ _inputField ] [
+                    label [ _for (nameof model.Fonts) ] [ locStr s["Fonts** for List"] ]
+                    let value = if model.IsNative then "True" else "False"
+                    span [ _group ] [
+                        label [] [
+                            radio (nameof model.IsNative) $"{nameof model.IsNative}_Y" "True" value
+                            locStr s["Native Fonts"]
                         ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _for "headingFontSize" ] [ encLocText s.["Heading Text Size"] ]
-            input [ _type "number"; _name "headingFontSize"; _id "headingFontSize"; _min "8"; _max "24"; _required
-                    _value (string m.headingFontSize) ]
+                        inputField "text" "nativeFontSpacer" "" [ _style "visibility:hidden" ]
+                    ]
+                    span [ _group ] [
+                        label [] [
+                            radio (nameof model.IsNative) $"{nameof model.IsNative}_N" "False" value
+                            locStr s["Named Fonts"]
+                        ]
+                        inputField "text" (nameof model.Fonts) (defaultArg model.Fonts "") [ _required ]
+                    ]
+                ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.HeadingFontSize) ] [ locStr s["Heading Text Size"] ]
+                        inputField "number" (nameof model.HeadingFontSize) (string model.HeadingFontSize) [
+                            _min "8"; _max "24"; _required
+                        ]
+                    ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.ListFontSize) ] [ locStr s["List Text Size"] ]
+                        inputField "number" (nameof model.ListFontSize) (string model.ListFontSize) [
+                            _min "8"; _max "24"; _required
                         ]
-          div [ _class "pt-field" ] [
-            label [ _for "listFontSize" ] [ encLocText s.["List Text Size"] ]
-            input [ _type "number"; _name "listFontSize"; _id "listFontSize"; _min "8"; _max "24"; _required
-                    _value (string m.listFontSize) ]
                     ]
                 ]
             ]
             fieldset [] [
-        legend [] [ strong [] [ icon "settings"; rawText " &nbsp;"; encLocText s.["Other Settings"] ] ]
-        div [ _class "pt-field-row" ] [
-          div [ _class "pt-field" ] [
-            label [ _for "TimeZone" ] [ encLocText s.["Time Zone"] ]
+                legend [] [ strong [] [ icon "settings"; rawText " &nbsp;"; locStr s["Other Settings"] ] ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [] [ locStr s["Request List Visibility"] ]
+                        span [ _group ] [
+                            let name  = nameof model.Visibility
+                            let value = string model.Visibility
+                            label [] [
+                                radio name $"{name}_Public" (string GroupVisibility.PublicList) value
+                                locStr s["Public"]
+                            ]
+                            label [] [
+                                radio name $"{name}_Private" (string GroupVisibility.PrivateList) value
+                                locStr s["Private"]
+                            ]
+                            label [] [
+                                radio name $"{name}_Password" (string GroupVisibility.HasPassword) value
+                                locStr s["Password Protected"]
+                            ]
+                        ]
+                    ]
+                ]
+                let classSuffix = if model.Visibility = GroupVisibility.HasPassword then [ "pt-show" ] else []
+                div [ _id "divClassPassword"; _fieldRowWith ("pt-fadeable" :: classSuffix) ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.GroupPassword) ] [ locStr s["Group Password (Used to Read Online)"] ]
+                        inputField "text" (nameof model.GroupPassword) (defaultArg model.GroupPassword "") []
+                    ]
+                ]
+                div [ _fieldRow ] [
+                    div [ _inputField ] [
+                        label [ _for (nameof model.TimeZone) ] [ locStr s["Time Zone"] ]
                         seq {
-              yield "", selectDefault s.["Select"].Value
-              yield! tzs |> List.map (fun tz -> tz.timeZoneId, (TimeZones.name tz.timeZoneId s).Value)
+                            "", selectDefault s["Select"].Value
+                            yield!
+                                TimeZones.all
+                                |> List.map (fun tz -> TimeZoneId.toString tz, (TimeZones.name tz s).Value)
                         }
-            |> selectList "timeZone" m.timeZone [ _required ]
+                        |> selectList (nameof model.TimeZone) model.TimeZone [ _required ]
+                    ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.PageSize) ] [ locStr s["Page Size"] ]
+                        inputField "number" (nameof model.PageSize) (string model.PageSize) [
+                            _min "10"; _max "255"; _required
                         ]
                     ]
-        div [ _class "pt-field" ] [
-          label [] [ encLocText s.["Request List Visibility"] ]
-          span [] [
-            radio "listVisibility" "viz_Public" (string RequestVisibility.``public``) (string m.listVisibility)
-            label [ _for "viz_Public" ] [ encLocText s.["Public"] ]
-            rawText " &nbsp;"
-            radio "listVisibility" "viz_Private" (string RequestVisibility.``private``) (string m.listVisibility)
-            label [ _for "viz_Private" ] [ encLocText s.["Private"] ]
-            rawText " &nbsp;"
-            radio "listVisibility" "viz_Password" (string RequestVisibility.passwordProtected) (string m.listVisibility)
-            label [ _for "viz_Password" ] [ encLocText s.["Password Protected"] ]
+                    div [ _inputField ] [
+                        label [ _for (nameof model.AsOfDate) ] [ locStr s["“As of” Date Display"] ]
+                        ReferenceList.asOfDateList s
+                        |> List.map (fun (code, desc) -> code, desc.Value)
+                        |> selectList (nameof model.AsOfDate) model.AsOfDate [ _required ]
                     ]
                 ]
-        div [ yield _id "divClassPassword"
-              match m.listVisibility = RequestVisibility.passwordProtected with
-              | true -> yield _class "pt-field-row pt-fadeable pt-show"
-              | false -> yield _class "pt-field-row pt-fadeable"
-              ] [
-          div [ _class "pt-field" ] [
-            label [ _for "groupPassword" ] [ encLocText s.["Group Password (Used to Read Online)"] ]
-            input [ _type "text"; _name "groupPassword"; _id "groupPassword";
-                    _value (match m.groupPassword with Some x -> x | None -> "") ]
-            ]
-          ]
-        div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Preferences"] ]
             ]
+            div [ _fieldRow ] [ submit [] "save" s["Save Preferences"] ]
         ]
         p [] [
             rawText "** "
-      raw l.["List font names, separated by commas."]
+            raw l["Native fonts match the default font based on the user's device (computer, phone, tablet, etc.)."]
             space
-      raw l.["The first font that is matched is the one that is used."]
+            raw l["Named fonts should be separated by commas, and will be displayed using the first one the user has in the list."]
             space
-      raw l.["Ending with either “serif” or “sans-serif” will cause the user's browser to use the default “serif” font (“Times New Roman” on Windows) or “sans-serif” font (“Arial” on Windows) if no other fonts in the list are found."]
+            raw l["Ending this list with either “serif” or “sans-serif” will cause the user's browser to use the default “serif” font (“Times New Roman” on Windows) or “sans-serif” font (“Arial” on Windows) if no other fonts in the list are found."]
         ]
         p [] [
             rawText "*** "
-      raw l.["If you want a custom color, you may be able to get some ideas (and a list of RGB values for those colors) from the W3 School's <a href=\"http://www.w3schools.com/html/html_colornames.asp\" title=\"HTML Color List - W3 School\">HTML color name list</a>."]
+            raw l["If you want a custom color, you may be able to get some ideas (and a list of RGB values for those colors) from the W3 School's <a href=\"http://www.w3schools.com/html/html_colornames.asp\" title=\"HTML Color List - W3 School\">HTML color name list</a>."]
         ]
-    script [] [ rawText "PT.onLoad(PT.smallGroup.preferences.onPageLoad)" ]
     ]
     |> Layout.Content.standard
     |> Layout.standard vi "Group Preferences"

src/PrayerTracker.UI/User.fs

@@ -1,41 +1,38 @@
 module PrayerTracker.Views.User
 
-open Giraffe.GiraffeViewEngine
-open PrayerTracker.Entities
+open Giraffe.ViewEngine
+open Giraffe.ViewEngine.Accessibility
+open Giraffe.ViewEngine.Htmx
+open PrayerTracker
 open PrayerTracker.ViewModels
 
 /// View for the group assignment page
-let assignGroups m (groups : Map<string, string>) (curGroups : string list) ctx vi =
+let assignGroups model groups curGroups ctx viewInfo =
     let s         = I18N.localizer.Force ()
-  let pageTitle = sprintf "%s • %A" m.userName s.["Assign Groups"]
-  form [ _action "/user/small-groups/save"; _method "post"; _class "pt-center-columns" ] [
+    let pageTitle = sprintf "%s • %A" model.UserName s["Assign Groups"]
+    let vi        = AppViewInfo.withScopedStyles [ "#groupList { grid-template-columns: auto; }" ] viewInfo
+    form [ _action "/user/small-groups/save"; _method "post"; _class "pt-center-columns"; Target.content ] [
         csrfToken ctx
-    input [ _type "hidden"; _name "userId"; _value (m.userId.ToString "N") ]
-    input [ _type "hidden"; _name "userName"; _value m.userName ]
-    table [ _class "pt-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ rawText "&nbsp;" ]
-          th [] [ encLocText s.["Group"] ]
+        inputField "hidden" (nameof model.UserId) model.UserId []
+        inputField "hidden" (nameof model.UserName) model.UserName []
+        section [ _id "groupList"; _class "pt-table"; _ariaLabel "Assigned small groups" ] [
+            div [ _class "row head" ] [
+                header [ _class "cell" ] [ locStr s["Group"] ]
+            ]
+            for groupId, name in groups do
+                div [ _class "row" ] [
+                    div [ _class "cell" ] [
+                        input [ _type  "checkbox"
+                                _name  (nameof model.SmallGroups)
+                                _id    groupId
+                                _value groupId
+                                if List.contains groupId curGroups then _checked ]
+                        space
+                        label [ _for groupId ] [ str name ]
                     ]
                 ]
-      groups
-      |> Seq.map (fun grp ->
-          let inputId = sprintf "id-%s" grp.Key
-          tr [] [
-            td [] [
-              input [ yield _type "checkbox"
-                      yield _name "smallGroups"
-                      yield _id inputId
-                      yield _value grp.Key
-                      match curGroups |> List.contains grp.Key with true -> yield _checked | false -> () ]
         ]
-            td [] [ label [ _for inputId ] [ encodedText grp.Value ] ]
-            ])
-      |> List.ofSeq
-      |> tbody []
-      ]
-    div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Group Assignments"] ]
+        div [ _fieldRow ] [ submit [] "save" s["Save Group Assignments"] ]
     ]
     |> List.singleton
     |> Layout.Content.standard
@@ -43,35 +40,44 @@ let assignGroups m (groups : Map<string, string>) (curGroups : string list) ctx
 
 
 /// View for the password change page
-let changePassword ctx vi =
+let changePassword ctx viewInfo =
     let s    = I18N.localizer.Force ()
+    let model = { OldPassword = ""; NewPassword = ""; NewPasswordConfirm = "" }
+    let vi    =
+        viewInfo
+        |> AppViewInfo.withScopedStyles [
+            let fields =
+                toHtmlIds [ nameof model.OldPassword; nameof model.NewPassword; nameof model.NewPasswordConfirm ]
+            $"{fields} {{ width: 10rem; }}"
+        ]
     [   p [ _class "pt-center-text" ] [
-      encLocText s.["To change your password, enter your current password in the specified box below, then enter your new password twice."]
+            locStr s["To change your password, enter your current password in the specified box below, then enter your new password twice."]
         ]
         form [ _action   "/user/password/change"
                _method   "post"
-           _onsubmit (sprintf "return PT.compareValidation('newPassword','newPasswordConfirm','%A')" s.["The passwords do not match"]) ] [
-      style [ _scoped ] [ rawText "#oldPassword, #newPassword, #newPasswordConfirm { width: 10rem; } "]
+               _onsubmit $"""return PT.compareValidation('{nameof model.NewPassword}','{nameof model.NewPasswordConfirm}','%A{s["The passwords do not match"]}')"""
+               Target.content ] [
             csrfToken ctx
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "oldPassword" ] [ encLocText s.["Current Password"] ]
-          input [ _type "password"; _name "oldPassword"; _id "oldPassword"; _required; _autofocus ]
+            div [ _fieldRow ] [
+                div [ _inputField ] [
+                    label [ _for (nameof model.OldPassword) ] [ locStr s["Current Password"] ]
+                    inputField "password" (nameof model.OldPassword) "" [ _required; _autofocus ]
                 ]
             ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "newPassword" ] [ encLocText s.["New Password Twice"] ]
-          input [ _type "password"; _name "newPassword"; _id "newPassword"; _required ]
+            div [ _fieldRow ] [
+                div [ _inputField ] [
+                    label [ _for (nameof model.NewPassword) ] [ locStr s["New Password Twice"] ]
+                    inputField "password" (nameof model.NewPassword) "" [ _required ]
                 ]
-        div [ _class "pt-field" ] [
-          label [] [ rawText "&nbsp;" ]
-          input [ _type "password"; _name "newPasswordConfirm"; _id "newPasswordConfirm"; _required ]
+                div [ _inputField ] [
+                    label [ _for (nameof model.NewPasswordConfirm) ] [ rawText "&nbsp;" ]
+                    inputField "password" (nameof model.NewPasswordConfirm) "" [ _required ]
                 ]
             ]
-      div [ _class "pt-field-row" ] [
-        submit [ _onclick "document.getElementById('newPasswordConfirm').setCustomValidity('')" ] "done"
-               s.["Change Your Password"]
+            div [ _fieldRow ] [
+                submit [
+                    _onclick $"document.getElementById('{nameof model.NewPasswordConfirm}').setCustomValidity('')"
+                ] "done" s["Change Your Password"]
             ]
         ]
     ]
@@ -80,143 +86,160 @@ let changePassword ctx vi =
 
 
 /// View for the edit user page
-let edit (m : EditUser) ctx vi =
+let edit (model : EditUser) ctx viewInfo =
     let s             = I18N.localizer.Force ()
-  let pageTitle     = match m.isNew () with true -> "Add a New User" | false -> "Edit User"
-  let pwPlaceholder = s.[match m.isNew () with true -> "" | false -> "No change"].Value
-  [ form [ _action "/user/edit/save"; _method "post"; _class "pt-center-columns"
-           _onsubmit (sprintf "return PT.compareValidation('password','passwordConfirm','%A')" s.["The passwords do not match"]) ] [
-      style [ _scoped ]
-        [ rawText "#firstName, #lastName, #password, #passwordConfirm { width: 10rem; } #emailAddress { width: 20rem; } " ]
+    let pageTitle     = if model.IsNew then "Add a New User" else "Edit User"
+    let pwPlaceholder = s[if model.IsNew then "" else "No change"].Value
+    let vi            =
+        viewInfo
+        |> AppViewInfo.withScopedStyles [
+            let fields =
+                [ nameof model.FirstName; nameof model.LastName; nameof model.Password; nameof model.PasswordConfirm ]
+                |> toHtmlIds
+            $"{fields} {{ width: 10rem; }}"
+            $"#{nameof model.Email} {{ width: 20rem; }}"
+        ]
+        |> AppViewInfo.withOnLoadScript $"PT.user.edit.onPageLoad({(string model.IsNew).ToLowerInvariant ()})"
+    form [ _action   "/user/edit/save"
+           _method   "post"
+           _class    "pt-center-columns"
+           _onsubmit $"""return PT.compareValidation('{nameof model.Password}','{nameof model.PasswordConfirm}','%A{s["The passwords do not match"]}')"""
+           Target.content ] [
         csrfToken ctx
-      input [ _type "hidden"; _name "userId"; _value (m.userId.ToString "N") ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "firstName" ] [ encLocText s.["First Name"] ]
-          input [ _type "text"; _name "firstName"; _id "firstName"; _value m.firstName; _required; _autofocus ]
+        inputField "hidden" (nameof model.UserId) model.UserId []
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.FirstName) ] [ locStr s["First Name"] ]
+                inputField "text" (nameof model.FirstName) model.FirstName [ _required; _autofocus ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "lastName" ] [ encLocText s.["Last Name"] ]
-          input [ _type "text"; _name "lastName"; _id "lastName"; _value m.lastName; _required ]
+            div [ _inputField ] [
+                label [ _for (nameof model.LastName) ] [ locStr s["Last Name"] ]
+                inputField "text" (nameof model.LastName) model.LastName [ _required ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "emailAddress" ] [ encLocText s.["E-mail Address"] ]
-          input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _value m.emailAddress; _required ]
+            div [ _inputField ] [
+                label [ _for (nameof model.Email) ] [ locStr s["E-mail Address"] ]
+                inputField "email" (nameof model.Email) model.Email [ _required ]
             ]
         ]
-      div [ _class "pt-field-row" ] [
-        div [ _class "pt-field" ] [
-          label [ _for "password" ] [ encLocText s.["Password"] ]
-          input [ _type "password"; _name "password"; _id "password"; _placeholder pwPlaceholder ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Password) ] [ locStr s["Password"] ]
+                inputField "password" (nameof model.Password) "" [ _placeholder pwPlaceholder ]
             ]
-        div [ _class "pt-field" ] [
-          label [ _for "passwordConfirm" ] [ encLocText s.["Password Again"] ]
-          input [ _type "password"; _name "passwordConfirm"; _id "passwordConfirm"; _placeholder pwPlaceholder ]
+            div [ _inputField ] [
+                label [ _for "passwordConfirm" ] [ locStr s["Password Again"] ]
+                inputField "password" (nameof model.PasswordConfirm) "" [ _placeholder pwPlaceholder ]
             ]
         ]
-      div [ _class "pt-checkbox-field" ] [
-        input [ yield _type "checkbox"
-                yield _name "isAdmin"
-                yield _id "isAdmin"
-                yield _value "True"
-                match m.isAdmin with Some x when x -> yield _checked | _ -> () ]
-        label [ _for "isAdmin" ] [ encLocText s.["This user is a PrayerTracker administrator"] ]
+        div [ _checkboxField ] [
+            inputField "checkbox" (nameof model.IsAdmin) "True" [ if defaultArg model.IsAdmin false then _checked ]
+            label [ _for (nameof model.IsAdmin) ] [ locStr s["This User Is a {0} Administrator", s["PrayerTracker"]] ]
         ]
-      div [ _class "pt-field-row" ] [ submit [] "save" s.["Save User"] ]
-      ]
-    script [] [ rawText (sprintf "PT.onLoad(PT.user.edit.onPageLoad(%s))" ((string (m.isNew ())).ToLower ())) ]
+        div [ _fieldRow ] [ submit [] "save" s["Save User"] ]
     ]
+    |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi pageTitle
 
-
 /// View for the user log on page
-let logOn (m : UserLogOn) (groups : Map<string, string>) ctx vi =
+let logOn (model : UserLogOn) groups ctx viewInfo =
     let s  = I18N.localizer.Force ()
-  form [ _action "/user/log-on"; _method "post"; _class "pt-center-columns" ] [
-    style [ _scoped ] [ rawText "#emailAddress { width: 20rem; }" ]
+    let vi = AppViewInfo.withScopedStyles [ $"#{nameof model.Email} {{ width: 20rem; }}" ] viewInfo
+    form [ _action "/user/log-on"; _method "post"; _class "pt-center-columns"; Target.body ] [
         csrfToken ctx
-    input [ _type "hidden"; _name "redirectUrl"; _value (defaultArg m.redirectUrl "") ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "emailAddress"] [ encLocText s.["E-mail Address"] ]
-        input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _value m.emailAddress; _required; _autofocus ]
+        inputField "hidden" (nameof model.RedirectUrl) (defaultArg model.RedirectUrl "") []
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.Email) ] [ locStr s["E-mail Address"] ]
+                inputField "email" (nameof model.Email) model.Email [ _required; _autofocus ]
             ]
-      div [ _class "pt-field" ] [
-        label [ _for "password" ] [ encLocText s.["Password"] ]
-        input [ _type "password"; _name "password"; _id "password"; _required;
-                _placeholder (sprintf "(%s)" (s.["Case-Sensitive"].Value.ToLower ())) ]
+            div [ _inputField ] [
+                label [ _for (nameof model.Password) ] [ locStr s["Password"] ]
+                inputField "password" (nameof model.Password) "" [
+                    _placeholder $"""({s["Case-Sensitive"].Value.ToLower ()})"""; _required
                 ]
             ]
-    div [ _class "pt-field-row" ] [
-      div [ _class "pt-field" ] [
-        label [ _for "smallGroupId" ] [ encLocText s.["Group"] ]
-        seq {
-          yield "", selectDefault s.["Select Group"].Value
-          yield! groups |> Seq.sortBy (fun x -> x.Value) |> Seq.map (fun x -> x.Key, x.Value)
-          }
-        |> selectList "smallGroupId" "" [ _required ]
-               
+        ]
+        div [ _fieldRow ] [
+            div [ _inputField ] [
+                label [ _for (nameof model.SmallGroupId) ] [ locStr s["Group"] ]
+                seq { "", selectDefault s["Select Group"].Value; yield! groups }
+                |> selectList (nameof model.SmallGroupId) "" [ _required ]
             ]
         ]
-    div [ _class "pt-checkbox-field" ] [
-      input [ _type "checkbox"; _name "rememberMe"; _id "rememberMe"; _value "True" ]
-      label [ _for "rememberMe" ] [ encLocText s.["Remember Me"] ]
+        div [ _checkboxField ] [
+            inputField "checkbox" (nameof model.RememberMe) "True" []
+            label [ _for "rememberMe" ] [ locStr s["Remember Me"] ]
             br []
-      small [] [ em [] [ rawText "("; encodedText (s.["Requires Cookies"].Value.ToLower ()); rawText ")" ] ]
+            small [] [ em [] [ str $"""({s["Requires Cookies"].Value.ToLower ()})""" ] ]
         ]
-    div [ _class "pt-field-row" ] [ submit [] "account_circle" s.["Log On"] ]
+        div [ _fieldRow ] [ submit [] "account_circle" s["Log On"] ]
     ]
     |> List.singleton
     |> Layout.Content.standard
     |> Layout.standard vi "User Log On"
 
 
+open PrayerTracker.Entities
+
 /// View for the user maintenance page
-let maintain (users : User list) ctx vi =
+let maintain (users : User list) ctx viewInfo =
     let s  = I18N.localizer.Force ()
+    let vi = AppViewInfo.withScopedStyles [ "#userList { grid-template-columns: repeat(4, auto); }" ] viewInfo
+    let userTable =
+        match users with
+        | [] -> space
+        | _ ->
+            section [ _id "userList"; _class "pt-table"; _ariaLabel "User list" ] [
+                div [ _class "row head" ] [
+                    header [ _class "cell" ] [ locStr s["Actions"] ]
+                    header [ _class "cell" ] [ locStr s["Name"] ]
+                    header [ _class "cell" ] [ locStr s["Last Seen"] ]
+                    header [ _class "cell" ] [ locStr s["Admin?"] ]  
+                ]
+                for user in users do
+                    let userId    = shortGuid user.Id.Value
+                    let delAction = $"/user/{userId}/delete"
+                    let delPrompt = s["Are you sure you want to delete this {0}?  This action cannot be undone.",
+                                      $"""{s["User"].Value.ToLower ()} ({user.Name})"""].Value
+                    div [ _class "row" ] [
+                        div [ _class "cell actions" ] [
+                            a [ _href $"/user/{userId}/edit"; _title s["Edit This User"].Value ] [ iconSized 18 "edit" ]
+                            a [ _href $"/user/{userId}/small-groups"; _title s["Assign Groups to This User"].Value ] [
+                                iconSized 18 "group"
+                            ]
+                            a [ _href      delAction
+                                _title     s["Delete This User"].Value
+                                _hxPost    delAction
+                                _hxConfirm delPrompt ] [
+                                iconSized 18 "delete_forever"
+                            ]
+                        ]
+                        div [ _class "cell" ] [ str user.Name ]
+                        div [ _class "cell" ] [
+                            match user.LastSeen with
+                            | Some dt -> dt.ToString (s["MMMM d, yyyy"].Value, null)
+                            | None -> "--"
+                            |> str
+                        ]
+                        div [ _class "cell pt-center-text" ] [
+                            if user.IsAdmin then strong [] [ locStr s["Yes"] ] else locStr s["No"]
+                        ]
+                    ]
+            ]
     [   div [ _class "pt-center-text" ] [
             br []
-      a [ _href (sprintf "/user/%s/edit" emptyGuid); _title s.["Add a New User"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New User"] ]
+            a [ _href $"/user/{emptyGuid}/edit"; _title s["Add a New User"].Value ] [
+                icon "add_circle"; rawText " &nbsp;"; locStr s["Add a New User"]
+            ]
             br []
             br []
         ]
         tableSummary users.Length s
-    table [ _class "pt-table pt-action-table" ] [
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Admin?"] ]
+        form [ _method "post" ] [
+            csrfToken ctx
+            userTable
         ]
     ]
-      users
-      |> List.map (fun user ->
-          let userId    = user.userId.ToString "N"
-          let delAction = sprintf "/user/%s/delete" userId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                              (sprintf "%s (%s)" (s.["User"].Value.ToLower()) user.fullName)].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/user/%s/edit" userId); _title s.["Edit This User"].Value ] [ icon "edit" ]
-              a [ _href (sprintf "/user/%s/small-groups" userId); _title s.["Assign Groups to This User"].Value ]
-                [ icon "group" ]
-              a [ _href delAction
-                  _title s.["Delete This User"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText user.fullName ]
-            td [ _class "pt-center-text" ] [
-              match user.isAdmin with
-              | true -> yield strong [] [ encLocText s.["Yes"] ]
-              | false -> yield encLocText s.["No"]
-              ]
-            ])
-      |> tbody []
-      ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
-    ]
     |> Layout.Content.standard
     |> Layout.standard vi "Maintain Users"

src/PrayerTracker.UI/Utils.fs

@@ -1,38 +1,44 @@
 [<AutoOpen>]
 module PrayerTracker.Utils
 
-open System.Net
-open System.Security.Cryptography
-open System.Text
-open System.Text.RegularExpressions
 open System
+open Giraffe
 
-/// Hash a string with a SHA1 hash
-let sha1Hash (x : string) =
-  use alg = SHA1.Create ()
-  alg.ComputeHash (ASCIIEncoding().GetBytes x)
-  |> Seq.map (fun chr -> chr.ToString "x2")
-  |> Seq.reduce (+)
+/// Parse a short-GUID-based ID from a string
+let idFromShort<'T> (f: Guid -> 'T) strValue =
+    (ShortGuid.toGuid >> f) strValue
+
+/// Format a GUID as a short GUID
+let shortGuid = ShortGuid.fromGuid
+
+/// An empty short GUID string (used for "add" actions)
+let emptyGuid = shortGuid Guid.Empty
 
 
-/// Hash a string using 1,024 rounds of PBKDF2 and a salt
-let pbkdf2Hash (salt : Guid) (x : string) =
-  use alg = new Rfc2898DeriveBytes (x, Encoding.UTF8.GetBytes (salt.ToString "N"), 1024)
-  Convert.ToBase64String(alg.GetBytes 64)
+/// String helper functions
+module String =
   
+    /// string.Trim()
+    let trim (str: string) = str.Trim()
 
-/// Replace the first occurrence of a string with a second string within a given string
-let replaceFirst (needle : string) replacement (haystack : string) =
-  let i = haystack.IndexOf needle
-  match i with
+    /// string.Replace()
+    let replace (find: string) repl (str: string) = str.Replace(find, repl)
+
+    /// Replace the first occurrence of a string with a second string within a given string
+    let replaceFirst (needle: string) replacement (haystack: string) =
+        match haystack.IndexOf needle with
         | -1 -> haystack
-  | _ ->
-      seq {
-        yield haystack.Substring (0, i)
-        yield replacement
-        yield haystack.Substring (i + needle.Length)
-        }
-      |> Seq.reduce (+)
+        | idx -> String.concat "" [ haystack[0..idx - 1]; replacement; haystack[idx + needle.Length..] ]
+    
+    /// Convert a string to an option, with null, blank, and whitespace becoming None
+    let noneIfBlank (str: string) =
+        match str with
+        | null -> None
+        | it when it.Trim () = "" -> None
+        | it -> Some it
+
+
+open System.Text.RegularExpressions
 
 /// Strip HTML tags from the given string
 // Adapted from http://www.dijksterhuis.org/safely-cleaning-html-with-strip_tags-in-csharp/
@@ -40,32 +46,24 @@ let stripTags allowedTags input =
     let stripHtmlExp = Regex @"(<\/?[^>]+>)"
     let mutable output = input
     for tag in stripHtmlExp.Matches input do
-    let htmlTag = tag.Value.ToLower ()
-    let isAllowed =
+        let htmlTag = tag.Value.ToLower()
+        let shouldReplace =
             allowedTags
-      |> List.fold
-          (fun acc t ->
+            |> List.fold (fun acc t ->
                    acc
-                || htmlTag.IndexOf (sprintf "<%s>" t) = 0
-                || htmlTag.IndexOf (sprintf "<%s " t) = 0
-                || htmlTag.IndexOf (sprintf "</%s" t) = 0) false
-    match isAllowed with
-    | true -> ()
-    | false -> output <- replaceFirst tag.Value "" output
+                || htmlTag.IndexOf $"<{t}>" = 0
+                || htmlTag.IndexOf $"<{t} " = 0
+                || htmlTag.IndexOf $"</{t}" = 0) false
+            |> not
+        if shouldReplace then output <- String.replaceFirst tag.Value "" output
     output
 
+
 /// Wrap a string at the specified number of characters
 let wordWrap charPerLine (input : string) =
     match input.Length with
     | len when len <= charPerLine -> input
     | _ ->
-      let rec findSpace (inp : string) idx =
-        match idx with
-        | 0 -> 0
-        | _ ->
-            match inp.Substring (idx, 1) with
-            | null | " " -> idx
-            | _ -> findSpace inp (idx - 1)
         seq {
             for line in input.Replace("\r", "").Split '\n' do
                 let mutable remaining = line
@@ -73,133 +71,131 @@ let wordWrap charPerLine (input : string) =
                 | 0 -> ()
                 | _ ->
                     while charPerLine < remaining.Length do
-                let spaceIdx = findSpace remaining charPerLine
-                match spaceIdx with
-                | 0 ->
+                        if charPerLine + 1 < remaining.Length && remaining[charPerLine] = ' ' then
+                            // Line length is followed by a space; return [charPerLine] as a line
+                            yield remaining[0..charPerLine - 1]
+                            remaining <- remaining[charPerLine + 1..]
+                        else
+                            match remaining[0..charPerLine - 1].LastIndexOf ' ' with
+                            | -1 ->
                                 // No whitespace; just break it at [characters]
-                    yield remaining.Substring (0, charPerLine)
-                    remaining <- remaining.Substring charPerLine
-                | _ ->
-                    yield remaining.Substring (0, spaceIdx)
-                    remaining <- remaining.Substring (spaceIdx + 1)
-              match remaining.Length with
-              | 0 -> ()
-              | _ -> yield remaining
+                                yield remaining[0..charPerLine - 1]
+                                remaining <- remaining[charPerLine..]
+                            | spaceIdx ->
+                                // Break on the last space in the line
+                                yield remaining[0..spaceIdx - 1]
+                                remaining <- remaining[spaceIdx + 1..]
+                    // Leftovers - yum!
+                    match remaining.Length with 0 -> () | _ -> yield remaining
+            yield ""
         }
-      |> Seq.fold (fun (acc : StringBuilder) line -> acc.AppendFormat ("{0}\n", line)) (StringBuilder ())
-      |> string
+        |> String.concat "\n"
 
 /// Modify the text returned by CKEditor into the format we need for request and announcement text
 let ckEditorToText (text : string) =
-  text
-    .Replace("\n\t", "") // \r
-    .Replace("&nbsp;", " ")
-    .Replace("  ", "&#xa0; ")
-    .Replace("</p><p>", "<br><br>") // \r
-    .Replace("</p>", "")
-    .Replace("<p>", "")
-    .Trim()
+    [ "\n\t",    ""
+      "&nbsp;",  " "
+      "  ",      "&#xa0; "
+      "</p><p>", "<br><br>"
+      "</p>",    ""
+      "<p>",     ""
+    ]
+    |> List.fold (fun (txt: string) (x, y) -> String.replace x y txt) text
+    |> String.trim
 
 
+open System.Net
+
 /// Convert an HTML piece of text to plain text
 let htmlToPlainText html =
     match html with
     | null | "" -> ""
     | _ ->
-      WebUtility.HtmlDecode((html.Trim() |> stripTags [ "br" ]).Replace("<br />", "\n").Replace("<br>", "\n"))
-        .Replace("\u00a0", " ")
+        html.Trim ()
+        |> stripTags [ "br" ]
+        |> String.replace "<br />" "\n"
+        |> String.replace "<br>" "\n"
+        |> WebUtility.HtmlDecode
+        |> String.replace "\u00a0" " "
 
 /// Get the second portion of a tuple as a string
 let sndAsString x = (snd >> string) x
 
+
+/// Make a URL with query string parameters
+let makeUrl url qs =
+    if List.isEmpty qs then url
+    else $"""{url}?{String.Join('&',  List.map (fun (k, v) -> $"%s{k}={WebUtility.UrlEncode v}") qs)}"""
+
+
 /// "Magic string" repository
 [<RequireQualifiedAccess>]
 module Key =
     
+    /// The request start time (added via middleware, read when rendering the footer)
+    let startTime = "StartTime"
+    
     /// This contains constants for session-stored objects within PrayerTracker
     module Session =
+        
         /// The currently logged-on small group
         let currentGroup = "CurrentGroup"
+        
         /// The currently logged-on user
         let currentUser = "CurrentUser"
+        
         /// User messages to be displayed the next time a page is sent
         let userMessages = "UserMessages"
+        
         /// The URL to which the user should be redirected once they have logged in
         let redirectUrl = "RedirectUrl"
 
-  /// Names and value names for use with cookies
-  module Cookie =
-    /// The name of the user cookie
-    let user = "LoggedInUser"
-    /// The name of the class cookie
-    let group = "LoggedInClass"
-    /// The name of the culture cookie
-    let culture = "CurrentCulture"
-    /// The name of the idle timeout cookie
-    let timeout = "TimeoutCookie"
-    /// The cookies that should be cleared when a user or group logs off
-    let logOffCookies = [ user; group; timeout ]
-
 
 /// Enumerated values for small group request list visibility (derived from preferences, used in UI)
-module RequestVisibility =
+module GroupVisibility =
+    
     /// Requests are publicly accessible
     [<Literal>]
-  let ``public`` = 1
+    let PublicList = 1
+    
     /// The small group members can enter a password to view the request list
     [<Literal>]
-  let passwordProtected = 2
+    let HasPassword = 2
+    
     /// No one can see the requests for a small group except its administrators ("User" access level)
     [<Literal>]
-  let ``private`` = 3
-
-
-/// A page with verbose user instructions
-type HelpPage =
-  { /// The module to which the help page applies
-    ``module`` : string
-    /// The topic for the help page
-    topic : string
-    /// The text with which this help page is linked (context help is linked with an icon)
-    linkedText : string
-    }
-  with
-    /// A help page that does not exist
-    static member None = { ``module`` = null; topic = null; linkedText = null }
-
-    /// The URL fragment for this page (appended to "/help/" for the full URL)
-    member this.Url = sprintf "%s/%s" this.``module`` this.topic
+    let PrivateList = 3
 
 
 /// Links for help locations
 module Help =
+    
     /// Help link for small group preference edit page
-  let groupPreferences = { ``module`` = "group"; topic = "preferences"; linkedText = "Change Preferences" }
+    let groupPreferences = "small-group/preferences"
+    
     /// Help link for send announcement page
-  let sendAnnouncement = { ``module`` = "group"; topic = "announcement"; linkedText = "Send Announcement" }
+    let sendAnnouncement = "small-group/announcement"
+    
     /// Help link for maintain group members page
-  let maintainGroupMembers = { ``module`` = "group"; topic = "members"; linkedText = "Maintain Group Members" }
+    let maintainGroupMembers = "small-group/members"
+    
     /// Help link for request edit page
-  let editRequest = { ``module`` = "requests"; topic = "edit"; linkedText = "Add / Edit a Request" }
+    let editRequest = "requests/edit"
+    
     /// Help link for maintain requests page
-  let maintainRequests = { ``module`` = "requests"; topic = "maintain"; linkedText = "Maintain Requests" }
+    let maintainRequests = "requests/maintain"
+    
     /// Help link for view request list page
-  let viewRequestList = { ``module`` = "requests"; topic = "view"; linkedText = "View Request List" }
+    let viewRequestList = "requests/view"
+    
     /// Help link for user and class login pages
-  let logOn = { ``module`` = "user"; topic = "logon"; linkedText = "Log On" }
+    let logOn = "user/log-on"
+    
     /// Help link for user password change page
-  let changePassword = { ``module`` = "user"; topic = "password"; linkedText = "Change Your Password" }
-  /// All help pages (the order is the order in which they are displayed on the main help page)
-  let all =
-    [ logOn
-      maintainRequests
-      editRequest
-      groupPreferences
-      maintainGroupMembers
-      viewRequestList
-      sendAnnouncement
-      changePassword
-      ]
+    let changePassword = "user/password"
+    
+    /// Create a full link for a help page
+    let fullLink lang url = $"https://docs.prayer.bitbadger.solutions/%s{lang}/%s{url}.html"
 
 
 /// This class serves as a common anchor for resources

src/PrayerTracker.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}"
 EndProject
@@ -11,6 +11,11 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Tests", "Pray
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Data", "PrayerTracker.Data\PrayerTracker.Data.fsproj", "{2B5BA107-9BDA-4A1D-A9AF-AFEE6BF12270}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B290BA27-C8B8-44F3-BF01-D103302D815F}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

src/PrayerTracker/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "3.1.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

src/PrayerTracker/App.fs

@@ -1,82 +1,118 @@
 namespace PrayerTracker
 
+open Microsoft.AspNetCore.Http
+
+/// Middleware to add the starting ticks for the request
+type RequestStartMiddleware (next: RequestDelegate) =
+    
+    member this.InvokeAsync (ctx: HttpContext) = task {
+        ctx.Items[Key.startTime] <- ctx.Now
+        return! next.Invoke ctx
+    }
+
+
+open System
 open Microsoft.AspNetCore.Builder
 open Microsoft.AspNetCore.Hosting
+open Microsoft.Extensions.Configuration
 
 /// Module to hold configuration for the web app
 [<RequireQualifiedAccess>]
 module Configure =
   
-  open Cookies
-  open Giraffe
-  open Giraffe.TokenRouter
-  open Microsoft.AspNetCore.Localization
-  open Microsoft.AspNetCore.Server.Kestrel.Core
-  open Microsoft.EntityFrameworkCore
-  open Microsoft.Extensions.Configuration
-  open Microsoft.Extensions.DependencyInjection
-  open Microsoft.Extensions.Localization
-  open Microsoft.Extensions.Logging
-  open Microsoft.Extensions.Options
-  open NodaTime
-  open System.Globalization
-
     /// Set up the configuration for the app
-  let configuration (ctx : WebHostBuilderContext) (cfg : IConfigurationBuilder) =
+    let configuration (ctx: WebHostBuilderContext) (cfg: IConfigurationBuilder) =
         cfg.SetBasePath(ctx.HostingEnvironment.ContentRootPath)
             .AddJsonFile("appsettings.json", optional = true, reloadOnChange = true)
-      .AddJsonFile(sprintf "appsettings.%s.json" ctx.HostingEnvironment.EnvironmentName, optional = true)
+            .AddJsonFile($"appsettings.{ctx.HostingEnvironment.EnvironmentName}.json", optional = true)
             .AddEnvironmentVariables()
         |> ignore
 
+    open Microsoft.AspNetCore.Server.Kestrel.Core
+    
     /// Configure Kestrel from appsettings.json
-  let kestrel (ctx : WebHostBuilderContext) (opts : KestrelServerOptions) =
+    let kestrel (ctx: WebHostBuilderContext) (opts: KestrelServerOptions) =
         (ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel"
 
+    open System.Globalization
+    open BitBadger.Documents.Postgres
+    open Microsoft.AspNetCore.Authentication.Cookies
+    open Microsoft.AspNetCore.Localization
+    open Microsoft.Extensions.Caching.Distributed
+    open Microsoft.Extensions.DependencyInjection
+    open NodaTime
+    open Npgsql
+    open PrayerTracker.Data
+    
+    /// Configure ASP.NET Core's service collection (dependency injection container)
     let services (svc : IServiceCollection) =
-    svc.AddOptions()
-      .AddLocalization(fun options -> options.ResourcesPath <- "Resources")
-      .Configure<RequestLocalizationOptions>(
-        fun (opts : RequestLocalizationOptions) ->
-          let supportedCultures =
-            [| CultureInfo "en-US"; CultureInfo "en-GB"; CultureInfo "en-AU"; CultureInfo "en"
-               CultureInfo "es-MX"; CultureInfo "es-ES"; CultureInfo "es"
-              |]
-          opts.DefaultRequestCulture <- RequestCulture ("en-US", "en-US")
+        let _ = svc.AddOptions()
+        let _ = svc.AddLocalization(fun options -> options.ResourcesPath <- "Resources")
+        let _ =
+            svc.Configure<RequestLocalizationOptions>(fun (opts: RequestLocalizationOptions) ->
+                let supportedCultures = [|
+                    CultureInfo "en-US"; CultureInfo "en-GB"; CultureInfo "en-AU"; CultureInfo "en"
+                    CultureInfo "es-MX"; CultureInfo "es-ES"; CultureInfo "es" |]
+                opts.DefaultRequestCulture <- RequestCulture("en-US", "en-US")
                 opts.SupportedCultures     <- supportedCultures
                 opts.SupportedUICultures   <- supportedCultures)
-      .AddDistributedMemoryCache()
-      .AddSession()
-      .AddAntiforgery()
-      .AddSingleton<IClock>(SystemClock.Instance)
-    |> ignore
-    let config = svc.BuildServiceProvider().GetRequiredService<IConfiguration>()
-    let crypto = config.GetSection "CookieCrypto"
-    CookieCrypto (crypto.["Key"], crypto.["IV"]) |> setCrypto
-    svc.AddDbContext<AppDbContext>(
-        fun options ->
-          options.UseNpgsql(config.GetConnectionString "PrayerTracker") |> ignore)
-    |> ignore
+        let _ =
+            svc.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+                .AddCookie(fun opts ->
+                    opts.ExpireTimeSpan    <- TimeSpan.FromMinutes 120.
+                    opts.SlidingExpiration <- true
+                    opts.AccessDeniedPath  <- "/error/403")
+        let _ = svc.AddAuthorization()
+
+        let cfg = svc.BuildServiceProvider().GetService<IConfiguration>()
+        let dsb = NpgsqlDataSourceBuilder(cfg.GetConnectionString "PrayerTracker")
+        let _   = dsb.UseNodaTime()
+        dsb.Build() |> Configuration.useDataSource 
+
+        let emailCfg = cfg.GetSection "Email"
+        if (emailCfg.GetChildren >> Seq.isEmpty >> not) () then ConfigurationBinder.Bind(emailCfg, Email.smtpOptions)
+
+        let _ = svc.AddSingleton<IDistributedCache, DistributedCache>()
+        let _ = svc.AddSession()
+        let _ = svc.AddAntiforgery()
+        let _ = svc.AddRouting()
+        let _ = svc.AddSingleton<IClock> SystemClock.Instance
+        
+        ()
+    
+    open Giraffe
+    
+    let noWeb : HttpHandler = fun next ctx ->
+        redirectTo true $"""/{string ctx.Request.RouteValues["path"]}""" next ctx
+        
+    open Giraffe.EndpointRouting
     
     /// Routes for PrayerTracker
-  let webApp =
-    router Handlers.CommonFunctions.fourOhFour [
-      GET [
+    let routes = [
+        route "/web/{**path}" noWeb
+        GET_HEAD [
             subRoute "/church" [
                 route  "es"       Handlers.Church.maintain
-          routef "/%O/edit" Handlers.Church.edit
-          ]
+                routef "/%O/edit" Handlers.Church.edit ]
             route    "/class/logon" (redirectTo true "/small-group/log-on")
             routef   "/error/%s"    Handlers.Home.error
             subRoute "/help" [
                 route    "" Handlers.Help.index
-          routef "/%s/%s" Handlers.Help.show
-          ]
+                subRoute "/requests" [
+                    route "/edit"     Handlers.Help.Requests.edit
+                    route "/maintain" Handlers.Help.Requests.maintain
+                    route "/view"     Handlers.Help.Requests.view ]
+                subRoute "/small-group" [
+                    route "/announcement" Handlers.Help.SmallGroup.announcement
+                    route "/members"      Handlers.Help.SmallGroup.members
+                    route "/preferences"  Handlers.Help.SmallGroup.preferences ]
+                subRoute "/user" [
+                    route "/log-on"   Handlers.Help.User.logOn
+                    route "/password" Handlers.Help.User.password ] ]
             routef   "/language/%s" Handlers.Home.language
             subRoute "/legal" [
                 route "/privacy-policy"   Handlers.Home.privacyPolicy
-          route "/terms-of-service" Handlers.Home.tos
-          ]
+                route "/terms-of-service" Handlers.Home.tos ]
             route    "/log-off" Handlers.Home.logOff
             subRoute "/prayer-request" [
                 route  "s"           (Handlers.PrayerRequest.maintain true)
@@ -90,8 +126,7 @@ module Configure =
                 routef "s/view/%s"   (Some >> Handlers.PrayerRequest.view)
                 routef "/%O/edit"    Handlers.PrayerRequest.edit
                 routef "/%O/expire"  Handlers.PrayerRequest.expire
-          routef "/%O/restore" Handlers.PrayerRequest.restore
-          ]
+                routef "/%O/restore" Handlers.PrayerRequest.restore ]
             subRoute "/small-group" [
                 route  ""                Handlers.SmallGroup.overview
                 route  "s"               Handlers.SmallGroup.maintain
@@ -102,8 +137,7 @@ module Configure =
                 route  "/logon"          (redirectTo true "/small-group/log-on")
                 routef "/member/%O/edit" Handlers.SmallGroup.editMember
                 route  "/members"        Handlers.SmallGroup.members
-          route  "/preferences"    Handlers.SmallGroup.preferences
-          ]
+                route  "/preferences"    Handlers.SmallGroup.preferences ]
             route    "/unauthorized" Handlers.Home.unauthorized
             subRoute "/user" [
                 route  "s"                Handlers.User.maintain
@@ -111,19 +145,15 @@ module Configure =
                 routef "/%O/small-groups" Handlers.User.smallGroups
                 route  "/log-on"          Handlers.User.logOn
                 route  "/logon"           (redirectTo true "/user/log-on")
-          route  "/password"        Handlers.User.password
-          ]
-        route "/" Handlers.Home.homePage
-        ]
+                route  "/password"        Handlers.User.password ]
+            route    "/" Handlers.Home.homePage ]
         POST [
             subRoute "/church" [
                 routef "/%O/delete" Handlers.Church.delete
-          route  "/save"      Handlers.Church.save
-          ]
+                route  "/save"      Handlers.Church.save ]
             subRoute "/prayer-request" [
                 routef "/%O/delete" Handlers.PrayerRequest.delete
-          route  "/save"      Handlers.PrayerRequest.save
-          ]
+                route  "/save"      Handlers.PrayerRequest.save ]
             subRoute "/small-group" [
                 route  "/announcement/send" Handlers.SmallGroup.sendAnnouncement
                 routef "/%O/delete"         Handlers.SmallGroup.delete
@@ -131,75 +161,76 @@ module Configure =
                 routef "/member/%O/delete"  Handlers.SmallGroup.deleteMember
                 route  "/member/save"       Handlers.SmallGroup.saveMember
                 route  "/preferences/save"  Handlers.SmallGroup.savePreferences
-          route  "/save"              Handlers.SmallGroup.save
-          ]
+                route  "/save"              Handlers.SmallGroup.save ]
             subRoute "/user" [
                 routef "/%O/delete"         Handlers.User.delete
                 route  "/edit/save"         Handlers.User.save
                 route  "/log-on"            Handlers.User.doLogOn
                 route  "/password/change"   Handlers.User.changePassword
-          route  "/small-groups/save" Handlers.User.saveGroups
-          ]
-        ]
-      ]
+                route  "/small-groups/save" Handlers.User.saveGroups ] ] ]
 
-  let errorHandler (ex : exn) (logger : ILogger) =
+    open Microsoft.Extensions.Logging
+
+    /// Giraffe error handler
+    let errorHandler (ex: exn) (logger: ILogger) =
         logger.LogError(EventId(), ex, "An unhandled exception has occurred while executing the request.")
         clearResponse >=> setStatusCode 500 >=> text ex.Message
     
+    open Microsoft.Extensions.Hosting
+    
     /// Configure logging
-  let logging (log : ILoggingBuilder) =
-    let env = log.Services.BuildServiceProvider().GetService<IHostingEnvironment> ()
-    match env.IsDevelopment () with
-    | true -> log
-    | false -> log.AddFilter (fun l -> l > LogLevel.Information)
+    let logging (log: ILoggingBuilder) =
+        let env = log.Services.BuildServiceProvider().GetService<IWebHostEnvironment>()
+        if env.IsDevelopment() then log else log.AddFilter(fun l -> l > LogLevel.Information)
         |> function l -> l.AddConsole().AddDebug()
         |> ignore
     
+    open BitBadger.AspNetCore.CanonicalDomains
+    open Microsoft.Extensions.Localization
+    open Microsoft.Extensions.Options
+    
+    /// Configure the application
     let app (app : IApplicationBuilder) =
-    let env = app.ApplicationServices.GetRequiredService<IHostingEnvironment>()
-    let log = app.ApplicationServices.GetRequiredService<ILoggerFactory>()
-    (match env.IsDevelopment () with
-     | true ->
-        log.AddConsole () |> ignore
-        app.UseDeveloperExceptionPage ()
-     | false ->
-        log.AddConsole LogLevel.Warning |> ignore
-        try
-          use scope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope ()
-          scope.ServiceProvider.GetService<AppDbContext>().Database.Migrate ()
-        with _ -> () // om nom nom
-        app.UseGiraffeErrorHandler errorHandler)
-      .UseStatusCodePagesWithReExecute("/error/{0}")
-      .UseStaticFiles()
-      .UseSession()
-      .UseRequestLocalization(app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>().Value)
-      .UseGiraffe(webApp)
+        let env = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>()
+        if env.IsDevelopment() then
+            app.UseDeveloperExceptionPage()
+        else
+            app.UseGiraffeErrorHandler errorHandler
         |> ignore
-    Views.I18N.setUpFactories <| app.ApplicationServices.GetRequiredService<IStringLocalizerFactory> ()
+        
+        let _ = app.UseForwardedHeaders()
+        let _ = app.UseCanonicalDomains()
+        let _ = app.UseStatusCodePagesWithReExecute "/error/{0}"
+        let _ = app.UseStaticFiles()
+        let _ = app.UseCookiePolicy(CookiePolicyOptions(MinimumSameSitePolicy = SameSiteMode.Strict))
+        let _ = app.UseMiddleware<RequestStartMiddleware>()
+        let _ = app.UseRouting()
+        let _ = app.UseSession()
+        let _ = app.UseRequestLocalization(
+            app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>().Value)
+        let _ = app.UseAuthentication()
+        let _ = app.UseAuthorization()
+        let _ = app.UseEndpoints(fun e -> e.MapGiraffeEndpoints routes)
+        app.ApplicationServices.GetRequiredService<IStringLocalizerFactory>() |> Views.I18N.setUpFactories 
 
 
 /// The web application
 module App =
     
-  open System
     open System.IO
 
-  let exitCode = 0
-
-  let CreateWebHostBuilder _ =
-    let contentRoot = Directory.GetCurrentDirectory ()
+    [<EntryPoint>]
+    let main args =
+        let contentRoot = Directory.GetCurrentDirectory()
+        let app =
             WebHostBuilder()
                 .UseContentRoot(contentRoot)
                 .ConfigureAppConfiguration(Configure.configuration)
                 .UseKestrel(Configure.kestrel)
-      .UseWebRoot(Path.Combine (contentRoot, "wwwroot"))
+                .UseWebRoot(Path.Combine(contentRoot, "wwwroot"))
                 .ConfigureServices(Configure.services)
                 .ConfigureLogging(Configure.logging)
-      .Configure(Action<IApplicationBuilder> Configure.app)
-
-  [<EntryPoint>]
-  let main args =
-    CreateWebHostBuilder(args).Build().Run()
-        
-    exitCode
+                .Configure(System.Action<IApplicationBuilder> Configure.app)
+                .Build()
+        if args.Length > 0 then printfn $"Unrecognized option {args[0]}" else app.Run()
+        0

src/PrayerTracker/Church.fs

@@ -1,113 +1,76 @@
 module PrayerTracker.Handlers.Church
 
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open System.Threading.Tasks
 open Giraffe
 open PrayerTracker
+open PrayerTracker.Data
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Threading.Tasks
 
 /// Find statistics for the given church
-let private findStats (db : AppDbContext) churchId =
-  task {
-    let! grps = db.CountGroupsByChurch   churchId
-    let! reqs = db.CountRequestsByChurch churchId
-    let! usrs = db.CountUsersByChurch    churchId
-    return (churchId.ToString "N"), { smallGroups = grps; prayerRequests = reqs; users = usrs }
-    }
+let private findStats churchId = task {
+    let! groups   = SmallGroups.countByChurch    churchId
+    let! requests = PrayerRequests.countByChurch churchId
+    let! users    = Users.countByChurch          churchId
+    return shortGuid churchId.Value, { SmallGroups = groups; PrayerRequests = requests; Users = users }
+}
 
-
-/// POST /church/[church-id]/delete
-let delete churchId : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    let db = ctx.dbContext ()
-    task {
-      let! church = db.TryChurchById churchId
-      match church with
-      | Some ch ->
-          let! _, stats = findStats db churchId
-          db.RemoveEntry ch
-          let! _ = db.SaveChangesAsync ()
-          let  s = Views.I18N.localizer.Force ()
+// POST /church/[church-id]/delete
+let delete chId : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    let churchId = ChurchId chId
+    match! Churches.tryById churchId with
+    | Some church ->
+        let! _, stats = findStats churchId
+        do! Churches.deleteById churchId
         addInfo ctx
-            s.["The church {0} and its {1} small groups (with {2} prayer request(s)) were deleted successfully; revoked access from {3} user(s)",
-                ch.name, stats.smallGroups, stats.prayerRequests, stats.users]
+            ctx.Strings["The church “{0}” and its {1} small group(s) (with {2} prayer request(s)) were deleted successfully; revoked access from {3} user(s)",
+                        church.Name, stats.SmallGroups, stats.PrayerRequests, stats.Users]
         return! redirectTo false "/churches" next ctx
-      | None -> return! fourOhFour next ctx
-      }
+    | None -> return! fourOhFour ctx
+}
 
+open System
 
-/// GET /church/[church-id]/edit
-let edit churchId : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      match churchId with
-      | x when x = Guid.Empty ->
+// GET /church/[church-id]/edit
+let edit churchId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    if churchId = Guid.Empty then
         return!
-            viewInfo ctx startTicks
+            viewInfo ctx
             |> Views.Church.edit EditChurch.empty ctx
             |> renderHtml next ctx
-      | _ ->
-          let  db     = ctx.dbContext ()
-          let! church = db.TryChurchById churchId
-          match church with
-          | Some ch -> 
+    else
+        match! Churches.tryById (ChurchId churchId) with
+        | Some church -> 
             return!
-                viewInfo ctx startTicks
-                |> Views.Church.edit (EditChurch.fromChurch ch) ctx
+                viewInfo ctx
+                |> Views.Church.edit (EditChurch.fromChurch church) ctx
                 |> renderHtml next ctx
-          | None -> return! fourOhFour next ctx
-      }
+        | None -> return! fourOhFour ctx
+}
 
-
-/// GET /churches
-let maintain : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    task {
-      let! churches = db.AllChurches ()
-      let! stats =
-        churches
-        |> Seq.ofList
-        |> Seq.map (fun c -> findStats db c.churchId)
-        |> Task.WhenAll
+// GET /churches
+let maintain : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let! churches = Churches.all ()
+    let  stats    = churches |> List.map (fun c -> findStats c.Id |> Async.AwaitTask |> Async.RunSynchronously)
     return!
-        viewInfo ctx startTicks
-        |> Views.Church.maintain churches (stats |> Map.ofArray) ctx
+        viewInfo ctx
+        |> Views.Church.maintain churches (stats |> Map.ofList) ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// POST /church/save
-let save : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<EditChurch> ()
-      match result with
-      | Ok m ->
-          let db = ctx.dbContext ()
+// POST /church/save
+let save : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditChurch> () with
+    | Ok model ->
         let! church =
-            match m.isNew () with
-            | true -> Task.FromResult<Church option>(Some { Church.empty with churchId = Guid.NewGuid () })
-            | false -> db.TryChurchById m.churchId
+            if model.IsNew then Task.FromResult(Some { Church.empty with Id = (Guid.NewGuid >> ChurchId) () })
+            else Churches.tryById (idFromShort ChurchId model.ChurchId)
         match church with
         | Some ch ->
-              m.populateChurch ch
-              |> (match m.isNew () with true -> db.AddEntry | false -> db.UpdateEntry)
-              let! _   = db.SaveChangesAsync ()
-              let  s   = Views.I18N.localizer.Force ()
-              let  act = s.[match m.isNew () with true -> "Added" | _ -> "Updated"].Value.ToLower ()
-              addInfo ctx s.["Successfully {0} church “{1}”", act, m.name]
+            do! Churches.save (model.PopulateChurch ch)
+            let act = ctx.Strings[if model.IsNew then "Added" else "Updated"].Value.ToLower()
+            addInfo ctx ctx.Strings["Successfully {0} church “{1}”", act, model.Name]
             return! redirectTo false "/churches" next ctx
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}

src/PrayerTracker/CommonFunctions.fs

@@ -2,159 +2,125 @@
 [<AutoOpen>]
 module PrayerTracker.Handlers.CommonFunctions
 
-open FSharp.Control.Tasks.V2.ContextInsensitive
-open Giraffe
-open Microsoft.AspNetCore.Antiforgery
-open Microsoft.AspNetCore.Html
-open Microsoft.AspNetCore.Http
-open Microsoft.AspNetCore.Http.Extensions
 open Microsoft.AspNetCore.Mvc.Rendering
-open Microsoft.Extensions.Localization
-open PrayerTracker
-open PrayerTracker.Cookies
-open PrayerTracker.ViewModels
-open System
-open System.Net
-open System.Reflection
-open System.Threading.Tasks
 
 /// Create a select list from an enumeration
-let toSelectList<'T> valFunc textFunc withDefault emptyText (items : 'T seq) =
-  match items with null -> nullArg "items" | _ -> ()
+let toSelectList<'T> valFunc textFunc withDefault emptyText (items: 'T seq) =
+    if isNull items then nullArg (nameof items)
     [ match withDefault with
       | true ->
-        let s = PrayerTracker.Views.I18N.localizer.Force ()
-        yield SelectListItem (sprintf "&mdash; %A &mdash;" s.[emptyText], "")
+          let s = PrayerTracker.Views.I18N.localizer.Force()
+          SelectListItem($"""&mdash; %A{s[emptyText]} &mdash;""", "")
       | _ -> ()
-    yield! items |> Seq.map (fun x -> SelectListItem (textFunc x, valFunc x))
-    ]
+      yield! items |> Seq.map (fun x -> SelectListItem(textFunc x, valFunc x)) ]
   
 /// Create a select list from an enumeration
-let toSelectListWithEmpty<'T> valFunc textFunc emptyText (items : 'T seq) =
+let toSelectListWithEmpty<'T> valFunc textFunc emptyText (items: 'T seq) =
     toSelectList valFunc textFunc true emptyText items
     
 /// Create a select list from an enumeration
-let toSelectListWithDefault<'T> valFunc textFunc (items : 'T seq) =
+let toSelectListWithDefault<'T> valFunc textFunc (items: 'T seq) =
     toSelectList valFunc textFunc true "Select" items
 
 /// The version of PrayerTracker
 let appVersion =
-  let v = Assembly.GetExecutingAssembly().GetName().Version
+    let v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version
 #if (DEBUG)
-  sprintf "v%A" v
+    $"v{v}"
 #else
     seq {
-    yield sprintf "v%d" v.Major
+        $"v%d{v.Major}"
         match v.Minor with
-    | 0 -> match v.Build with 0 -> () | _ -> yield sprintf ".0.%d" v.Build
+        | 0 -> match v.Build with 0 -> () | _ -> $".0.%d{v.Build}"
         | _ ->
-        yield sprintf ".%d" v.Minor
-        match v.Build with 0 -> () | _ -> yield sprintf ".%d" v.Build
+            $".%d{v.Minor}"
+            match v.Build with 0 -> () | _ -> $".%d{v.Build}"
     }
     |> String.concat ""
 #endif
 
-/// An option of the currently signed-in user
-let tryCurrentUser (ctx : HttpContext) =
-  ctx.Session.GetUser ()
 
-/// The currently signed-in user (will raise if none exists)
-let currentUser ctx =
-  match tryCurrentUser ctx with Some u -> u | None -> nullArg "User"
-
-/// An option of the currently signed-in small group
-let tryCurrentGroup (ctx : HttpContext) =
-  ctx.Session.GetSmallGroup ()
-
-/// The currently signed-in small group (will raise if none exists)
-let currentGroup ctx =
-  match tryCurrentGroup ctx with Some g -> g | None -> nullArg "SmallGroup"
+open Giraffe
+open Giraffe.Htmx
+open Microsoft.AspNetCore.Http
+open NodaTime
+open PrayerTracker
+open PrayerTracker.ViewModels
 
 /// Create the common view information heading
-let viewInfo (ctx : HttpContext) startTicks =
+let viewInfo (ctx: HttpContext) =
     let msg =
-    match ctx.Session.GetMessages () with
+        match ctx.Session.Messages with
         | [] -> []
         | x ->
-        ctx.Session.SetMessages []
+            ctx.Session.Messages <- []
             x
-  match tryCurrentUser ctx with
-  | Some u ->
-      // The idle timeout is 2 hours; if the app pool is recycled or the actual session goes away, we will log the
-      // user back in transparently using this cookie.  Every request resets the timer.
-      let timeout =
-        { Id       = u.userId
-          GroupId  = (currentGroup ctx).smallGroupId
-          Until    = DateTime.UtcNow.AddHours(2.).Ticks
-          Password = ""
-          }
-      ctx.Response.Cookies.Append 
-        (Key.Cookie.timeout, { timeout with Password = saltedTimeoutHash timeout }.toPayload (),
-          CookieOptions (Expires = Nullable<DateTimeOffset> (DateTimeOffset (DateTime timeout.Until)), HttpOnly = true))
-  | None -> ()
+    let layout =
+        match ctx.Request.Headers.HxTarget with
+        | Some hdr when hdr = "pt-body" -> ContentOnly
+        | Some _ -> PartialPage
+        | None -> FullPage
     { AppViewInfo.fresh with
-      version      = appVersion
-      messages     = msg
-      requestStart = startTicks
-      user         = ctx.Session.GetUser ()
-      group        = ctx.Session.GetSmallGroup ()
-      }
+        Version      = appVersion
+        Messages     = msg
+        RequestStart = ctx.Items[Key.startTime] :?> Instant
+        User         = ctx.Session.CurrentUser
+        Group        = ctx.Session.CurrentGroup
+        Layout       = layout }
 
 /// The view is the last parameter, so it can be composed
 let renderHtml next ctx view =
     htmlView view next ctx
 
+open Microsoft.Extensions.Logging
+
 /// Display an error regarding form submission
-let bindError (msg : string) next (ctx : HttpContext) =
-  System.Console.WriteLine msg
-  ctx.SetStatusCode 400
-  text msg next ctx
+let bindError (msg: string) =
+    handleContext (fun ctx ->
+        ctx.GetService<ILoggerFactory>().CreateLogger("PrayerTracker.Handlers").LogError msg
+        (setStatusCode 400 >=> text msg) earlyReturn ctx)
 
 /// Handler that will return a status code 404 and the text "Not Found"
-let fourOhFour next (ctx : HttpContext) =
-  ctx.SetStatusCode 404
-  text "Not Found" next ctx
-
+let fourOhFour (ctx: HttpContext) =
+    (setStatusCode 404 >=> text "Not Found") earlyReturn ctx
 
 /// Handler to validate CSRF prevention token
-let validateCSRF : HttpHandler =
-  fun next ctx ->
-    let antiForgery = ctx.GetService<IAntiforgery> ()
-    task {
-      let! isValid = antiForgery.IsRequestValidAsync ctx
-      match isValid with
+let validateCsrf : HttpHandler = fun next ctx -> task {
+    match! ctx.GetService<Microsoft.AspNetCore.Antiforgery.IAntiforgery>().IsRequestValidAsync ctx with
     | true -> return! next ctx
-      | false ->
-          return! (clearResponse >=> setStatusCode 400 >=> text "Quit hacking...") (fun _ -> Task.FromResult None) ctx
-      }
-
+    | false -> return! (clearResponse >=> setStatusCode 400 >=> text "Quit hacking...") earlyReturn ctx
+}
 
 /// Add a message to the session
-let addUserMessage (ctx : HttpContext) msg =
-  msg :: ctx.Session.GetMessages () |> ctx.Session.SetMessages
+let addUserMessage (ctx: HttpContext) msg =
+    ctx.Session.Messages <- msg :: ctx.Session.Messages
+
+
+open Microsoft.AspNetCore.Html
+open Microsoft.Extensions.Localization
 
 /// Convert a localized string to an HTML string
-let htmlLocString (x : LocalizedString) =
-  (WebUtility.HtmlEncode >> HtmlString) x.Value
+let htmlLocString (x: LocalizedString) =
+    (System.Net.WebUtility.HtmlEncode >> HtmlString) x.Value
 
-let htmlString (x : LocalizedString) =
+let htmlString (x: LocalizedString) =
     HtmlString x.Value
 
 /// Add an error message to the session
 let addError ctx msg =
-  addUserMessage ctx { UserMessage.Error with text = htmlLocString msg }
+    addUserMessage ctx { UserMessage.error with Text = htmlLocString msg }
 
 /// Add an informational message to the session
 let addInfo ctx msg =
-  addUserMessage ctx { UserMessage.Info with text = htmlLocString msg }
+    addUserMessage ctx { UserMessage.info with Text = htmlLocString msg }
 
 /// Add an informational HTML message to the session
 let addHtmlInfo ctx msg =
-  addUserMessage ctx { UserMessage.Info with text = htmlString msg }
+    addUserMessage ctx { UserMessage.info with Text = htmlString msg }
   
 /// Add a warning message to the session
 let addWarning ctx msg =
-  addUserMessage ctx { UserMessage.Warning with text = htmlLocString msg }
+    addUserMessage ctx { UserMessage.warning with Text = htmlLocString msg }
 
 
 /// A level of required access
@@ -169,104 +135,30 @@ type AccessLevel =
     | Public
 
 
-/// Require the given access role (also refreshes "Remember Me" user and group logons)
-let requireAccess level : HttpHandler =
+open Microsoft.AspNetCore.Http.Extensions
+open PrayerTracker.Entities
 
-  /// Is there currently a user logged on?
-  let isUserLoggedOn (ctx : HttpContext) =
-    ctx.Session.GetUser () |> Option.isSome
-
-  /// Log a user on from the timeout cookie
-  let logOnUserFromTimeoutCookie (ctx : HttpContext) =
-    task {
-      // Make sure the cookie hasn't been tampered with
-      try
-        match TimeoutCookie.fromPayload ctx.Request.Cookies.[Key.Cookie.timeout] with
-        | Some c when c.Password = saltedTimeoutHash c ->
-            let  db   = ctx.dbContext ()
-            let! user = db.TryUserById c.Id
-            match user with
-            | Some _ ->
-                ctx.Session.SetUser user
-                let! grp = db.TryGroupById c.GroupId
-                ctx.Session.SetSmallGroup grp
-            | _ -> ()
-        | _ -> ()
-      // If something above doesn't work, the user doesn't get logged in
-      with _ -> ()
-    }
-  
-  /// Attempt to log the user on from their stored cookie
-  let logOnUserFromCookie (ctx : HttpContext) =
-    task {
-      match UserCookie.fromPayload ctx.Request.Cookies.[Key.Cookie.user] with
-      | Some c ->
-          let  db   = ctx.dbContext ()
-          let! user = db.TryUserLogOnByCookie c.Id c.GroupId c.PasswordHash
-          match user with
-          | Some _ ->
-              ctx.Session.SetUser user
-              let! grp = db.TryGroupById c.GroupId
-              ctx.Session.SetSmallGroup grp
-              // Rewrite the cookie to extend the expiration
-              ctx.Response.Cookies.Append (Key.Cookie.user, c.toPayload (), autoRefresh)
-          | _ -> ()
-      | _ -> ()
-      }
-
-  /// Is there currently a small group (or member thereof) logged on?
-  let isGroupLoggedOn (ctx : HttpContext) =
-    ctx.Session.GetSmallGroup () |> Option.isSome
-    
-  /// Attempt to log the small group on from their stored cookie
-  let logOnGroupFromCookie (ctx : HttpContext) =
-    task {
-      match GroupCookie.fromPayload ctx.Request.Cookies.[Key.Cookie.group] with
-      | Some c ->
-          let! grp = (ctx.dbContext ()).TryGroupLogOnByCookie c.GroupId c.PasswordHash sha1Hash
-          match grp with
-          | Some _ ->
-              ctx.Session.SetSmallGroup grp
-              // Rewrite the cookie to extend the expiration
-              ctx.Response.Cookies.Append (Key.Cookie.group, c.toPayload (), autoRefresh)
-          | None -> ()
-      | None -> ()
-    }
-    
-  fun next ctx ->
-    task {
-      // Auto-logon user or class, if required
-      match isUserLoggedOn ctx with
-      | true -> ()
-      | false ->
-          do! logOnUserFromTimeoutCookie ctx
-          match isUserLoggedOn ctx with
-          | true -> ()
-          | false ->
-              do! logOnUserFromCookie ctx
-              match isGroupLoggedOn ctx with true -> () | false -> do! logOnGroupFromCookie ctx
-
-      match true with
-      | _ when level |> List.contains Public -> return! next ctx
-      | _ when level |> List.contains User  && isUserLoggedOn  ctx -> return! next ctx
-      | _ when level |> List.contains Group && isGroupLoggedOn ctx -> return! next ctx
-      | _ when level |> List.contains Admin && isUserLoggedOn  ctx ->
-          match (currentUser ctx).isAdmin with
-          | true -> return! next ctx
-          | false ->
-              let s = Views.I18N.localizer.Force ()
-              addError ctx s.["You are not authorized to view the requested page."]
+/// Require one of the given access roles
+let requireAccess levels : HttpHandler = fun next ctx -> task {
+    // These calls fill the user and group in the session, making .Value safe to use for the rest of the request
+    let! user  = ctx.CurrentUser()
+    let! group = ctx.CurrentGroup()
+    match user, group with
+    | _, _      when List.contains Public levels              -> return! next ctx
+    | Some _, _ when List.contains User   levels              -> return! next ctx
+    | _, Some _ when List.contains Group  levels              -> return! next ctx
+    | Some u, _ when List.contains Admin  levels && u.IsAdmin -> return! next ctx
+    | _, _ when List.contains Admin levels ->
+        addError ctx ctx.Strings["You are not authorized to view the requested page."]
         return! redirectTo false "/unauthorized" next ctx
-      | _ when level |> List.contains User ->
+    | _, _ when List.contains User levels ->
         // Redirect to the user log on page
-          ctx.Session.SetString (Key.Session.redirectUrl, ctx.Request.GetEncodedUrl ())
+        ctx.Session.SetString(Key.Session.redirectUrl, ctx.Request.GetEncodedPathAndQuery())
         return! redirectTo false "/user/log-on" next ctx
-      | _ when level |> List.contains Group ->
+    | _, _ when List.contains Group levels ->
         // Redirect to the small group log on page
-          ctx.Session.SetString (Key.Session.redirectUrl, ctx.Request.GetEncodedUrl ())
         return! redirectTo false "/small-group/log-on" next ctx
-      | _ ->
-          let s = Views.I18N.localizer.Force ()
-          addError ctx s.["You are not authorized to view the requested page."]
+    | _, _ ->
+        addError ctx ctx.Strings["You are not authorized to view the requested page."]
         return! redirectTo false "/unauthorized" next ctx
-      }
+}

src/PrayerTracker/Cookies.fs

@@ -1,128 +0,0 @@
-module PrayerTracker.Cookies
-
-open Microsoft.AspNetCore.Http
-open Newtonsoft.Json
-open System
-open System.Security.Cryptography
-open System.IO
-
-
-/// Cryptography settings to use for encrypting cookies
-type CookieCrypto (key : string, iv : string) =
-  /// The key for the AES encryptor/decryptor
-  member __.Key = Convert.FromBase64String key
-  /// The initialization vector for the AES encryptor/decryptor
-  member __.IV = Convert.FromBase64String iv
-
-
-/// Helpers for encrypting/decrypting cookies
-[<AutoOpen>]
-module private Crypto =
-  
-  /// An instance of the cookie cryptography settings
-  let mutable crypto = CookieCrypto ("", "")
-
-  /// Encrypt a cookie payload
-  let encrypt (payload : string) =
-    use aes = new AesManaged ()
-    use enc = aes.CreateEncryptor (crypto.Key, crypto.IV)
-    use ms  = new MemoryStream ()
-    use cs  = new CryptoStream (ms, enc, CryptoStreamMode.Write)
-    use sw  = new StreamWriter (cs)
-    sw.Write payload
-    sw.Close ()
-    (ms.ToArray >> Convert.ToBase64String) ()
-  
-  /// Decrypt a cookie payload
-  let decrypt payload =
-    use aes = new AesManaged ()
-    use dec = aes.CreateDecryptor (crypto.Key, crypto.IV)
-    use ms  = new MemoryStream (Convert.FromBase64String payload)
-    use cs  = new CryptoStream (ms, dec, CryptoStreamMode.Read)
-    use sr  = new StreamReader (cs)
-    sr.ReadToEnd ()
-
-  /// Encrypt a cookie
-  let encryptCookie cookie =
-    (JsonConvert.SerializeObject >> encrypt) cookie
-
-  /// Decrypt a cookie
-  let decryptCookie<'T> payload =
-    (decrypt >> JsonConvert.DeserializeObject<'T> >> box) payload
-    |> function null -> None | x -> Some (unbox<'T> x)
-
-
-/// Accessor so that the crypto settings instance can be set during startup
-let setCrypto c = Crypto.crypto <- c
-
-
-/// Properties stored in the Small Group cookie
-type GroupCookie =
-  { /// The Id of the small group
-    [<JsonProperty "g">]
-    GroupId : Guid
-    /// The password hash of the small group
-    [<JsonProperty "p">]
-    PasswordHash : string
-    }
-  with
-    /// Convert these properties to a cookie payload
-    member this.toPayload () =
-      encryptCookie this
-    /// Create a set of strongly-typed properties from the cookie payload
-    static member fromPayload x =
-      try decryptCookie<GroupCookie> x with _ -> None
-
-
-/// The payload for the timeout cookie
-type TimeoutCookie =
-  { /// The Id of the small group to which the user is currently logged in
-    [<JsonProperty "g">]
-    GroupId : Guid
-    /// The Id of the user who is currently logged in
-    [<JsonProperty "i">]
-    Id : Guid
-    /// The salted timeout hash to ensure that there has been no tampering with the cookie
-    [<JsonProperty "p">]
-    Password : string
-    /// How long this cookie is valid
-    [<JsonProperty "u">]
-    Until : int64
-    }
-  with
-    /// Convert this set of properties to the cookie payload
-    member this.toPayload () =
-      encryptCookie this
-    /// Create a strongly-typed timeout cookie from the cookie payload
-    static member fromPayload x =
-      try decryptCookie<TimeoutCookie> x with _ -> None
-
-
-/// The payload for the user's "Remember Me" cookie
-type UserCookie =
-  { /// The Id of the group into to which the user is logged
-    [< JsonProperty "g">]
-    GroupId : Guid
-    /// The Id of the user
-    [<JsonProperty "i">]
-    Id : Guid
-    /// The user's password hash
-    [<JsonProperty "p">]
-    PasswordHash : string
-    }
-  with
-    /// Convert this set of properties to a cookie payload
-    member this.toPayload () =
-      encryptCookie this
-    /// Create the strongly-typed cookie properties from a cookie payload
-    static member fromPayload x =
-      try decryptCookie<UserCookie> x with _ -> None
-
-
-/// Create a salted hash to use to validate the idle timeout key
-let saltedTimeoutHash (c : TimeoutCookie) =
-  sha1Hash (sprintf "Prayer%ATracker%AIdle%dTimeout" c.Id c.GroupId c.Until)
-
-/// Cookie options to push an expiration out by 100 days
-let autoRefresh =
-  CookieOptions (Expires = Nullable<DateTimeOffset> (DateTimeOffset (DateTime.UtcNow.AddDays 100.)), HttpOnly = true)

src/PrayerTracker/Email.fs

@@ -1,84 +1,115 @@
 /// Methods for sending e-mails
 module PrayerTracker.Email
 
-open FSharp.Control.Tasks.ContextInsensitive
 open MailKit.Net.Smtp
-open MailKit.Security
 open Microsoft.Extensions.Localization
 open MimeKit
-open MimeKit.Text
 open PrayerTracker.Entities
-open System
 
-/// The e-mail address from which e-mail is sent (must match Google account)
-let private fromAddress = "prayer@djs-consulting.com"
+/// Parameters required to send an e-mail
+type EmailOptions =
+    { /// The SMTP client
+      Client: SmtpClient
+      
+      /// The people who should receive the e-mail
+      Recipients: Member list
+      
+      /// The small group for which this e-mail is being sent
+      Group: SmallGroup
+      
+      /// The subject of the e-mail
+      Subject: string
+      
+      /// The body of the e-mail in HTML
+      HtmlBody: string
+      
+      /// The body of the e-mail in plain text
+      PlainTextBody: string
+      
+      /// Use the current user's preferred language
+      Strings: IStringLocalizer }
+
+/// Options to use when sending e-mail
+type SmtpServerOptions() =
+    /// The hostname of the SMTP server
+    member val SmtpHost: string = "localhost" with get, set
+
+    /// The port over which SMTP communication should occur
+    member val Port: int = 25 with get, set
+
+    /// Whether to use SSL when communicating with the SMTP server
+    member val UseSsl: bool = false with get, set
+
+    /// The authentication to use with the SMTP server
+    member val Authentication: string = "" with get, set
+
+    /// The e-mail address from which messages should be sent
+    member val FromAddress: string = "prayer@bitbadger.solutions" with get, set
+
+
+/// The options for the SMTP server
+let smtpOptions = SmtpServerOptions()
 
 /// Get an SMTP client connection
-// FIXME: make host configurable
-let getConnection () =
-  task {
-    let client = new SmtpClient ()
-    do! client.ConnectAsync ("127.0.0.1", 25, SecureSocketOptions.None)
+let getConnection () = task {
+    let client = new SmtpClient()
+    do! client.ConnectAsync(smtpOptions.SmtpHost, smtpOptions.Port, smtpOptions.UseSsl)
+    do! client.AuthenticateAsync(smtpOptions.FromAddress, smtpOptions.Authentication)
     return client
-    }
+}
       
 /// Create a mail message object, filled with everything but the body content
-let createMessage (grp : SmallGroup) subj =
-  let msg = MimeMessage ()
-  msg.From.Add (MailboxAddress (grp.preferences.emailFromName, fromAddress))
-  msg.Subject <- subj
-  msg.ReplyTo.Add (MailboxAddress (grp.preferences.emailFromName, grp.preferences.emailFromAddress))
+let createMessage opts =
+    let msg = new MimeMessage()
+    msg.From.Add(MailboxAddress(opts.Group.Preferences.EmailFromName, smtpOptions.FromAddress))
+    msg.Subject <- opts.Subject
+    msg.ReplyTo.Add(MailboxAddress(opts.Group.Preferences.EmailFromName, opts.Group.Preferences.EmailFromAddress))
     msg
 
+open MimeKit.Text
+
 /// Create an HTML-format e-mail message
-let createHtmlMessage grp subj body (s : IStringLocalizer) =
+let createHtmlMessage opts =
     let bodyText =
-    [ @"<!DOCTYPE html><html xmlns=""http://www.w3.org/1999/xhtml""><head><title></title></head><body>"
-      body
-      @"<hr><div style=""text-align:right;font-family:Arial,Helvetica,sans-serif;font-size:8pt;padding-right:10px;"">"
-      s.["Generated by P R A Y E R T R A C K E R"].Value
+        [ """<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><title></title></head><body>"""
+          opts.HtmlBody
+          """<hr><div style="text-align:right;font-family:Arial,Helvetica,sans-serif;font-size:8pt;padding-right:10px;">"""
+          opts.Strings["Generated by P R A Y E R T R A C K E R"].Value
           "<br><small>"
-      s.["from Bit Badger Solutions"].Value
-      "</small></div></body></html>"
-      ]
+          opts.Strings["from Bit Badger Solutions"].Value
+          "</small></div></body></html>" ]
         |> String.concat ""
-  let msg = createMessage grp subj
-  msg.Body <- TextPart (TextFormat.Html, Text = bodyText)
+    let msg = createMessage opts
+    msg.Body <- new TextPart(TextFormat.Html, Text = bodyText)
     msg
 
 /// Create a plain-text-format e-mail message
-let createTextMessage grp subj body (s : IStringLocalizer) =
+let createTextMessage opts =
     let bodyText =
-    [ body
+        [ opts.PlainTextBody
           "\n\n--\n"
-      s.["Generated by P R A Y E R T R A C K E R"].Value
+          opts.Strings["Generated by P R A Y E R T R A C K E R"].Value
           "\n"
-      s.["from Bit Badger Solutions"].Value
-      ]
+          opts.Strings["from Bit Badger Solutions"].Value ]
         |> String.concat ""
-  let msg = createMessage grp subj
-  msg.Body <- TextPart (TextFormat.Plain, Text = bodyText)
+    let msg = createMessage opts
+    msg.Body <- new TextPart(TextFormat.Plain, Text = bodyText)
     msg
 
 /// Send e-mails to a class
-let sendEmails (client : SmtpClient) (recipients : Member list) grp subj html text s =
-  task {
-    let htmlMsg = createHtmlMessage grp subj html s
-    let plainTextMsg = createTextMessage grp subj text s
+let sendEmails opts = task {
+    use htmlMsg      = createHtmlMessage opts
+    use plainTextMsg = createTextMessage opts
 
-    for mbr in recipients do
-      let emailType = match mbr.format with Some f -> f | None -> grp.preferences.defaultEmailType
-      let emailTo = MailboxAddress (mbr.memberName, mbr.email)
-      match emailType with
-      | EmailType.Html ->
+    for mbr in opts.Recipients do
+        let emailTo = MailboxAddress(mbr.Name, mbr.Email)
+        match defaultArg mbr.Format opts.Group.Preferences.DefaultEmailType with
+        | HtmlFormat ->
             htmlMsg.To.Add emailTo
-          do! client.SendAsync htmlMsg
-          htmlMsg.To.Clear ()
-      | EmailType.PlainText ->
+            let! _ = opts.Client.SendAsync htmlMsg
+            htmlMsg.To.Clear()
+        | PlainTextFormat ->
             plainTextMsg.To.Add emailTo
-          do! client.SendAsync plainTextMsg
-          plainTextMsg.To.Clear ()
-      | EmailType.AttachedPdf ->
-          raise <| NotImplementedException "Attached PDF format has not been implemented"
-      | _ -> invalidOp <| sprintf "Unknown e-mail type %s passed" emailType
-    }
+            let! _ = opts.Client.SendAsync plainTextMsg
+            plainTextMsg.To.Clear()
+}

src/PrayerTracker/Extensions.fs

@@ -3,43 +3,113 @@ module PrayerTracker.Extensions
 
 open Microsoft.AspNetCore.Http
 open Newtonsoft.Json
+open NodaTime
+open NodaTime.Serialization.JsonNet
+open PrayerTracker.Data
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
 
+/// JSON.NET serializer settings for NodaTime
+let private jsonSettings = JsonSerializerSettings().ConfigureForNodaTime DateTimeZoneProviders.Tzdb
 
+/// Extensions on the .NET session object
 type ISession with
+    
     /// Set an object in the session
-  member this.SetObject key value =
-    this.SetString (key, JsonConvert.SerializeObject value)
+    member this.SetObject<'T> key (value: 'T) =
+        this.SetString(key, JsonConvert.SerializeObject(value, jsonSettings))
     
     /// Get an object from the session
-  member this.GetObject<'T> key =
+    member this.TryGetObject<'T> key =
         match this.GetString key with
-    | null -> Unchecked.defaultof<'T>
-    | v -> JsonConvert.DeserializeObject<'T> v
+        | null -> None
+        | v -> Some (JsonConvert.DeserializeObject<'T>(v, jsonSettings))
 
-  member this.GetSmallGroup () =
-    this.GetObject<SmallGroup> Key.Session.currentGroup |> optRec
-  member this.SetSmallGroup (group : SmallGroup option) =
-    match group with
-    | Some g -> this.SetObject Key.Session.currentGroup g
+    /// The currently logged on small group
+    member this.CurrentGroup
+      with get () = this.TryGetObject<SmallGroup> Key.Session.currentGroup
+       and set (v: SmallGroup option) = 
+          match v with
+          | Some group -> this.SetObject Key.Session.currentGroup group
           | None -> this.Remove Key.Session.currentGroup
 
-  member this.GetUser () =
-    this.GetObject<User> Key.Session.currentUser |> optRec
-  member this.SetUser (user: User option) =
-    match user with
-    | Some u -> this.SetObject Key.Session.currentUser u
+    /// The currently logged on user
+    member this.CurrentUser
+      with get () = this.TryGetObject<User> Key.Session.currentUser
+       and set (v: User option) =
+          match v with
+          | Some user -> this.SetObject Key.Session.currentUser { user with PasswordHash = "" }
           | None -> this.Remove Key.Session.currentUser
     
-  member this.GetMessages () =
-    match box (this.GetObject<UserMessage list> Key.Session.userMessages) with
-    | null -> List.empty<UserMessage>
-    | msgs -> unbox msgs
-  member this.SetMessages (messages : UserMessage list) =
-    this.SetObject Key.Session.userMessages messages
+    /// Current messages for the session
+    member this.Messages
+      with get () =
+          this.TryGetObject<UserMessage list> Key.Session.userMessages
+          |> Option.defaultValue List.empty<UserMessage>
+       and set (v: UserMessage list) = this.SetObject Key.Session.userMessages v
 
 
+open System.Security.Claims
+
+/// Extensions on the claims principal
+type ClaimsPrincipal with
+    
+    /// The ID of the currently logged on small group    
+    member this.SmallGroupId =
+        if this.HasClaim (fun c -> c.Type = ClaimTypes.GroupSid) then
+            Some (idFromShort SmallGroupId (this.FindFirst(fun c -> c.Type = ClaimTypes.GroupSid).Value))
+        else None
+    
+    /// The ID of the currently signed in user    
+    member this.UserId =
+        if this.HasClaim (fun c -> c.Type = ClaimTypes.NameIdentifier) then
+            Some (idFromShort UserId (this.FindFirst(fun c -> c.Type = ClaimTypes.NameIdentifier).Value))
+        else None
+
+
+open Giraffe
+open Npgsql
+
+/// Extensions on the ASP.NET Core HTTP context
 type HttpContext with
-  /// Get the EF database context from DI
-  member this.dbContext () : AppDbContext = downcast this.RequestServices.GetService typeof<AppDbContext>
+    
+    /// The system clock (via DI)
+    member this.Clock = this.GetService<IClock>()
+    
+    /// The current instant
+    member this.Now = this.Clock.GetCurrentInstant()
+    
+    /// The common string localizer
+    member _.Strings = Views.I18N.localizer.Force()
+    
+    /// The currently logged on small group (sets the value in the session if it is missing)
+    member this.CurrentGroup () = task {
+        match this.Session.CurrentGroup with
+        | Some group -> return Some group
+        | None ->
+            match this.User.SmallGroupId with
+            | Some groupId ->
+                match! SmallGroups.tryByIdWithPreferences groupId with
+                | Some group ->
+                    this.Session.CurrentGroup <- Some group
+                    return Some group
+                | None -> return None
+            | None -> return None
+    }
+
+    /// The currently logged on user (sets the value in the session if it is missing)
+    member this.CurrentUser () = task {
+        match this.Session.CurrentUser with
+        | Some user -> return Some user
+        | None ->
+            match this.User.UserId with
+            | Some userId ->
+                match! Users.tryById userId with
+                | Some user ->
+                    // Set last seen for user
+                    do! Users.updateLastSeen userId this.Now
+                    this.Session.CurrentUser <- Some user
+                    return Some user
+                | None -> return None
+            | None -> return None
+    }

src/PrayerTracker/Help.fs

@@ -1,36 +1,86 @@
-module PrayerTracker.Handlers.Help
+/// Handlers for /help routes
+module PrayerTracker.Handlers.Help
 
 open Giraffe
 open PrayerTracker
-open System
 
-/// Help template lookup
-let private templates =
-  [ Help.sendAnnouncement.Url,     Views.Help.sendAnnouncement
-    Help.maintainGroupMembers.Url, Views.Help.groupMembers
-    Help.groupPreferences.Url,     Views.Help.preferences
-    Help.editRequest.Url,          Views.Help.editRequest
-    Help.maintainRequests.Url,     Views.Help.requests
-    Help.viewRequestList.Url,      Views.Help.viewRequests
-    Help.logOn.Url,                Views.Help.logOn
-    Help.changePassword.Url,       Views.Help.password
-    ]
-  |> Map.ofList
-
-
-/// GET /help
-let index : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
-    |> Views.Help.index
+// GET: /help
+let index : HttpHandler = fun next ctx -> task {
+    return!
+        Views.Help.index ()
+        |> Views.Layout.help ctx.Strings["Help Index"].Value true
         |> renderHtml next ctx
+}
 
+/// Handlers for /help/requests routes
+module Requests =
     
-/// GET /help/[module]/[topic]
-let show (``module``, topic) : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    match templates.TryGetValue (sprintf "%s/%s" ``module`` topic) with
-    | true, view -> renderHtml next ctx (view ())
-    | false, _ -> fourOhFour next ctx
+    // GET: /help/requests/edit
+    let edit : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.Requests.edit ()
+            |> Views.Layout.help ctx.Strings["Add / Edit a Request"].Value false
+            |> renderHtml next ctx
+    }
+    
+    // GET: /help/requests/maintain
+    let maintain : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.Requests.maintain ()
+            |> Views.Layout.help ctx.Strings["Maintain Requests"].Value false
+            |> renderHtml next ctx
+    }
+    
+    // GET: /help/requests/view
+    let view : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.Requests.view ()
+            |> Views.Layout.help ctx.Strings["View Request List"].Value false
+            |> renderHtml next ctx
+    }
+
+/// Handlers for /help/small-group routes
+module SmallGroup =
+    
+    // GET: /help/small-group/announcement
+    let announcement : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.SmallGroup.announcement ()
+            |> Views.Layout.help ctx.Strings["Send Announcement"].Value false
+            |> renderHtml next ctx
+    }
+    
+    // GET: /help/small-group/members
+    let members : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.SmallGroup.members ()
+            |> Views.Layout.help ctx.Strings["Maintain Group Members"].Value false
+            |> renderHtml next ctx
+    }
+    
+    // GET: /help/small-group/members
+    let preferences : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.SmallGroup.preferences ()
+            |> Views.Layout.help ctx.Strings["Change Preferences"].Value false
+            |> renderHtml next ctx
+    }
+
+/// Handlers for /help/user routes
+module User =
+    
+    // GET: /help/user/log-on
+    let logOn : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.User.logOn ()
+            |> Views.Layout.help ctx.Strings["Log On"].Value false
+            |> renderHtml next ctx
+    }
+    
+    // GET: /help/user/password
+    let password : HttpHandler = fun next ctx -> task {
+        return!
+            Views.Help.User.password ()
+            |> Views.Layout.help ctx.Strings["Change Your Password"].Value false
+            |> renderHtml next ctx
+    }

src/PrayerTracker/Home.fs

@@ -1,90 +1,72 @@
 module PrayerTracker.Handlers.Home
 
+open System
+open System.Globalization
 open Giraffe
 open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Localization
 open PrayerTracker
-open System
-open System.Globalization
 
-/// GET /error/[error-code]
-let error code : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
+// GET /error/[error-code]
+let error code : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
+    viewInfo ctx
     |> Views.Home.error code
     |> renderHtml next ctx
 
-
-/// GET /
-let homePage : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
+// GET /
+let homePage : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
+    viewInfo ctx
     |> Views.Home.index
     |> renderHtml next ctx
 
-
-/// GET /language/[culture]
-let language culture : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
+// GET /language/[culture]
+let language culture : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
     try
         match culture with
         | null
         | ""
         | "en" -> "en-US"
         | "es" -> "es-MX"
-      | _ -> sprintf "%s-%s" culture (culture.ToUpper ())
+        | _ -> $"{culture}-{culture.ToUpper()}"
         |> (CultureInfo >> Option.ofObj)
     with
     | :? CultureNotFoundException
     | :? ArgumentException -> None
     |> function
     | Some c ->
-        ctx.Response.Cookies.Append (
+        ctx.Response.Cookies.Append(
             CookieRequestCultureProvider.DefaultCookieName,
-          CookieRequestCultureProvider.MakeCookieValue (RequestCulture c),
-          CookieOptions (Expires = Nullable<DateTimeOffset> (DateTimeOffset (DateTime.Now.AddYears 1))))
+            CookieRequestCultureProvider.MakeCookieValue(RequestCulture c),
+            CookieOptions(Expires = Nullable<DateTimeOffset>(DateTimeOffset(DateTime.Now.AddYears 1))))
     | _ -> ()
-    let url = match string ctx.Request.Headers.["Referer"] with null | "" -> "/" | r -> r
+    let url = match string ctx.Request.Headers["Referer"] with null | "" -> "/" | r -> r
     redirectTo false url next ctx
 
-
-/// GET /legal/privacy-policy
-let privacyPolicy : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
+// GET /legal/privacy-policy
+let privacyPolicy : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
+    viewInfo ctx
     |> Views.Home.privacyPolicy
     |> renderHtml next ctx
 
-
-/// GET /legal/terms-of-service
-let tos : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
+// GET /legal/terms-of-service
+let tos : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
+    viewInfo ctx
     |> Views.Home.termsOfService
     |> renderHtml next ctx
 
+open Microsoft.AspNetCore.Authentication
+open Microsoft.AspNetCore.Authentication.Cookies
 
-/// GET /log-off
-let logOff : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    ctx.Session.Clear ()
-    // Remove cookies if they exist
-    Key.Cookie.logOffCookies |> List.iter ctx.Response.Cookies.Delete
-    let s = Views.I18N.localizer.Force ()
-    addHtmlInfo ctx s.["Log Off Successful • Have a nice day!"]
-    redirectTo false "/" next ctx
+// GET /log-off
+let logOff : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
+    ctx.Session.Clear()
+    do! ctx.SignOutAsync CookieAuthenticationDefaults.AuthenticationScheme
+    addHtmlInfo ctx ctx.Strings["Log Off Successful • Have a nice day!"]
+    return! redirectTo false "/" next ctx
+}
 
-
-/// GET /unauthorized
-let unauthorized : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
+// GET /unauthorized
+let unauthorized : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx ->
+    viewInfo ctx
     |> Views.Home.unauthorized
     |> renderHtml next ctx

src/PrayerTracker/PrayerRequest.fs

@@ -1,299 +1,271 @@
 module PrayerTracker.Handlers.PrayerRequest
 
-open FSharp.Control.Tasks.V2.ContextInsensitive
 open Giraffe
 open Microsoft.AspNetCore.Http
-open NodaTime
 open PrayerTracker
+open PrayerTracker.Data
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Threading.Tasks
 
 /// Retrieve a prayer request, and ensure that it belongs to the current class
-let private findRequest (ctx : HttpContext) reqId =
-  task {
-    let! req = ctx.dbContext().TryRequestById reqId
-    match req with
-    | Some pr when pr.smallGroupId = (currentGroup ctx).smallGroupId -> return Ok pr
+let private findRequest (ctx: HttpContext) reqId = task {
+    match! PrayerRequests.tryById reqId with
+    | Some req when req.SmallGroupId = ctx.Session.CurrentGroup.Value.Id -> return Ok req
     | Some _ ->
-        let s = Views.I18N.localizer.Force ()
-        addError ctx s.["The prayer request you tried to access is not assigned to your group"]
-        return Error (redirectTo false "/unauthorized")
-    | None -> return Error fourOhFour
-    }
+        addError ctx ctx.Strings["The prayer request you tried to access is not assigned to your group"]
+        return Result.Error (redirectTo false "/unauthorized" earlyReturn ctx)
+    | None -> return Result.Error (fourOhFour ctx)
+}
 
 /// Generate a list of requests for the given date
-let private generateRequestList ctx date =
-  let grp   = currentGroup ctx
-  let clock = ctx.GetService<IClock> ()
-  let listDate =
-    match date with
-    | Some d -> d
-    | None -> grp.localDateNow clock
-  let reqs = ctx.dbContext().AllRequestsForSmallGroup grp clock (Some listDate) true
-  { requests   = reqs |> List.ofSeq
-    date       = listDate
-    listGroup  = grp
-    showHeader = true
-    canEmail   = tryCurrentUser ctx |> Option.isSome
-    recipients = []
-    }
+let private generateRequestList (ctx: HttpContext) date = task {
+    let  group    = ctx.Session.CurrentGroup.Value
+    let  listDate = match date with Some d -> d | None -> SmallGroup.localDateNow ctx.Clock group
+    let! reqs     =
+        PrayerRequests.forGroup
+            { SmallGroup = group
+              Clock      = ctx.Clock
+              ListDate   = Some listDate
+              ActiveOnly = true
+              PageNumber = 0 }
+    return
+        { Requests   = reqs
+          Date       = listDate
+          SmallGroup = group
+          ShowHeader = true
+          CanEmail   = Option.isSome ctx.User.UserId
+          Recipients = [] }
+}
+
+open NodaTime.Text
 
 /// Parse a string into a date (optionally, of course)
-let private parseListDate (date : string option) =
+let private parseListDate (date: string option) =
     match date with
-  | Some dt -> match DateTime.TryParse dt with true, d -> Some d | false, _ -> None
+    | Some dt -> match LocalDatePattern.Iso.Parse dt with it when it.Success -> Some it.Value | _ -> None
     | None -> None
 
+open System
 
-/// GET /prayer-request/[request-id]/edit
-let edit (reqId : PrayerRequestId) : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let grp        = currentGroup ctx
-    let now        = grp.localDateNow (ctx.GetService<IClock> ())
-    task {
-      match reqId = Guid.Empty with
-      | true ->
+// GET /prayer-request/[request-id]/edit
+let edit reqId : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let group     = ctx.Session.CurrentGroup.Value
+    let now       = SmallGroup.localDateNow ctx.Clock group
+    let requestId = PrayerRequestId reqId
+    if requestId.Value = Guid.Empty then
         return!
-            { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Help.editRequest }
-            |> Views.PrayerRequest.edit EditRequest.empty (now.ToString "yyyy-MM-dd") ctx
+            { viewInfo ctx with HelpLink = Some Help.editRequest }
+            |> Views.PrayerRequest.edit EditRequest.empty (now.ToString("R", null)) ctx
             |> renderHtml next ctx
-      | false ->
-          let! result = findRequest ctx reqId
-          match result with
+    else
+        match! findRequest ctx requestId with
         | Ok req ->
-              let s = Views.I18N.localizer.Force ()
-              match req.isExpired now grp.preferences.daysToExpire with
-              | true ->
-                  { UserMessage.Warning with
-                      text        = htmlLocString s.["This request is expired."]
-                      description =
-                        s.["To make it active again, update it as necessary, leave “{0}” and “{1}” unchecked, and it will return as an active request.",
-                            s.["Expire Immediately"], s.["Check to not update the date"]]
+            let s = ctx.Strings
+            if PrayerRequest.isExpired now group req then
+                { UserMessage.warning with
+                    Text        = htmlLocString s["This request is expired."]
+                    Description =
+                        s["To make it active again, update it as necessary, leave “{0}” and “{1}” unchecked, and it will return as an active request.",
+                          s["Expire Immediately"], s["Check to not update the date"]]
                         |> (htmlLocString >> Some)
                   }
                 |> addUserMessage ctx
-              | false -> ()
             return!
-                { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Help.editRequest }
+                { viewInfo ctx with HelpLink = Some Help.editRequest }
                 |> Views.PrayerRequest.edit (EditRequest.fromRequest req) "" ctx
                 |> renderHtml next ctx
-          | Error e -> return! e next ctx
-      }
+        | Result.Error e -> return! e
+}
 
+open Microsoft.Extensions.Configuration
 
-/// GET /prayer-requests/email/[date]
-let email date : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let s          = Views.I18N.localizer.Force ()
+// GET /prayer-requests/email/[date]
+let email date : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let  s          = ctx.Strings
     let  listDate   = parseListDate (Some date)
-    let grp        = currentGroup ctx
-    task {
-      let  list       = generateRequestList ctx listDate
-      let! recipients = ctx.dbContext().AllMembersForSmallGroup grp.smallGroupId
+    let! list       = generateRequestList ctx listDate
+    let  group      = ctx.Session.CurrentGroup.Value
+    let! recipients = Members.forGroup group.Id
     use! client     = Email.getConnection ()
-      do! Email.sendEmails client recipients
-            grp s.["Prayer Requests for {0} - {1:MMMM d, yyyy}", grp.name, list.date].Value
-            (list.asHtml s) (list.asText s) s
+    do! Email.sendEmails
+            { Client        = client
+              Recipients    = recipients
+              Group         = group
+              Subject       = s["Prayer Requests for {0} - {1:MMMM d, yyyy}", group.Name, list.Date].Value
+              HtmlBody      = list.AsHtml s
+              PlainTextBody = list.AsText s
+              Strings       = s }
+    do! client.DisconnectAsync true
     return!
-        viewInfo ctx startTicks
-        |> Views.PrayerRequest.email { list with recipients = recipients }
+        viewInfo ctx
+        |> Views.PrayerRequest.email { list with Recipients = recipients }
         |> renderHtml next ctx
-      }
+}
 
-
-/// POST /prayer-request/[request-id]/delete
-let delete reqId : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = findRequest ctx reqId
-      match result with
-      | Ok r ->
-          let db = ctx.dbContext ()
-          let s  = Views.I18N.localizer.Force ()
-          db.PrayerRequests.Remove r |> ignore
-          let! _ = db.SaveChangesAsync ()
-          addInfo ctx s.["The prayer request was deleted successfully"]
+// POST /prayer-request/[request-id]/delete
+let delete reqId : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    let requestId = PrayerRequestId reqId
+    match! findRequest ctx requestId with
+    | Ok req ->
+        do! PrayerRequests.deleteById req.Id
+        addInfo ctx ctx.Strings["The prayer request was deleted successfully"]
         return! redirectTo false "/prayer-requests" next ctx
-      | Error e -> return! e next ctx
-      }
+    | Result.Error e -> return! e
+}
 
-
-/// GET /prayer-request/[request-id]/expire
-let expire reqId : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    task {
-      let! result = findRequest ctx reqId
-      match result with
-      | Ok r ->
-          let db = ctx.dbContext ()
-          let s  = Views.I18N.localizer.Force ()
-          db.UpdateEntry { r with isManuallyExpired = true }
-          let! _ = db.SaveChangesAsync ()
-          addInfo ctx s.["Successfully {0} prayer request", s.["Expired"].Value.ToLower ()]
+// GET /prayer-request/[request-id]/expire
+let expire reqId : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let requestId = PrayerRequestId reqId
+    match! findRequest ctx requestId with
+    | Ok req ->
+        do! PrayerRequests.updateExpiration { req with Expiration = Forced } false
+        addInfo ctx ctx.Strings["Successfully {0} prayer request", ctx.Strings["Expired"].Value.ToLower()]
         return! redirectTo false "/prayer-requests" next ctx
-      | Error e -> return! e next ctx
-      }
+    | Result.Error e -> return! e
+}
 
-
-/// GET /prayer-requests/[group-id]/list
-let list groupId : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    task {
-      let! grp = db.TryGroupById groupId
-      match grp with
-      | Some g when g.preferences.isPublic ->
-          let clock = ctx.GetService<IClock> ()
-          let reqs  = db.AllRequestsForSmallGroup g clock None true
+// GET /prayer-requests/[group-id]/list
+let list groupId : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
+    match! SmallGroups.tryByIdWithPreferences (SmallGroupId groupId) with
+    | Some group when group.Preferences.IsPublic ->
+        let! reqs =
+            PrayerRequests.forGroup
+                { SmallGroup = group
+                  Clock      = ctx.Clock
+                  ListDate   = None
+                  ActiveOnly = true
+                  PageNumber = 0 }
         return!
-            viewInfo ctx startTicks
+            viewInfo ctx
             |> Views.PrayerRequest.list
-                { requests   = List.ofSeq reqs
-                  date       = g.localDateNow clock
-                  listGroup  = g
-                  showHeader = true
-                  canEmail   = (tryCurrentUser >> Option.isSome) ctx
-                  recipients = []
-                  }
+                { Requests   = reqs
+                  Date       = SmallGroup.localDateNow ctx.Clock group
+                  SmallGroup = group
+                  ShowHeader = true
+                  CanEmail   = Option.isSome ctx.User.UserId
+                  Recipients = [] }
             |> renderHtml next ctx
     | Some _ ->
-          let s = Views.I18N.localizer.Force ()
-          addError ctx s.["The request list for the group you tried to view is not public."]
+        addError ctx ctx.Strings["The request list for the group you tried to view is not public."]
         return! redirectTo false "/unauthorized" next ctx
-      | None -> return! fourOhFour next ctx
-      }
+    | None -> return! fourOhFour ctx
+}
 
-
-/// GET /prayer-requests/lists
-let lists : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! grps = ctx.dbContext().PublicAndProtectedGroups ()
+// GET /prayer-requests/lists
+let lists : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
+    let! groups = SmallGroups.listPublicAndProtected ()
     return!
-        viewInfo ctx startTicks
-        |> Views.PrayerRequest.lists grps
+        viewInfo ctx
+        |> Views.PrayerRequest.lists groups
         |> renderHtml next ctx
+}
+
+// GET /prayer-requests[/inactive?]
+//  - OR -
+// GET /prayer-requests?search=[search-query]
+let maintain onlyActive : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let group   = ctx.Session.CurrentGroup.Value
+    let pageNbr =
+        match ctx.GetQueryStringValue "page" with
+        | Ok pg -> match Int32.TryParse pg with true, p -> p | false, _ -> 1
+        | Result.Error _ -> 1
+    let! model = backgroundTask {
+        match ctx.GetQueryStringValue "search" with
+        | Ok search ->
+            let! reqs = PrayerRequests.searchForGroup group search pageNbr
+            return
+                { MaintainRequests.empty with
+                    Requests   = reqs
+                    SearchTerm = Some search
+                    PageNbr    = Some pageNbr }
+        | Result.Error _ ->
+            let! reqs =
+                PrayerRequests.forGroup
+                    { SmallGroup = group
+                      Clock      = ctx.Clock
+                      ListDate   = None
+                      ActiveOnly = onlyActive
+                      PageNumber = pageNbr }
+            return
+                { MaintainRequests.empty with
+                    Requests   = reqs
+                    OnlyActive = Some onlyActive
+                    PageNbr    = if onlyActive then None else Some pageNbr }
     }
-
-
-/// GET /prayer-requests[/inactive?]
-let maintain onlyActive : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    let grp        = currentGroup ctx
-    task {
-      let reqs = db.AllRequestsForSmallGroup grp (ctx.GetService<IClock> ()) None onlyActive
     return!
-        { viewInfo ctx startTicks with helpLink = Help.maintainRequests }
-        |> Views.PrayerRequest.maintain reqs grp onlyActive ctx
+        { viewInfo ctx with HelpLink = Some Help.maintainRequests }
+        |> Views.PrayerRequest.maintain { model with SmallGroup = group } ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /prayer-request/print/[date]
-let print date : HttpHandler =
-  requireAccess [ User; Group ]
-  >=> fun next ctx ->
-    let listDate = parseListDate (Some date)
-    task {
-      let list = generateRequestList ctx listDate
+// GET /prayer-request/print/[date]
+let print date : HttpHandler = requireAccess [ User; Group ] >=> fun next ctx -> task {
+    let! list = generateRequestList ctx (parseListDate (Some date))
     return!
         Views.PrayerRequest.print list appVersion
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /prayer-request/[request-id]/restore
-let restore reqId : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    task {
-      let! result = findRequest ctx reqId
-      match result with
-      | Ok r ->
-          let db = ctx.dbContext ()
-          let s  = Views.I18N.localizer.Force ()
-          db.UpdateEntry { r with isManuallyExpired = false; updatedDate = DateTime.Now }
-          let! _ = db.SaveChangesAsync ()
-          addInfo ctx s.["Successfully {0} prayer request", s.["Restored"].Value.ToLower ()]
+// GET /prayer-request/[request-id]/restore
+let restore reqId : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let requestId = PrayerRequestId reqId
+    match! findRequest ctx requestId with
+    | Ok req ->
+        do! PrayerRequests.updateExpiration { req with Expiration = Automatic; UpdatedDate = ctx.Now } true
+        addInfo ctx ctx.Strings["Successfully {0} prayer request", ctx.Strings["Restored"].Value.ToLower ()]
         return! redirectTo false "/prayer-requests" next ctx
-      | Error e -> return! e next ctx
-      }
+    | Result.Error e -> return! e
+}
 
+open System.Threading.Tasks
 
-/// POST /prayer-request/save
-let save : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<EditRequest> ()
-      match result with
-      | Ok m ->
-          let  db  = ctx.dbContext ()
+// POST /prayer-request/save
+let save : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditRequest>() with
+    | Ok model ->
+        let  group = ctx.Session.CurrentGroup.Value
         let! req   =
-            match m.isNew () with
-            | true -> Task.FromResult (Some { PrayerRequest.empty with prayerRequestId = Guid.NewGuid () })
-            | false -> db.TryRequestById m.requestId
+            if model.IsNew then
+                { PrayerRequest.empty with
+                    Id           = (Guid.NewGuid >> PrayerRequestId) ()
+                    SmallGroupId = group.Id
+                    UserId       = ctx.User.UserId.Value
+                }
+                |> (Some >> Task.FromResult)
+            else PrayerRequests.tryById (idFromShort PrayerRequestId model.RequestId)
         match req with
-          | Some pr ->
-              let upd8 =
+        | Some pr when pr.SmallGroupId = group.Id ->
+            let now  = SmallGroup.localDateNow ctx.Clock group
+            let updated =
                 { pr with
-                    requestType       = m.requestType
-                    requestor         = m.requestor
-                    text              = ckEditorToText m.text
-                    doNotExpire       = m.expiration = "Y"
-                    isManuallyExpired = m.expiration = "X"
+                    RequestType = PrayerRequestType.fromCode model.RequestType
+                    Requestor   = match model.Requestor with Some x when x.Trim() = "" -> None | x -> x
+                    Text        = ckEditorToText model.Text
+                    Expiration  = Expiration.fromCode model.Expiration
                 }
-              let grp = currentGroup ctx
-              let now = grp.localDateNow (ctx.GetService<IClock> ())
-              match m.isNew () with
-              | true ->
-                  let dt = match m.enteredDate with Some x -> x | None -> now
-                  { upd8 with
-                      smallGroupId = grp.smallGroupId
-                      userId       = (currentUser ctx).userId
-                      enteredDate  = dt
-                      updatedDate  = dt
-                    }
-              | false when Option.isSome m.skipDateUpdate && Option.get m.skipDateUpdate -> upd8
-              | false -> { upd8 with updatedDate = now }
-              |> (match m.isNew () with true -> db.AddEntry | false -> db.UpdateEntry)
-              let! _   = db.SaveChangesAsync ()
-              let  s   = Views.I18N.localizer.Force ()
-              let  act = match m.isNew () with true -> "Added" | false -> "Updated"
-              addInfo ctx s.["Successfully {0} prayer request", s.[act].Value.ToLower ()]
+                |> function
+                | it when model.IsNew ->
+                    let dt =
+                        (defaultArg (parseListDate model.EnteredDate) now)
+                            .AtStartOfDayInZone(SmallGroup.timeZone group)
+                            .ToInstant()
+                    { it with EnteredDate = dt; UpdatedDate = dt }
+                | it when defaultArg model.SkipDateUpdate false -> it
+                | it -> { it with UpdatedDate = ctx.Now }
+            do! PrayerRequests.save updated
+            let act = if model.IsNew then "Added" else "Updated"
+            addInfo ctx ctx.Strings["Successfully {0} prayer request", ctx.Strings[act].Value.ToLower()]
             return! redirectTo false "/prayer-requests" next ctx
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | Some _
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// GET /prayer-request/view/[date?]
-let view date : HttpHandler =
-  requireAccess [ User; Group ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let listDate   = parseListDate date
-    task {
-      let list = generateRequestList ctx listDate
+// GET /prayer-request/view/[date?]
+let view date : HttpHandler = requireAccess [ User; Group ] >=> fun next ctx -> task {
+    let! list = generateRequestList ctx (parseListDate date)
     return!
-        viewInfo ctx startTicks
-        |> Views.PrayerRequest.view { list with showHeader = false }
+        viewInfo ctx
+        |> Views.PrayerRequest.view { list with ShowHeader = false }
         |> renderHtml next ctx
-      }
+}

src/PrayerTracker/PrayerTracker.fsproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AssemblyVersion>7.1.0.0</AssemblyVersion>
-    <FileVersion>7.0.0.0</FileVersion>
-    <Authors></Authors>
-    <Company>Bit Badger Solutions</Company>
+    <OutputType>Exe</OutputType>
+    <PublishSingleFile>False</PublishSingleFile>
+    <SelfContained>False</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +13,6 @@
   <ItemGroup>
     <None Include="appsettings.json" />
     <Compile Include="Extensions.fs" />
-    <Compile Include="Cookies.fs" />
     <Compile Include="Email.fs" />
     <Compile Include="CommonFunctions.fs" />
     <Compile Include="Church.fs" />
@@ -28,11 +25,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="3.1.0" />
-    <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+    <PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="2.0.0" />
+    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.1.0" />
+    <PackageReference Update="FSharp.Core" Version="8.0.300" />
   </ItemGroup>
 
   <ItemGroup>
@@ -40,8 +36,4 @@
     <ProjectReference Include="..\PrayerTracker.UI\PrayerTracker.UI.fsproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
-  </ItemGroup>
-
 </Project>

src/PrayerTracker/SmallGroup.fs

@@ -1,409 +1,306 @@
 module PrayerTracker.Handlers.SmallGroup
 
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open System
 open Giraffe
-open Giraffe.GiraffeViewEngine
-open Microsoft.AspNetCore.Http
-open NodaTime
 open PrayerTracker
-open PrayerTracker.Cookies
+open PrayerTracker.Data
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Threading.Tasks
 
-/// Set a small group "Remember Me" cookie
-let private setGroupCookie (ctx : HttpContext) pwHash =
-  ctx.Response.Cookies.Append
-    (Key.Cookie.group, { GroupId = (currentGroup ctx).smallGroupId; PasswordHash = pwHash }.toPayload(), autoRefresh)
-
-
-/// GET /small-group/announcement
-let announcement : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    { viewInfo ctx startTicks with helpLink = Help.sendAnnouncement; script = [ "ckeditor/ckeditor" ] }
-    |> Views.SmallGroup.announcement (currentUser ctx).isAdmin ctx
+// GET /small-group/announcement
+let announcement : HttpHandler = requireAccess [ User ] >=> fun next ctx ->
+    { viewInfo ctx with HelpLink = Some Help.sendAnnouncement }
+    |> Views.SmallGroup.announcement ctx.Session.CurrentUser.Value.IsAdmin ctx
     |> renderHtml next ctx
 
-
-/// POST /small-group/[group-id]/delete
-let delete groupId : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    let db = ctx.dbContext ()
-    let s  = Views.I18N.localizer.Force ()
-    task {
-      let! grp = db.TryGroupById groupId
-      match grp with
-      | Some g ->
-          let! reqs = db.CountRequestsBySmallGroup groupId
-          let! usrs = db.CountUsersBySmallGroup    groupId
-          db.RemoveEntry g
-          let! _ = db.SaveChangesAsync ()
+// POST /small-group/[group-id]/delete
+let delete grpId : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    let groupId = SmallGroupId grpId
+    match! SmallGroups.tryById groupId with
+    | Some grp ->
+        let! reqs  = PrayerRequests.countByGroup groupId
+        let! users = Users.countByGroup          groupId
+        do! SmallGroups.deleteById groupId
         addInfo ctx
-            s.["The group {0} and its {1} prayer request(s) were deleted successfully; revoked access from {2} user(s)",
-                 g.name, reqs, usrs]
+            ctx.Strings["The group “{0}” and its {1} prayer request(s) were deleted successfully; revoked access from {2} user(s)",
+                        grp.Name, reqs, users]
         return! redirectTo false "/small-groups" next ctx
-      | None -> return! fourOhFour next ctx
-      }
+    | None -> return! fourOhFour ctx
+}
 
-
-/// POST /small-group/member/[member-id]/delete
-let deleteMember memberId : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    let db = ctx.dbContext ()
-    let s  = Views.I18N.localizer.Force ()
-    task {
-      let! mbr = db.TryMemberById memberId
-      match mbr with
-      | Some m when m.smallGroupId = (currentGroup ctx).smallGroupId ->
-          db.RemoveEntry m
-          let! _ = db.SaveChangesAsync ()
-          addHtmlInfo ctx s.["The group member “{0}” was deleted successfully", m.memberName]
+// POST /small-group/member/[member-id]/delete
+let deleteMember mbrId : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    let group    = ctx.Session.CurrentGroup.Value
+    let memberId = MemberId mbrId
+    match! Members.tryById memberId with
+    | Some mbr when mbr.SmallGroupId = group.Id ->
+        do! Members.deleteById memberId
+        addHtmlInfo ctx ctx.Strings["The group member “{0}” was deleted successfully", mbr.Name]
         return! redirectTo false "/small-group/members" next ctx
     | Some _
-      | None -> return! fourOhFour next ctx
-      }
+    | None -> return! fourOhFour ctx
+}
 
-
-/// GET /small-group/[group-id]/edit
-let edit (groupId : SmallGroupId) : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    task {
-      let! churches = db.AllChurches ()
-      match groupId = Guid.Empty with
-      | true ->
+// GET /small-group/[group-id]/edit
+let edit grpId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let! churches = Churches.all ()
+    let  groupId  = SmallGroupId grpId
+    if groupId.Value = Guid.Empty then
         return!
-            viewInfo ctx startTicks
+            viewInfo ctx
             |> Views.SmallGroup.edit EditSmallGroup.empty churches ctx
             |> renderHtml next ctx
-      | false ->
-          let! grp = db.TryGroupById groupId
-          match grp with
-          | Some g ->
+    else
+        match! SmallGroups.tryById groupId with
+        | Some grp ->
             return!
-                viewInfo ctx startTicks
-                |> Views.SmallGroup.edit (EditSmallGroup.fromGroup g) churches ctx
+                viewInfo ctx
+                |> Views.SmallGroup.edit (EditSmallGroup.fromGroup grp) churches ctx
                 |> renderHtml next ctx
-          | None -> return! fourOhFour next ctx
-      }
+        | None -> return! fourOhFour ctx
+}
 
-
-/// GET /small-group/member/[member-id]/edit
-let editMember (memberId : MemberId) : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    let s          = Views.I18N.localizer.Force ()
-    let grp        = currentGroup ctx
-    let typs       = ReferenceList.emailTypeList grp.preferences.defaultEmailType s
-    task {
-      match memberId = Guid.Empty with
-      | true ->
+// GET /small-group/member/[member-id]/edit
+let editMember mbrId : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let group    = ctx.Session.CurrentGroup.Value
+    let types    = ReferenceList.emailTypeList group.Preferences.DefaultEmailType ctx.Strings
+    let memberId = MemberId mbrId
+    if memberId.Value = Guid.Empty then
         return!
-            viewInfo ctx startTicks
-            |> Views.SmallGroup.editMember EditMember.empty typs ctx
+            viewInfo ctx
+            |> Views.SmallGroup.editMember EditMember.empty types ctx
             |> renderHtml next ctx
-      | false ->
-          let! mbr = db.TryMemberById memberId
-          match mbr with
-          | Some m when m.smallGroupId = grp.smallGroupId ->
+    else
+        match! Members.tryById memberId with
+        | Some mbr when mbr.SmallGroupId = group.Id ->
             return!
-                viewInfo ctx startTicks
-                |> Views.SmallGroup.editMember (EditMember.fromMember m) typs ctx
+                viewInfo ctx
+                |> Views.SmallGroup.editMember (EditMember.fromMember mbr) types ctx
                 |> renderHtml next ctx
         | Some _
-          | None -> return! fourOhFour next ctx
-      }
+        | None -> return! fourOhFour ctx
+}
 
-
-/// GET /small-group/log-on/[group-id?]
-let logOn (groupId : SmallGroupId option) : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! grps  = ctx.dbContext().ProtectedGroups ()
-      let  grpId = match groupId with Some gid -> gid.ToString "N" |  None -> ""
+// GET /small-group/log-on/[group-id?]
+let logOn grpId : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
+    let! groups  = SmallGroups.listProtected ()
+    let  groupId = match grpId with Some gid -> shortGuid gid | None -> ""
     return!
-        { viewInfo ctx startTicks with helpLink = Help.logOn }
-        |> Views.SmallGroup.logOn grps grpId ctx
+        { viewInfo ctx with HelpLink = Some Help.logOn }
+        |> Views.SmallGroup.logOn groups groupId ctx
         |> renderHtml next ctx
-      }
+}
 
+open System.Security.Claims
+open Microsoft.AspNetCore.Authentication
+open Microsoft.AspNetCore.Authentication.Cookies
 
-/// POST /small-group/log-on/submit
-let logOnSubmit : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<GroupLogOn> ()
-      match result with
-      | Ok m ->
-        let  s   = Views.I18N.localizer.Force ()
-        let! grp = ctx.dbContext().TryGroupLogOnByPassword m.smallGroupId m.password
-        match grp with
-        | Some _ ->
-            ctx.Session.SetSmallGroup grp
-            match m.rememberMe with
-            | Some x when x -> (setGroupCookie ctx << Utils.sha1Hash) m.password
-            | _ -> ()
-            addInfo ctx s.["Log On Successful • Welcome to {0}", s.["PrayerTracker"]]
+// POST /small-group/log-on/submit
+let logOnSubmit : HttpHandler = requireAccess [ AccessLevel.Public ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<GroupLogOn>() with
+    | Ok model ->
+        match! SmallGroups.logOn (idFromShort SmallGroupId model.SmallGroupId) model.Password with
+        | Some group ->
+            ctx.Session.CurrentGroup <- Some group
+            let identity = ClaimsIdentity(
+                Seq.singleton (Claim(ClaimTypes.GroupSid, shortGuid group.Id.Value)),
+                CookieAuthenticationDefaults.AuthenticationScheme)
+            do! ctx.SignInAsync(
+                    identity.AuthenticationType, ClaimsPrincipal identity,
+                    AuthenticationProperties(
+                        IssuedUtc    = DateTimeOffset.UtcNow,
+                        IsPersistent = defaultArg model.RememberMe false))
+            addInfo ctx ctx.Strings["Log On Successful • Welcome to {0}", ctx.Strings["PrayerTracker"]]
             return! redirectTo false "/prayer-requests/view" next ctx
         | None ->
-            addError ctx s.["Password incorrect - login unsuccessful"]
-            return! redirectTo false (sprintf "/small-group/log-on/%s" (m.smallGroupId.ToString "N")) next ctx
-      | Error e -> return! bindError e next ctx
-      }
+            addError ctx ctx.Strings["Password incorrect - login unsuccessful"]
+            return! redirectTo false $"/small-group/log-on/{model.SmallGroupId}" next ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// GET /small-groups
-let maintain : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! grps = ctx.dbContext().AllGroups ()
+// GET /small-groups
+let maintain : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let! groups = SmallGroups.infoForAll ()
     return!
-        viewInfo ctx startTicks
-        |> Views.SmallGroup.maintain grps ctx
+        viewInfo ctx
+        |> Views.SmallGroup.maintain groups ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /small-group/members
-let members : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    let grp        = currentGroup ctx
-    let s          = Views.I18N.localizer.Force ()
-    task {
-      let! mbrs = db.AllMembersForSmallGroup grp.smallGroupId
-      let  typs = ReferenceList.emailTypeList grp.preferences.defaultEmailType s |> Map.ofSeq
+// GET /small-group/members
+let members : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let  group   = ctx.Session.CurrentGroup.Value
+    let! members = Members.forGroup group.Id
+    let  types   = ReferenceList.emailTypeList group.Preferences.DefaultEmailType ctx.Strings |> Map.ofSeq
     return!
-        { viewInfo ctx startTicks with helpLink = Help.maintainGroupMembers }
-        |> Views.SmallGroup.members mbrs typs ctx
+        { viewInfo ctx with HelpLink = Some Help.maintainGroupMembers }
+        |> Views.SmallGroup.members members types ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /small-group
-let overview : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    let clock      = ctx.GetService<IClock> ()
-    task {
-      let  reqs     = db.AllRequestsForSmallGroup  (currentGroup ctx) clock None true |> List.ofSeq
-      let! reqCount = db.CountRequestsBySmallGroup (currentGroup ctx).smallGroupId
-      let! mbrCount = db.CountMembersForSmallGroup (currentGroup ctx).smallGroupId
-      let m =
-        { totalActiveReqs = List.length reqs
-          allReqs         = reqCount
-          totalMbrs       = mbrCount
-          activeReqsByCat =
-            (reqs
+// GET /small-group
+let overview : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
+    let  group    = ctx.Session.CurrentGroup.Value
+    let! reqs     = PrayerRequests.forGroup
+                        { SmallGroup = group
+                          Clock      = ctx.Clock
+                          ListDate   = None
+                          ActiveOnly = true
+                          PageNumber = 0 }
+    let! reqCount = PrayerRequests.countByGroup group.Id
+    let! mbrCount = Members.countByGroup        group.Id
+    let! admins   = Users.listByGroupId         group.Id
+    let  model    =
+        { TotalActiveReqs  = List.length reqs
+          AllReqs          = reqCount
+          TotalMembers     = mbrCount
+          ActiveReqsByType = (
+             reqs
              |> Seq.ofList
-            |> Seq.map (fun req -> req.requestType)
+             |> Seq.map (fun req -> req.RequestType)
              |> Seq.distinct
-            |> Seq.map (fun reqType -> reqType, reqs |> List.filter (fun r -> r.requestType = reqType) |> List.length)
+             |> Seq.map (fun reqType -> reqType, reqs |> List.filter (fun r -> r.RequestType = reqType) |> List.length)
              |> Map.ofSeq)
-          }
+          Admins            = admins }
     return!
-        viewInfo ctx startTicks
-        |> Views.SmallGroup.overview m
+        viewInfo ctx
+        |> Views.SmallGroup.overview model
         |> renderHtml next ctx
-    }
+}
 
-
-/// GET /small-group/preferences
-let preferences : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! tzs = ctx.dbContext().AllTimeZones ()
+// GET /small-group/preferences
+let preferences : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
     return!
-        { viewInfo ctx startTicks with helpLink = Help.groupPreferences }
-        |> Views.SmallGroup.preferences (EditPreferences.fromPreferences (currentGroup ctx).preferences) tzs ctx
+        { viewInfo ctx with HelpLink = Some Help.groupPreferences }
+        |> Views.SmallGroup.preferences (EditPreferences.fromPreferences ctx.Session.CurrentGroup.Value.Preferences) ctx
         |> renderHtml next ctx
-      }
+}
 
+open System.Threading.Tasks
 
-/// POST /small-group/save
-let save : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    let s = Views.I18N.localizer.Force ()
-    task {
-      let! result = ctx.TryBindFormAsync<EditSmallGroup> ()
-      match result with
-      | Ok m ->
-          let db = ctx.dbContext ()
-          let! grp =
-            match m.isNew () with
-            | true -> Task.FromResult<SmallGroup option>(Some { SmallGroup.empty with smallGroupId = Guid.NewGuid () })
-            | false -> db.TryGroupById m.smallGroupId
-          match grp with
-          | Some g ->
-              m.populateGroup g
-              |> function
-              | g when m.isNew () ->
-                  db.AddEntry g
-                  db.AddEntry { g.preferences with smallGroupId = g.smallGroupId }
-              | g -> db.UpdateEntry g
-              let! _ = db.SaveChangesAsync ()
-              let act = s.[match m.isNew () with true -> "Added" | false -> "Updated"].Value.ToLower ()
-              addHtmlInfo ctx s.["Successfully {0} group “{1}”", act, m.name]
+// POST /small-group/save
+let save : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditSmallGroup>() with
+    | Ok model ->
+        let! tryGroup =
+            if model.IsNew then Task.FromResult(Some { SmallGroup.empty with Id = (Guid.NewGuid >> SmallGroupId) () })
+            else SmallGroups.tryById (idFromShort SmallGroupId model.SmallGroupId)
+        match tryGroup with
+        | Some group ->
+            do! SmallGroups.save (model.populateGroup group) model.IsNew
+            let act = ctx.Strings[if model.IsNew then "Added" else "Updated"].Value.ToLower()
+            addHtmlInfo ctx ctx.Strings["Successfully {0} group “{1}”", act, model.Name]
             return! redirectTo false "/small-groups" next ctx
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// POST /small-group/member/save
-let saveMember : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<EditMember> ()
-      match result with
-      | Ok m ->
-          let  grp  = currentGroup ctx
-          let  db   = ctx.dbContext ()
-          let! mMbr =
-            match m.isNew () with
-            | true ->
-                Task.FromResult<Member option>
-                  (Some
-                    { Member.empty with
-                        memberId     = Guid.NewGuid ()
-                        smallGroupId = grp.smallGroupId
-                      })
-            | false -> db.TryMemberById m.memberId
-          match mMbr with
-          | Some mbr when mbr.smallGroupId = grp.smallGroupId ->
+// POST /small-group/member/save
+let saveMember : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditMember>() with
+    | Ok model ->
+        let  group  = ctx.Session.CurrentGroup.Value
+        let! tryMbr =
+            if model.IsNew then
+                Task.FromResult(Some { Member.empty with Id = (Guid.NewGuid >> MemberId) (); SmallGroupId = group.Id })
+            else Members.tryById (idFromShort MemberId model.MemberId)
+        match tryMbr with
+        | Some mbr when mbr.SmallGroupId = group.Id ->
+            do! Members.save
                     { mbr with
-                  memberName = m.memberName
-                  email      = m.emailAddress
-                  format     = match m.emailType with "" | null -> None | _ -> Some m.emailType
-                }
-              |> (match m.isNew () with true -> db.AddEntry | false -> db.UpdateEntry)
-              let! _ = db.SaveChangesAsync ()
-              let s = Views.I18N.localizer.Force ()
-              let act = s.[match m.isNew () with true -> "Added" | false -> "Updated"].Value.ToLower ()
-              addInfo ctx s.["Successfully {0} group member", act]
+                        Name   = model.Name
+                        Email  = model.Email
+                        Format = String.noneIfBlank model.Format |> Option.map EmailFormat.fromCode }
+            let act = ctx.Strings[if model.IsNew then "Added" else "Updated"].Value.ToLower()
+            addInfo ctx ctx.Strings["Successfully {0} group member", act]
             return! redirectTo false "/small-group/members" next ctx
         | Some _
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// POST /small-group/preferences/save
-let savePreferences : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<EditPreferences> ()
-      match result with
-      | Ok m ->
-          let db = ctx.dbContext ()
-          // Since the class is stored in the session, we'll use an intermediate instance to persist it; once that
-          // works, we can repopulate the session instance.  That way, if the update fails, the page should still show
-          // the database values, not the then out-of-sync session ones.
-          let! grp = db.TryGroupById (currentGroup ctx).smallGroupId
-          match grp with
-          | Some g ->
-              let prefs = m.populatePreferences g.preferences
-              db.UpdateEntry prefs
-              let! _ = db.SaveChangesAsync ()
+// POST /small-group/preferences/save
+let savePreferences : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditPreferences>() with
+    | Ok model ->
+        // Since the class is stored in the session, we'll use an intermediate instance to persist it; once that works,
+        // we can repopulate the session instance. That way, if the update fails, the page should still show the
+        // database values, not the then out-of-sync session ones.
+        let group = ctx.Session.CurrentGroup.Value
+        match! SmallGroups.tryByIdWithPreferences group.Id with
+        | Some group ->
+            let pref = model.PopulatePreferences group.Preferences
+            do! SmallGroups.savePreferences pref
             // Refresh session instance
-              ctx.Session.SetSmallGroup <| Some { g with preferences = prefs }
-              let s = Views.I18N.localizer.Force ()
-              addInfo ctx s.["Group preferences updated successfully"]
+            ctx.Session.CurrentGroup <- Some { group with Preferences = pref }
+            addInfo ctx ctx.Strings["Group preferences updated successfully"]
             return! redirectTo false "/small-group/preferences" next ctx
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
+open Giraffe.ViewEngine
+open PrayerTracker.Views.CommonFunctions
+open Microsoft.Extensions.Configuration
 
-/// POST /small-group/announcement/send
-let sendAnnouncement : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! result = ctx.TryBindFormAsync<Announcement> ()
-      match result with
-      | Ok m ->
-          let grp = currentGroup ctx
-          let usr = currentUser ctx
-          let db  = ctx.dbContext ()
-          let now = grp.localTimeNow (ctx.GetService<IClock> ())
-          let s   = Views.I18N.localizer.Force ()
+// POST /small-group/announcement/send
+let sendAnnouncement : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<Announcement>() with
+    | Ok model ->
+        let group = ctx.Session.CurrentGroup.Value
+        let pref  = group.Preferences
+        let usr   = ctx.Session.CurrentUser.Value
+        let now   = SmallGroup.localTimeNow ctx.Clock group
+        let s     = ctx.Strings
         // Reformat the text to use the class's font stylings
-          let requestText = ckEditorToText m.text
+        let requestText = ckEditorToText model.Text
         let htmlText =
-            p [ _style (sprintf "font-family:%s;font-size:%dpt;" grp.preferences.listFonts grp.preferences.textFontSize) ]
-              [ rawText requestText ]
+            p [ _style $"font-family:{pref.FontStack};font-size:%d{pref.TextFontSize}pt;" ] [ rawText requestText ]
             |> renderHtmlNode
         let plainText = (htmlToPlainText >> wordWrap 74) htmlText
         // Send the e-mails
-          let! recipients =
-            match m.sendToClass with
-            | "N" when usr.isAdmin -> db.AllUsersAsMembers ()
-            | _ -> db.AllMembersForSmallGroup grp.smallGroupId
+        let! recipients = task {
+            if model.SendToClass = "N" && usr.IsAdmin then
+                let! users = Users.all ()
+                return users |> List.map (fun u -> { Member.empty with Name = u.Name; Email = u.Email })
+            else return! Members.forGroup group.Id
+        }
         use! client = Email.getConnection ()
-          do! Email.sendEmails client recipients grp
-                s.["Announcement for {0} - {1:MMMM d, yyyy} {2}",
-                    grp.name, now.Date, (now.ToString "h:mm tt").ToLower ()].Value
-                htmlText plainText s
+        do! Email.sendEmails
+                { Client        = client
+                  Recipients    = recipients
+                  Group         = group
+                  Subject       = s["Announcement for {0} - {1:MMMM d, yyyy} {2}", group.Name, now.Date,
+                                    now.ToString("h:mm tt", null).ToLower()].Value
+                  HtmlBody      = htmlText
+                  PlainTextBody = plainText
+                  Strings       = s }
+        do! client.DisconnectAsync true
         // Add to the request list if desired
-          match m.sendToClass, m.addToRequestList with
+        match model.SendToClass, model.AddToRequestList with
         | "N", _
         | _, None  -> ()
         | _, Some x when not x -> ()
         | _, _ ->
+            let zone = SmallGroup.timeZone group
+            do! PrayerRequests.save
                     { PrayerRequest.empty with
-                  prayerRequestId = Guid.NewGuid ()
-                  smallGroupId    = grp.smallGroupId
-                  userId          = usr.userId
-                  requestType     = Option.get m.requestType
-                  text            = requestText
-                  enteredDate     = now
-                  updatedDate     = now
-                }
-              |> db.AddEntry
-              let! _ = db.SaveChangesAsync ()
-              ()
+                        Id           = (Guid.NewGuid >> PrayerRequestId) ()
+                        SmallGroupId = group.Id
+                        UserId       = usr.Id
+                        RequestType  = (Option.get >> PrayerRequestType.fromCode) model.RequestType
+                        Text         = requestText
+                        EnteredDate  = now.Date.AtStartOfDayInZone(zone).ToInstant()
+                        UpdatedDate  = now.InZoneLeniently(zone).ToInstant() }
         // Tell 'em what they've won, Johnny!
         let toWhom =
-            match m.sendToClass with
-            | "N" -> s.["{0} users", s.["PrayerTracker"]].Value
-            | _ -> s.["Group Members"].Value.ToLower ()
-          let andAdded = match m.addToRequestList with Some x when x -> "and added it to the request list" | _ -> ""
-          addInfo ctx s.["Successfully sent announcement to all {0} {1}", toWhom, s.[andAdded]]
+            if model.SendToClass = "N" then s["{0} users", s["PrayerTracker"]].Value
+            else s["Group Members"].Value.ToLower()
+        let andAdded = match model.AddToRequestList with Some x when x -> "and added it to the request list" | _ -> ""
+        addInfo ctx s["Successfully sent announcement to all {0} {1}", toWhom, s[andAdded]]
         return!
-            viewInfo ctx startTicks
-            |> Views.SmallGroup.announcementSent { m with text = htmlText }
+            viewInfo ctx
+            |> Views.SmallGroup.announcementSent { model with Text = htmlText }
             |> renderHtml next ctx
-      | Error e -> return! bindError e next ctx
-      }
+    | Result.Error e -> return! bindError e next ctx
+}

src/PrayerTracker/User.fs

@@ -1,344 +1,275 @@
 module PrayerTracker.Handlers.User
 
-open FSharp.Control.Tasks.V2.ContextInsensitive
+open System
 open Giraffe
-open Microsoft.AspNetCore.Html
 open Microsoft.AspNetCore.Http
+open Microsoft.AspNetCore.Identity
 open PrayerTracker
-open PrayerTracker.Cookies
+open PrayerTracker.Data
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Collections.Generic
-open System.Net
-open System.Threading.Tasks
 
-/// Set the user's "remember me" cookie
-let private setUserCookie (ctx : HttpContext) pwHash =
-  ctx.Response.Cookies.Append (
-    Key.Cookie.user,
-    { Id = (currentUser ctx).userId; GroupId = (currentGroup ctx).smallGroupId; PasswordHash = pwHash }.toPayload(),
-    autoRefresh)
+#nowarn "44" // The default Rfc2898DeriveBytes is used to identify passwords to be upgraded
 
-/// Retrieve a user from the database by password
-// If the hashes do not match, determine if it matches a previous scheme, and upgrade them if it does
-let private findUserByPassword m (db : AppDbContext) =
-  task {
-    match! db.TryUserByEmailAndGroup m.emailAddress m.smallGroupId with
-    | Some u ->
-        match u.salt with
-        | Some salt ->
-            // Already upgraded; match = success
-            let pwHash = pbkdf2Hash salt m.password
-            match u.passwordHash = pwHash with
-            | true -> return Some { u with passwordHash = ""; salt = None; smallGroups = List<UserSmallGroup>() }, pwHash
-            | _ -> return None, ""
-        | _ ->
-            // Not upgraded; check against old hash
-            match u.passwordHash = sha1Hash m.password with
-            | true ->
-                // Upgrade 'em!
-                let salt     = Guid.NewGuid ()
-                let pwHash   = pbkdf2Hash salt m.password
-                let upgraded = { u with salt = Some salt; passwordHash = pwHash }
-                db.UpdateEntry upgraded
-                let! _ = db.SaveChangesAsync ()
-                return Some { u with passwordHash = ""; salt = None; smallGroups = List<UserSmallGroup>() }, pwHash
-            | _ -> return None, ""
-    | _ -> return None, ""
+/// Password hashing implementation extending ASP.NET Core's identity implementation
+[<AutoOpen>]
+module Hashing =
+    
+    open System.Security.Cryptography
+    open System.Text
+    
+    /// Custom password hasher used to verify and upgrade old password hashes
+    type PrayerTrackerPasswordHasher() =
+        inherit PasswordHasher<User>()
+        
+        override this.VerifyHashedPassword(user, hashedPassword, providedPassword) =
+            if isNull hashedPassword   then nullArg (nameof hashedPassword)
+            if isNull providedPassword then nullArg (nameof providedPassword)
+            
+            let hashBytes = Convert.FromBase64String hashedPassword
+            
+            match hashBytes[0] with
+            | 255uy ->
+                // v2 hashes - PBKDF2 (RFC 2898), 1,024 rounds
+                if hashBytes.Length < 49 then PasswordVerificationResult.Failed
+                else
+                    let v2Hash =
+                        use alg = new Rfc2898DeriveBytes (
+                            providedPassword, Encoding.UTF8.GetBytes ((Guid hashBytes[1..16]).ToString "N"), 1024)
+                        (alg.GetBytes >> Convert.ToBase64String) 64
+                    if Encoding.UTF8.GetString hashBytes[17..] = v2Hash then
+                        PasswordVerificationResult.SuccessRehashNeeded
+                    else PasswordVerificationResult.Failed
+            | 254uy ->
+                // v1 hashes - SHA-1
+                let v1Hash =
+                    use alg = SHA1.Create()
+                    alg.ComputeHash (Encoding.ASCII.GetBytes providedPassword)
+                    |> Seq.map (fun byt -> byt.ToString "x2")
+                    |> String.concat ""
+                if Encoding.UTF8.GetString hashBytes[1..] = v1Hash then
+                    PasswordVerificationResult.SuccessRehashNeeded
+                else
+                    PasswordVerificationResult.Failed
+            | _ -> base.VerifyHashedPassword(user, hashedPassword, providedPassword)
+
+    
+/// Retrieve a user from the database by password, upgrading password hashes if required
+let private findUserByPassword model = task {
+    match! Users.tryByEmailAndGroup model.Email (idFromShort SmallGroupId model.SmallGroupId) with
+    | Some user ->
+        let hasher = PrayerTrackerPasswordHasher()
+        match hasher.VerifyHashedPassword(user, user.PasswordHash, model.Password) with
+        | PasswordVerificationResult.Success -> return Some user
+        | PasswordVerificationResult.SuccessRehashNeeded ->
+            let upgraded = { user with PasswordHash = hasher.HashPassword(user, model.Password) }
+            do! Users.updatePassword upgraded
+            return Some upgraded
+        | _ -> return None
+    | None -> return None
+}
+
+/// Return a default URL if the given URL is non-local or otherwise questionable
+let sanitizeUrl providedUrl defaultUrl =
+    let url = match defaultArg providedUrl "" with "" -> defaultUrl | it -> it
+    if url.IndexOf "\\" >= 0 || url.IndexOf "//" >= 0 then defaultUrl
+    elif Seq.exists Char.IsControl url then defaultUrl
+    else url
+
+// POST /user/password/change
+let changePassword : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<ChangePassword>() with
+    | Ok model ->
+        let  curUsr = ctx.Session.CurrentUser.Value
+        let  hasher = PrayerTrackerPasswordHasher()
+        let! user   = task {
+            match! Users.tryById curUsr.Id with
+            | Some usr ->
+                if hasher.VerifyHashedPassword(usr, usr.PasswordHash, model.OldPassword)
+                       = PasswordVerificationResult.Success then
+                    return Some usr
+                else return None
+            | _ -> return None
         }
-
-
-/// POST /user/password/change
-let changePassword : HttpHandler =
-  requireAccess [ User ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<ChangePassword> ()
-      match result with
-      | Ok m ->
-          let  s      = Views.I18N.localizer.Force ()
-          let  db     = ctx.dbContext ()
-          let  curUsr = currentUser ctx
-          let! dbUsr  = db.TryUserById curUsr.userId
-          let! user   =
-            match dbUsr with
-            | Some usr ->
-                // Check the old password against a possibly non-salted hash
-                (match usr.salt with | Some salt -> pbkdf2Hash salt | _ -> sha1Hash) m.oldPassword
-                |> db.TryUserLogOnByCookie curUsr.userId (currentGroup ctx).smallGroupId
-            | _ -> Task.FromResult None
         match user with
-          | Some _ when m.newPassword = m.newPasswordConfirm ->
-              match dbUsr with
-              | Some usr ->
-                  // Generate salt if it has not been already
-                  let salt = match usr.salt with Some s -> s | _ -> Guid.NewGuid ()
-                  db.UpdateEntry { usr with passwordHash = pbkdf2Hash salt m.newPassword; salt = Some salt }
-                  let! _ = db.SaveChangesAsync ()
-                  // If the user is remembered, update the cookie with the new hash
-                  match ctx.Request.Cookies.Keys.Contains Key.Cookie.user with
-                  | true -> setUserCookie ctx usr.passwordHash
-                  | _ -> ()
-                  addInfo ctx s.["Your password was changed successfully"]
-              | None -> addError ctx s.["Unable to change password"]
+        | Some usr when model.NewPassword = model.NewPasswordConfirm ->
+            do! Users.updatePassword { usr with PasswordHash = hasher.HashPassword(usr, model.NewPassword) }
+            addInfo ctx ctx.Strings["Your password was changed successfully"]
             return! redirectTo false "/" next ctx
         | Some _ ->
-              addError ctx s.["The new passwords did not match - your password was NOT changed"]
+            addError ctx ctx.Strings["The new passwords did not match - your password was NOT changed"]
             return! redirectTo false "/user/password" next ctx
         | None ->
-              addError ctx s.["The old password was incorrect - your password was NOT changed"]
+            addError ctx ctx.Strings["The old password was incorrect - your password was NOT changed"]
             return! redirectTo false "/user/password" next ctx
-      | Error e -> return! bindError e next ctx
-      }
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// POST /user/[user-id]/delete
-let delete userId : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let  db   = ctx.dbContext ()
-      let! user = db.TryUserById userId
-      match user with
-      | Some u ->
-          db.RemoveEntry u
-          let! _ = db.SaveChangesAsync ()
-          let  s = Views.I18N.localizer.Force ()
-          addInfo ctx s.["Successfully deleted user {0}", u.fullName]
+// POST /user/[user-id]/delete
+let delete usrId : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    let userId = UserId usrId
+    match! Users.tryById userId with
+    | Some user ->
+        do! Users.deleteById userId
+        addInfo ctx ctx.Strings["Successfully deleted user {0}", user.Name]
         return! redirectTo false "/users" next ctx
-      | _ -> return! fourOhFour next ctx
-      }
+    | _ -> return! fourOhFour ctx
+}
 
+open System.Net
+open System.Security.Claims
+open Microsoft.AspNetCore.Authentication
+open Microsoft.AspNetCore.Authentication.Cookies
+open Microsoft.AspNetCore.Html
 
-/// POST /user/log-on
-let doLogOn : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<UserLogOn> ()
-      match result with
-      | Ok m -> 
-          let  db          = ctx.dbContext ()
-          let  s           = Views.I18N.localizer.Force ()
-          let! usr, pwHash = findUserByPassword m db
-          let! grp         = db.TryGroupById m.smallGroupId
-          let  nextUrl     =
-            match usr with
-            | Some _ ->
-                ctx.Session.SetUser       usr
-                ctx.Session.SetSmallGroup grp
-                match m.rememberMe with Some x when x -> setUserCookie ctx pwHash | _ -> ()
-                addHtmlInfo ctx s.["Log On Successful • Welcome to {0}", s.["PrayerTracker"]]
-                match m.redirectUrl with
-                | None -> "/small-group"
-                | Some x when x = "" -> "/small-group"
-                | Some x -> x
-            | _ ->
-                let grpName = match grp with Some g -> g.name | _ -> "N/A"
-                { UserMessage.Error with
-                    text        = htmlLocString s.["Invalid credentials - log on unsuccessful"]
-                    description =
-                      [ s.["This is likely due to one of the following reasons"].Value
-                        ":<ul><li>"
-                        s.["The e-mail address “{0}” is invalid.", WebUtility.HtmlEncode m.emailAddress].Value
-                        "</li><li>"
-                        s.["The password entered does not match the password for the given e-mail address."].Value
-                        "</li><li>"
-                        s.["You are not authorized to administer the group “{0}”.", WebUtility.HtmlEncode grpName].Value
-                        "</li></ul>"
-                        ]
+// POST /user/log-on
+let doLogOn : HttpHandler = requireAccess [ AccessLevel.Public ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<UserLogOn>() with
+    | Ok model -> 
+        let s = ctx.Strings
+        match! findUserByPassword model with
+        | Some user ->
+            match! SmallGroups.tryByIdWithPreferences (idFromShort SmallGroupId model.SmallGroupId) with
+            | Some group ->
+                ctx.Session.CurrentUser  <- Some user
+                ctx.Session.CurrentGroup <- Some group
+                let identity = ClaimsIdentity(
+                    seq {
+                        Claim(ClaimTypes.NameIdentifier, shortGuid user.Id.Value)
+                        Claim(ClaimTypes.GroupSid, shortGuid group.Id.Value)
+                    }, CookieAuthenticationDefaults.AuthenticationScheme)
+                do! ctx.SignInAsync(
+                        identity.AuthenticationType, ClaimsPrincipal identity,
+                        AuthenticationProperties(
+                            IssuedUtc    = DateTimeOffset.UtcNow,
+                            IsPersistent = defaultArg model.RememberMe false))
+                do! Users.updateLastSeen user.Id ctx.Now
+                addHtmlInfo ctx s["Log On Successful • Welcome to {0}", s["PrayerTracker"]]
+                return! redirectTo false (sanitizeUrl model.RedirectUrl "/small-group") next ctx
+            | None -> return! fourOhFour ctx
+        | None ->
+            { UserMessage.error with
+                Text        = htmlLocString s["Invalid credentials - log on unsuccessful"]
+                Description =
+                    let detail =
+                        [ "This is likely due to one of the following reasons:<ul>"
+                          "<li>The e-mail address “{0}” is invalid.</li>"
+                          "<li>The password entered does not match the password for the given e-mail address.</li>"
+                          "<li>You are not authorized to administer the selected group.</li></ul>" ]
                         |> String.concat ""
-                      |> (HtmlString >> Some)
-                  }
+                    Some (HtmlString(s[detail, WebUtility.HtmlEncode model.Email].Value)) }
             |> addUserMessage ctx
-                "/user/log-on"
-          return! redirectTo false nextUrl next ctx
-      | Error e -> return! bindError e next ctx
-      }
+            return! redirectTo false "/user/log-on" next ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// GET /user/[user-id]/edit
-let edit (userId : UserId) : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      match userId = Guid.Empty with
-      | true ->
+// GET /user/[user-id]/edit
+let edit usrId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let userId = UserId usrId
+    if userId.Value = Guid.Empty then
         return!
-            viewInfo ctx startTicks
+            viewInfo ctx
             |> Views.User.edit EditUser.empty ctx
             |> renderHtml next ctx
-      | false ->
-          let! user = ctx.dbContext().TryUserById userId
-          match user with
-          | Some u ->
+    else
+        match! Users.tryById userId with
+        | Some user ->
             return!
-                viewInfo ctx startTicks
-                |> Views.User.edit (EditUser.fromUser u) ctx
+                viewInfo ctx
+                |> Views.User.edit (EditUser.fromUser user) ctx
                 |> renderHtml next ctx
-          | _ -> return! fourOhFour next ctx
-      }
+        | _ -> return! fourOhFour ctx
+}
 
-
-/// GET /user/log-on
-let logOn : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let s = Views.I18N.localizer.Force ()
-    task {
-      let! groups = ctx.dbContext().GroupList ()
+// GET /user/log-on
+let logOn : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
+    let! groups = SmallGroups.listAll ()
     let  url    = Option.ofObj <| ctx.Session.GetString Key.Session.redirectUrl
     match url with
     | Some _ ->
         ctx.Session.Remove Key.Session.redirectUrl
-          addWarning ctx s.["The page you requested requires authentication; please log on below."]
+        addWarning ctx ctx.Strings["The page you requested requires authentication; please log on below."]
     | None -> ()
     return!
-        { viewInfo ctx startTicks with helpLink = Help.logOn }
-        |> Views.User.logOn { UserLogOn.empty with redirectUrl = url } groups ctx
+        { viewInfo ctx with HelpLink = Some Help.logOn }
+        |> Views.User.logOn { UserLogOn.empty with RedirectUrl = url } groups ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /users
-let maintain : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    task {
-      let! users = ctx.dbContext().AllUsers ()
+// GET /users
+let maintain : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let! users = Users.all ()
     return!
-        viewInfo ctx startTicks
+        viewInfo ctx
         |> Views.User.maintain users ctx
         |> renderHtml next ctx
-      }
+}
 
-
-/// GET /user/password
-let password : HttpHandler =
-  requireAccess [ User ]
-  >=> fun next ctx ->
-    { viewInfo ctx DateTime.Now.Ticks with helpLink = Help.changePassword }
+// GET /user/password
+let password : HttpHandler = requireAccess [ User ] >=> fun next ctx ->
+    { viewInfo ctx with HelpLink = Some Help.changePassword }
     |> Views.User.changePassword ctx
     |> renderHtml next ctx
 
+open System.Threading.Tasks
 
-/// POST /user/save
-let save : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<EditUser> ()
-      match result with
-      | Ok m ->
-          let  db   = ctx.dbContext ()
+// POST /user/save
+let save : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<EditUser>() with
+    | Ok model ->
         let! user =
-            match m.isNew () with
-            | true -> Task.FromResult (Some { User.empty with userId = Guid.NewGuid () })
-            | false -> db.TryUserById m.userId
-          let saltedUser = 
+            if model.IsNew then Task.FromResult(Some { User.empty with Id = (Guid.NewGuid >> UserId) () })
+            else Users.tryById (idFromShort UserId model.UserId)
         match user with
-            | Some u ->
-                match u.salt with
-                | None when m.password <> "" ->
-                    // Generate salt so that a new password hash can be generated
-                    Some { u with salt = Some (Guid.NewGuid ()) }
-                | _ ->
-                    // Leave the user with no salt, so prior hash can be validated/upgraded
-                    user
-            | _ -> user
-          match saltedUser with
-          | Some u ->
-              m.populateUser u (pbkdf2Hash (Option.get u.salt))
-              |> (match m.isNew () with true -> db.AddEntry | false -> db.UpdateEntry)
-              let! _ = db.SaveChangesAsync ()
-              let  s = Views.I18N.localizer.Force ()
-              match m.isNew () with
-              | true ->
+        | Some usr ->
+            let hasher      = PrayerTrackerPasswordHasher()
+            let updatedUser = model.PopulateUser usr (fun pw -> hasher.HashPassword(usr, pw))
+            do! Users.save updatedUser
+            let s = ctx.Strings
+            if model.IsNew then
                 let h = CommonFunctions.htmlString
-                  { UserMessage.Info with
-                      text = h s.["Successfully {0} user", s.["Added"].Value.ToLower ()]
-                      description = 
-                        h s.[ "Please select at least one group for which this user ({0}) is authorized", u.fullName]
-                        |> Some
-                    }
+                { UserMessage.info with
+                    Text        = h s["Successfully {0} user", s["Added"].Value.ToLower ()]
+                    Description = 
+                        h s["Please select at least one group for which this user ({0}) is authorized",
+                            updatedUser.Name]
+                        |> Some }
                 |> addUserMessage ctx
-                  return! redirectTo false (sprintf "/user/%s/small-groups" (u.userId.ToString "N")) next ctx
-              | false ->
-                  addInfo ctx s.["Successfully {0} user", s.["Updated"].Value.ToLower ()]
+                return! redirectTo false $"/user/{shortGuid usr.Id.Value}/small-groups" next ctx
+            else
+                addInfo ctx s["Successfully {0} user", s["Updated"].Value.ToLower ()]
                 return! redirectTo false "/users" next ctx
-          | None -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+        | None -> return! fourOhFour ctx
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// POST /user/small-groups/save
-let saveGroups : HttpHandler =
-  requireAccess [ Admin ]
-  >=> validateCSRF
-  >=> fun next ctx ->
-    task {
-      let! result = ctx.TryBindFormAsync<AssignGroups> ()
-      match result with
-      | Ok m ->
-          let s = Views.I18N.localizer.Force ()
-          match Seq.length m.smallGroups with
+// POST /user/small-groups/save
+let saveGroups : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task {
+    match! ctx.TryBindFormAsync<AssignGroups>() with
+    | Ok model ->
+        match Seq.length model.SmallGroups with
         | 0 ->
-              addError ctx s.["You must select at least one group to assign"]
-              return! redirectTo false (sprintf "/user/%s/small-groups" (m.userId.ToString "N")) next ctx
+            addError ctx ctx.Strings["You must select at least one group to assign"]
+            return! redirectTo false $"/user/{model.UserId}/small-groups" next ctx
         | _ ->
-              let  db   = ctx.dbContext ()
-              let! user = db.TryUserByIdWithGroups m.userId
-              match user with
-              | Some u ->
-                  let grps =
-                    m.smallGroups.Split ','
-                    |> Array.map Guid.Parse
-                    |> List.ofArray
-                  u.smallGroups
-                  |> Seq.filter (fun x -> not (grps |> List.exists (fun y -> y = x.smallGroupId)))
-                  |> db.UserGroupXref.RemoveRange
-                  grps
-                  |> Seq.ofList
-                  |> Seq.filter (fun x -> not (u.smallGroups |> Seq.exists (fun y -> y.smallGroupId = x)))
-                  |> Seq.map (fun x -> { UserSmallGroup.empty with userId = u.userId; smallGroupId = x })
-                  |> List.ofSeq
-                  |> List.iter db.AddEntry
-                  let! _ = db.SaveChangesAsync ()
-                  addInfo ctx s.["Successfully updated group permissions for {0}", m.userName]
+            do! Users.updateSmallGroups (idFromShort UserId model.UserId)
+                    (model.SmallGroups.Split ',' |> Array.map (idFromShort SmallGroupId) |> List.ofArray)
+            addInfo ctx ctx.Strings["Successfully updated group permissions for {0}", model.UserName]
             return! redirectTo false "/users" next ctx
-                | _ -> return! fourOhFour next ctx
-      | Error e -> return! bindError e next ctx
-      }
+    | Result.Error e -> return! bindError e next ctx
+}
 
-
-/// GET /user/[user-id]/small-groups
-let smallGroups userId : HttpHandler =
-  requireAccess [ Admin ]
-  >=> fun next ctx ->
-    let startTicks = DateTime.Now.Ticks
-    let db         = ctx.dbContext ()
-    task {
-      let! user = db.TryUserByIdWithGroups userId
-      match user with
-      | Some u ->
-          let! grps      = db.GroupList ()
-          let  curGroups =
-            seq {
-              for g in u.smallGroups do
-                yield g.smallGroupId.ToString "N"
-              }
-            |> List.ofSeq
+// GET /user/[user-id]/small-groups
+let smallGroups usrId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task {
+    let userId = UserId usrId
+    match! Users.tryById userId with
+    | Some user ->
+        let! groups    = SmallGroups.listAll ()
+        let! groupIds  = Users.groupIdsByUserId userId
+        let  curGroups = groupIds |> List.map (fun g -> shortGuid g.Value)
         return! 
-            viewInfo ctx startTicks
-            |> Views.User.assignGroups (AssignGroups.fromUser u) grps curGroups ctx
+            viewInfo ctx
+            |> Views.User.assignGroups (AssignGroups.fromUser user) groups curGroups ctx
             |> renderHtml next ctx
-      | None -> return! fourOhFour next ctx
-      }
+    | None -> return! fourOhFour ctx
+}

src/PrayerTracker/wwwroot/css/app.css

@@ -1,11 +1,20 @@
 /**
  * This is the main stylesheet for the PrayerTracker application.
  */
+:root {
+  --dark-blue-hue: 240;
+  --dark-blue-sat: 100%;
+  --darkest: hsl(var(--dark-blue-hue), var(--dark-blue-sat), 6%);
+  --dark: hsl(var(--dark-blue-hue), var(--dark-blue-sat), 13%);
+  --lighter-dark: hsl(var(--dark-blue-hue), var(--dark-blue-sat), 25%);
+  --inverse-backgroud: hsl(0, 0%, 95%);
+  --background: hsla(0, 0%, 0%, .01);
+  --native-fonts: system-ui,-apple-system,"Segoe UI",Roboto,Ubuntu,"Liberation Sans",Cantarell,"Helvetica Neue",sans-serif;
+}
 body {
-  background-color: #222;
+  background-color: var(--background);
   margin: 0;
-  margin-bottom: 25px;
-  font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+  font-family: var(--native-fonts);
   font-size: 1rem;
 }
 acronym {
@@ -18,10 +27,10 @@ a,
 a:link,
 a:visited {
   text-decoration: none;
-  color: navy;
+  color: var(--dark);
 }
 a:hover {
-  border-bottom: dotted 1px navy;
+  border-bottom: dotted 1px var(--darkest);
 } 
 a > img {
   border: 0;
@@ -32,7 +41,7 @@ a > img {
   justify-content: space-between;
   overflow: hidden;
   width: 100%;
-  background-image: linear-gradient(to bottom, #222, #444);
+  background-image: linear-gradient(to bottom, var(--darkest), var(--dark));
   margin-bottom: 0;
 }
 .pt-title-bar-left,
@@ -46,7 +55,7 @@ a > img {
   float: left;
   font-size: 1.25rem;
   font-weight: bold;
-  padding: .5rem 1rem 0 1rem;
+  padding: .5rem 1rem 0 .75rem;
 }
 .pt-title-bar-home a:link,
 .pt-title-bar-home a:visited {
@@ -65,7 +74,7 @@ a > img {
   float: left;
 }
 .pt-title-bar li a,
-.pt-title-bar .dropbtn,
+.pt-title-bar .dropdown-btn,
 .pt-title-bar .home-link {
   display: inline-block;
   color: #9d9d9d;
@@ -77,7 +86,7 @@ a > img {
   font-size: 1.1rem;
 }
 .pt-title-bar li a:hover,
-.pt-title-bar .dropdown:hover .dropbtn {
+.pt-title-bar .dropdown:hover .dropdown-btn {
   color: white;
   border-bottom: none;
 }
@@ -87,7 +96,7 @@ a > img {
 .pt-title-bar .dropdown-content {
   display: none;
   position: absolute;
-  background-image: linear-gradient(to bottom, #444, #888);
+  background-image: linear-gradient(to bottom, var(--dark), var(--lighter-dark));
   min-width: 160px;
   box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
   z-index: 1;
@@ -100,14 +109,14 @@ a > img {
   text-align: left;
 }
 .pt-title-bar .dropdown-content a:hover {
-  background-color: #222;
+  background-color: var(--inverse-backgroud);
+  color: var(--lighter-dark);
 }
 .pt-title-bar .dropdown:hover .dropdown-content {
   display: block;
 }
 #pt-body {
-  background-color: #fcfcfc;
-  padding-bottom: 10px;
+  padding-bottom: 1rem;
 }
 #pt-language {
   background-color: lightgray;
@@ -116,74 +125,84 @@ a > img {
   justify-content: space-between;
   border-bottom: solid 1px darkgray;
   border-top: solid 1px darkgray;
+  padding: 0 .75rem;
 }
 #pt-page-title {
   text-align: center;
   border-bottom: dotted 1px lightgray;
 }
 .pt-content {
-  margin: auto;
+  margin: auto auto 1.5rem auto;
   max-width: 60rem;
 }
 .pt-content.pt-full-width {
   max-width: unset;
-  margin-left: .5%;
-  margin-right: .5%;
+  margin-left: .75rem;
+  margin-right: .75rem;
 }
 @media screen and (max-width: 60rem) {
   .pt-content {
-    margin-left: .5%;
-    margin-right: .5%;
+    margin-left: .75rem;
+    margin-right: .75rem;
   }
 }
 fieldset {
-  margin: auto;
+  margin: auto auto 1rem auto;
   border: solid 1px #ccc;
   border-radius: 1rem;
-  margin-bottom: 1rem;
 }
 input[type=email],
 input[type=text],
 input[type=password],
 input[type=date],
 input[type=number],
+input[type=url],
 select {
-  border-radius: 5px;
+  border-radius: .2rem;
+  border-color: var(--lighter-dark);
   font-size: 1rem;
-  padding: .2rem;
-  font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
-}
-input:nth-of-type(2) {
-  margin-left: 2rem;
+  padding: .25rem;
+  font-family: var(--native-fonts);
+  border-width: 1px;
 }
 button[type=submit] {
-  border-radius: 10px;
+  border-radius: .6rem;
   padding: .2rem 1rem;
   margin-top: .5rem;
-  background-color: #444;
-  border: none;
+  background-color: var(--lighter-dark);
+  border: solid 1px var(--lighter-dark);
   color: white;
 }
 button[type=submit]:hover {
-  background-color: #222;
-  cursor:pointer;
+  color: var(--lighter-dark);
+  background-color: var(--inverse-backgroud);
+  cursor: pointer;
 }
-footer {
+footer.pt-footer {
   position: fixed;
   bottom: 0;
   width: 100%;
-  border-bottom: solid 10px #222;
+  padding-top: .5rem;
+  background-image: linear-gradient(to bottom, var(--background), var(--darkest));
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-between;
+  align-items: end;
 }
 #pt-legal {
-  background-color: #222;
-  margin: 0 0 -30px 0;
-  padding-left: 10px;
+  padding-left: .75rem;
 }
 #pt-legal a:link,
 #pt-legal a:visited {
-  color: lightgray;
-  color: rgba(255, 255, 255, .5);
+  color: white;
   font-size: 10pt;
+  background-color: var(--darkest);
+  padding: 0 .5rem;
+  border-top-left-radius: .5rem;
+  border-top-right-radius: .5rem;
+}
+#pt-legal a:hover {
+  background-color: var(--lighter-dark);
 }
 #pt-footer {
   border: solid 2px navy;
@@ -191,15 +210,18 @@ footer {
   border-top-left-radius: 7px;
   border-top-right-radius: 7px;
   padding: 2px 5px 0 5px;
-  margin: 0 10px -11px auto;
+  margin-right: .75rem;
   font-size: 70%;
   color: navy;
   background-color: #eee;
-  float:right;
+}
+#pt-footer img,
+#pt-footer span,
+#pt-footer i {
   vertical-align: bottom;
 }
-#pt-footer img {
-  vertical-align: bottom;
+#pt-version {
+  padding-left: .25rem;
 }
 footer a:hover {
   border-bottom: 0;
@@ -214,6 +236,7 @@ footer a:hover {
   flex-flow: row wrap;
   align-items: center;
   justify-content: center;
+  gap: 2rem;
 }
 .pt-field {
   display: flex;
@@ -231,8 +254,11 @@ footer a:hover {
   text-transform: uppercase;
   color: #777;
 }
-.pt-field ~ .pt-field {
-  margin-left: 3rem;
+.pt-group {
+  display: flex;
+  flex-flow: row;
+  gap: 1.5rem;
+  align-items: baseline;
 }
 .pt-center-text {
   text-align: center;
@@ -240,37 +266,49 @@ footer a:hover {
 .pt-right-text {
   text-align: right;
 }
+
 .pt-table {
-  margin: auto;
-  border-collapse: collapse;
+  display: grid;
+  justify-content: center;
 }
-.pt-table tr:hover {
+.pt-table .row.head,
+.pt-table .row {
+  display: contents;
+}
+.pt-table .row:hover > * {
   background-color: #eee;
 }
-.pt-table tr th,
-.pt-table tr td {
+.pt-table .row.head .cell {
+  background-image: linear-gradient(to bottom, var(--dark), var(--lighter-dark));
+  font-weight: bold;
+  color: white;
+  text-align: center;
+  font-size: .85rem;
+}
+.pt-table .row.head .cell:first-of-type {
+  border-top-left-radius: .5rem;
+}
+.pt-table .row.head .cell:last-of-type {
+  border-top-right-radius: .5rem;
+}
+.pt-table .cell {
   padding: .25rem .5rem;
+  border-bottom: dotted 1px var(--lighter-dark);
 }
-.pt-table tr td {
-  border-bottom: dotted 1px #444;
+.pt-table .cell.actions {
+  border-bottom-color: var(--background);
 }
-.pt-action-table tr td:first-child {
-  white-space: nowrap;
-  border-bottom: 0;
-}
-.pt-action-table tr td:first-child a {
-  background-color: lightgray;
+.pt-table .cell.actions a {
+  background-color: gray;
   color: white;
   border-radius: .5rem;
-  padding: .125rem .5rem .5rem .5rem;
+  padding: 0 .5rem .25rem;
   margin: 0 .125rem;
 }
-.pt-action-table tr:hover td:first-child a {
-  background-color: navy;
-}
-.pt-action-table tr td:first-child a:hover {
-  border-bottom: 0;
+.pt-table .row:hover .cell.actions a {
+  background-color: var(--dark);
 }
+
 /* TODO: Figure out nice CSS transitions for these; these don't work */
 .pt-fadeable {
   height: 0;
@@ -300,7 +338,7 @@ article.pt-overview section header {
   text-align: center;
   border-top-left-radius: 1rem;
   border-top-right-radius: 1rem;
-  background-image: linear-gradient(to bottom, #444, #888);
+  background-image: linear-gradient(to bottom, var(--dark), var(--lighter-dark));
   padding: .5rem 1rem;
   color: white;
 }
@@ -308,7 +346,7 @@ article.pt-overview section div {
   padding: .5rem;
 }
 article.pt-overview section div hr {
-  color: #444;
+  color: var(--dark);
   margin: .5rem -.5rem;
 }
 article.pt-overview section div p {
@@ -317,6 +355,12 @@ article.pt-overview section div p {
 .pt-editor {
   width: 100%;
 }
+.pt-messages {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  align-items: center;
+}
 .pt-msg {
   margin: .5rem auto;
   border-top-right-radius: .5rem;
@@ -324,15 +368,12 @@ article.pt-overview section div p {
   border-width: 2px;
   border-style: solid;
   border-collapse: inherit;
+  padding: 5px 30px;
+  text-align: center;
 }
 .pt-msg ul {
   text-align: left;
 }
-.pt-msg td {
-  padding: 5px 30px;
-  margin-bottom: 2px;
-  text-align: center;
-}
 .pt-msg.error {
   background-color: #ffb6c1;
   border-color: #ff0000;
@@ -369,6 +410,12 @@ article.pt-overview section div p {
   border-radius: 5px;
   margin: auto;
 }
+.pt-search-form input,
+.pt-search-form button,
+.pt-search-form i.material-icons {
+  font-size: .8rem;
+}
+
 .pt-request-update {
   font-style: italic;
 }
@@ -393,6 +440,9 @@ article.pt-overview section div p {
 .material-icons {
   vertical-align: middle;
 }
+.pt-help-link {
+  padding-right: .25rem;
+}
 #pt-help {
   background-color: #fcfcfc;
 }

src/PrayerTracker/wwwroot/css/help.css

@@ -5,6 +5,9 @@
   background-color: white;
   padding: 0 .25em;
 }
+.pt-title-bar-home {
+  height: 2rem;
+}
 .pt-title-bar-left {
   color: white;
   font-size: 1.25rem;
@@ -17,9 +20,24 @@
   font-size: 1.1rem;
   font-variant: small-caps;
   margin-right: 1rem;
+  align-self: center;
 }
 h2 {
   margin-top: 0;
   padding-left: .5rem;
   border-bottom: solid 1px #444;
 }
+.pt-close-window, .pt-help-index {
+  font-size: 1.25rem;
+}
+.pt-help-index {
+  display: none;
+}
+@media screen and (min-width:451px) {
+  .pt-close-window {
+    display: none;
+  }
+  .pt-help-index {
+    display: block;
+  }
+}

src/PrayerTracker/wwwroot/js/app.js

@@ -2,28 +2,14 @@
  * This file contains a library of common functions used throughout the PrayerTracker website, as well as specific
  * functions used on pages throughout the site.
  */
-const PT = {
+this.PT = {
 
   /**
    * Open a window with help
    * @param {string} url The URL for the help page.
    */
   showHelp(url) {
-    window.open(`/help/${url}`, 'helpWindow', 'height=600px,width=450px,toolbar=0,menubar=0,scrollbars=1')
-    return false
-  },
-
-  /**
-   * Confirm, then submit a delete action
-   * @param {string} action The URL for the action attribute of the delete form.
-   * @param {string} prompt The localized prompt for confirmation.
-   */
-  confirmDelete(action, prompt) {
-    if (confirm(prompt)) {
-      let form = document.querySelector('#DeleteForm')
-      form.setAttribute('action', action)
-      form.submit()
-    }
+    window.open(url, "helpWindow", "height=600px,width=450px,toolbar=0,menubar=0,scrollbars=1")
     return false
   },
 
@@ -36,14 +22,6 @@ const PT = {
       .forEach(f => document.getElementById(f).required = true)
   },
 
-  /**
-   * Queue an action to occur when the DOM content is loaded
-   * @param {Function} func The function to run once the DOM content is loaded
-   */
-  onLoad(func) {
-    document.addEventListener('DOMContentLoaded', func)
-  },
-
   /**
    * Validation that compares the values of 2 fields and fails if they do not match
    * @param {string} field1 The ID of the first field
@@ -55,7 +33,7 @@ const PT = {
     const field1Value = document.getElementById(field1).value
     const field2Element = document.getElementById(field2)
     if (field1Value === field2Element.value) {
-      field2Element.setCustomValidity('')
+      field2Element.setCustomValidity("")
       return true
     }
     field2Element.setCustomValidity(errorMsg)
@@ -67,8 +45,8 @@ const PT = {
    * @param {HTMLElement} div The div to be shown
    */
   showDiv(div) {
-    if (div.className.indexOf(' pt-shown') === -1) {
-      div.className += ' pt-shown'
+    if (div.className.indexOf(" pt-shown") === -1) {
+      div.className += " pt-shown"
     }
   },
 
@@ -77,7 +55,7 @@ const PT = {
    * @param {HTMLElement} div The div to be hidden
    */
   hideDiv(div) {
-    div.className = div.className.replace(' pt-shown', '')
+    div.className = div.className.replace(" pt-shown", "")
   },
 
   /**
@@ -85,10 +63,18 @@ const PT = {
    */
   initCKEditor() {
     ClassicEditor
-      .create(document.querySelector('#text'))
+      .create(document.querySelector("#Text"))
+      .then(editor => window.ckEditor = editor)
       .catch(console.error)
   },
 
+  /**
+   * Instruct the current CKEditor element to update its source (needed as htmx does not fire the submit event)
+   */
+  updateCKEditor() {
+    window.ckEditor.updateElement()
+  },
+
   /**
    * Scripts for pages served by the Church controller
    */
@@ -101,9 +87,9 @@ const PT = {
        * If the interface box is checked, show and require the interface URL field (if not, well... don't)
        */
       checkInterface() {
-        const div  = document.getElementById('divInterfaceAddress')
-        const addr = document.getElementById('interfaceAddress')
-        if (document.getElementById('hasInterface').checked) {
+        const div  = document.getElementById("divInterfaceAddress")
+        const addr = document.getElementById("InterfaceAddress")
+        if (document.getElementById("HasInterface").checked) {
           PT.showDiv(div)
           addr.required = true
         }
@@ -117,30 +103,12 @@ const PT = {
        */
       onPageLoad() {
         PT.church.edit.checkInterface()
-        document.getElementById('hasInterface')
-          .addEventListener('click', PT.church.edit.checkInterface)
+        document.getElementById("HasInterface")
+          .addEventListener("click", PT.church.edit.checkInterface)
       }
     }
   },
 
-  /**
-   * Scripts for pages served by the Requests controller
-   */
-  requests: {
-    /**
-     * Script for the request view page
-     */
-    view: {
-      /**
-       * Prompt the user to remind them that they are about to e-mail their class
-       * @param {string} confirmationPrompt The text to display to the user
-       */
-      promptBeforeEmail(confirmationPrompt) {
-        return confirm(confirmationPrompt)
-      },
-    },
-  },
-
   /**
    * Scripts for pages served by the SmallGroup controller
    */
@@ -154,23 +122,23 @@ const PT = {
        */
       onPageLoad() {
         PT.initCKEditor()
-        const sendNo = document.getElementById('sendN')
-        const catDiv = document.getElementById('divCategory')
-        const catSel = document.getElementById('requestType')
-        const addChk = document.getElementById('addToRequestList')
-        if (sendNo !== 'undefined') {
-          const addDiv = document.getElementById('divAddToList')
-          sendNo.addEventListener('click', () => {
+        const sendNo = document.getElementById("SendToClass_N")
+        const catDiv = document.getElementById("divCategory")
+        const catSel = document.getElementById("RequestType")
+        const addChk = document.getElementById("AddToRequestList")
+        if (sendNo !== "undefined") {
+          const addDiv = document.getElementById("divAddToList")
+          sendNo.addEventListener("click", () => {
             PT.hideDiv(addDiv)
             PT.hideDiv(catDiv)
             catSel.required = false
             addChk.checked = false
           })
-          document.getElementById('sendY').addEventListener('click', () => {
+          document.getElementById("SendToClass_Y").addEventListener("click", () => {
             PT.showDiv(addDiv)
           })
         }
-        addChk.addEventListener('click', () => {
+        addChk.addEventListener("click", () => {
           if (addChk.checked) {
             PT.showDiv(catDiv)
             catSel.required = true
@@ -190,11 +158,11 @@ const PT = {
        * Determine which field should have the focus
        */
       onPageLoad() {
-        const grp = document.getElementById('SmallGroupId')
+        const grp = document.getElementById("SmallGroupId")
         if (grp.options[grp.selectedIndex].value === '') {
           grp.focus()
         } else {
-          document.getElementById('Password').focus()
+          document.getElementById("Password").focus()
         }
       }
     },
@@ -210,8 +178,8 @@ const PT = {
        */
       toggleType(name) {
         const isNamed = document.getElementById(`${name}Type_Name`)
-        const named = document.getElementById(`${name}Color_Select`)
-        const custom = document.getElementById(`${name}Color_Color`)
+        const named = document.getElementById(`${name}_Select`)
+        const custom = document.getElementById(`${name}_Color`)
         if (isNamed.checked) {
           custom.disabled = true
           named.disabled = false
@@ -225,9 +193,9 @@ const PT = {
        * Show or hide the class password based on the visibility.
        */
       checkVisibility() {
-        const divPw = document.getElementById('divClassPassword')
-        if (document.getElementById('viz_Public').checked
-            || document.getElementById('viz_Private').checked) {
+        const divPw = document.getElementById("divClassPassword")
+        if (document.getElementById("Visibility_Public").checked
+            || document.getElementById("Visibility_Private").checked) {
           // Disable password
           PT.hideDiv(divPw)
         } else {
@@ -235,24 +203,37 @@ const PT = {
         }
       },
 
+      /**
+       * Enable or disable the font list based on whether the native font stack is selected or not
+       */
+      checkFonts() {
+        document.getElementById("Fonts").disabled = document.getElementById("IsNative_Y").checked
+      },
+
       /**
        * Bind the event handlers
        */
       onPageLoad() {
-        ['Public', 'Private', 'Password'].map(typ => {
-          document.getElementById(`viz_${typ}`).addEventListener('click',
+        ["Public", "Private", "Password"].map(typ => {
+          document.getElementById(`Visibility_${typ}`).addEventListener("click",
             PT.smallGroup.preferences.checkVisibility)
         })
         PT.smallGroup.preferences.checkVisibility()
-        ;['headingLine', 'headingText'].map(name => {
-          document.getElementById(`${name}Type_Name`).addEventListener('click', () => {
+        ;["LineColor", "HeadingColor"].map(name => {
+          document.getElementById(`${name}Type_Name`).addEventListener("click", () => {
             PT.smallGroup.preferences.toggleType(name)
           })
-          document.getElementById(`${name}Type_RGB`).addEventListener('click', () => {
+          document.getElementById(`${name}Type_RGB`).addEventListener("click", () => {
             PT.smallGroup.preferences.toggleType(name)
           })
           PT.smallGroup.preferences.toggleType(name)
         })
+        ;["Y", "N"].map(name => {
+          document.getElementById(`IsNative_${name}`).addEventListener("click", () => {
+            PT.smallGroup.preferences.checkFonts()
+          })
+        })
+        PT.smallGroup.preferences.checkFonts()
       },
     },
   },
@@ -270,9 +251,33 @@ const PT = {
        */
       onPageLoad(isNew) {
         if (isNew) {
-          PT.requireFields(['password', 'passwordConfirm'])
+          PT.requireFields(["Password", "PasswordConfirm"])
         }
       }
     }
   },
 }
+
+htmx.on("htmx:configRequest", function (e) {
+  e.detail.headers["X-Target"] = e.detail.target
+})
+htmx.on("htmx:responseError", function (e) {
+  /** @type {XMLHttpRequest} */
+  const xhr = e.detail.xhr
+  
+  const detail = document.createElement("div")
+  detail.className = "description"
+  detail.innerHTML = `<em>(Status code ${xhr.status}: ${xhr.statusText})</em>`
+  
+  const msg = document.createElement("div")
+  msg.className = "pt-msg error"
+  msg.innerHTML = `<strong>ERROR</strong> &#xbb; ${xhr.responseText}<br>`
+  msg.appendChild(detail)
+  
+  const messages = document.createElement("div")
+  messages.className = "pt-messages"
+  messages.appendChild(msg)
+  
+  const title = document.getElementById("pt-page-title")
+  title.parentNode.insertBefore(messages, title.nextSibling)
+})