bit-badger/PrayerTracker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

Compare commits

base: bit-badger:main
Branches Tags
bit-badger:main
bit-badger:v8.4
bit-badger:v8.3
bit-badger:v8.2
bit-badger:v8.1
bit-badger:v8
bit-badger:v7.6.1
bit-badger:v7.6
bit-badger:v7.5
bit-badger:v.7.4.2
bit-badger:v7.4.1
bit-badger:v7.4
bit-badger:v7.3.2
bit-badger:v7.3.1
bit-badger:v7.3
bit-badger:v7.2
bit-badger:v7.1
..
compare: bit-badger:v7.6
Branches Tags
bit-badger:main
bit-badger:v8.4
bit-badger:v8.3
bit-badger:v8.2
bit-badger:v8.1
bit-badger:v8
bit-badger:v7.6.1
bit-badger:v7.6
bit-badger:v7.5
bit-badger:v.7.4.2
bit-badger:v7.4.1
bit-badger:v7.4
bit-badger:v7.3.2
bit-badger:v7.3.1
bit-badger:v7.3
bit-badger:v7.2
bit-badger:v7.1

No commits in common. "main" and "v7.6" have entirely different histories.
main ... v7.6

92 changed files with 8218 additions and 8726 deletions
Show Stats Expand all files Collapse all files

12
.config/dotnet-tools.json
View File

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

2
.gitignore vendored
View File

@ -332,7 +332,5 @@ ASALocalRun/
### --- ### ### --- ###
src/PrayerTracker/appsettings.json src/PrayerTracker/appsettings.json
docs/_site docs/_site
**/*.db*
.ionide .ionide
.vscode

44
build.fsx
View File

@ -1,44 +0,0 @@
#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"

233
build.fsx.lock
View File

@ -1,233 +0,0 @@
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))

1
docs/CNAME Normal file
View File

@ -0,0 +1 @@
docs.prayer.bitbadger.solutions

24
docs/Gemfile Normal file
View File

@ -0,0 +1,24 @@
source "https://rubygems.org"
# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
#
# bundle exec jekyll serve
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
gem "github-pages", group: :jekyll_plugins
# If you have any plugins, put them here!
group :jekyll_plugins do
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?

267
docs/Gemfile.lock Normal file
View File

@ -0,0 +1,267 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.7)
dnsruby (1.61.5)
simpleidn (~> 0.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
execjs (2.7.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ffi (1.13.1)
ffi (1.13.1-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (209)
github-pages-health-check (= 1.16.1)
jekyll (= 3.9.0)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.6)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.13.0)
jekyll-mentions (= 1.6.0)
jekyll-optional-front-matter (= 0.3.2)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.3.0)
jekyll-redirect-from (= 0.16.0)
jekyll-relative-links (= 0.6.1)
jekyll-remote-theme (= 0.4.2)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.6.1)
jekyll-sitemap (= 1.4.0)
jekyll-swiss (= 1.0.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.2)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
jekyll-theme-minimal (= 0.1.1)
jekyll-theme-modernist (= 0.1.1)
jekyll-theme-primer (= 0.5.4)
jekyll-theme-slate (= 0.1.1)
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.3)
jemoji (= 0.12.0)
kramdown (= 2.3.0)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.3)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.10.4, < 2.0)
rouge (= 3.23.0)
terminal-table (~> 1.4)
github-pages-health-check (1.16.1)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (~> 3.0)
typhoeus (~> 1.3)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.9.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.3.1)
commonmarker (~> 0.14)
jekyll (>= 3.7, < 5.0)
jekyll-commonmark-ghpages (0.1.6)
commonmarker (~> 0.17.6)
jekyll-commonmark (~> 1.2)
rouge (>= 2.0, < 4.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.6.0)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-optional-front-matter (0.3.2)
jekyll (>= 3.0, < 5.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.3.0)
jekyll (>= 3.0, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-remote-theme (0.4.2)
addressable (~> 2.0)
jekyll (>= 3.5, < 5.0)
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
rubyzip (>= 1.3.0, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-swiss (1.0.0)
jekyll-theme-architect (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-cayman (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.2)
jekyll (> 3.5, < 5.0)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-merlot (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-midnight (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-minimal (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-modernist (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-primer (0.5.4)
jekyll (> 3.5, < 5.0)
jekyll-github-metadata (~> 2.9)
jekyll-seo-tag (~> 2.0)
jekyll-theme-slate (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-tactile (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-time-machine (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.3)
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.12.0)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.3.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
multi_json (1.15.0)
multipart-post (2.1.1)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
octokit (4.19.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.23.0)
ruby-enum (0.8.0)
i18n
ruby2_keywords (0.0.2)
rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
simpleidn (0.1.1)
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.3)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2020.4)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unf_ext (0.0.7.7-x64-mingw32)
unicode-display_width (1.7.0)
wdm (0.1.1)
PLATFORMS
ruby
x64-mingw32
DEPENDENCIES
github-pages
tzinfo-data
wdm (~> 0.1.0)
BUNDLED WITH
2.1.4

11
docs/_config.yml Normal file
View File

@ -0,0 +1,11 @@
defaults:
-
scope:
path: "en"
values:
layout: "en"
-
scope:
path: "es"
values:
layout: "es"

41
docs/_layouts/en.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }} &#xab; PrayerTracker Help</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
<link href="/css/help.css" rel="stylesheet">
</head>
<body>
<header class="pt-title-bar">
<section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">PrayerTracker</a></span></section>
<section class="pt-title-bar-right">Help</section>
</header>
<div id="pt-body">
<header id="pt-language">
<div>
Language: English &bull;
<a href="{{ page.url | replace_first: "/en", "/es" }}">Esta pagina en español</a>
</div>
</header>
<h2 id="pt-page-title">{{ page.title }}</h2>
<div class="pt-content">
{{ content }}
<div class="pt-close-window">
<p class="pt-center-text">
<a href="#" title="Click to Close This Window" onclick="window.close();return false">
<i class="material-icons">cancel</i> Close Window
</a>
</p>
</div>
<div class="pt-help-index">
<p class="pt-center-text">
<a href="/en/" title="Help Index">&#xab; Back to Help Index</a>
</p>
</div>
</div>
</div>
</body>
</html>

44
docs/_layouts/es.html Normal file
View File

@ -0,0 +1,44 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }} &#xab; Ayuda de SeguidorOración</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
<link href="/css/help.css" rel="stylesheet">
</head>
<body>
<header class="pt-title-bar">
<section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">SeguidorOración</a></span></section>
<section class="pt-title-bar-right">Ayuda</section>
</header>
<div id="pt-body">
<header id="pt-language">
<div>
Lengua: Español &bull;
<a href="{{ page.url | replace_first: "/es", "/en" }}">This page in English</a>
</div>
</header>
<h2 id="pt-page-title">{{ page.title }}</h2>
<div class="pt-content">
{{ content }}
{% if page.skip_footer %}
{% else %}
<div class="pt-close-window">
<p class="pt-center-text">
<a href="#" title="Haga Clic para Cerrar Esta Ventana" onclick="window.close();return false">
<i class="material-icons">cancel</i> Cerrar Esta Ventana
</a>
</p>
</div>
<div class="pt-help-index">
<p class="pt-center-text">
<a href="/es/" title="Índice de ayuda">&#xab; Volver al índice de ayuda</a>
</p>
</div>
{% endif %}
</div>
</div>
</body>
</html>

26
docs/_layouts/home.html Normal file
View File

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }} &#xab; PrayerTracker Help / Ayuda de SeguidorOración</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
<link href="/css/help.css" rel="stylesheet">
</head>
<body>
<header class="pt-title-bar">
<section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">PrayerTracker / SeguidorOración</a></span></section>
<section class="pt-title-bar-right">Help / Ayuda</section>
</header>
<div id="pt-body">
<header id="pt-language">
<div>&nbsp;</div>
</header>
<h2 id="pt-page-title">{{ page.title }}</h2>
<div class="pt-content pt-center-text">
{{ content }}
</div>
</div>
</body>
</html>

43
docs/css/help.css Normal file
View File

@ -0,0 +1,43 @@
/**
* PrayerTracker Help styling
*/
.pt-content {
background-color: white;
padding: 0 .25em;
}
.pt-title-bar-home {
height: 2rem;
}
.pt-title-bar-left {
color: white;
font-size: 1.25rem;
font-weight: bold;
margin-left: .5rem;
}
.pt-title-bar-right {
color: white;
color: rgba(255, 255, 255, .75);
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;
}
}

26
docs/en/index.md Normal file
View File

@ -0,0 +1,26 @@
---
title: Help
skip_footer: true
---
Throughout PrayerTracker, you'll see an icon (a question mark in a circle) next to the title on each page. Clicking this will open a new, small window with directions on using that page. If you are looking for a quick overview of PrayerTracker, start with the “Add / Edit a Request” and “Change Preferences” entries.
----
<p class="pt-center-text"><strong>Help Topics</strong></p>
[Change Preferences](./small-group/preferences.html)
[Send Announcement](./small-group/announcement.html)
[Maintain Group Members](./small-group/members.html)
[Add / Edit a Request](./requests/edit.html)
[Maintain Requests](./requests/maintain.html)
[View Request List](./requests/view.html)
[Log On](./user/log-on.html)
[Change Your Password](./user/password.html)

27
docs/en/requests/edit.md Normal file
View File

@ -0,0 +1,27 @@
---
title: Add / Edit a Request
---
This page allows you to enter or update a new prayer request.
## Request Type
There are 5 request types in PrayerTracker. “Current Requests” are your regular requests that people may have regarding things happening over the next week or so. “Long-Term Requests” are requests that may occur repeatedly or continue indefinitely. “Praise Reports” are like “Current Requests”, but they are answers to prayer to share with your group. “Expecting” is for those who are pregnant. “Announcements” are like “Current Requests”, but instead of a request, they are simply passing information along about something coming up.
The order above is the order in which the request types appear on the list. “Long-Term Requests” and “Expecting” are not subject to the automatic expiration (set on the “Change Preferences” page) that the other requests are.
## Date
For new requests, this is a box with a calendar date picker. Click or tab into the box to display the calendar, which will be preselected to today's date. For existing requests, there will be a check box labeled “Check to not update the date”. This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request.
## Requestor / Subject
For requests or praises, this field is for the name of the person who made the request or offered the praise report. For announcements, this should contain the subject of the announcement. 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.
## Expiration
“Expire Normally” means that the request is subject to the expiration days in the group preferences. “Request Never Expires” can be used to make a request never expire (note that this is redundant for “Long-Term Requests” and “Expecting”). If you are editing an existing request, a third option appears. “Expire Immediately” will make the request expire when it is saved. 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.
## Request
This is the text of the request. 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. It also supports undo and redo, and the editor supports full-screen mode. Hover over each icon to see what each button does.

29
docs/en/requests/maintain.md Normal file
View File

@ -0,0 +1,29 @@
---
title: Maintain Requests
---
From this page, you can add, edit, and delete your current requests. You can also restore requests that may have expired, but should be made active once again.
## Add a New Request
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.
## Search Requests
If you are looking for a particular requests, enter some text in the search box and click “Search”. PrayerTracker will search the Requestor/Subject and Request Text fields (case-insensitively) of both active and inactive requests. 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. They will also be displayed in pages, if there are a lot of results; the number per page is configurable by small group.
## Edit Request
To edit a request, click the blue pencil icon; it's the first icon under the “Actions” column heading.
## Expire a Request
For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately. This is equivalent to editing the request, selecting “Expire Immediately”, and saving it.
## Restore an Inactive Request
When the page is first displayed, it does not display inactive requests. However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown. The middle icon will look like an eye; clicking it will restore the request as an active request. The last updated date will be current, and the request is set to expire normally.
## Delete a Request
Deleting a request is contrary to the intent of PrayerTracker, as you can retrieve requests that have expired. However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “Actions” column will allow you to do it. Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good.

17
docs/en/requests/view.md Normal file
View File

@ -0,0 +1,17 @@
---
title: View Request List
---
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. (NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)
## List for Next Sunday
This will modify the date for the list, so it will look like it is currently next Sunday. 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. Note that this link does not appear if it is Sunday.
## View Printable
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. Once you have clicked the link, you can print it using your browser's standard “Print” functionality.
## Send Via E-mail
Clicking this link will send the list you are currently viewing to your group members. The page will remind you that you are about to do that, and ask for your confirmation. If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like. You may safely use your browser's “Back” button to navigate away from the page.

11
docs/en/small-group/announcement.md Normal file
View File

@ -0,0 +1,11 @@
---
title: Send Announcement
---
## Announcement Text
This is the text of the announcement you would like to send. It functions the same way as the text box on the [“Edit Request” page](../requests/edit.html#request).
## Add to Request List
Without this box checked, the text of the announcement will only be e-mailed to your group members. If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected.

17
docs/en/small-group/members.md Normal file
View File

@ -0,0 +1,17 @@
---
title: Maintain Group Members
---
From this page, you can add, edit, and delete the e-mail addresses for your group.
## Add a New Group Member
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.
## Edit Group Member
To edit an e-mail address, click the blue pencil icon; it's the first icon under the “Actions” column heading. This will allow you to update the name and/or the e-mail address for that member.
## Delete a Group Member
To delete an e-mail address, click the blue trash can icon in the “Actions” column. Note that once an e-mail address has been deleted, it is gone. (Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)

70
docs/en/small-group/preferences.md Normal file
View File

@ -0,0 +1,70 @@
---
title: Change Preferences
---
This page allows you to change how your prayer request list looks and behaves. Each section is addressed below.
## Requests Expire After
When a regular request goes this many days without being updated, it expires and no longer appears on the request list. Note that the categories “Long-Term Requests” and “Expecting” never expire automatically.
## Requests “New” For
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. All categories respect this setting. 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. (NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)
## Long-Term Requests Alerted for Update
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.
## Request Sorting
By default, requests are sorted within each group by the last updated date, with the most recent on top. If you would prefer to have the list sorted by requestor or subject rather than by date, select “Sort by Requestor Name” instead.
## E-mail “From” Name and Address
PrayerTracker must put an name and e-mail address in the “from” position of each e-mail it sends. The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”. 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). 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.
## E-mail Format
This is the default e-mail format for your group. The PrayerTracker default is HTML, which sends the list just as you see it online. 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. The setting on this page is the group default; you can select a format for each recipient on the “Maintain Group Members” page.
## Colors
You can customize the colors that are used for the headings and lines in your request list. 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. 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. The background color cannot be changed.
## Fonts for List
This is a comma-separated list of fonts that will be used for your request list. 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. It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”. 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.
## Heading / List Text Size
This is the point size to use for each. The default for the heading is 16pt, and the default for the text is 12pt.
## Making a “Large Print” List
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:
> _Fonts_<br>
> &#8212; 'Times New Roman',serif
>
> _Heading Text Size_<br>
> &#8212; 18pt
>
> _List Text Size_<br>
> &#8212; 16pt
## Time Zone
This is the time zone that you would like to use for your group. If you do not see your time zone listed, just [contact Daniel](mailto:daniel@djs-consulting.com?subject=PrayerTracker%20Time%20Zone) and tell him what time zone you need.
## Request List Visibility
The group's request list can be either public, private, or password-protected. 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). 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. As this is a shared password, it is stored in plain text, so you can easily see what it is. If you select “Password Protected” but do not enter a password, the list remains private, which is also the default value. (Changing this password will force all members of the group who logged in with the “Remember Me” box checked to provide the new password.)
## Page Size
As small groups use PrayerTracker, they accumulate many expired requests. When lists of requests that include expired requests, the results will be broken up into pages. The default value is 100 requests per page, but may be set as low as 10 or as high as 255.
## "As of" Date Display
PrayerTracker can display the last date a request was updated, at the end of the request text. By default, it does not. 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)".

13
docs/en/user/log-on.md Normal file
View File

@ -0,0 +1,13 @@
---
title: Log On
---
This page allows you to log on to PrayerTracker. There are two different levels of access for PrayerTracker - user and group.
## User Log On
Enter your e-mail address and password into the appropriate boxes, then select your group. If you want PrayerTracker to remember you on your computer, click the “Remember Me” box before clicking the “Log On” button.
## Group Log On
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. If you want PrayerTracker to remember your group, click the “Remember Me” box before clicking the “Log On” button.

7
docs/en/user/password.md Normal file
View File

@ -0,0 +1,7 @@
---
title: Change Your Password
---
This page will let you change your password. Enter your existing password in the top box, then enter your new password in the bottom two boxes. 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.
"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. [Click here to request help resetting your password](mailto:daniel@djs-consulting.com?subject=PrayerTracker%20Password%20Help).

26
docs/es/index.md Normal file
View File

@ -0,0 +1,26 @@
---
title: Ayuda
skip_footer: true
---
En todo el sistema, verá un icono (un signo de interrogación en un círculo) junto al título de cada página. Al hacer clic en esta opción, se abrirá una nueva y pequeña ventana con instrucciones sobre cómo usar esa página. Si está buscando una descripción rápida de SeguidorOración, comience con las entradas "Agregar / Editar una Petición" y "Cambiar las Preferencias".
----
<p class="pt-center-text"><strong>Los Temas de Ayuda</strong></p>
[Cambiar las Preferencias](./small-group/preferences.html)
[Enviar un Anuncio](./small-group/announcement.html)
[Mantener los Miembros del Grupo](./small-group/members.html)
[Agregar / Editar una Petición](./requests/edit.html)
[Mantener las Peticiones](./requests/maintain.html)
[Ver la Lista de Peticiones](./requests/view.html)
[Iniciar Sesión](./user/log-on.html)
[Cambiar Su Contraseña](./user/password.html)

27
docs/es/requests/edit.md Normal file
View File

@ -0,0 +1,27 @@
---
title: Agregar / Editar una Petición
---
Esta página le permite introducir o actualizar una petición de oración nueva.
## Tipo de Petición
Hay 5 tipos de peticiones en SeguidorOración. “Peticiones Actuales” son sus peticiones habituales que la gente pueda tener acerca de las cosas que suceden durante la próxima semana o así. “Peticiones a Largo Plazo” son peticiones que pueden ocurrir varias veces, o continuar indefinidamente. “Informes de Alabanza” son como “Peticiones Actuales”, pero son respuestas a la oración para compartir con su grupo. “Embarazada” es para aquellos que están embarazadas. “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.
El orden anterior es el orden en que los tipos de peticiones aparecen en la lista. “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.
## Fecha
Para nuevas peticiones, se trata de una caja con un selector de fechas del calendario. Haga clic en la pestaña o en la caja para mostrar el calendario, que será preseleccionada para la fecha de hoy. Para peticiones existentes, habrá una casilla de verificación “Seleccionar para no actualizar la fecha”. Esto puede ser usado si corrige la ortografía ni la puntuacion, y no tienen una actualización real de hacer la petición.
## Peticionario / Sujeto
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. Para los anuncios, este debe contener el objeto del anuncio. 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.
## Expiración
“Expirará Normalmente” significa que la petición está sujeta a los días de vencimiento de las preferencias del grupo. “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”). Si está editando una petición existente, aparece una tercera opción. “Expirará Inmediatamente” hará que la petición expirará cuando se guarda. 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.
## Petición
Este es el texto de la petición. 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. 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.

29
docs/es/requests/maintain.md Normal file
View File

@ -0,0 +1,29 @@
---
title: Mantener las Peticiones
---
Desde esta página, usted puede agregar, editar y borrar sus peticiones actuales. También puede restaurar peticiones que han caducado, sino que debe ser activa, una vez más.
## Agregar una Nueva Petición
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.
## Busca las Peticiones
Si está buscando una solicitud en particular, ingrese un texto en el cuadro de búsqueda y haga clic en “Buscar”. 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. 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. 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.
## Editar la Petición
Para editar una petición, haga clic en el icono de lápiz azul, el primer icono bajo el título de columna “Acciones”.
## Expirar una petición
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. Esto equivale a editar la petición, seleccionar "Expirará Inmediatamente" y guardarla.
## Restaurar una Petición Inactivo
Cuando la página se muestra por primera vez, que no muestra peticiones inactivos. 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. El icono del centro se verá como un ojo; Haciendo clic en él, restaurará la petición como una petición activa. La última fecha actualizada será actual, y la petición se establece para caducar normalmente.
## Eliminar una Petición
Eliminación de una petición es contraria a la intención de SeguidorOración, como se puede recuperar peticiones que han expirado. Sin embargo, si hay una solicitud que debe ser eliminado, haga clic en el icono azul de la papelera en la columna “Acciones” le permitirá hacerlo. 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.

17
docs/es/requests/view.md Normal file
View File

@ -0,0 +1,17 @@
---
title: Ver la Lista de Peticiones
---
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. (NOTA: Si usted está registrado como miembro de la clase, la única opción que se ve es para ver una lista para imprimir.)
## Lista para el Próximo Domingo
Esto modificará la fecha de la lista, por lo que se verá como es en la actualidad el próximo Domingo. 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. Tenga en cuenta que este enlace no aparece si es Domingo.
## Versión Imprimible
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. Una vez que haya hecho clic en el enlace, se puede imprimir con el navegador estándar de “Imprimir” funcionalidad.
## Enviar por correo electrónico
Al hacer clic en este enlace le enviará la lista que está viendo en ese momento a los miembros del grupo. La página te recordará que estás a punto de hacerlo, y pedir su confirmación. Si continúa, usted verá una página que muestra a la que la lista fue enviado, y lo que la lista parecía. Usted puede utilizar con seguridad de su navegador botón “Atrás” para navegar fuera de la página.

11
docs/es/small-group/announcement.md Normal file
View File

@ -0,0 +1,11 @@
---
title: Enviar un Anuncio
---
## Texto del Anuncio
Este es el texto del anuncio que desea enviar. Funciona de la misma forma que el cuadro de texto en [la página “Editar la Petición”](../requests/edit.html#peticion).
## Agregar a la Lista de Peticiones En
Sin esta caja marcada, el texto del anuncio sólo será por correo electrónico a los miembros del su grupo. 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.

17
docs/es/small-group/members.md Normal file
View File

@ -0,0 +1,17 @@
---
title: Mantener los Miembros del Grupo
---
Desde esta página, usted puede agregar, editar y eliminar las direcciones de correo electrónico para su grupo.
## Añadir un Nuevo Miembro del Grupo
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.
## Editar el Miembro del Grupo
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 “Acciones”. Esto le permitirá actualizar el nombre y / o la dirección de correo electrónico para ese miembro.
## Eliminar un Miembro del Grupo
Para eliminar una dirección de correo electrónico, haga clic en el icono azul de la papelera en la columna “Acciones”. Tenga en cuenta que una vez que la dirección de correo electrónico se ha eliminado, se ha ido. (Por supuesto, si usted lo elimine por error, se puede entrar de nuevo utilizando la opción “Agregar” instrucciones de arriba.)

70
docs/es/small-group/preferences.md Normal file
View File

@ -0,0 +1,70 @@
---
title: Cambiar las Preferencias
---
Esta página le permite cambiar la forma en que su lista de peticiones de la oración se ve y se comporta. Cada sección se aborda más adelante.
## Peticiones Expiran Después de
Cuando una petición regular va esta cantidad de días sin actualizar, caduca y ya no aparece en la lista de peticiones. Tenga en cuenta que las categorías “Peticiones a Largo Plazo” y “Embarazada” no expirará automáticamente.
## Peticiones “Nuevas” Para
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. Todas las categorías respetar esta opción. 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. (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 “-”.)
## Peticiones a Largo Plazo Alertó para la Actualización
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.
## Orden de Peticiones
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. 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.
## Correo Electrónico “De” Nombre y Dirección
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. El nombre predeterminado es “PrayerTracker”, y el valor predeterminado dirección de correo electrónico es “prayer@djs-consulting.com”. 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). 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.
## Formato de Correo Electrónico
Este es el valor predeterminado formato de correo electrónico para su grupo. El valor predeterminado de SeguidorOración es HTML, el cual envía la lista al igual que usted lo ve en el sitio. 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. 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”.
## Colores
Usted puede personalizar los colores que se utilizan para las partidas y líneas en su lista de peticiones. 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. 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. El color de fondo no puede ser cambiado.
## Fuentes de la Lista
Esta es una lista separada por comas de fuentes que se utilizarán para su lista de peticiones. 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. Generalmente es mejor quedarse con las fuentes que vienen con Windows - Fuentes como “Arial”, “Times New Roman”, “Tahoma”, y “Comic Sans MS”. 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”).
## Tamaño del Texto de Partida y Lista
Este es el tamaño de punto a utilizar para cada uno. El valor predeterminado para el título es 16 puntos, y el valor por defecto para el texto es 12 puntos.
## Realización de una Lista de “Letra Grande”
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”:
> _Fuentes_<br>
> &#8212; 'Times New Roman',serif
>
> _Partida el Tamaño del Texto_<br>
> &#8212; 18pt
>
> _Lista el Tamaño del Texto_<br>
> &#8212; 16pt
## Zona Horaria
Esta es la zona horaria que desea utilizar para su clase. Si no puede ver la zona horaria en la lista, ponte en [contacto con Daniel](mailto:daniel@djs-consulting.com?subject=Zona%20Horaria%20por%20SeguidorOración) y decirle lo que la zona horaria que usted necesita.
## La Visibilidad del la Lista de las Peticiones
La lista de peticiones del grupo puede ser pública, privada o protegida por contraseña. 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). 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. Como se trata de una contraseña compartida, se almacena en texto plano, así que usted puede ver fácilmente lo que es. Si selecciona "Protegido por Contraseña" pero no introduce una contraseña, la lista sigue siendo privado, que también es el valor predeterminado. (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.)
## Tamaño de Página
A medida que los grupos pequeños utilizan SeguidorOración, acumulan muchas solicitudes caducadas. Cuando las listas de solicitudes que incluyen solicitudes caducadas, los resultados se dividirán en páginas. El valor predeterminado es de 100 solicitudes por página, pero se puede establecer tan bajo como 10 o tan alto como 255.
## Visualización de la Fecha “Como de”
SeguidorOración puede mostrar la última fecha en que se actualizó una solicitud, al final del texto de solicitud. Por defecto, no lo hace. 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)".

13
docs/es/user/log-on.md Normal file
View File

@ -0,0 +1,13 @@
---
title: Iniciar Sesión
---
Esta página le permite acceder a SeguidorOración. Hay dos diferentes niveles de acceso para SeguidorOración - el usuario y el grupo.
## Iniciar Sesión como Usuario
Introduzca su dirección de correo electrónico y contraseña en las cajas apropiadas y seleccione su grupo. 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.
## Iniciar Sesión como Grupo
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. 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.

7
docs/es/user/password.md Normal file
View File

@ -0,0 +1,7 @@
---
title: Cambiar Su Contraseña
---
Esta página le permitirá cambiar su contraseña. Ingrese su contraseña actual en la caja superior y introduzca la nueva contraseña en la parte inferior dos cajas. 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.
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. [Haga clic aquí para solicitar ayuda para restablecer su contraseña](mailto:daniel@djs-consulting.com?subject=Ayuda%20de%20Contraseña%20de%20SeguidorOración).

8
docs/index.md Normal file
View File

@ -0,0 +1,8 @@
---
title: Help / Ayuda
layout: home
---
## [English](/en)
## [Español](/es)

2
fake.cmd
View File

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

7
fake.sh
View File

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

3
src/.dockerignore
View File

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

8
src/Directory.Build.props
View File

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

25
src/Dockerfile
View File

@ -1,25 +0,0 @@
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" ]

589
src/PrayerTracker.Data/Access.fs
View File

@ -1,589 +0,0 @@
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)
()
}

86
src/PrayerTracker.Data/AppDbContext.fs Normal file
View File

@ -0,0 +1,86 @@
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)

380
src/PrayerTracker.Data/DataAccess.fs Normal file
View File

@ -0,0 +1,380 @@
[<AutoOpen>]
module PrayerTracker.DataAccess
open Microsoft.EntityFrameworkCore
open PrayerTracker.Entities
open System.Collections.Generic
open System.Linq
[<AutoOpen>]
module private Helpers =
open Microsoft.FSharpLu
open System.Threading.Tasks
/// Central place to append sort criteria for prayer request queries
let reqSort sort (q : IQueryable<PrayerRequest>) =
match sort with
| SortByDate ->
query {
for req in q do
sortByDescending req.updatedDate
thenByDescending req.enteredDate
thenBy req.requestor
}
| SortByRequestor ->
query {
for req in q do
sortBy req.requestor
thenByDescending req.updatedDate
thenByDescending req.enteredDate
}
/// Convert a possibly-null object to an option, wrapped as a task
let toOptionTask<'T> (item : 'T) = (Option.fromObject >> Task.FromResult) item
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 =
query {
for ch in this.Churches.AsNoTracking () do
where (ch.churchId = cId)
exactlyOneOrDefault
}
|> toOptionTask
/// Find all churches
member this.AllChurches () =
task {
let q =
query {
for ch in this.Churches.AsNoTracking () do
sortBy ch.name
}
let! churches = q.ToListAsync ()
return List.ofSeq churches
}
(*-- MEMBER EXTENSIONS --*)
/// Get a small group member by its Id
member this.TryMemberById mId =
query {
for mbr in this.Members.AsNoTracking () do
where (mbr.memberId = mId)
select mbr
exactlyOneOrDefault
}
|> toOptionTask
/// Find all members for a small group
member this.AllMembersForSmallGroup gId =
task {
let q =
query {
for mbr in this.Members.AsNoTracking () do
where (mbr.smallGroupId = gId)
sortBy mbr.memberName
}
let! mbrs = q.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 =
query {
for req in this.PrayerRequests.AsNoTracking () do
where (req.prayerRequestId = reqId)
exactlyOneOrDefault
}
|> toOptionTask
/// Get all (or active) requests for a small group as of now or the specified date
// TODO: why not make this an async list like the rest of these methods?
member this.AllRequestsForSmallGroup (grp : SmallGroup) clock listDate activeOnly pageNbr : PrayerRequest seq =
let theDate = match listDate with Some dt -> dt | _ -> grp.localDateNow clock
query {
for req in this.PrayerRequests.AsNoTracking () do
where (req.smallGroupId = grp.smallGroupId)
}
|> function
| q when activeOnly ->
let asOf = theDate.AddDays(-(float grp.preferences.daysToExpire)).Date
query {
for req in q do
where ( ( req.updatedDate > asOf
|| req.expiration = Manual
|| req.requestType = LongTermRequest
|| req.requestType = Expecting)
&& req.expiration <> Forced)
}
| q -> q
|> reqSort grp.preferences.requestSort
|> function
| q ->
match activeOnly with
| true -> upcast q
| false ->
upcast query {
for req in q do
skip ((pageNbr - 1) * grp.preferences.pageSize)
take grp.preferences.pageSize
}
/// 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)
/// Get all (or active) requests for a small group as of now or the specified date
// TODO: same as above...
member this.SearchRequestsForSmallGroup (grp : SmallGroup) (searchTerm : string) pageNbr : PrayerRequest seq =
let pgSz = grp.preferences.pageSize
let toSkip = (pageNbr - 1) * pgSz
let sql =
""" SELECT * FROM pt."PrayerRequest" WHERE "SmallGroupId" = {0} AND "Text" ILIKE {1}
UNION
SELECT * FROM pt."PrayerRequest" WHERE "SmallGroupId" = {0} AND COALESCE("Requestor", '') ILIKE {1}"""
let like = sprintf "%%%s%%"
this.PrayerRequests.FromSqlRaw(sql, grp.smallGroupId, like searchTerm).AsNoTracking ()
|> reqSort grp.preferences.requestSort
|> function
| q ->
upcast query {
for req in q do
skip toSkip
take pgSz
}
(*-- SMALL GROUP EXTENSIONS --*)
/// Find a small group by its Id
member this.TryGroupById gId =
query {
for grp in this.SmallGroups.AsNoTracking().Include (fun sg -> sg.preferences) do
where (grp.smallGroupId = gId)
exactlyOneOrDefault
}
|> toOptionTask
/// Get small groups that are public or password protected
member this.PublicAndProtectedGroups () =
task {
let smallGroups = this.SmallGroups.AsNoTracking().Include(fun sg -> sg.preferences).Include (fun sg -> sg.church)
let q =
query {
for grp in smallGroups do
where ( grp.preferences.isPublic
|| (grp.preferences.groupPassword <> null && grp.preferences.groupPassword <> ""))
sortBy grp.church.name
thenBy grp.name
}
let! grps = q.ToListAsync ()
return List.ofSeq grps
}
/// Get small groups that are password protected
member this.ProtectedGroups () =
task {
let q =
query {
for grp in this.SmallGroups.AsNoTracking().Include (fun sg -> sg.church) do
where (grp.preferences.groupPassword <> null && grp.preferences.groupPassword <> "")
sortBy grp.church.name
thenBy grp.name
}
let! grps = q.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 q =
query {
for grp in this.SmallGroups.AsNoTracking().Include (fun sg -> sg.church) do
sortBy grp.church.name
thenBy grp.name
}
let! grps = q.ToListAsync ()
return grps
|> Seq.map (fun grp -> grp.smallGroupId.ToString "N", $"{grp.church.name} | {grp.name}")
|> List.ofSeq
}
/// Log on a small group
member this.TryGroupLogOnByPassword gId pw =
task {
match! this.TryGroupById gId with
| None -> return None
| Some grp ->
match pw = grp.preferences.groupPassword with
| true -> return Some grp
| _ -> return None
}
/// Check a cookie log on for a small group
member this.TryGroupLogOnByCookie gId pwHash (hasher : string -> string) =
task {
match! this.TryGroupById gId with
| None -> return None
| Some grp ->
match pwHash = hasher grp.preferences.groupPassword with
| true -> return Some 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 =
query {
for tz in this.TimeZones do
where (tz.timeZoneId = tzId)
exactlyOneOrDefault
}
|> toOptionTask
/// Get all time zones
member this.AllTimeZones () =
task {
let q =
query {
for tz in this.TimeZones do
sortBy tz.sortOrder
}
let! tzs = q.ToListAsync ()
return List.ofSeq tzs
}
(*-- USER EXTENSIONS --*)
/// Find a user by its Id
member this.TryUserById uId =
query {
for usr in this.Users.AsNoTracking () do
where (usr.userId = uId)
exactlyOneOrDefault
}
|> toOptionTask
/// Find a user by its e-mail address and authorized small group
member this.TryUserByEmailAndGroup email gId =
query {
for usr in this.Users.AsNoTracking () do
where (usr.emailAddress = email && usr.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
exactlyOneOrDefault
}
|> toOptionTask
/// Find a user by its Id (tracked entity), eagerly loading the user's groups
member this.TryUserByIdWithGroups uId =
query {
for usr in this.Users.AsNoTracking().Include (fun u -> u.smallGroups) do
where (usr.userId = uId)
exactlyOneOrDefault
}
|> toOptionTask
/// Get a list of all users
member this.AllUsers () =
task {
let q =
query {
for usr in this.Users.AsNoTracking () do
sortBy usr.lastName
thenBy usr.firstName
}
let! usrs = q.ToListAsync ()
return List.ofSeq usrs
}
/// Get all PrayerTracker users as members (used to send e-mails)
member this.AllUsersAsMembers () =
task {
let q =
query {
for usr in this.Users.AsNoTracking () do
sortBy usr.lastName
thenBy usr.firstName
select { Member.empty with email = usr.emailAddress; memberName = usr.fullName }
}
let! usrs = q.ToListAsync ()
return List.ofSeq usrs
}
/// Find a user based on their credentials
member this.TryUserLogOnByPassword email pwHash gId =
query {
for usr in this.Users.AsNoTracking () do
where ( usr.emailAddress = email
&& usr.passwordHash = pwHash
&& usr.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
exactlyOneOrDefault
}
|> toOptionTask
/// Find a user based on credentials stored in a cookie
member this.TryUserLogOnByCookie uId gId pwHash =
task {
match! this.TryUserByIdWithGroups uId with
| None -> return None
| Some usr ->
match pwHash = usr.passwordHash && usr.smallGroups |> Seq.exists (fun xref -> xref.smallGroupId = gId) with
| true ->
this.Entry<User>(usr).State <- EntityState.Detached
return Some { usr 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))

193
src/PrayerTracker.Data/DistributedCache.fs
View File

@ -1,193 +0,0 @@
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

1127
src/PrayerTracker.Data/Entities.fs
View File

File diff suppressed because it is too large Load Diff

514
src/PrayerTracker.Data/Migrations/20161217153124_InitialDatabase.fs Normal file
View File

@ -0,0 +1,514 @@
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
// fsharplint:disable RecordFieldNames
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>
pageSize : OperationBuilder<AddColumnOperation>
asOfDateDisplay : OperationBuilder<AddColumnOperation>
}
type MemberTable =
{ memberId : OperationBuilder<AddColumnOperation>
email : OperationBuilder<AddColumnOperation>
format : OperationBuilder<AddColumnOperation>
memberName : OperationBuilder<AddColumnOperation>
smallGroupId : OperationBuilder<AddColumnOperation>
}
type PrayerRequestTable =
{ prayerRequestId : OperationBuilder<AddColumnOperation>
enteredDate : OperationBuilder<AddColumnOperation>
expiration : 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", nullable = false, maxLength = Nullable<int> 2)
}),
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", nullable = false, defaultValue = "D", maxLength = Nullable<int> 1)
textFontSize = table.Column<int> (name = "TextFontSize", nullable = false, defaultValue = 12)
timeZoneId = table.Column<string> (name = "TimeZoneId", nullable = false, defaultValue = "America/Denver")
pageSize = table.Column<int> (name = "PageSize", nullable = false, defaultValue = 100)
asOfDateDisplay = table.Column<string> (name = "AsOfDateDisplay", nullable = false, defaultValue = "N", maxLength = Nullable<int> 1)
}),
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)
expiration = table.Column<bool> (name = "Expiration", nullable = false)
enteredDate = table.Column<DateTime> (name = "EnteredDate", 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("H") |> 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.Property<int>("pageSize").IsRequired().ValueGeneratedOnAdd().HasDefaultValue(100) |> ignore
b.Property<string>("asOfDateDisplay").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("N").HasMaxLength(1) |> 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<DateTime>("enteredDate").IsRequired() |> ignore
b.Property<string>("expiration").IsRequired().HasMaxLength 1 |> ignore
b.Property<bool>("notifyChaplain") |> ignore
b.Property<string>("requestType").IsRequired().HasMaxLength 1 |> 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

200
src/PrayerTracker.Data/Migrations/AppDbContextModelSnapshot.fs Normal file
View File

@ -0,0 +1,200 @@
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("H").HasMaxLength(1) |> 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.Property<int>("pageSize").IsRequired().ValueGeneratedOnAdd().HasDefaultValue(100) |> ignore
b.Property<string>("asOfDateDisplay").IsRequired().ValueGeneratedOnAdd().HasDefaultValue("N").HasMaxLength(1) |> 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<DateTime>("enteredDate") |> ignore
b.Property<string>("expiration").IsRequired().HasMaxLength(1) |> ignore
b.Property<bool>("notifyChaplain") |> ignore
b.Property<string>("requestType").IsRequired().HasMaxLength(1) |> 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

20
src/PrayerTracker.Data/PrayerTracker.Data.fsproj
View File

@ -1,18 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Entities.fs" /> <Compile Include="Entities.fs" />
<Compile Include="Access.fs" /> <Compile Include="AppDbContext.fs" />
<Compile Include="DistributedCache.fs" /> <Compile Include="DataAccess.fs" />
<Compile Include="Migrations\20161217153124_InitialDatabase.fs" />
<Compile Include="Migrations\AppDbContextModelSnapshot.fs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BitBadger.Documents.Postgres" Version="3.1.0" /> <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
<PackageReference Include="Giraffe" Version="6.4.0" /> <PackageReference Include="Microsoft.FSharpLu" Version="0.11.7" />
<PackageReference Include="NodaTime" Version="3.1.11" /> <PackageReference Include="NodaTime" Version="3.0.5" />
<PackageReference Include="Npgsql.FSharp" Version="5.7.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
<PackageReference Include="Npgsql.NodaTime" Version="8.0.3" />
<PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
</Project> </Project>

615
src/PrayerTracker.Tests/Data/EntitiesTests.fs
View File

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

7
src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
View File

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -14,9 +15,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Expecto" Version="10.2.1" /> <PackageReference Include="Expecto" Version="9.0.4" />
<PackageReference Include="NodaTime.Testing" Version="3.1.11" /> <PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="10.0.2" />
<PackageReference Update="FSharp.Core" Version="8.0.300" /> <PackageReference Include="NodaTime.Testing" Version="3.0.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/PrayerTracker.Tests/Program.fs
View File

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

307
src/PrayerTracker.Tests/UI/CommonFunctionsTests.fs
View File

@ -1,215 +1,208 @@
module PrayerTracker.UI.CommonFunctionsTests module PrayerTracker.UI.CommonFunctionsTests
open System.IO
open Expecto open Expecto
open Giraffe.ViewEngine open Giraffe.ViewEngine
open Microsoft.AspNetCore.Mvc.Localization open Microsoft.AspNetCore.Mvc.Localization
open Microsoft.Extensions.Localization open Microsoft.Extensions.Localization
open PrayerTracker.Tests.TestLocalization open PrayerTracker.Tests.TestLocalization
open PrayerTracker.Views open PrayerTracker.Views
open System.IO
[<Tests>] [<Tests>]
let iconSizedTests = let iconSizedTests =
testList "iconSized" [ testList "iconSized" [
test "succeeds" { test "succeeds" {
let ico = iconSized 18 "tom-&-jerry" |> renderHtmlNode 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"
} }
] ]
[<Tests>] [<Tests>]
let iconTests = let iconTests =
testList "icon" [ testList "icon" [
test "succeeds" { test "succeeds" {
let ico = icon "bob-&-tom" |> renderHtmlNode 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>] [<Tests>]
let locStrTests = let locStrTests =
testList "locStr" [ testList "locStr" [
test "succeeds" { test "succeeds" {
let enc = locStr (LocalizedString ("test", "test&")) |> renderHtmlNode let enc = locStr (LocalizedString ("test", "test&")) |> renderHtmlNode
Expect.equal enc "test&amp;" "string not encoded correctly" Expect.equal enc "test&amp;" "string not encoded correctly"
} }
] ]
[<Tests>] [<Tests>]
let namedColorListTests = let namedColorListTests =
testList "namedColorList" [ testList "namedColorList" [
test "succeeds with default values" { test "succeeds with default values" {
let expected = let expected =
[ """<select name="the-name">""" [ "<select name=\"the-name\">"
"""<option value="aqua" style="background-color:aqua;color:black;">aqua</option>""" "<option value=\"aqua\" style=\"background-color:aqua;color:black;\">aqua</option>"
"""<option value="black" style="background-color:black;color:white;">black</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=\"blue\" style=\"background-color:blue;color:white;\">blue</option>"
"""<option value="fuchsia" style="background-color:fuchsia;color:black;">fuchsia</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=\"gray\" style=\"background-color:gray;color:white;\">gray</option>"
"""<option value="green" style="background-color:green;color:white;">green</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=\"lime\" style=\"background-color:lime;color:black;\">lime</option>"
"""<option value="maroon" style="background-color:maroon;color:white;">maroon</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=\"navy\" style=\"background-color:navy;color:white;\">navy</option>"
"""<option value="olive" style="background-color:olive;color:white;">olive</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=\"purple\" style=\"background-color:purple;color:white;\">purple</option>"
"""<option value="red" style="background-color:red;color:black;">red</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=\"silver\" style=\"background-color:silver;color:black;\">silver</option>"
"""<option value="teal" style="background-color:teal;color:white;">teal</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=\"white\" style=\"background-color:white;color:black;\">white</option>"
"""<option value="yellow" style="background-color:yellow;color:black;">yellow</option>""" "<option value=\"yellow\" style=\"background-color:yellow;color:black;\">yellow</option>"
"</select>" "</select>"
] ]
|> String.concat "" |> String.concat ""
let selectList = namedColorList "the-name" "" [] _s |> renderHtmlNode let selectList = namedColorList "the-name" "" [] _s |> renderHtmlNode
Expect.equal expected selectList "The default select list was not generated correctly" Expect.equal expected selectList "The default select list was not generated correctly"
} }
test "succeeds with a selected value" { test "succeeds with a selected value" {
let selectList = namedColorList "the-name" "white" [] _s |> renderHtmlNode let selectList = namedColorList "the-name" "white" [] _s |> renderHtmlNode
Expect.stringContains selectList " selected>white</option>" "Selected option not generated correctly" Expect.stringContains selectList " selected>white</option>" "Selected option not generated correctly"
} }
test "succeeds with extra attributes" { test "succeeds with extra attributes" {
let selectList = namedColorList "the-name" "" [ _id "myId" ] _s |> renderHtmlNode 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"
} }
] ]
[<Tests>] [<Tests>]
let radioTests = let radioTests =
testList "radio" [ testList "radio" [
test "succeeds when not selected" { test "succeeds when not selected" {
let rad = radio "a-name" "anId" "test" "unit" |> renderHtmlNode 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" "Unselected radio button not generated correctly"
} }
test "succeeds when selected" { test "succeeds when selected" {
let rad = radio "a-name" "anId" "unit" "unit" |> renderHtmlNode 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" "Selected radio button not generated correctly"
} }
] ]
[<Tests>] [<Tests>]
let rawLocTextTests = let rawLocTextTests =
testList "rawLocText" [ testList "rawLocText" [
test "succeeds" { test "succeeds" {
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw (LocalizedHtmlString ("test", "test&")) |> renderHtmlNode let raw = rawLocText sw (LocalizedHtmlString ("test", "test&")) |> renderHtmlNode
Expect.equal raw "test&" "string not written correctly" Expect.equal raw "test&" "string not written correctly"
} }
] ]
[<Tests>] [<Tests>]
let selectDefaultTests = let selectDefaultTests =
testList "selectDefault" [ testList "selectDefault" [
test "succeeds" { test "succeeds" {
Expect.equal (selectDefault "a&b") "— a&b —" "Default selection not generated correctly" Expect.equal (selectDefault "a&b") "— a&b —" "Default selection not generated correctly"
} }
] ]
[<Tests>] [<Tests>]
let selectListTests = let selectListTests =
testList "selectList" [ testList "selectList" [
test "succeeds with minimum options" { test "succeeds with minimum options" {
let theList = selectList "a-list" "" [] [] |> renderHtmlNode let theList = selectList "a-list" "" [] [] |> renderHtmlNode
Expect.equal theList """<select name="a-list" id="a-list"></select>""" Expect.equal theList "<select name=\"a-list\" id=\"a-list\"></select>" "Empty select list not generated correctly"
"Empty select list not generated correctly" }
} test "succeeds with all options" {
test "succeeds with all options" { let theList =
let theList = [ "tom", "Tom&"
[ "tom", "Tom&" "bob", "Bob"
"bob", "Bob" "jan", "Jan"
"jan", "Jan" ]
] |> selectList "the-list" "bob" [ _style "ugly" ]
|> selectList "the-list" "bob" [ _style "ugly" ] |> renderHtmlNode
|> renderHtmlNode let expected =
let expected = [ "<select name=\"the-list\" id=\"the-list\" style=\"ugly\">"
[ """<select name="the-list" id="the-list" style="ugly">""" "<option value=\"tom\">Tom&amp;</option>"
"""<option value="tom">Tom&amp;</option>""" "<option value=\"bob\" selected>Bob</option>"
"""<option value="bob" selected>Bob</option>""" "<option value=\"jan\">Jan</option>"
"""<option value="jan">Jan</option>""" "</select>"
"""</select>""" ]
] |> String.concat ""
|> String.concat "" Expect.equal theList expected "Filled select list not generated correctly"
Expect.equal theList expected "Filled select list not generated correctly" }
}
] ]
[<Tests>] [<Tests>]
let spaceTests = let spaceTests =
testList "space" [ testList "space" [
test "succeeds" { test "succeeds" {
Expect.equal (renderHtmlNode space) " " "space literal not correct" Expect.equal (renderHtmlNode space) " " "space literal not correct"
} }
] ]
[<Tests>] [<Tests>]
let submitTests = let submitTests =
testList "submit" [ testList "submit" [
test "succeeds" { 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 Expect.equal
btn 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" "Submit button not generated correctly"
} }
] ]
[<Tests>] [<Tests>]
let tableSummaryTests = let tableSummaryTests =
testList "tableSummary" [ testList "tableSummary" [
test "succeeds for no entries" { test "succeeds for no entries" {
let sum = tableSummary 0 _s |> renderHtmlNode 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" "Summary for no items is incorrect"
} }
test "succeeds for one entry" { test "succeeds for one entry" {
let sum = tableSummary 1 _s |> renderHtmlNode 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" "Summary for one item is incorrect"
} }
test "succeeds for many entries" { test "succeeds for many entries" {
let sum = tableSummary 5 _s |> renderHtmlNode 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" "Summary for many items is incorrect"
} }
] ]
module TimeZones = module TimeZones =
open PrayerTracker.Entities open PrayerTracker.Views.CommonFunctions.TimeZones
open PrayerTracker.Views.CommonFunctions.TimeZones
[<Tests>] [<Tests>]
let nameTests = let nameTests =
testList "TimeZones.name" [ testList "TimeZones.name" [
test "succeeds for US Eastern time" { test "succeeds for US Eastern time" {
Expect.equal (name (TimeZoneId "America/New_York") _s |> string) "Eastern" Expect.equal (name "America/New_York" _s |> string) "Eastern" "US Eastern time zone not returned correctly"
"US Eastern time zone not returned correctly" }
} test "succeeds for US Central time" {
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"
test "succeeds for US Mountain time" { }
Expect.equal (name (TimeZoneId "America/Denver") _s |> string) "Mountain" test "succeeds for US Mountain (AZ) time" {
"US Mountain time zone not returned correctly" Expect.equal (name "America/Phoenix" _s |> string) "Mountain (Arizona)"
} "US Mountain (AZ) time zone not returned correctly"
test "succeeds for US Mountain (AZ) time" { }
Expect.equal (name (TimeZoneId "America/Phoenix") _s |> string) "Mountain (Arizona)" test "succeeds for US Pacific time" {
"US Mountain (AZ) time zone not returned correctly" Expect.equal (name "America/Los_Angeles" _s |> string) "Pacific" "US Pacific time zone not returned correctly"
} }
test "succeeds for US Pacific time" { test "succeeds for Central European time" {
Expect.equal (name (TimeZoneId "America/Los_Angeles") _s |> string) "Pacific" Expect.equal (name "Europe/Berlin" _s |> string) "Central European"
"US Pacific time zone not returned correctly" "Central European time zone not returned correctly"
} }
test "succeeds for Central European time" { test "fails for unexpected time zone" {
Expect.equal (name (TimeZoneId "Europe/Berlin") _s |> string) "Central European" Expect.equal (name "Wakanda" _s |> string) "Wakanda" "Unexpected time zone should have returned the original ID"
"Central European time zone not returned correctly" }
} ]
test "fails for unexpected time zone" {
Expect.equal (name (TimeZoneId "Wakanda") _s |> string) "Wakanda"
"Unexpected time zone should have returned the original ID"
}
]

313
src/PrayerTracker.Tests/UI/UtilsTests.fs
View File

@ -5,192 +5,189 @@ open PrayerTracker
[<Tests>] [<Tests>]
let ckEditorToTextTests = let ckEditorToTextTests =
testList "ckEditorToText" [ testList "ckEditorToText" [
test "replaces newline/tab sequence with nothing" { test "replaces newline/tab sequence with nothing" {
Expect.equal (ckEditorToText "Here is some \n\ttext") "Here is some text" Expect.equal (ckEditorToText "Here is some \n\ttext") "Here is some text"
"Newline/tab sequence should have been removed" "Newline/tab sequence should have been removed"
} }
test "replaces &nbsp; with a space" { test "replaces &nbsp; with a space" {
Expect.equal (ckEditorToText "Test&nbsp;text") "Test text" "&nbsp; should have been replaced with a space" Expect.equal (ckEditorToText "Test&nbsp;text") "Test text" "&nbsp; should have been replaced with a space"
} }
test "replaces double space with one non-breaking space and one regular space" { test "replaces double space with one non-breaking space and one regular space" {
Expect.equal (ckEditorToText "Test text") "Test&#xa0; text" Expect.equal (ckEditorToText "Test text") "Test&#xa0; text"
"double space should have been replaced with one non-breaking space and one regular space" "double space should have been replaced with one non-breaking space and one regular space"
} }
test "replaces paragraph break with two line breaks" { test "replaces paragraph break with two line breaks" {
Expect.equal (ckEditorToText "some</p><p>text") "some<br><br>text" Expect.equal (ckEditorToText "some</p><p>text") "some<br><br>text"
"paragraph break should have been replaced with two line breaks" "paragraph break should have been replaced with two line breaks"
} }
test "removes start and end paragraph tags" { test "removes start and end paragraph tags" {
Expect.equal (ckEditorToText "<p>something something</p>") "something something" Expect.equal (ckEditorToText "<p>something something</p>") "something something"
"start/end paragraph tags should have been removed" "start/end paragraph tags should have been removed"
} }
test "trims the result" { test "trims the result" {
Expect.equal (ckEditorToText " abc ") "abc" "Should have trimmed the resulting text" Expect.equal (ckEditorToText " abc ") "abc" "Should have trimmed the resulting text"
} }
test "does all the replacements and removals at one time" { test "does all the replacements and removals at one time" {
Expect.equal (ckEditorToText " <p>Paragraph&nbsp;1\n\t line two</p><p>Paragraph 2 x</p>") Expect.equal (ckEditorToText " <p>Paragraph&nbsp;1\n\t line two</p><p>Paragraph 2 x</p>")
"Paragraph 1 line two<br><br>Paragraph 2&#xa0; x" "Paragraph 1 line two<br><br>Paragraph 2&#xa0; x"
"all replacements and removals were not made correctly" "all replacements and removals were not made correctly"
} }
] ]
[<Tests>] [<Tests>]
let htmlToPlainTextTests = let htmlToPlainTextTests =
testList "htmlToPlainText" [ testList "htmlToPlainText" [
test "decodes HTML-encoded entities" { test "decodes HTML-encoded entities" {
Expect.equal (htmlToPlainText "1 &gt; 0") "1 > 0" "HTML-encoded entities should have been decoded" Expect.equal (htmlToPlainText "1 &gt; 0") "1 > 0" "HTML-encoded entities should have been decoded"
} }
test "trims the input HTML" { test "trims the input HTML" {
Expect.equal (htmlToPlainText " howdy ") "howdy" "HTML input string should have been trimmed" Expect.equal (htmlToPlainText " howdy ") "howdy" "HTML input string should have been trimmed"
} }
test "replaces line breaks with new lines" { test "replaces line breaks with new lines" {
Expect.equal (htmlToPlainText "Lots<br>of<br />new<br>lines") "Lots\nof\nnew\nlines" Expect.equal (htmlToPlainText "Lots<br>of<br />new<br>lines") "Lots\nof\nnew\nlines"
"Break tags should have been converted to newline characters" "Break tags should have been converted to newline characters"
} }
test "replaces non-breaking spaces with spaces" { test "replaces non-breaking spaces with spaces" {
Expect.equal (htmlToPlainText "Here&nbsp;is&#xa0;some&nbsp;more&#xa0;text") "Here is some more text" Expect.equal (htmlToPlainText "Here&nbsp;is&#xa0;some&nbsp;more&#xa0;text") "Here is some more text"
"Non-breaking spaces should have been replaced with spaces" "Non-breaking spaces should have been replaced with spaces"
} }
test "does all replacements at one time" { test "does all replacements at one time" {
Expect.equal (htmlToPlainText " &lt;&nbsp;&lt;<br>test") "< <\ntest" Expect.equal (htmlToPlainText " &lt;&nbsp;&lt;<br>test") "< <\ntest" "All replacements were not made correctly"
"All replacements were not made correctly" }
} test "does not fail when passed null" {
test "does not fail when passed null" { Expect.equal (htmlToPlainText null) "" "Should return an empty string for null input"
Expect.equal (htmlToPlainText null) "" "Should return an empty string for null input" }
} test "does not fail when passed an empty string" {
test "does not fail when passed an empty string" { Expect.equal (htmlToPlainText "") "" "Should return an empty string when given 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" {
test "preserves blank lines for two consecutive line breaks" { let expected = "Paragraph 1\n\nParagraph 2\n\n...and paragraph 3"
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>")
Expect.equal expected "Blank lines not preserved for consecutive line breaks"
(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>] [<Tests>]
let makeUrlTests = let makeUrlTests =
testList "makeUrl" [ testList "makeUrl" [
test "returns the URL when there are no parameters" { 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" 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" { test "returns the URL with one query string parameter" {
Expect.equal (makeUrl "/test" [ "unit", "true" ]) "/test?unit=true" "The URL was not constructed properly" 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" { test "returns the URL with multiple encoded query string parameters" {
let url = makeUrl "/test" [ "space", "a space"; "turkey", "=" ] let url = makeUrl "/test" [ "space", "a space"; "turkey", "=" ]
Expect.equal url "/test?space=a+space&turkey=%3D" "The URL was not constructed properly" Expect.equal url "/test?space=a+space&turkey=%3D" "The URL was not constructed properly"
} }
] ]
[<Tests>] [<Tests>]
let sndAsStringTests = let sndAsStringTests =
testList "sndAsString" [ testList "sndAsString" [
test "converts the second item to a string" { test "converts the second item to a string" {
Expect.equal (sndAsString ("a", 5)) "5" Expect.equal (sndAsString ("a", 5)) "5" "The second part of the tuple should have been converted to a string"
"The second part of the tuple should have been converted to a string" }
}
] ]
module StringTests = module StringTests =
open PrayerTracker.Utils.String open PrayerTracker.Utils.String
[<Tests>] [<Tests>]
let replaceFirstTests = let replaceFirstTests =
testList "String.replaceFirst" [ testList "String.replaceFirst" [
test "replaces the first occurrence when it is found at the beginning of the string" { test "replaces the first occurrence when it is found at the beginning of the string" {
let testString = "unit unit unit" let testString = "unit unit unit"
Expect.equal (replaceFirst "unit" "test" testString) "test unit unit" Expect.equal (replaceFirst "unit" "test" testString) "test unit unit"
"First occurrence of a substring was not replaced properly at the beginning of the string" "First occurrence of a substring was not replaced properly at the beginning of the string"
} }
test "replaces the first occurrence when it is found in the center of the string" { test "replaces the first occurrence when it is found in the center of the string" {
let testString = "test unit test" let testString = "test unit test"
Expect.equal (replaceFirst "unit" "test" testString) "test test test" Expect.equal (replaceFirst "unit" "test" testString) "test test test"
"First occurrence of a substring was not replaced properly when it is in the center of the string" "First occurrence of a substring was not replaced properly when it is in the center of the string"
} }
test "returns the original string if the replacement isn't found" { test "returns the original string if the replacement isn't found" {
let testString = "unit tests" let testString = "unit tests"
Expect.equal (replaceFirst "tested" "testing" testString) "unit tests" Expect.equal (replaceFirst "tested" "testing" testString) "unit tests"
"String which did not have the target substring was not returned properly" "String which did not have the target substring was not returned properly"
} }
] ]
[<Tests>] [<Tests>]
let replaceTests = let replaceTests =
testList "String.replace" [ testList "String.replace" [
test "succeeds" { test "succeeds" {
Expect.equal (replace "a" "b" "abacab") "bbbcbb" "String did not replace properly" Expect.equal (replace "a" "b" "abacab") "bbbcbb" "String did not replace properly"
} }
] ]
[<Tests>] [<Tests>]
let trimTests = let trimTests =
testList "String.trim" [ testList "String.trim" [
test "succeeds" { test "succeeds" {
Expect.equal (trim " abc ") "abc" "Space not trimmed from string properly" Expect.equal (trim " abc ") "abc" "Space not trimmed from string properly"
} }
] ]
[<Tests>] [<Tests>]
let stripTagsTests = 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" [ testList "stripTags" [
test "does nothing if all tags are allowed" { test "does nothing if all tags are allowed" {
Expect.equal (stripTags [ "p"; "br" ] testString) testString Expect.equal (stripTags [ "p"; "br" ] testString) testString
"There should have been no replacements in the target string" "There should have been no replacements in the target string"
} }
test "strips the start/end tag for non allowed tag" { test "strips the start/end tag for non allowed tag" {
Expect.equal (stripTags [ "br" ] testString) "Here is some text<br> <br />and some more" Expect.equal (stripTags [ "br" ] testString) "Here is some text<br> <br />and some more"
"There should have been no \"p\" tag, but all \"br\" tags, in the returned string" "There should have been no \"p\" tag, but all \"br\" tags, in the returned string"
} }
test "strips void/self-closing tags" { test "strips void/self-closing tags" {
Expect.equal (stripTags [] testString) "Here is some text and some more" Expect.equal (stripTags [] testString) "Here is some text and some more"
"There should have been no tags; all void and self-closing tags should have been stripped" "There should have been no tags; all void and self-closing tags should have been stripped"
} }
] ]
[<Tests>] [<Tests>]
let wordWrapTests = let wordWrapTests =
testList "wordWrap" [ testList "wordWrap" [
test "breaks where it is supposed to" { test "breaks where it is supposed to" {
let testString = "The quick brown fox jumps over the lazy dog\nIt does!" 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" Expect.equal (wordWrap 20 testString) "The quick brown fox\njumps over the lazy\ndog\nIt does!\n"
"Line not broken correctly" "Line not broken correctly"
} }
test "wraps long line without a space" { test "wraps long line without a space" {
let testString = "Asamatteroffact, the dog does too" let testString = "Asamatteroffact, the dog does too"
Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n" Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n"
"Longer line not broken correctly" "Longer line not broken correctly"
} }
test "preserves blank lines" { test "preserves blank lines" {
let testString = "Here is\n\na string with blank lines" let testString = "Here is\n\na string with blank lines"
Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved" Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
} }
] ]
[<Tests>] [<Tests>]
let wordWrapBTests = let wordWrapBTests =
testList "wordWrapB" [ testList "wordWrapB" [
test "breaks where it is supposed to" { test "breaks where it is supposed to" {
let testString = "The quick brown fox jumps over the lazy dog\nIt does!" 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" Expect.equal (wordWrap 20 testString) "The quick brown fox\njumps over the lazy\ndog\nIt does!\n"
"Line not broken correctly" "Line not broken correctly"
} }
test "wraps long line without a space and a line with exact length" { test "wraps long line without a space and a line with exact length" {
let testString = "Asamatteroffact, the dog does too" let testString = "Asamatteroffact, the dog does too"
Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n" Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n"
"Longer line not broken correctly" "Longer line not broken correctly"
} }
test "wraps long line without a space and a line with non-exact length" { test "wraps long line without a space and a line with non-exact length" {
let testString = "Asamatteroffact, that dog does too" let testString = "Asamatteroffact, that dog does too"
Expect.equal (wordWrap 10 testString) "Asamattero\nffact,\nthat dog\ndoes too\n" Expect.equal (wordWrap 10 testString) "Asamattero\nffact,\nthat dog\ndoes too\n"
"Longer line not broken correctly" "Longer line not broken correctly"
} }
test "preserves blank lines" { test "preserves blank lines" {
let testString = "Here is\n\na string with blank lines" let testString = "Here is\n\na string with blank lines"
Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved" Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
} }
] ]

1266
src/PrayerTracker.Tests/UI/ViewModelsTests.fs
View File

File diff suppressed because it is too large Load Diff

199
src/PrayerTracker.UI/Church.fs
View File

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

248
src/PrayerTracker.UI/CommonFunctions.fs
View File

@ -1,24 +1,26 @@
[<AutoOpen>] [<AutoOpen>]
module PrayerTracker.Views.CommonFunctions module PrayerTracker.Views.CommonFunctions
open System.IO
open System.Text.Encodings.Web
open Giraffe open Giraffe
open Giraffe.ViewEngine open Giraffe.ViewEngine
open Microsoft.AspNetCore.Antiforgery open Microsoft.AspNetCore.Antiforgery
open Microsoft.AspNetCore.Html
open Microsoft.AspNetCore.Http open Microsoft.AspNetCore.Http
open Microsoft.AspNetCore.Mvc.Localization open Microsoft.AspNetCore.Mvc.Localization
open Microsoft.Extensions.Localization open Microsoft.Extensions.Localization
open System
open System.IO
open System.Text.Encodings.Web
/// Encoded text for a localized string /// Encoded text for a localized string
let locStr (text : LocalizedString) = str text.Value let locStr (text : LocalizedString) = str text.Value
/// Raw text for a localized HTML string /// Raw text for a localized HTML string
let rawLocText (writer : StringWriter) (text : LocalizedHtmlString) = let rawLocText (writer : StringWriter) (text : LocalizedHtmlString) =
text.WriteTo (writer, HtmlEncoder.Default) text.WriteTo (writer, HtmlEncoder.Default)
let txt = string writer let txt = string writer
writer.GetStringBuilder().Clear () |> ignore writer.GetStringBuilder().Clear () |> ignore
rawText txt rawText txt
/// A space (used for back-to-back localization string breaks) /// A space (used for back-to-back localization string breaks)
let space = rawText " " let space = rawText " "
@ -27,153 +29,106 @@ let space = rawText " "
let icon name = i [ _class "material-icons" ] [ rawText name ] let icon name = i [ _class "material-icons" ] [ rawText name ]
/// Generate a Material Design icon, specifying the point size (must be defined in CSS) /// Generate a Material Design icon, specifying the point size (must be defined in CSS)
let iconSized size name = i [ _class $"material-icons md-%i{size}" ] [ rawText name ] let iconSized size name = i [ _class $"material-icons md-{size}" ] [ rawText name ]
/// Generate a CSRF prevention token /// Generate a CSRF prevention token
let csrfToken (ctx : HttpContext) = let csrfToken (ctx : HttpContext) =
let antiForgery = ctx.GetService<IAntiforgery> () let antiForgery = ctx.GetService<IAntiforgery> ()
let tokenSet = antiForgery.GetAndStoreTokens ctx let tokenSet = antiForgery.GetAndStoreTokens ctx
input [ _type "hidden"; _name tokenSet.FormFieldName; _value tokenSet.RequestToken ] input [ _type "hidden"; _name tokenSet.FormFieldName; _value tokenSet.RequestToken ]
/// Create a summary for a table of items /// Create a summary for a table of items
let tableSummary itemCount (s : IStringLocalizer) = let tableSummary itemCount (s : IStringLocalizer) =
div [ _class "pt-center-text" ] [ div [ _class "pt-center-text" ] [
small [] [ small [] [
match itemCount with match itemCount with
| 0 -> s["No Entries to Display"] | 0 -> s.["No Entries to Display"]
| 1 -> s["Displaying {0} Entry", itemCount] | 1 -> s.["Displaying {0} Entry", itemCount]
| _ -> s["Displaying {0} Entries", itemCount] | _ -> s.["Displaying {0} Entries", itemCount]
|> locStr |> locStr
] ]
] ]
/// Generate a list of named HTML colors /// Generate a list of named HTML colors
let namedColorList name selected attrs (s : IStringLocalizer) = 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 { seq {
("aqua", s["Aqua"], "black") ("aqua", s.["Aqua"], "black")
("black", s["Black"], "white") ("black", s.["Black"], "white")
("blue", s["Blue"], "white") ("blue", s.["Blue"], "white")
("fuchsia", s["Fuchsia"], "black") ("fuchsia", s.["Fuchsia"], "black")
("gray", s["Gray"], "white") ("gray", s.["Gray"], "white")
("green", s["Green"], "white") ("green", s.["Green"], "white")
("lime", s["Lime"], "black") ("lime", s.["Lime"], "black")
("maroon", s["Maroon"], "white") ("maroon", s.["Maroon"], "white")
("navy", s["Navy"], "white") ("navy", s.["Navy"], "white")
("olive", s["Olive"], "white") ("olive", s.["Olive"], "white")
("purple", s["Purple"], "white") ("purple", s.["Purple"], "white")
("red", s["Red"], "black") ("red", s.["Red"], "black")
("silver", s["Silver"], "black") ("silver", s.["Silver"], "black")
("teal", s["Teal"], "white") ("teal", s.["Teal"], "white")
("white", s["White"], "black") ("white", s.["White"], "black")
("yellow", s["Yellow"], "black") ("yellow", s.["Yellow"], "black")
} }
|> Seq.map (fun color -> |> Seq.map (fun color ->
let colorName, text, txtColor = color let (colorName, dispText, txtColor) = color
option option [ yield _value colorName
[ _value colorName yield _style $"background-color:{colorName};color:{txtColor};"
_style $"background-color:{colorName};color:{txtColor};" match colorName = selected with true -> yield _selected | false -> () ] [
if colorName = selected then _selected encodedText (dispText.Value.ToLower ())
] [ encodedText (text.Value.ToLower ()) ]) ])
|> List.ofSeq |> List.ofSeq
|> select (_name name :: attrs) |> 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 /// Generate an input[type=radio] that is selected if its value is the current value
let radio name domId value current = let radio name domId value current =
input [ _type "radio" input [ _type "radio"
_name name _name name
if domId <> "" then _id domId _id domId
_value value _value value
if value = current then _checked ] match value = current with true -> _checked | false -> () ]
/// Generate a select list with the current value selected /// Generate a select list with the current value selected
let selectList name selected attrs items = let selectList name selected attrs items =
items items
|> Seq.map (fun (value, text) -> |> Seq.map (fun (value, text) ->
option option [ _value value
[ _value value match value = selected with true -> _selected | false -> () ] [ encodedText text ])
if value = selected then _selected |> List.ofSeq
] [ encodedText text ]) |> select (List.concat [ [ _name name; _id name ]; attrs ])
|> List.ofSeq
|> select (List.concat [ [ _name name; _id name ]; attrs ])
/// Generate the text for a default entry at the top of a select list /// Generate the text for a default entry at the top of a select list
let selectDefault text = $"— %s{text} —" let selectDefault text = $"— {text} —"
/// Generate a standard submit button with icon and text /// Generate a standard submit button with icon and text
let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText " &nbsp;"; locStr text ] let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText " &nbsp;"; locStr text ]
/// Create an HTML onsubmit event handler /// Format a GUID with no dashes (used for URLs and forms)
let flatGuid (x : Guid) = x.ToString "N"
/// An empty GUID string (used for "add" actions)
let emptyGuid = flatGuid Guid.Empty
/// blockquote tag
let blockquote = tag "blockquote"
/// role attribute
let _role = attr "role"
/// aria-* attribute
let _aria typ = attr $"aria-{typ}"
/// onclick attribute
let _onclick = attr "onclick"
/// onsubmit attribute
let _onsubmit = attr "onsubmit" let _onsubmit = attr "onsubmit"
/// A "rel='noopener'" attribute /// scoped flag (used for <style> tag)
let _relNoOpener = _rel "noopener" let _scoped = flag "scoped"
/// 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 /// The name this function used to have when the view engine was part of Giraffe
let renderHtmlNode = RenderView.AsString.htmlNode let renderHtmlNode = RenderView.AsString.htmlNode
open Microsoft.AspNetCore.Html
/// Render an HTML node, then return the value as an HTML string /// Render an HTML node, then return the value as an HTML string
let renderHtmlString = renderHtmlNode >> HtmlString let renderHtmlString = renderHtmlNode >> HtmlString
@ -181,37 +136,20 @@ let renderHtmlString = renderHtmlNode >> HtmlString
/// Utility methods to help with time zones (and localization of their names) /// Utility methods to help with time zones (and localization of their names)
module TimeZones = module TimeZones =
open PrayerTracker.Entities open System.Collections.Generic
/// Cross-reference between time zone Ids and their English names /// Cross-reference between time zone Ids and their English names
let private xref = [ let private xref =
TimeZoneId "America/Chicago", "Central" [ "America/Chicago", "Central"
TimeZoneId "America/Denver", "Mountain" "America/Denver", "Mountain"
TimeZoneId "America/Los_Angeles", "Pacific" "America/Los_Angeles", "Pacific"
TimeZoneId "America/New_York", "Eastern" "America/New_York", "Eastern"
TimeZoneId "America/Phoenix", "Mountain (Arizona)" "America/Phoenix", "Mountain (Arizona)"
TimeZoneId "Europe/Berlin", "Central European" "Europe/Berlin", "Central European"
] ]
|> Map.ofList
/// Get the name of a time zone, given its Id /// Get the name of a time zone, given its Id
let name timeZoneId (s : IStringLocalizer) = let name tzId (s : IStringLocalizer) =
match xref |> List.tryFind (fun it -> fst it = timeZoneId) with try s.[xref.[tzId]]
| Some tz -> s[snd tz] with :? KeyNotFoundException -> LocalizedString (tzId, tzId)
| 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"

300
src/PrayerTracker.UI/Help.fs
View File

@ -1,300 +0,0 @@
/// Help content for PrayerTracker
module PrayerTracker.Views.Help
open System.IO
open Giraffe.ViewEngine
open PrayerTracker.ViewModels
/// The help index page
let index () =
let s = I18N.localizer.Force()
let l = I18N.forView "Help/Index"
use sw = new StringWriter()
let raw = rawLocText sw
[ p [] [
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 [] [ 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"] ] ] ]
/// 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 allows you to enter or update a new prayer request."] ]
h2 [ _id "request-type" ] [ locStr s["Request Type"] ]
p [] [
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."]
]
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."] ] ]
/// Maintain Requests
let maintain () =
let s = I18N.localizer.Force()
let l = I18N.forView "Help/Requests/Maintain"
use sw = new StringWriter()
let raw = rawLocText sw
[ p [] [
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 [] [
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 [] [
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 [] [
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 [] [
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 [] [
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 Request List
let view () =
let s = I18N.localizer.Force()
let l = I18N.forView "Help/Requests/View"
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.)"] ]
h2 [ _id "list-for-next-sunday" ] [ locStr s["List for Next Sunday"] ]
p [] [
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 [] [
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 [] [
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."] ] ] ]

455
src/PrayerTracker.UI/Home.fs
View File

@ -1,259 +1,262 @@
/// Views associated with the home page, or those that don't fit anywhere else /// Views associated with the home page, or those that don't fit anywhere else
module PrayerTracker.Views.Home module PrayerTracker.Views.Home
open System.IO
open Giraffe.ViewEngine open Giraffe.ViewEngine
open Microsoft.AspNetCore.Html
open PrayerTracker.ViewModels open PrayerTracker.ViewModels
open System.IO
/// The error page /// The error page
let error code viewInfo = let error code vi =
let s = I18N.localizer.Force () let s = I18N.localizer.Force ()
let l = I18N.forView "Home/Error" let l = I18N.forView "Home/Error"
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw let raw = rawLocText sw
let is404 = "404" = code let is404 = "404" = code
let pageTitle = if is404 then "Page Not Found" else "Server Error" let pageTitle = match is404 with true -> "Page Not Found" | false -> "Server Error"
[ yield! [ yield!
if is404 then match is404 with
[ p [] [ | true ->
raw l["The page you requested cannot be found."] [ p [] [
raw l["Please use your &ldquo;Back&rdquo; button to return to {0}.", s["PrayerTracker"]] raw l.["The page you requested cannot be found."]
] raw l.["Please use your &ldquo;Back&rdquo; 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).", p [] [
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"]]
] ]
else ]
[ p [] [ | false ->
raw l["An error ({0}) has occurred.", code] [ p [] [
raw l["Please use your &ldquo;Back&rdquo; button to return to {0}.", s["PrayerTracker"]] raw l.["An error ({0}) has occurred.", code]
] raw l.["Please use your &ldquo;Back&rdquo; button to return to {0}.", s.["PrayerTracker"]]
] ]
br [] ]
hr [] br []
div [ _style "font-size:70%;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',sans-serif" ] [ hr []
img [ _src $"""/img/%A{s["footer_en"]}.png""" div [ _style "font-size:70%;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',sans-serif" ] [
_alt $"""%A{s["PrayerTracker"]} %A{s["from Bit Badger Solutions"]}""" img [ _src $"""/img/%A{s.["footer_en"]}.png"""
_title $"""%A{s["PrayerTracker"]} %A{s["from Bit Badger Solutions"]}""" _alt $"""%A{s.["PrayerTracker"]} %A{s.["from Bit Badger Solutions"]}"""
_style "vertical-align:text-bottom;" ] _title $"""%A{s.["PrayerTracker"]} %A{s.["from Bit Badger Solutions"]}"""
str viewInfo.Version _style "vertical-align:text-bottom;" ]
] str vi.version
]
] ]
|> div [] |> div []
|> Layout.bare pageTitle |> Layout.bare pageTitle
/// The home page /// The home page
let index viewInfo = let index vi =
let s = I18N.localizer.Force () let s = I18N.localizer.Force ()
let l = I18N.forView "Home/Index" let l = I18N.forView "Home/Index"
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw let raw = rawLocText sw
[ p [] [
raw l["Welcome to <strong>{0}</strong>!", s["PrayerTracker"]] [ p [] [
space raw l.["Welcome to <strong>{0}</strong>!", 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.", space
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.",
space s.["PrayerTracker"]]
raw l["It is provided at no charge, as a ministry and a community service."] space
raw l.["It is provided at no charge, as a ministry and a community service."]
]
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"]]
space
raw l.["Some of the things it can do..."]
]
ul [] [
li [] [
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"]]
space
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.)"]
] ]
h4 [] [ raw l["What Does It Do?"] ] li [] [
p [] [ raw l.["Requests can be viewed any time."]
raw l["{0} has what you need to make maintaining a prayer request list a breeze.", s["PrayerTracker"]] space
space raw l.["Lists can be made public, or they can be secured with a password, if desired."]
raw l["Some of the things it can do..."]
] ]
ul [] [ li [] [
li [] [ raw l.["Lists can be e-mailed to a pre-defined list of members."]
raw l["It drops old requests off the list automatically."] space
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["Requests other than “{0}” requests will expire at 14 days, though this can be changed by the organization.", space
s["Long-Term Requests"]] 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."]
space
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.)"]
]
li [] [
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."]
]
li [] [
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."]
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."]
]
li [] [
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."]
space
raw l["This allows for configuration of large-print lists, among other things."]
]
] ]
h4 [] [ raw l["How Can Your Organization Use {0}?", s["PrayerTracker"]] ] li [] [
p [] [ raw l.["The look and feel of the list can be configured for each group."]
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.", space
s["PrayerTracker"]] raw l.["All fonts, colors, and sizes can be customized."]
space 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.", raw l.["This allows for configuration of large-print lists, among other things."]
s["PrayerTracker"]]
]
h4 [] [ raw l["Do I Have to Register to See the Requests?"] ]
p [] [
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."]
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"]]
]
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"]]
] ]
]
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"]]
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"]]
]
h4 [] [ raw l.["Do I Have to Register to See the Requests?"] ]
p [] [
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."]
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"]]
]
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"]]
]
] ]
|> Layout.Content.standard |> Layout.Content.standard
|> Layout.standard viewInfo "Welcome!" |> Layout.standard vi "Welcome!"
/// Privacy Policy page /// Privacy Policy page
let privacyPolicy viewInfo = let privacyPolicy vi =
let s = I18N.localizer.Force () let s = I18N.localizer.Force ()
let l = I18N.forView "Home/PrivacyPolicy" let l = I18N.forView "Home/PrivacyPolicy"
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw let raw = rawLocText sw
[ p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l["(as of July 31, 2018)"] ] ] ]
p [] [ [ p [ _class "pt-right-text" ] [ small[] [ em [] [ raw l.["(as of July 31, 2018)"] ] ] ]
raw l["The nature of the service is one where privacy is a must."] p [] [
space raw l.["The nature of the service is one where privacy is a must."]
raw l["The items below will help you understand the data we collect, access, and store on your behalf as you use this service."] 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."]
]
h3 [] [ raw l.["What We Collect"] ]
ul [] [
li [] [
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"]]
space
raw l.["Users are also associated with one or more small groups."]
] ]
h3 [] [ raw l["What We Collect"] ] li [] [
ul [] [ strong [] [ raw l.["User Provided Data"] ]
li [] [ rawText " &ndash; "
strong [] [ raw l["Identifying Data"] ] raw l.["{0} stores the text of prayer requests.", s.["PrayerTracker"]]
rawText " &ndash; " space
raw l["{0} stores the first and last names, e-mail addresses, and hashed passwords of all authorized users.", 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."]
s["PrayerTracker"]]
space
raw l["Users are also associated with one or more small groups."]
]
li [] [
strong [] [ raw l["User Provided Data"] ]
rawText " &ndash; "
raw l["{0} stores the text of prayer requests.", s["PrayerTracker"]]
space
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"] ] ]
ul [] [ h3 [] [ raw l.["How Your Data Is Accessed / Secured"] ]
li [] [ ul [] [
raw l["While you are signed in, {0} utilizes a session cookie, and transmits that cookie to the server to establish your identity.", li [] [
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.",
space s.["PrayerTracker"]]
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.", space
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.",
space s.["Remember Me"], s.["Log Off"]]
raw l["Both of these cookies are encrypted, both in your browser and in transit."] space
space raw l.["Both of these cookies are encrypted, both in your browser and in transit."]
raw l["Finally, a third cookie is used to maintain your currently selected language, so that this selection is maintained across browser sessions."] space
] 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."]
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"]]
space
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."]
]
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."]
space
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."]
]
] ]
h3 [] [ raw l["Removing Your Data"] ] li [] [
p [] [ raw l.["Data for your small group is returned to you, as required, to display and edit."]
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.", space
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."]
space
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."]
space
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."]
]
]
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"]]
]
] ]
|> Layout.Content.standard |> Layout.Content.standard
|> Layout.standard viewInfo "Privacy Policy" |> Layout.standard vi "Privacy Policy"
/// Terms of Service page /// Terms of Service page
let termsOfService viewInfo = let termsOfService vi =
let s = I18N.localizer.Force () let s = I18N.localizer.Force ()
let l = I18N.forView "Home/TermsOfService" let l = I18N.forView "Home/TermsOfService"
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw let raw = rawLocText sw
let ppLink = let ppLink =
a [ _href "/legal/privacy-policy" ] [ str (s["Privacy Policy"].Value.ToLower ()) ] a [ _href "/web/legal/privacy-policy" ] [ str (s.["Privacy Policy"].Value.ToLower ()) ]
|> renderHtmlString |> renderHtmlString
[ p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l["(as of May 24, 2018)"] ] ] ] [ p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l.["(as of May 24, 2018)"] ] ] ]
h3 [] [ str "1. "; raw l["Acceptance of Terms"] ] h3 [] [ str "1. "; raw l.["Acceptance of Terms"] ]
p [] [ 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 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 [] [ str "2. "; raw l["Description of Service and Registration"] ] h3 [] [ str "2. "; raw l.["Description of Service and Registration"] ]
p [] [ p [] [
raw l["{0} is a service that allows individuals to enter and amend prayer requests on behalf of organizations.", raw l.["{0} is a service that allows individuals to enter and amend prayer requests on behalf of organizations.",
s["PrayerTracker"]] s.["PrayerTracker"]]
space 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 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 [] [ str "3. "; raw l["Liability"] ] h3 [] [ str "3. "; raw l.["Liability"] ]
p [] [ 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 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 [] [ str "4. "; raw l["Updates to Terms"] ] h3 [] [ str "4. "; raw l.["Updates to Terms"] ]
p [] [ 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 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 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 [] 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.Content.standard
|> Layout.standard viewInfo "Terms of Service" |> Layout.standard vi "Terms of Service"
/// View for unauthorized page /// View for unauthorized page
let unauthorized viewInfo = let unauthorized vi =
let s = I18N.localizer.Force () let s = I18N.localizer.Force ()
let l = I18N.forView "Home/Unauthorized" let l = I18N.forView "Home/Unauthorized"
use sw = new StringWriter () use sw = new StringWriter ()
let raw = rawLocText sw let raw = rawLocText sw
[ p [] [ [ 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.).", 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"]] s.["PrayerTracker"]]
] ]
p [] [ p [] [
raw l["Otherwise, you may select one of the links above to get back into an authorized portion of {0}.", raw l.["Otherwise, you may select one of the links above to get back into an authorized portion of {0}.",
s["PrayerTracker"]] s.["PrayerTracker"]]
] ]
] ]
|> Layout.Content.standard |> Layout.Content.standard
|> Layout.standard viewInfo "Unauthorized Access" |> Layout.standard vi "Unauthorized Access"

6
src/PrayerTracker.UI/I18N.fs
View File

@ -11,12 +11,12 @@ let private resAsmName = typeof<Common>.Assembly.GetName().Name
/// Set up the string and HTML localizer factories /// Set up the string and HTML localizer factories
let setUpFactories fac = let setUpFactories fac =
stringLocFactory <- fac stringLocFactory <- fac
htmlLocFactory <- HtmlLocalizerFactory stringLocFactory htmlLocFactory <- HtmlLocalizerFactory stringLocFactory
/// An instance of the common string localizer /// An instance of the common string localizer
let localizer = lazy (stringLocFactory.Create ("Common", resAsmName)) let localizer = lazy (stringLocFactory.Create ("Common", resAsmName))
/// Get a view localizer /// Get a view localizer
let forView (view : string) = let forView (view : string) =
htmlLocFactory.Create ($"Views.{view.Replace ('/', '.')}", resAsmName) htmlLocFactory.Create ($"""Views.{view.Replace ('/', '.')}""", resAsmName)

558
src/PrayerTracker.UI/Layout.fs
View File

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

637
src/PrayerTracker.UI/PrayerRequest.fs
View File

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

39
src/PrayerTracker.UI/PrayerTracker.UI.fsproj
View File

@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Utils.fs" /> <Compile Include="Utils.fs" />
<Compile Include="ViewModels.fs" /> <Compile Include="ViewModels.fs" />
@ -7,7 +11,6 @@
<Compile Include="CommonFunctions.fs" /> <Compile Include="CommonFunctions.fs" />
<Compile Include="Layout.fs" /> <Compile Include="Layout.fs" />
<Compile Include="Church.fs" /> <Compile Include="Church.fs" />
<Compile Include="Help.fs" />
<Compile Include="Home.fs" /> <Compile Include="Home.fs" />
<Compile Include="PrayerRequest.fs" /> <Compile Include="PrayerRequest.fs" />
<Compile Include="SmallGroup.fs" /> <Compile Include="SmallGroup.fs" />
@ -15,15 +18,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Giraffe" Version="5.0.0" />
<PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" /> <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
<PackageReference Include="Giraffe.ViewEngine.Htmx" Version="2.0.0" /> <PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.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" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -34,33 +36,6 @@
<EmbeddedResource Update="Resources\Common.es.resx"> <EmbeddedResource Update="Resources\Common.es.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Update="Resources\Help\Index.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\Requests\Edit.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\Requests\Maintain.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\Requests\View.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\SmallGroup\Announcement.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\SmallGroup\Members.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\SmallGroup\Preferences.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\User\LogOn.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Help\User\Password.es.resx">
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Views\Home\Error.es.resx"> <EmbeddedResource Update="Resources\Views\Home\Error.es.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource> </EmbeddedResource>

106
src/PrayerTracker.UI/Resources/Common.es.resx
View File

@ -396,8 +396,8 @@
<data name="The group member “{0}” was deleted successfully" xml:space="preserve"> <data name="The group member “{0}” was deleted successfully" xml:space="preserve">
<value>El miembro del grupo “{0}” se eliminó con éxito</value> <value>El miembro del grupo “{0}” se eliminó con éxito</value>
</data> </data>
<data name="The group “{0}” and its {1} prayer request(s) were deleted successfully; revoked access from {2} user(s)" xml:space="preserve"> <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> <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>
<data name="The old password was incorrect - your password was NOT changed" xml:space="preserve"> <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> <value>La contraseña antigua es incorrecta - la contraseña NO ha cambiado</value>
@ -417,8 +417,8 @@
<data name="There are no classes with passwords defined" xml:space="preserve"> <data name="There are no classes with passwords defined" xml:space="preserve">
<value>No hay clases con contraseñas se define</value> <value>No hay clases con contraseñas se define</value>
</data> </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 selected group.&lt;/li&gt;&lt;/ul&gt;" xml:space="preserve"> <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 seleccionado.&lt;/li&gt;&lt;/ul&gt;</value> <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> </data>
<data name="This page loaded in {0:N3} seconds" xml:space="preserve"> <data name="This page loaded in {0:N3} seconds" xml:space="preserve">
<value>Esta página cargada en {0:N3} segundos</value> <value>Esta página cargada en {0:N3} segundos</value>
@ -742,7 +742,7 @@
<value>Este</value> <value>Este</value>
</data> </data>
<data name="MMMM d, yyyy" xml:space="preserve"> <data name="MMMM d, yyyy" xml:space="preserve">
<value>d \d\e MMMM yyyy</value> <value>d \de MMMM yyyy</value>
</data> </data>
<data name="Mountain" xml:space="preserve"> <data name="Mountain" xml:space="preserve">
<value>Montaña</value> <value>Montaña</value>
@ -822,100 +822,4 @@
<data name="as of" xml:space="preserve"> <data name="as of" xml:space="preserve">
<value>como de</value> <value>como de</value>
</data> </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> </root>

70
src/PrayerTracker.UI/Resources/Views/Help/Index.es.resx
View File

@ -1,70 +0,0 @@
<?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="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 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>

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

@ -1,133 +0,0 @@
<?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 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="There are 5 request types in PrayerTracker." xml:space="preserve">
<value>Hay 5 tipos de peticiones en SeguidorOración.</value>
</data>
<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="“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="“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="“Expecting” is for those who are pregnant." xml:space="preserve">
<value>“Embarazada” es para aquellos que están embarazadas.</value>
</data>
<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="“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="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="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>

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

@ -1,112 +0,0 @@
<?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 your current requests." xml:space="preserve">
<value>Desde esta página, usted puede agregar, editar y borrar sus peticiones actuales.</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>

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

@ -1,94 +0,0 @@
<?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 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="(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="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="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>
</data>
</root>

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

@ -1,73 +0,0 @@
<?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>

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

@ -1,82 +0,0 @@
<?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>

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

@ -1,205 +0,0 @@
<?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>

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

@ -1,79 +0,0 @@
<?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 log on to PrayerTracker." xml:space="preserve">
<value>Esta página le permite acceder a SeguidorOración.</value>
</data>
<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="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>

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

@ -1,79 +0,0 @@
<?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 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 “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="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>

2
src/PrayerTracker.UI/Resources/Views/Home/PrivacyPolicy.es.resx
View File

@ -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"> <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> <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>
<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"> <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">
<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> <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>
<data name="On the server, all data is stored in a controlled-access database." xml:space="preserve"> <data name="On the server, all data is stored in a controlled-access database." xml:space="preserve">

12
src/PrayerTracker.UI/Resources/Views/SmallGroup/Preferences.es.resx
View File

@ -117,16 +117,16 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<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"> <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>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> <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> </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"> <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> <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>
<data name="Native fonts match the default font based on the user's device (computer, phone, tablet, etc.)." xml:space="preserve"> <data name="List font names, separated by commas." xml:space="preserve">
<value>Las fuentes nativas coinciden con la fuente predeterminada según el dispositivo del usuario (computadora, teléfono, tableta, etc.).</value> <value>Lista de nombres de fuentes separados por comas.</value>
</data> </data>
<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"> <data name="The first font that is matched is the one that is used." 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> <value>La primera fuente que se corresponde es el que se utiliza.</value>
</data> </data>
</root> </root>

1046
src/PrayerTracker.UI/SmallGroup.fs
View File

File diff suppressed because it is too large Load Diff

405
src/PrayerTracker.UI/User.fs
View File

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

294
src/PrayerTracker.UI/Utils.fs
View File

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

1289
src/PrayerTracker.UI/ViewModels.fs
View File

File diff suppressed because it is too large Load Diff

5
src/PrayerTracker.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 16
VisualStudioVersion = 17.2.32630.192 VisualStudioVersion = 16.0.29411.108
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}" Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}"
EndProject EndProject
@ -14,6 +14,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B290BA27-C8B8-44F3-BF01-D103302D815F}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B290BA27-C8B8-44F3-BF01-D103302D815F}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
global.json = global.json
EndProjectSection EndProjectSection
EndProject EndProject
Global Global

389
src/PrayerTracker/App.fs
View File

@ -1,236 +1,201 @@
namespace PrayerTracker 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.Builder
open Microsoft.AspNetCore.Hosting open Microsoft.AspNetCore.Hosting
open Microsoft.Extensions.Configuration
/// Module to hold configuration for the web app /// Module to hold configuration for the web app
[<RequireQualifiedAccess>] [<RequireQualifiedAccess>]
module Configure = module Configure =
/// Set up the configuration for the app open Cookies
let configuration (ctx: WebHostBuilderContext) (cfg: IConfigurationBuilder) = open Giraffe
cfg.SetBasePath(ctx.HostingEnvironment.ContentRootPath) open Giraffe.EndpointRouting
.AddJsonFile("appsettings.json", optional = true, reloadOnChange = true) open Microsoft.AspNetCore.Localization
.AddJsonFile($"appsettings.{ctx.HostingEnvironment.EnvironmentName}.json", optional = true) open Microsoft.AspNetCore.Server.Kestrel.Core
.AddEnvironmentVariables() open Microsoft.EntityFrameworkCore
|> ignore open Microsoft.Extensions.Configuration
open Microsoft.Extensions.DependencyInjection
open Microsoft.Extensions.Hosting
open Microsoft.Extensions.Localization
open Microsoft.Extensions.Logging
open Microsoft.Extensions.Options
open NodaTime
open System.Globalization
open Microsoft.AspNetCore.Server.Kestrel.Core /// Set up the configuration for the app
let configuration (ctx : WebHostBuilderContext) (cfg : IConfigurationBuilder) =
cfg.SetBasePath(ctx.HostingEnvironment.ContentRootPath)
.AddJsonFile("appsettings.json", optional = true, reloadOnChange = true)
.AddJsonFile($"appsettings.{ctx.HostingEnvironment.EnvironmentName}.json", optional = true)
.AddEnvironmentVariables()
|> ignore
/// Configure Kestrel from appsettings.json /// Configure Kestrel from appsettings.json
let kestrel (ctx: WebHostBuilderContext) (opts: KestrelServerOptions) = let kestrel (ctx : WebHostBuilderContext) (opts : KestrelServerOptions) =
(ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel" (ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel"
open System.Globalization let services (svc : IServiceCollection) =
open BitBadger.Documents.Postgres svc.AddOptions()
open Microsoft.AspNetCore.Authentication.Cookies .AddLocalization(fun options -> options.ResourcesPath <- "Resources")
open Microsoft.AspNetCore.Localization .Configure<RequestLocalizationOptions>(
open Microsoft.Extensions.Caching.Distributed fun (opts : RequestLocalizationOptions) ->
open Microsoft.Extensions.DependencyInjection let supportedCultures =
open NodaTime [| CultureInfo "en-US"; CultureInfo "en-GB"; CultureInfo "en-AU"; CultureInfo "en"
open Npgsql CultureInfo "es-MX"; CultureInfo "es-ES"; CultureInfo "es"
open PrayerTracker.Data |]
opts.DefaultRequestCulture <- RequestCulture ("en-US", "en-US")
opts.SupportedCultures <- supportedCultures
opts.SupportedUICultures <- supportedCultures)
.AddDistributedMemoryCache()
.AddSession()
.AddAntiforgery()
.AddRouting()
.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),
ServiceLifetime.Scoped, ServiceLifetime.Singleton)
|> ignore
/// Configure ASP.NET Core's service collection (dependency injection container) /// Routes for PrayerTracker
let services (svc : IServiceCollection) = let routes =
let _ = svc.AddOptions() [ subRoute "/web" [
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)
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 routes = [
route "/web/{**path}" noWeb
GET_HEAD [ GET_HEAD [
subRoute "/church" [ subRoute "/church" [
route "es" Handlers.Church.maintain 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 route "/class/logon" (redirectTo true "/web/small-group/log-on")
subRoute "/help" [ routef "/error/%s" Handlers.Home.error
route "" Handlers.Help.index routef "/language/%s" Handlers.Home.language
subRoute "/requests" [ subRoute "/legal" [
route "/edit" Handlers.Help.Requests.edit route "/privacy-policy" Handlers.Home.privacyPolicy
route "/maintain" Handlers.Help.Requests.maintain route "/terms-of-service" Handlers.Home.tos
route "/view" Handlers.Help.Requests.view ] ]
subRoute "/small-group" [ route "/log-off" Handlers.Home.logOff
route "/announcement" Handlers.Help.SmallGroup.announcement subRoute "/prayer-request" [
route "/members" Handlers.Help.SmallGroup.members route "s" (Handlers.PrayerRequest.maintain true)
route "/preferences" Handlers.Help.SmallGroup.preferences ] routef "s/email/%s" Handlers.PrayerRequest.email
subRoute "/user" [ route "s/inactive" (Handlers.PrayerRequest.maintain false)
route "/log-on" Handlers.Help.User.logOn route "s/lists" Handlers.PrayerRequest.lists
route "/password" Handlers.Help.User.password ] ] routef "s/%O/list" Handlers.PrayerRequest.list
routef "/language/%s" Handlers.Home.language route "s/maintain" (redirectTo true "/web/prayer-requests")
subRoute "/legal" [ routef "s/print/%s" Handlers.PrayerRequest.print
route "/privacy-policy" Handlers.Home.privacyPolicy route "s/view" (Handlers.PrayerRequest.view None)
route "/terms-of-service" Handlers.Home.tos ] routef "s/view/%s" (Some >> Handlers.PrayerRequest.view)
route "/log-off" Handlers.Home.logOff routef "/%O/edit" Handlers.PrayerRequest.edit
subRoute "/prayer-request" [ routef "/%O/expire" Handlers.PrayerRequest.expire
route "s" (Handlers.PrayerRequest.maintain true) routef "/%O/restore" Handlers.PrayerRequest.restore
routef "s/email/%s" Handlers.PrayerRequest.email ]
route "s/inactive" (Handlers.PrayerRequest.maintain false) subRoute "/small-group" [
route "s/lists" Handlers.PrayerRequest.lists route "" Handlers.SmallGroup.overview
routef "s/%O/list" Handlers.PrayerRequest.list route "s" Handlers.SmallGroup.maintain
route "s/maintain" (redirectTo true "/prayer-requests") route "/announcement" Handlers.SmallGroup.announcement
routef "s/print/%s" Handlers.PrayerRequest.print routef "/%O/edit" Handlers.SmallGroup.edit
route "s/view" (Handlers.PrayerRequest.view None) route "/log-on" (Handlers.SmallGroup.logOn None)
routef "s/view/%s" (Some >> Handlers.PrayerRequest.view) routef "/log-on/%O" (Some >> Handlers.SmallGroup.logOn)
routef "/%O/edit" Handlers.PrayerRequest.edit route "/logon" (redirectTo true "/web/small-group/log-on")
routef "/%O/expire" Handlers.PrayerRequest.expire routef "/member/%O/edit" Handlers.SmallGroup.editMember
routef "/%O/restore" Handlers.PrayerRequest.restore ] route "/members" Handlers.SmallGroup.members
subRoute "/small-group" [ route "/preferences" Handlers.SmallGroup.preferences
route "" Handlers.SmallGroup.overview ]
route "s" Handlers.SmallGroup.maintain route "/unauthorized" Handlers.Home.unauthorized
route "/announcement" Handlers.SmallGroup.announcement subRoute "/user" [
routef "/%O/edit" Handlers.SmallGroup.edit route "s" Handlers.User.maintain
route "/log-on" (Handlers.SmallGroup.logOn None) routef "/%O/edit" Handlers.User.edit
routef "/log-on/%O" (Some >> Handlers.SmallGroup.logOn) routef "/%O/small-groups" Handlers.User.smallGroups
route "/logon" (redirectTo true "/small-group/log-on") route "/log-on" Handlers.User.logOn
routef "/member/%O/edit" Handlers.SmallGroup.editMember route "/logon" (redirectTo true "/web/user/log-on")
route "/members" Handlers.SmallGroup.members route "/password" Handlers.User.password
route "/preferences" Handlers.SmallGroup.preferences ] ]
route "/unauthorized" Handlers.Home.unauthorized route "/" Handlers.Home.homePage
subRoute "/user" [ ]
route "s" Handlers.User.maintain
routef "/%O/edit" Handlers.User.edit
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 ]
POST [ POST [
subRoute "/church" [ subRoute "/church" [
routef "/%O/delete" Handlers.Church.delete 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 subRoute "/prayer-request" [
route "/save" Handlers.PrayerRequest.save ] routef "/%O/delete" Handlers.PrayerRequest.delete
subRoute "/small-group" [ route "/save" Handlers.PrayerRequest.save
route "/announcement/send" Handlers.SmallGroup.sendAnnouncement ]
routef "/%O/delete" Handlers.SmallGroup.delete subRoute "/small-group" [
route "/log-on/submit" Handlers.SmallGroup.logOnSubmit route "/announcement/send" Handlers.SmallGroup.sendAnnouncement
routef "/member/%O/delete" Handlers.SmallGroup.deleteMember routef "/%O/delete" Handlers.SmallGroup.delete
route "/member/save" Handlers.SmallGroup.saveMember route "/log-on/submit" Handlers.SmallGroup.logOnSubmit
route "/preferences/save" Handlers.SmallGroup.savePreferences routef "/member/%O/delete" Handlers.SmallGroup.deleteMember
route "/save" Handlers.SmallGroup.save ] route "/member/save" Handlers.SmallGroup.saveMember
subRoute "/user" [ route "/preferences/save" Handlers.SmallGroup.savePreferences
routef "/%O/delete" Handlers.User.delete route "/save" Handlers.SmallGroup.save
route "/edit/save" Handlers.User.save ]
route "/log-on" Handlers.User.doLogOn subRoute "/user" [
route "/password/change" Handlers.User.changePassword routef "/%O/delete" Handlers.User.delete
route "/small-groups/save" Handlers.User.saveGroups ] ] ] 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
]
]
]
// Temp redirect to new URLs
route "/" (redirectTo false "/web/")
]
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
/// Giraffe error handler /// Configure logging
let errorHandler (ex: exn) (logger: ILogger) = let logging (log : ILoggingBuilder) =
logger.LogError(EventId(), ex, "An unhandled exception has occurred while executing the request.") let env = log.Services.BuildServiceProvider().GetService<IWebHostEnvironment> ()
clearResponse >=> setStatusCode 500 >=> text ex.Message match env.IsDevelopment () with
| true -> log
| false -> log.AddFilter (fun l -> l > LogLevel.Information)
|> function l -> l.AddConsole().AddDebug()
|> ignore
open Microsoft.Extensions.Hosting let app (app : IApplicationBuilder) =
let env = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>()
/// Configure logging (match env.IsDevelopment () with
let logging (log: ILoggingBuilder) = | true ->
let env = log.Services.BuildServiceProvider().GetService<IWebHostEnvironment>() app.UseDeveloperExceptionPage ()
if env.IsDevelopment() then log else log.AddFilter(fun l -> l > LogLevel.Information) | false ->
|> function l -> l.AddConsole().AddDebug() try
|> ignore use scope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope ()
scope.ServiceProvider.GetService<AppDbContext>().Database.Migrate ()
open BitBadger.AspNetCore.CanonicalDomains with _ -> () // om nom nom
open Microsoft.Extensions.Localization app.UseGiraffeErrorHandler errorHandler)
open Microsoft.Extensions.Options .UseStatusCodePagesWithReExecute("/error/{0}")
.UseStaticFiles()
/// Configure the application .UseRouting()
let app (app : IApplicationBuilder) = .UseSession()
let env = app.ApplicationServices.GetRequiredService<IWebHostEnvironment>() .UseRequestLocalization(app.ApplicationServices.GetService<IOptions<RequestLocalizationOptions>>().Value)
if env.IsDevelopment() then .UseEndpoints (fun e -> e.MapGiraffeEndpoints routes)
app.UseDeveloperExceptionPage() |> ignore
else Views.I18N.setUpFactories <| app.ApplicationServices.GetRequiredService<IStringLocalizerFactory> ()
app.UseGiraffeErrorHandler errorHandler
|> ignore
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 /// The web application
module App = module App =
open System.IO open System.IO
[<EntryPoint>] [<EntryPoint>]
let main args = let main _ =
let contentRoot = Directory.GetCurrentDirectory() let contentRoot = Directory.GetCurrentDirectory ()
let app = WebHostBuilder()
WebHostBuilder() .UseContentRoot(contentRoot)
.UseContentRoot(contentRoot) .ConfigureAppConfiguration(Configure.configuration)
.ConfigureAppConfiguration(Configure.configuration) .UseKestrel(Configure.kestrel)
.UseKestrel(Configure.kestrel) .UseWebRoot(Path.Combine (contentRoot, "wwwroot"))
.UseWebRoot(Path.Combine(contentRoot, "wwwroot")) .ConfigureServices(Configure.services)
.ConfigureServices(Configure.services) .ConfigureLogging(Configure.logging)
.ConfigureLogging(Configure.logging) .Configure(System.Action<IApplicationBuilder> Configure.app)
.Configure(System.Action<IApplicationBuilder> Configure.app) .Build()
.Build() .Run ()
if args.Length > 0 then printfn $"Unrecognized option {args[0]}" else app.Run() 0
0

128
src/PrayerTracker/Church.fs
View File

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

303
src/PrayerTracker/CommonFunctions.fs
View File

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

129
src/PrayerTracker/Cookies.fs Normal file
View File

@ -0,0 +1,129 @@
module PrayerTracker.Cookies
open Microsoft.AspNetCore.Http
open Newtonsoft.Json
open System
open System.Security.Cryptography
open System.IO
// fsharplint:disable MemberNames
/// 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 = Aes.Create ()
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 = Aes.Create ()
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 $"Prayer%A{c.Id}Tracker%A{c.GroupId}Idle%d{c.Until}Timeout"
/// Cookie options to push an expiration out by 100 days
let autoRefresh =
CookieOptions (Expires = Nullable<DateTimeOffset> (DateTimeOffset (DateTime.UtcNow.AddDays 100.)), HttpOnly = true)

152
src/PrayerTracker/Email.fs
View File

@ -2,114 +2,76 @@
module PrayerTracker.Email module PrayerTracker.Email
open MailKit.Net.Smtp open MailKit.Net.Smtp
open MailKit.Security
open Microsoft.Extensions.Localization open Microsoft.Extensions.Localization
open MimeKit open MimeKit
open MimeKit.Text
open PrayerTracker.Entities open PrayerTracker.Entities
/// Parameters required to send an e-mail /// The e-mail address from which e-mail is sent
type EmailOptions = let private fromAddress = "prayer@bitbadger.solutions"
{ /// 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 /// Get an SMTP client connection
// FIXME: make host configurable
let getConnection () = task { let getConnection () = task {
let client = new SmtpClient() let client = new SmtpClient ()
do! client.ConnectAsync(smtpOptions.SmtpHost, smtpOptions.Port, smtpOptions.UseSsl) do! client.ConnectAsync ("127.0.0.1", 25, SecureSocketOptions.None)
do! client.AuthenticateAsync(smtpOptions.FromAddress, smtpOptions.Authentication) return client
return client }
}
/// Create a mail message object, filled with everything but the body content /// Create a mail message object, filled with everything but the body content
let createMessage opts = let createMessage (grp : SmallGroup) subj =
let msg = new MimeMessage() let msg = MimeMessage ()
msg.From.Add(MailboxAddress(opts.Group.Preferences.EmailFromName, smtpOptions.FromAddress)) msg.From.Add (MailboxAddress (grp.preferences.emailFromName, fromAddress))
msg.Subject <- opts.Subject msg.Subject <- subj
msg.ReplyTo.Add(MailboxAddress(opts.Group.Preferences.EmailFromName, opts.Group.Preferences.EmailFromAddress)) msg.ReplyTo.Add (MailboxAddress (grp.preferences.emailFromName, grp.preferences.emailFromAddress))
msg msg
open MimeKit.Text
/// Create an HTML-format e-mail message /// Create an HTML-format e-mail message
let createHtmlMessage opts = let createHtmlMessage grp subj body (s : IStringLocalizer) =
let bodyText = let bodyText =
[ """<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><title></title></head><body>""" [ """<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml"><head><title></title></head><body>"""
opts.HtmlBody body
"""<hr><div style="text-align:right;font-family:Arial,Helvetica,sans-serif;font-size:8pt;padding-right:10px;">""" """<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 s.["Generated by P R A Y E R T R A C K E R"].Value
"<br><small>" "<br><small>"
opts.Strings["from Bit Badger Solutions"].Value s.["from Bit Badger Solutions"].Value
"</small></div></body></html>" ] "</small></div></body></html>"
|> String.concat "" ]
let msg = createMessage opts |> String.concat ""
msg.Body <- new TextPart(TextFormat.Html, Text = bodyText) let msg = createMessage grp subj
msg msg.Body <- TextPart (TextFormat.Html, Text = bodyText)
msg
/// Create a plain-text-format e-mail message /// Create a plain-text-format e-mail message
let createTextMessage opts = let createTextMessage grp subj body (s : IStringLocalizer) =
let bodyText = let bodyText =
[ opts.PlainTextBody [ body
"\n\n--\n" "\n\n--\n"
opts.Strings["Generated by P R A Y E R T R A C K E R"].Value s.["Generated by P R A Y E R T R A C K E R"].Value
"\n" "\n"
opts.Strings["from Bit Badger Solutions"].Value ] s.["from Bit Badger Solutions"].Value
|> String.concat "" ]
let msg = createMessage opts |> String.concat ""
msg.Body <- new TextPart(TextFormat.Plain, Text = bodyText) let msg = createMessage grp subj
msg msg.Body <- TextPart (TextFormat.Plain, Text = bodyText)
msg
/// Send e-mails to a class /// Send e-mails to a class
let sendEmails opts = task { let sendEmails (client : SmtpClient) (recipients : Member list) grp subj html text s = task {
use htmlMsg = createHtmlMessage opts let htmlMsg = createHtmlMessage grp subj html s
use plainTextMsg = createTextMessage opts let plainTextMsg = createTextMessage grp subj text s
for mbr in opts.Recipients do for mbr in recipients do
let emailTo = MailboxAddress(mbr.Name, mbr.Email) let emailType = match mbr.format with Some f -> EmailFormat.fromCode f | None -> grp.preferences.defaultEmailType
match defaultArg mbr.Format opts.Group.Preferences.DefaultEmailType with let emailTo = MailboxAddress (mbr.memberName, mbr.email)
| HtmlFormat -> match emailType with
htmlMsg.To.Add emailTo | HtmlFormat ->
let! _ = opts.Client.SendAsync htmlMsg htmlMsg.To.Add emailTo
htmlMsg.To.Clear() do! client.SendAsync htmlMsg
| PlainTextFormat -> htmlMsg.To.Clear ()
plainTextMsg.To.Add emailTo | PlainTextFormat ->
let! _ = opts.Client.SendAsync plainTextMsg plainTextMsg.To.Add emailTo
plainTextMsg.To.Clear() do! client.SendAsync plainTextMsg
} plainTextMsg.To.Clear ()
}

133
src/PrayerTracker/Extensions.fs
View File

@ -2,114 +2,51 @@
module PrayerTracker.Extensions module PrayerTracker.Extensions
open Microsoft.AspNetCore.Http open Microsoft.AspNetCore.Http
open Microsoft.Extensions.DependencyInjection
open Microsoft.FSharpLu
open Newtonsoft.Json open Newtonsoft.Json
open NodaTime
open NodaTime.Serialization.JsonNet
open PrayerTracker.Data
open PrayerTracker.Entities open PrayerTracker.Entities
open PrayerTracker.ViewModels open PrayerTracker.ViewModels
/// JSON.NET serializer settings for NodaTime // fsharplint:disable MemberNames
let private jsonSettings = JsonSerializerSettings().ConfigureForNodaTime DateTimeZoneProviders.Tzdb
/// Extensions on the .NET session object
type ISession with type ISession with
/// Set an object in the session
member this.SetObject key value =
this.SetString (key, JsonConvert.SerializeObject value)
/// Set an object in the session /// Get an object from the session
member this.SetObject<'T> key (value: 'T) = member this.GetObject<'T> key =
this.SetString(key, JsonConvert.SerializeObject(value, jsonSettings)) match this.GetString key with
| null -> Unchecked.defaultof<'T>
| v -> JsonConvert.DeserializeObject<'T> v
/// Get an object from the session /// The current small group for the session
member this.TryGetObject<'T> key = member this.smallGroup
match this.GetString key with with get () = this.GetObject<SmallGroup> Key.Session.currentGroup |> Option.fromObject
| null -> None and set (v : SmallGroup option) =
| v -> Some (JsonConvert.DeserializeObject<'T>(v, jsonSettings)) match v with
| Some group -> this.SetObject Key.Session.currentGroup group
| None -> this.Remove Key.Session.currentGroup
/// The currently logged on small group /// The current user for the session
member this.CurrentGroup member this.user
with get () = this.TryGetObject<SmallGroup> Key.Session.currentGroup with get () = this.GetObject<User> Key.Session.currentUser |> Option.fromObject
and set (v: SmallGroup option) = and set (v : User option) =
match v with match v with
| Some group -> this.SetObject Key.Session.currentGroup group | Some user -> this.SetObject Key.Session.currentUser user
| None -> this.Remove Key.Session.currentGroup | None -> this.Remove Key.Session.currentUser
/// The currently logged on user /// Current messages for the session
member this.CurrentUser member this.messages
with get () = this.TryGetObject<User> Key.Session.currentUser with get () =
and set (v: User option) = match box (this.GetObject<UserMessage list> Key.Session.userMessages) with
match v with | null -> List.empty<UserMessage>
| Some user -> this.SetObject Key.Session.currentUser { user with PasswordHash = "" } | msgs -> unbox msgs
| None -> this.Remove Key.Session.currentUser and set (v : UserMessage list) = this.SetObject Key.Session.userMessages v
/// 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 type HttpContext with
/// The EF Core database context (via DI)
/// The system clock (via DI) member this.db
member this.Clock = this.GetService<IClock>() with get () = this.RequestServices.GetRequiredService<AppDbContext> ()
/// 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
}

86
src/PrayerTracker/Help.fs
View File

@ -1,86 +0,0 @@
/// Handlers for /help routes
module PrayerTracker.Handlers.Help
open Giraffe
open PrayerTracker
// 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/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
}

98
src/PrayerTracker/Home.fs
View File

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

531
src/PrayerTracker/PrayerRequest.fs
View File

@ -2,270 +2,283 @@
open Giraffe open Giraffe
open Microsoft.AspNetCore.Http open Microsoft.AspNetCore.Http
open NodaTime
open PrayerTracker open PrayerTracker
open PrayerTracker.Data
open PrayerTracker.Entities open PrayerTracker.Entities
open PrayerTracker.ViewModels open PrayerTracker.ViewModels
/// Retrieve a prayer request, and ensure that it belongs to the current class
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 _ ->
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: 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) =
match date with
| Some dt -> match LocalDatePattern.Iso.Parse dt with it when it.Success -> Some it.Value | _ -> None
| None -> None
open System open System
// 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 with HelpLink = Some Help.editRequest }
|> Views.PrayerRequest.edit EditRequest.empty (now.ToString("R", null)) ctx
|> renderHtml next ctx
else
match! findRequest ctx requestId with
| Ok req ->
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
return!
{ viewInfo ctx with HelpLink = Some Help.editRequest }
|> Views.PrayerRequest.edit (EditRequest.fromRequest req) "" ctx
|> renderHtml 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 -> task {
let s = ctx.Strings
let listDate = parseListDate (Some date)
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 = 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
|> 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 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
| Result.Error e -> return! e
}
// 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
| Result.Error e -> return! e
}
// 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
|> Views.PrayerRequest.list
{ Requests = reqs
Date = SmallGroup.localDateNow ctx.Clock group
SmallGroup = group
ShowHeader = true
CanEmail = Option.isSome ctx.User.UserId
Recipients = [] }
|> renderHtml next ctx
| Some _ ->
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 ctx
}
// GET /prayer-requests/lists
let lists : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task {
let! groups = SmallGroups.listPublicAndProtected ()
return!
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 }
}
return!
{ 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 -> 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 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
| Result.Error e -> return! e
}
open System.Threading.Tasks open System.Threading.Tasks
// POST /prayer-request/save /// Retrieve a prayer request, and ensure that it belongs to the current class
let save : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task { let private findRequest (ctx : HttpContext) reqId = task {
match! ctx.TryBindFormAsync<EditRequest>() with match! ctx.db.TryRequestById reqId with
| Ok model -> | Some req when req.smallGroupId = (currentGroup ctx).smallGroupId -> return Ok req
let group = ctx.Session.CurrentGroup.Value | Some _ ->
let! req = let s = Views.I18N.localizer.Force ()
if model.IsNew then addError ctx s.["The prayer request you tried to access is not assigned to your group"]
{ PrayerRequest.empty with return Error (redirectTo false "/web/unauthorized")
Id = (Guid.NewGuid >> PrayerRequestId) () | None -> return Error fourOhFour
SmallGroupId = group.Id }
UserId = ctx.User.UserId.Value
}
|> (Some >> Task.FromResult)
else PrayerRequests.tryById (idFromShort PrayerRequestId model.RequestId)
match req with
| Some pr when pr.SmallGroupId = group.Id ->
let now = SmallGroup.localDateNow ctx.Clock group
let updated =
{ pr with
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
}
|> 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
| Some _
| None -> return! fourOhFour ctx
| Result.Error e -> return! bindError e next ctx
}
// GET /prayer-request/view/[date?] /// Generate a list of requests for the given date
let view date : HttpHandler = requireAccess [ User; Group ] >=> fun next ctx -> task { let private generateRequestList ctx date =
let! list = generateRequestList ctx (parseListDate 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.db.AllRequestsForSmallGroup grp clock (Some listDate) true 0
{ requests = reqs |> List.ofSeq
date = listDate
listGroup = grp
showHeader = true
canEmail = ctx.Session.user |> Option.isSome
recipients = []
}
/// Parse a string into a date (optionally, of course)
let private parseListDate (date : string option) =
match date with
| Some dt -> match DateTime.TryParse dt with true, d -> Some d | false, _ -> None
| None -> None
/// GET /prayer-request/[request-id]/edit
let edit (reqId : PrayerRequestId) : HttpHandler =
requireAccess [ User ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
let grp = currentGroup ctx
let now = grp.localDateNow (ctx.GetService<IClock> ())
match reqId = Guid.Empty with
| true ->
return!
{ viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Some Help.editRequest }
|> Views.PrayerRequest.edit EditRequest.empty (now.ToString "yyyy-MM-dd") ctx
|> renderHtml next ctx
| false ->
match! findRequest ctx reqId 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"]]
|> (htmlLocString >> Some)
}
|> addUserMessage ctx
| false -> ()
return!
{ viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Some Help.editRequest }
|> Views.PrayerRequest.edit (EditRequest.fromRequest req) "" ctx
|> renderHtml next ctx
| Error e -> return! e next ctx
}
/// GET /prayer-requests/email/[date]
let email date : HttpHandler =
requireAccess [ User ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
let s = Views.I18N.localizer.Force ()
let listDate = parseListDate (Some date)
let grp = currentGroup ctx
let list = generateRequestList ctx listDate
let! recipients = ctx.db.AllMembersForSmallGroup grp.smallGroupId
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
return! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.PrayerRequest.view { list with ShowHeader = false } |> Views.PrayerRequest.email { list with recipients = recipients }
|> renderHtml next ctx |> renderHtml next ctx
} }
/// POST /prayer-request/[request-id]/delete
let delete reqId : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx -> task {
match! findRequest ctx reqId with
| Ok req ->
let s = Views.I18N.localizer.Force ()
ctx.db.PrayerRequests.Remove req |> ignore
let! _ = ctx.db.SaveChangesAsync ()
addInfo ctx s.["The prayer request was deleted successfully"]
return! redirectTo false "/web/prayer-requests" next ctx
| Error e -> return! e next ctx
}
/// GET /prayer-request/[request-id]/expire
let expire reqId : HttpHandler =
requireAccess [ User ]
>=> fun next ctx -> task {
match! findRequest ctx reqId with
| Ok req ->
let s = Views.I18N.localizer.Force ()
ctx.db.UpdateEntry { req with expiration = Forced }
let! _ = ctx.db.SaveChangesAsync ()
addInfo ctx s.["Successfully {0} prayer request", s.["Expired"].Value.ToLower ()]
return! redirectTo false "/web/prayer-requests" next ctx
| Error e -> return! e next ctx
}
/// GET /prayer-requests/[group-id]/list
let list groupId : HttpHandler =
requireAccess [ AccessLevel.Public ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
match! ctx.db.TryGroupById groupId with
| Some grp when grp.preferences.isPublic ->
let clock = ctx.GetService<IClock> ()
let reqs = ctx.db.AllRequestsForSmallGroup grp clock None true 0
return!
viewInfo ctx startTicks
|> Views.PrayerRequest.list
{ requests = List.ofSeq reqs
date = grp.localDateNow clock
listGroup = grp
showHeader = true
canEmail = ctx.Session.user |> Option.isSome
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."]
return! redirectTo false "/web/unauthorized" next ctx
| None -> return! fourOhFour next ctx
}
/// GET /prayer-requests/lists
let lists : HttpHandler =
requireAccess [ AccessLevel.Public ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
let! grps = ctx.db.PublicAndProtectedGroups ()
return!
viewInfo ctx startTicks
|> Views.PrayerRequest.lists grps
|> renderHtml next ctx
}
/// GET /prayer-requests[/inactive?]
/// - OR -
/// GET /prayer-requests?search=[search-query]
let maintain onlyActive : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
let grp = currentGroup ctx
let pageNbr =
match ctx.GetQueryStringValue "page" with
| Ok pg -> match Int32.TryParse pg with true, p -> p | false, _ -> 1
| Error _ -> 1
let m =
match ctx.GetQueryStringValue "search" with
| Ok srch ->
{ MaintainRequests.empty with
requests = ctx.db.SearchRequestsForSmallGroup grp srch pageNbr
searchTerm = Some srch
pageNbr = Some pageNbr
}
| Error _ ->
{ MaintainRequests.empty with
requests = ctx.db.AllRequestsForSmallGroup grp (ctx.GetService<IClock> ()) None onlyActive pageNbr
onlyActive = Some onlyActive
pageNbr = match onlyActive with true -> None | false -> Some pageNbr
}
{ viewInfo ctx startTicks with helpLink = Some Help.maintainRequests }
|> Views.PrayerRequest.maintain { m with smallGroup = grp } ctx
|> renderHtml next ctx
/// GET /prayer-request/print/[date]
let print date : HttpHandler =
requireAccess [ User; Group ]
>=> fun next ctx ->
let list = parseListDate (Some date) |> generateRequestList ctx
Views.PrayerRequest.print list appVersion
|> renderHtml next ctx
/// GET /prayer-request/[request-id]/restore
let restore reqId : HttpHandler =
requireAccess [ User ]
>=> fun next ctx -> task {
match! findRequest ctx reqId with
| Ok req ->
let s = Views.I18N.localizer.Force ()
ctx.db.UpdateEntry { req with expiration = Automatic; updatedDate = DateTime.Now }
let! _ = ctx.db.SaveChangesAsync ()
addInfo ctx s.["Successfully {0} prayer request", s.["Restored"].Value.ToLower ()]
return! redirectTo false "/web/prayer-requests" next ctx
| Error e -> return! e next ctx
}
/// POST /prayer-request/save
let save : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx -> task {
match! ctx.TryBindFormAsync<EditRequest> () with
| Ok m ->
let! req =
match m.isNew () with
| true -> Task.FromResult (Some { PrayerRequest.empty with prayerRequestId = Guid.NewGuid () })
| false -> ctx.db.TryRequestById m.requestId
match req with
| Some pr ->
let upd8 =
{ pr with
requestType = PrayerRequestType.fromCode m.requestType
requestor = match m.requestor with Some x when x.Trim () = "" -> None | x -> x
text = ckEditorToText m.text
expiration = Expiration.fromCode m.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 -> ctx.db.AddEntry | false -> ctx.db.UpdateEntry)
let! _ = ctx.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 ()]
return! redirectTo false "/web/prayer-requests" next ctx
| None -> return! fourOhFour next ctx
| 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 list = parseListDate date |> generateRequestList ctx
viewInfo ctx startTicks
|> Views.PrayerRequest.view { list with showHeader = false }
|> renderHtml next ctx

13
src/PrayerTracker/PrayerTracker.fsproj
View File

@ -1,9 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <TargetFramework>net6.0</TargetFramework>
<PublishSingleFile>False</PublishSingleFile>
<SelfContained>False</SelfContained>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -13,10 +11,10 @@
<ItemGroup> <ItemGroup>
<None Include="appsettings.json" /> <None Include="appsettings.json" />
<Compile Include="Extensions.fs" /> <Compile Include="Extensions.fs" />
<Compile Include="Cookies.fs" />
<Compile Include="Email.fs" /> <Compile Include="Email.fs" />
<Compile Include="CommonFunctions.fs" /> <Compile Include="CommonFunctions.fs" />
<Compile Include="Church.fs" /> <Compile Include="Church.fs" />
<Compile Include="Help.fs" />
<Compile Include="Home.fs" /> <Compile Include="Home.fs" />
<Compile Include="PrayerRequest.fs" /> <Compile Include="PrayerRequest.fs" />
<Compile Include="SmallGroup.fs" /> <Compile Include="SmallGroup.fs" />
@ -25,10 +23,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" /> <PackageReference Include="Giraffe" Version="5.0.0" />
<PackageReference Include="Giraffe.Htmx" Version="2.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.1.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
<PackageReference Update="FSharp.Core" Version="8.0.300" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

663
src/PrayerTracker/SmallGroup.fs
View File

@ -1,306 +1,385 @@
module PrayerTracker.Handlers.SmallGroup module PrayerTracker.Handlers.SmallGroup
open System
open Giraffe open Giraffe
open Giraffe.ViewEngine
open Microsoft.AspNetCore.Http
open NodaTime
open PrayerTracker open PrayerTracker
open PrayerTracker.Data open PrayerTracker.Cookies
open PrayerTracker.Entities open PrayerTracker.Entities
open PrayerTracker.ViewModels open PrayerTracker.ViewModels
open PrayerTracker.Views.CommonFunctions
// GET /small-group/announcement open System
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 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
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 ctx
}
// 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 &ldquo;{0}&rdquo; was deleted successfully", mbr.Name]
return! redirectTo false "/small-group/members" next ctx
| Some _
| None -> return! fourOhFour ctx
}
// 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
|> Views.SmallGroup.edit EditSmallGroup.empty churches ctx
|> renderHtml next ctx
else
match! SmallGroups.tryById groupId with
| Some grp ->
return!
viewInfo ctx
|> Views.SmallGroup.edit (EditSmallGroup.fromGroup grp) churches ctx
|> renderHtml next ctx
| None -> return! fourOhFour ctx
}
// 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
|> Views.SmallGroup.editMember EditMember.empty types ctx
|> renderHtml next ctx
else
match! Members.tryById memberId with
| Some mbr when mbr.SmallGroupId = group.Id ->
return!
viewInfo ctx
|> Views.SmallGroup.editMember (EditMember.fromMember mbr) types ctx
|> renderHtml next ctx
| Some _
| None -> return! fourOhFour ctx
}
// 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 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 {
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 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 -> task {
let! groups = SmallGroups.infoForAll ()
return!
viewInfo ctx
|> Views.SmallGroup.maintain groups ctx
|> renderHtml next ctx
}
// 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 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 -> 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.distinct
|> Seq.map (fun reqType -> reqType, reqs |> List.filter (fun r -> r.RequestType = reqType) |> List.length)
|> Map.ofSeq)
Admins = admins }
return!
viewInfo ctx
|> Views.SmallGroup.overview model
|> renderHtml next ctx
}
// GET /small-group/preferences
let preferences : HttpHandler = requireAccess [ User ] >=> fun next ctx -> task {
return!
{ 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 open System.Threading.Tasks
// POST /small-group/save /// Set a small group "Remember Me" cookie
let save : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task { let private setGroupCookie (ctx : HttpContext) pwHash =
match! ctx.TryBindFormAsync<EditSmallGroup>() with ctx.Response.Cookies.Append
| Ok model -> (Key.Cookie.group, { GroupId = (currentGroup ctx).smallGroupId; PasswordHash = pwHash }.toPayload (), autoRefresh)
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 ctx
| Result.Error e -> return! bindError e next ctx
}
// 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
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 ctx
| Result.Error e -> return! bindError e next ctx
}
// POST /small-group/preferences/save /// GET /small-group/announcement
let savePreferences : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task { let announcement : HttpHandler =
match! ctx.TryBindFormAsync<EditPreferences>() with requireAccess [ User ]
| Ok model -> >=> fun next ctx ->
// Since the class is stored in the session, we'll use an intermediate instance to persist it; once that works, let startTicks = DateTime.Now.Ticks
// we can repopulate the session instance. That way, if the update fails, the page should still show the { viewInfo ctx startTicks with helpLink = Some Help.sendAnnouncement; script = [ "ckeditor/ckeditor" ] }
// database values, not the then out-of-sync session ones. |> Views.SmallGroup.announcement (currentUser ctx).isAdmin ctx
let group = ctx.Session.CurrentGroup.Value |> renderHtml next ctx
match! SmallGroups.tryByIdWithPreferences group.Id with
| Some group ->
let pref = model.PopulatePreferences group.Preferences
do! SmallGroups.savePreferences pref
// Refresh session instance
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 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 /// POST /small-group/[group-id]/delete
let sendAnnouncement : HttpHandler = requireAccess [ User ] >=> validateCsrf >=> fun next ctx -> task { let delete groupId : HttpHandler =
match! ctx.TryBindFormAsync<Announcement>() with requireAccess [ Admin ]
| Ok model -> >=> validateCSRF
let group = ctx.Session.CurrentGroup.Value >=> fun next ctx -> task {
let pref = group.Preferences let s = Views.I18N.localizer.Force ()
let usr = ctx.Session.CurrentUser.Value match! ctx.db.TryGroupById groupId with
let now = SmallGroup.localTimeNow ctx.Clock group | Some grp ->
let s = ctx.Strings let! reqs = ctx.db.CountRequestsBySmallGroup groupId
// Reformat the text to use the class's font stylings let! usrs = ctx.db.CountUsersBySmallGroup groupId
let requestText = ckEditorToText model.Text ctx.db.RemoveEntry grp
let htmlText = let! _ = ctx.db.SaveChangesAsync ()
p [ _style $"font-family:{pref.FontStack};font-size:%d{pref.TextFontSize}pt;" ] [ rawText requestText ] addInfo ctx
|> renderHtmlNode s.["The group {0} and its {1} prayer request(s) were deleted successfully; revoked access from {2} user(s)",
let plainText = (htmlToPlainText >> wordWrap 74) htmlText grp.name, reqs, usrs]
// Send the e-mails return! redirectTo false "/web/small-groups" next ctx
let! recipients = task { | None -> return! fourOhFour next ctx
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 /// POST /small-group/member/[member-id]/delete
} let deleteMember memberId : HttpHandler =
use! client = Email.getConnection () requireAccess [ User ]
do! Email.sendEmails >=> validateCSRF
{ Client = client >=> fun next ctx -> task {
Recipients = recipients let s = Views.I18N.localizer.Force ()
Group = group match! ctx.db.TryMemberById memberId with
Subject = s["Announcement for {0} - {1:MMMM d, yyyy} {2}", group.Name, now.Date, | Some mbr when mbr.smallGroupId = (currentGroup ctx).smallGroupId ->
now.ToString("h:mm tt", null).ToLower()].Value ctx.db.RemoveEntry mbr
HtmlBody = htmlText let! _ = ctx.db.SaveChangesAsync ()
PlainTextBody = plainText addHtmlInfo ctx s.["The group member &ldquo;{0}&rdquo; was deleted successfully", mbr.memberName]
Strings = s } return! redirectTo false "/web/small-group/members" next ctx
do! client.DisconnectAsync true | Some _
// Add to the request list if desired | None -> return! fourOhFour next ctx
match model.SendToClass, model.AddToRequestList with }
| "N", _
| _, None -> ()
| _, Some x when not x -> () /// GET /small-group/[group-id]/edit
| _, _ -> let edit (groupId : SmallGroupId) : HttpHandler =
let zone = SmallGroup.timeZone group requireAccess [ Admin ]
do! PrayerRequests.save >=> fun next ctx -> task {
{ PrayerRequest.empty with let startTicks = DateTime.Now.Ticks
Id = (Guid.NewGuid >> PrayerRequestId) () let! churches = ctx.db.AllChurches ()
SmallGroupId = group.Id match groupId = Guid.Empty with
UserId = usr.Id | true ->
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 =
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! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.SmallGroup.announcementSent { model with Text = htmlText } |> Views.SmallGroup.edit EditSmallGroup.empty churches ctx
|> renderHtml next ctx
| false ->
match! ctx.db.TryGroupById groupId with
| Some grp ->
return!
viewInfo ctx startTicks
|> Views.SmallGroup.edit (EditSmallGroup.fromGroup grp) churches ctx
|> renderHtml next ctx
| None -> return! fourOhFour next ctx
}
/// GET /small-group/member/[member-id]/edit
let editMember (memberId : MemberId) : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
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 ->
return!
viewInfo ctx startTicks
|> Views.SmallGroup.editMember EditMember.empty typs ctx
|> renderHtml next ctx |> renderHtml next ctx
| Result.Error e -> return! bindError e next ctx | false ->
} match! ctx.db.TryMemberById memberId with
| Some mbr when mbr.smallGroupId = grp.smallGroupId ->
return!
viewInfo ctx startTicks
|> Views.SmallGroup.editMember (EditMember.fromMember mbr) typs ctx
|> renderHtml next ctx
| Some _
| None -> return! fourOhFour next 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.db.ProtectedGroups ()
let grpId = match groupId with Some gid -> flatGuid gid | None -> ""
return!
{ viewInfo ctx startTicks with helpLink = Some Help.logOn }
|> Views.SmallGroup.logOn grps grpId ctx
|> renderHtml next ctx
}
/// POST /small-group/log-on/submit
let logOnSubmit : HttpHandler =
requireAccess [ AccessLevel.Public ]
>=> validateCSRF
>=> fun next ctx ->
task {
match! ctx.TryBindFormAsync<GroupLogOn> () with
| Ok m ->
let s = Views.I18N.localizer.Force ()
match! ctx.db.TryGroupLogOnByPassword m.smallGroupId m.password with
| Some grp ->
ctx.Session.smallGroup <- Some grp
match m.rememberMe with
| Some x when x -> (setGroupCookie ctx << sha1Hash) m.password
| _ -> ()
addInfo ctx s.["Log On Successful • Welcome to {0}", s.["PrayerTracker"]]
return! redirectTo false "/web/prayer-requests/view" next ctx
| None ->
addError ctx s.["Password incorrect - login unsuccessful"]
return! redirectTo false $"/web/small-group/log-on/{flatGuid m.smallGroupId}" next ctx
| 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.db.AllGroups ()
return!
viewInfo ctx startTicks
|> Views.SmallGroup.maintain grps ctx
|> renderHtml next ctx
}
/// GET /small-group/members
let members : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
let grp = currentGroup ctx
let s = Views.I18N.localizer.Force ()
task {
let! mbrs = ctx.db.AllMembersForSmallGroup grp.smallGroupId
let typs = ReferenceList.emailTypeList grp.preferences.defaultEmailType s |> Map.ofSeq
return!
{ viewInfo ctx startTicks with helpLink = Some Help.maintainGroupMembers }
|> Views.SmallGroup.members mbrs typs ctx
|> renderHtml next ctx
}
/// GET /small-group
let overview : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
let clock = ctx.GetService<IClock> ()
task {
let reqs = ctx.db.AllRequestsForSmallGroup (currentGroup ctx) clock None true 0 |> List.ofSeq
let! reqCount = ctx.db.CountRequestsBySmallGroup (currentGroup ctx).smallGroupId
let! mbrCount = ctx.db.CountMembersForSmallGroup (currentGroup ctx).smallGroupId
let m =
{ totalActiveReqs = List.length reqs
allReqs = reqCount
totalMbrs = mbrCount
activeReqsByCat =
(reqs
|> Seq.ofList
|> Seq.map (fun req -> req.requestType)
|> Seq.distinct
|> Seq.map (fun reqType -> reqType, reqs |> List.filter (fun r -> r.requestType = reqType) |> List.length)
|> Map.ofSeq)
}
return!
viewInfo ctx startTicks
|> Views.SmallGroup.overview m
|> renderHtml next ctx
}
/// GET /small-group/preferences
let preferences : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
task {
let! tzs = ctx.db.AllTimeZones ()
return!
{ viewInfo ctx startTicks with helpLink = Some Help.groupPreferences }
|> Views.SmallGroup.preferences (EditPreferences.fromPreferences (currentGroup ctx).preferences) tzs ctx
|> renderHtml next ctx
}
/// POST /small-group/save
let save : HttpHandler =
requireAccess [ Admin ]
>=> validateCSRF
>=> fun next ctx ->
let s = Views.I18N.localizer.Force ()
task {
match! ctx.TryBindFormAsync<EditSmallGroup> () with
| Ok m ->
let! group =
match m.isNew () with
| true -> Task.FromResult<SmallGroup option>(Some { SmallGroup.empty with smallGroupId = Guid.NewGuid () })
| false -> ctx.db.TryGroupById m.smallGroupId
match group with
| Some grp ->
m.populateGroup grp
|> function
| grp when m.isNew () ->
ctx.db.AddEntry grp
ctx.db.AddEntry { grp.preferences with smallGroupId = grp.smallGroupId }
| grp -> ctx.db.UpdateEntry grp
let! _ = ctx.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]
return! redirectTo false "/web/small-groups" next ctx
| None -> return! fourOhFour next ctx
| Error e -> return! bindError e next ctx
}
/// POST /small-group/member/save
let saveMember : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx ->
task {
match! ctx.TryBindFormAsync<EditMember> () with
| Ok m ->
let grp = currentGroup ctx
let! mMbr =
match m.isNew () with
| true ->
Task.FromResult<Member option>
(Some
{ Member.empty with
memberId = Guid.NewGuid ()
smallGroupId = grp.smallGroupId
})
| false -> ctx.db.TryMemberById m.memberId
match mMbr with
| Some mbr when mbr.smallGroupId = grp.smallGroupId ->
{ mbr with
memberName = m.memberName
email = m.emailAddress
format = match m.emailType with "" | null -> None | _ -> Some m.emailType
}
|> (match m.isNew () with true -> ctx.db.AddEntry | false -> ctx.db.UpdateEntry)
let! _ = ctx.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]
return! redirectTo false "/web/small-group/members" next ctx
| Some _
| None -> return! fourOhFour next ctx
| Error e -> return! bindError e next ctx
}
/// POST /small-group/preferences/save
let savePreferences : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx ->
task {
match! ctx.TryBindFormAsync<EditPreferences> () with
| Ok m ->
// 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.
match! ctx.db.TryGroupById (currentGroup ctx).smallGroupId with
| Some grp ->
let prefs = m.populatePreferences grp.preferences
ctx.db.UpdateEntry prefs
let! _ = ctx.db.SaveChangesAsync ()
// Refresh session instance
ctx.Session.smallGroup <- Some { grp with preferences = prefs }
let s = Views.I18N.localizer.Force ()
addInfo ctx s.["Group preferences updated successfully"]
return! redirectTo false "/web/small-group/preferences" next ctx
| None -> return! fourOhFour next ctx
| Error e -> return! bindError e next ctx
}
/// POST /small-group/announcement/send
let sendAnnouncement : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
task {
match! ctx.TryBindFormAsync<Announcement> () with
| Ok m ->
let grp = currentGroup ctx
let usr = currentUser ctx
let now = grp.localTimeNow (ctx.GetService<IClock> ())
let s = Views.I18N.localizer.Force ()
// Reformat the text to use the class's font stylings
let requestText = ckEditorToText m.text
let htmlText =
p [ _style $"font-family:{grp.preferences.listFonts};font-size:%d{grp.preferences.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 -> ctx.db.AllUsersAsMembers ()
| _ -> ctx.db.AllMembersForSmallGroup grp.smallGroupId
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
// Add to the request list if desired
match m.sendToClass, m.addToRequestList with
| "N", _
| _, None -> ()
| _, Some x when not x -> ()
| _, _ ->
{ PrayerRequest.empty with
prayerRequestId = Guid.NewGuid ()
smallGroupId = grp.smallGroupId
userId = usr.userId
requestType = (Option.get >> PrayerRequestType.fromCode) m.requestType
text = requestText
enteredDate = now
updatedDate = now
}
|> ctx.db.AddEntry
let! _ = ctx.db.SaveChangesAsync ()
()
// 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]]
return!
viewInfo ctx startTicks
|> Views.SmallGroup.announcementSent { m with text = htmlText }
|> renderHtml next ctx
| Error e -> return! bindError e next ctx
}

512
src/PrayerTracker/User.fs
View File

@ -1,275 +1,311 @@
module PrayerTracker.Handlers.User module PrayerTracker.Handlers.User
open System
open Giraffe open Giraffe
open Microsoft.AspNetCore.Html
open Microsoft.AspNetCore.Http open Microsoft.AspNetCore.Http
open Microsoft.AspNetCore.Identity
open PrayerTracker open PrayerTracker
open PrayerTracker.Data open PrayerTracker.Cookies
open PrayerTracker.Entities open PrayerTracker.Entities
open PrayerTracker.ViewModels open PrayerTracker.ViewModels
open PrayerTracker.Views.CommonFunctions
#nowarn "44" // The default Rfc2898DeriveBytes is used to identify passwords to be upgraded open System
open System.Collections.Generic
/// 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
}
match user with
| 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 ctx.Strings["The new passwords did not match - your password was NOT changed"]
return! redirectTo false "/user/password" next ctx
| None ->
addError ctx ctx.Strings["The old password was incorrect - your password was NOT changed"]
return! redirectTo false "/user/password" next ctx
| Result.Error e -> return! bindError e next ctx
}
// 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 ctx
}
open System.Net open System.Net
open System.Security.Claims open System.Threading.Tasks
open Microsoft.AspNetCore.Authentication
open Microsoft.AspNetCore.Authentication.Cookies
open Microsoft.AspNetCore.Html
// POST /user/log-on /// Set the user's "remember me" cookie
let doLogOn : HttpHandler = requireAccess [ AccessLevel.Public ] >=> validateCsrf >=> fun next ctx -> task { let private setUserCookie (ctx : HttpContext) pwHash =
match! ctx.TryBindFormAsync<UserLogOn>() with ctx.Response.Cookies.Append (
| Ok model -> Key.Cookie.user,
let s = ctx.Strings { Id = (currentUser ctx).userId; GroupId = (currentGroup ctx).smallGroupId; PasswordHash = pwHash }.toPayload (),
match! findUserByPassword model with autoRefresh)
| Some user ->
match! SmallGroups.tryByIdWithPreferences (idFromShort SmallGroupId model.SmallGroupId) with /// Retrieve a user from the database by password
| Some group -> // If the hashes do not match, determine if it matches a previous scheme, and upgrade them if it does
ctx.Session.CurrentUser <- Some user let private findUserByPassword m (db : AppDbContext) = task {
ctx.Session.CurrentGroup <- Some group match! db.TryUserByEmailAndGroup m.emailAddress m.smallGroupId with
let identity = ClaimsIdentity( | Some u when Option.isSome u.salt ->
seq { // Already upgraded; match = success
Claim(ClaimTypes.NameIdentifier, shortGuid user.Id.Value) let pwHash = pbkdf2Hash (Option.get u.salt) m.password
Claim(ClaimTypes.GroupSid, shortGuid group.Id.Value) match u.passwordHash = pwHash with
}, CookieAuthenticationDefaults.AuthenticationScheme) | true -> return Some { u with passwordHash = ""; salt = None; smallGroups = List<UserSmallGroup>() }, pwHash
do! ctx.SignInAsync( | _ -> return None, ""
identity.AuthenticationType, ClaimsPrincipal identity, | Some u when u.passwordHash = sha1Hash m.password ->
AuthenticationProperties( // Not upgraded, but password is good; upgrade 'em!
IssuedUtc = DateTimeOffset.UtcNow, // Upgrade 'em!
IsPersistent = defaultArg model.RememberMe false)) let salt = Guid.NewGuid ()
do! Users.updateLastSeen user.Id ctx.Now let pwHash = pbkdf2Hash salt m.password
addHtmlInfo ctx s["Log On Successful • Welcome to {0}", s["PrayerTracker"]] let upgraded = { u with salt = Some salt; passwordHash = pwHash }
return! redirectTo false (sanitizeUrl model.RedirectUrl "/small-group") next ctx db.UpdateEntry upgraded
| None -> return! fourOhFour ctx let! _ = db.SaveChangesAsync ()
return Some { u with passwordHash = ""; salt = None; smallGroups = List<UserSmallGroup>() }, pwHash
| _ -> return None, ""
}
/// POST /user/password/change
let changePassword : HttpHandler =
requireAccess [ User ]
>=> validateCSRF
>=> fun next ctx -> task {
match! ctx.TryBindFormAsync<ChangePassword> () with
| Ok m ->
let s = Views.I18N.localizer.Force ()
let curUsr = currentUser ctx
let! dbUsr = ctx.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
|> ctx.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 ()
ctx.db.UpdateEntry { usr with passwordHash = pbkdf2Hash salt m.newPassword; salt = Some salt }
let! _ = ctx.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"]
return! redirectTo false "/web/" next ctx
| Some _ ->
addError ctx s.["The new passwords did not match - your password was NOT changed"]
return! redirectTo false "/web/user/password" next ctx
| None -> | None ->
{ UserMessage.error with addError ctx s.["The old password was incorrect - your password was NOT changed"]
Text = htmlLocString s["Invalid credentials - log on unsuccessful"] return! redirectTo false "/web/user/password" next ctx
Description = | Error e -> return! bindError e next ctx
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 ""
Some (HtmlString(s[detail, WebUtility.HtmlEncode model.Email].Value)) }
|> addUserMessage ctx
return! redirectTo false "/user/log-on" next ctx
| Result.Error e -> return! bindError e next ctx
}
// GET /user/[user-id]/edit
let edit usrId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task { /// POST /user/[user-id]/delete
let userId = UserId usrId let delete userId : HttpHandler =
if userId.Value = Guid.Empty then requireAccess [ Admin ]
>=> validateCSRF
>=> fun next ctx -> task {
match! ctx.db.TryUserById userId with
| Some user ->
ctx.db.RemoveEntry user
let! _ = ctx.db.SaveChangesAsync ()
let s = Views.I18N.localizer.Force ()
addInfo ctx s.["Successfully deleted user {0}", user.fullName]
return! redirectTo false "/web/users" next ctx
| _ -> return! fourOhFour next ctx
}
/// POST /user/log-on
let doLogOn : HttpHandler =
requireAccess [ AccessLevel.Public ]
>=> validateCSRF
>=> fun next ctx -> task {
match! ctx.TryBindFormAsync<UserLogOn> () with
| Ok m ->
let s = Views.I18N.localizer.Force ()
let! usr, pwHash = findUserByPassword m ctx.db
let! grp = ctx.db.TryGroupById m.smallGroupId
let nextUrl =
match usr with
| Some _ ->
ctx.Session.user <- usr
ctx.Session.smallGroup <- 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 -> "/web/small-group"
| Some x when x = "" -> "/web/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>"
]
|> String.concat ""
|> (HtmlString >> Some)
}
|> addUserMessage ctx
"/web/user/log-on"
return! redirectTo false nextUrl next ctx
| Error e -> return! bindError e next ctx
}
/// GET /user/[user-id]/edit
let edit (userId : UserId) : HttpHandler =
requireAccess [ Admin ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
match userId = Guid.Empty with
| true ->
return! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.User.edit EditUser.empty ctx |> Views.User.edit EditUser.empty ctx
|> renderHtml next ctx |> renderHtml next ctx
else | false ->
match! Users.tryById userId with match! ctx.db.TryUserById userId with
| Some user -> | Some user ->
return! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.User.edit (EditUser.fromUser user) ctx |> Views.User.edit (EditUser.fromUser user) ctx
|> renderHtml next ctx |> renderHtml next ctx
| _ -> return! fourOhFour ctx | _ -> return! fourOhFour next ctx
} }
// GET /user/log-on
let logOn : HttpHandler = requireAccess [ AccessLevel.Public ] >=> fun next ctx -> task { /// GET /user/log-on
let! groups = SmallGroups.listAll () let logOn : HttpHandler =
let url = Option.ofObj <| ctx.Session.GetString Key.Session.redirectUrl requireAccess [ AccessLevel.Public ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
let s = Views.I18N.localizer.Force ()
let! groups = ctx.db.GroupList ()
let url = Option.ofObj <| ctx.Session.GetString Key.Session.redirectUrl
match url with match url with
| Some _ -> | Some _ ->
ctx.Session.Remove Key.Session.redirectUrl ctx.Session.Remove Key.Session.redirectUrl
addWarning ctx ctx.Strings["The page you requested requires authentication; please log on below."] addWarning ctx s.["The page you requested requires authentication; please log on below."]
| None -> () | None -> ()
return! return!
{ viewInfo ctx with HelpLink = Some Help.logOn } { viewInfo ctx startTicks with helpLink = Some Help.logOn }
|> Views.User.logOn { UserLogOn.empty with RedirectUrl = url } groups ctx |> Views.User.logOn { UserLogOn.empty with redirectUrl = url } groups ctx
|> renderHtml next ctx |> renderHtml next ctx
} }
// GET /users
let maintain : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task { /// GET /users
let! users = Users.all () let maintain : HttpHandler =
requireAccess [ Admin ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
let! users = ctx.db.AllUsers ()
return! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.User.maintain users ctx |> Views.User.maintain users ctx
|> renderHtml next ctx |> renderHtml next ctx
} }
// GET /user/password
let password : HttpHandler = requireAccess [ User ] >=> fun next ctx -> /// GET /user/password
{ viewInfo ctx with HelpLink = Some Help.changePassword } let password : HttpHandler =
requireAccess [ User ]
>=> fun next ctx ->
{ viewInfo ctx DateTime.Now.Ticks with helpLink = Some Help.changePassword }
|> Views.User.changePassword ctx |> Views.User.changePassword ctx
|> renderHtml next ctx |> renderHtml next ctx
open System.Threading.Tasks
// POST /user/save /// POST /user/save
let save : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task { let save : HttpHandler =
match! ctx.TryBindFormAsync<EditUser>() with requireAccess [ Admin ]
| Ok model -> >=> validateCSRF
>=> fun next ctx -> task {
match! ctx.TryBindFormAsync<EditUser> () with
| Ok m ->
let! user = let! user =
if model.IsNew then Task.FromResult(Some { User.empty with Id = (Guid.NewGuid >> UserId) () }) match m.isNew () with
else Users.tryById (idFromShort UserId model.UserId) | true -> Task.FromResult (Some { User.empty with userId = Guid.NewGuid () })
match user with | false -> ctx.db.TryUserById m.userId
| Some usr -> let saltedUser =
let hasher = PrayerTrackerPasswordHasher() match user with
let updatedUser = model.PopulateUser usr (fun pw -> hasher.HashPassword(usr, pw)) | Some u ->
do! Users.save updatedUser match u.salt with
let s = ctx.Strings | None when m.password <> "" ->
if model.IsNew then // 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 ->
let updatedUser = m.populateUser u (pbkdf2Hash (Option.get u.salt))
updatedUser |> (match m.isNew () with true -> ctx.db.AddEntry | false -> ctx.db.UpdateEntry)
let! _ = ctx.db.SaveChangesAsync ()
let s = Views.I18N.localizer.Force ()
match m.isNew () with
| true ->
let h = CommonFunctions.htmlString let h = CommonFunctions.htmlString
{ UserMessage.info with { UserMessage.info with
Text = h s["Successfully {0} user", s["Added"].Value.ToLower ()] text = h s.["Successfully {0} user", s.["Added"].Value.ToLower ()]
Description = description =
h s["Please select at least one group for which this user ({0}) is authorized", h s.["Please select at least one group for which this user ({0}) is authorized",
updatedUser.Name] updatedUser.fullName]
|> Some } |> Some
}
|> addUserMessage ctx |> addUserMessage ctx
return! redirectTo false $"/user/{shortGuid usr.Id.Value}/small-groups" next ctx return! redirectTo false $"/web/user/{flatGuid u.userId}/small-groups" next ctx
else | false ->
addInfo ctx s["Successfully {0} user", s["Updated"].Value.ToLower ()] addInfo ctx s.["Successfully {0} user", s.["Updated"].Value.ToLower ()]
return! redirectTo false "/users" next ctx return! redirectTo false "/web/users" next ctx
| None -> return! fourOhFour ctx | None -> return! fourOhFour next ctx
| Result.Error e -> return! bindError e next ctx | Error e -> return! bindError e next ctx
} }
// POST /user/small-groups/save
let saveGroups : HttpHandler = requireAccess [ Admin ] >=> validateCsrf >=> fun next ctx -> task { /// POST /user/small-groups/save
match! ctx.TryBindFormAsync<AssignGroups>() with let saveGroups : HttpHandler =
| Ok model -> requireAccess [ Admin ]
match Seq.length model.SmallGroups with >=> validateCSRF
>=> fun next ctx -> task {
match! ctx.TryBindFormAsync<AssignGroups> () with
| Ok m ->
let s = Views.I18N.localizer.Force ()
match Seq.length m.smallGroups with
| 0 -> | 0 ->
addError ctx ctx.Strings["You must select at least one group to assign"] addError ctx s.["You must select at least one group to assign"]
return! redirectTo false $"/user/{model.UserId}/small-groups" next ctx return! redirectTo false $"/web/user/{flatGuid m.userId}/small-groups" next ctx
| _ -> | _ ->
do! Users.updateSmallGroups (idFromShort UserId model.UserId) match! ctx.db.TryUserByIdWithGroups m.userId with
(model.SmallGroups.Split ',' |> Array.map (idFromShort SmallGroupId) |> List.ofArray) | Some user ->
addInfo ctx ctx.Strings["Successfully updated group permissions for {0}", model.UserName] let grps =
return! redirectTo false "/users" next ctx m.smallGroups.Split ','
| Result.Error e -> return! bindError e next ctx |> Array.map Guid.Parse
} |> List.ofArray
user.smallGroups
|> Seq.filter (fun x -> not (grps |> List.exists (fun y -> y = x.smallGroupId)))
|> ctx.db.UserGroupXref.RemoveRange
grps
|> Seq.ofList
|> Seq.filter (fun x -> not (user.smallGroups |> Seq.exists (fun y -> y.smallGroupId = x)))
|> Seq.map (fun x -> { UserSmallGroup.empty with userId = user.userId; smallGroupId = x })
|> List.ofSeq
|> List.iter ctx.db.AddEntry
let! _ = ctx.db.SaveChangesAsync ()
addInfo ctx s.["Successfully updated group permissions for {0}", m.userName]
return! redirectTo false "/web/users" next ctx
| _ -> return! fourOhFour next ctx
| Error e -> return! bindError e next ctx
}
// GET /user/[user-id]/small-groups
let smallGroups usrId : HttpHandler = requireAccess [ Admin ] >=> fun next ctx -> task { /// GET /user/[user-id]/small-groups
let userId = UserId usrId let smallGroups userId : HttpHandler =
match! Users.tryById userId with requireAccess [ Admin ]
>=> fun next ctx -> task {
let startTicks = DateTime.Now.Ticks
match! ctx.db.TryUserByIdWithGroups userId with
| Some user -> | Some user ->
let! groups = SmallGroups.listAll () let! grps = ctx.db.GroupList ()
let! groupIds = Users.groupIdsByUserId userId let curGroups = user.smallGroups |> Seq.map (fun g -> flatGuid g.smallGroupId) |> List.ofSeq
let curGroups = groupIds |> List.map (fun g -> shortGuid g.Value)
return! return!
viewInfo ctx viewInfo ctx startTicks
|> Views.User.assignGroups (AssignGroups.fromUser user) groups curGroups ctx |> Views.User.assignGroups (AssignGroups.fromUser user) grps curGroups ctx
|> renderHtml next ctx |> renderHtml next ctx
| None -> return! fourOhFour ctx | None -> return! fourOhFour next ctx
} }

184
src/PrayerTracker/wwwroot/css/app.css
View File

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

18
src/PrayerTracker/wwwroot/css/help.css
View File

@ -5,9 +5,6 @@
background-color: white; background-color: white;
padding: 0 .25em; padding: 0 .25em;
} }
.pt-title-bar-home {
height: 2rem;
}
.pt-title-bar-left { .pt-title-bar-left {
color: white; color: white;
font-size: 1.25rem; font-size: 1.25rem;
@ -20,24 +17,9 @@
font-size: 1.1rem; font-size: 1.1rem;
font-variant: small-caps; font-variant: small-caps;
margin-right: 1rem; margin-right: 1rem;
align-self: center;
} }
h2 { h2 {
margin-top: 0; margin-top: 0;
padding-left: .5rem; padding-left: .5rem;
border-bottom: solid 1px #444; 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;
}
}

153
src/PrayerTracker/wwwroot/js/app.js
View File

@ -2,14 +2,28 @@
* This file contains a library of common functions used throughout the PrayerTracker website, as well as specific * This file contains a library of common functions used throughout the PrayerTracker website, as well as specific
* functions used on pages throughout the site. * functions used on pages throughout the site.
*/ */
this.PT = { const PT = {
/** /**
* Open a window with help * Open a window with help
* @param {string} url The URL for the help page. * @param {string} url The URL for the help page.
*/ */
showHelp(url) { showHelp(url) {
window.open(url, "helpWindow", "height=600px,width=450px,toolbar=0,menubar=0,scrollbars=1") window.open(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()
}
return false return false
}, },
@ -22,6 +36,14 @@ this.PT = {
.forEach(f => document.getElementById(f).required = true) .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 * Validation that compares the values of 2 fields and fails if they do not match
* @param {string} field1 The ID of the first field * @param {string} field1 The ID of the first field
@ -33,7 +55,7 @@ this.PT = {
const field1Value = document.getElementById(field1).value const field1Value = document.getElementById(field1).value
const field2Element = document.getElementById(field2) const field2Element = document.getElementById(field2)
if (field1Value === field2Element.value) { if (field1Value === field2Element.value) {
field2Element.setCustomValidity("") field2Element.setCustomValidity('')
return true return true
} }
field2Element.setCustomValidity(errorMsg) field2Element.setCustomValidity(errorMsg)
@ -45,8 +67,8 @@ this.PT = {
* @param {HTMLElement} div The div to be shown * @param {HTMLElement} div The div to be shown
*/ */
showDiv(div) { showDiv(div) {
if (div.className.indexOf(" pt-shown") === -1) { if (div.className.indexOf(' pt-shown') === -1) {
div.className += " pt-shown" div.className += ' pt-shown'
} }
}, },
@ -55,7 +77,7 @@ this.PT = {
* @param {HTMLElement} div The div to be hidden * @param {HTMLElement} div The div to be hidden
*/ */
hideDiv(div) { hideDiv(div) {
div.className = div.className.replace(" pt-shown", "") div.className = div.className.replace(' pt-shown', '')
}, },
/** /**
@ -63,18 +85,10 @@ this.PT = {
*/ */
initCKEditor() { initCKEditor() {
ClassicEditor ClassicEditor
.create(document.querySelector("#Text")) .create(document.querySelector('#text'))
.then(editor => window.ckEditor = editor)
.catch(console.error) .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 * Scripts for pages served by the Church controller
*/ */
@ -87,9 +101,9 @@ this.PT = {
* If the interface box is checked, show and require the interface URL field (if not, well... don't) * If the interface box is checked, show and require the interface URL field (if not, well... don't)
*/ */
checkInterface() { checkInterface() {
const div = document.getElementById("divInterfaceAddress") const div = document.getElementById('divInterfaceAddress')
const addr = document.getElementById("InterfaceAddress") const addr = document.getElementById('interfaceAddress')
if (document.getElementById("HasInterface").checked) { if (document.getElementById('hasInterface').checked) {
PT.showDiv(div) PT.showDiv(div)
addr.required = true addr.required = true
} }
@ -103,12 +117,30 @@ this.PT = {
*/ */
onPageLoad() { onPageLoad() {
PT.church.edit.checkInterface() PT.church.edit.checkInterface()
document.getElementById("HasInterface") document.getElementById('hasInterface')
.addEventListener("click", PT.church.edit.checkInterface) .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 * Scripts for pages served by the SmallGroup controller
*/ */
@ -122,23 +154,23 @@ this.PT = {
*/ */
onPageLoad() { onPageLoad() {
PT.initCKEditor() PT.initCKEditor()
const sendNo = document.getElementById("SendToClass_N") const sendNo = document.getElementById('sendN')
const catDiv = document.getElementById("divCategory") const catDiv = document.getElementById('divCategory')
const catSel = document.getElementById("RequestType") const catSel = document.getElementById('requestType')
const addChk = document.getElementById("AddToRequestList") const addChk = document.getElementById('addToRequestList')
if (sendNo !== "undefined") { if (sendNo !== 'undefined') {
const addDiv = document.getElementById("divAddToList") const addDiv = document.getElementById('divAddToList')
sendNo.addEventListener("click", () => { sendNo.addEventListener('click', () => {
PT.hideDiv(addDiv) PT.hideDiv(addDiv)
PT.hideDiv(catDiv) PT.hideDiv(catDiv)
catSel.required = false catSel.required = false
addChk.checked = false addChk.checked = false
}) })
document.getElementById("SendToClass_Y").addEventListener("click", () => { document.getElementById('sendY').addEventListener('click', () => {
PT.showDiv(addDiv) PT.showDiv(addDiv)
}) })
} }
addChk.addEventListener("click", () => { addChk.addEventListener('click', () => {
if (addChk.checked) { if (addChk.checked) {
PT.showDiv(catDiv) PT.showDiv(catDiv)
catSel.required = true catSel.required = true
@ -158,11 +190,11 @@ this.PT = {
* Determine which field should have the focus * Determine which field should have the focus
*/ */
onPageLoad() { onPageLoad() {
const grp = document.getElementById("SmallGroupId") const grp = document.getElementById('SmallGroupId')
if (grp.options[grp.selectedIndex].value === '') { if (grp.options[grp.selectedIndex].value === '') {
grp.focus() grp.focus()
} else { } else {
document.getElementById("Password").focus() document.getElementById('Password').focus()
} }
} }
}, },
@ -178,8 +210,8 @@ this.PT = {
*/ */
toggleType(name) { toggleType(name) {
const isNamed = document.getElementById(`${name}Type_Name`) const isNamed = document.getElementById(`${name}Type_Name`)
const named = document.getElementById(`${name}_Select`) const named = document.getElementById(`${name}Color_Select`)
const custom = document.getElementById(`${name}_Color`) const custom = document.getElementById(`${name}Color_Color`)
if (isNamed.checked) { if (isNamed.checked) {
custom.disabled = true custom.disabled = true
named.disabled = false named.disabled = false
@ -193,9 +225,9 @@ this.PT = {
* Show or hide the class password based on the visibility. * Show or hide the class password based on the visibility.
*/ */
checkVisibility() { checkVisibility() {
const divPw = document.getElementById("divClassPassword") const divPw = document.getElementById('divClassPassword')
if (document.getElementById("Visibility_Public").checked if (document.getElementById('viz_Public').checked
|| document.getElementById("Visibility_Private").checked) { || document.getElementById('viz_Private').checked) {
// Disable password // Disable password
PT.hideDiv(divPw) PT.hideDiv(divPw)
} else { } else {
@ -203,37 +235,24 @@ this.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 * Bind the event handlers
*/ */
onPageLoad() { onPageLoad() {
["Public", "Private", "Password"].map(typ => { ['Public', 'Private', 'Password'].map(typ => {
document.getElementById(`Visibility_${typ}`).addEventListener("click", document.getElementById(`viz_${typ}`).addEventListener('click',
PT.smallGroup.preferences.checkVisibility) PT.smallGroup.preferences.checkVisibility)
}) })
PT.smallGroup.preferences.checkVisibility() PT.smallGroup.preferences.checkVisibility()
;["LineColor", "HeadingColor"].map(name => { ;['headingLine', 'headingText'].map(name => {
document.getElementById(`${name}Type_Name`).addEventListener("click", () => { document.getElementById(`${name}Type_Name`).addEventListener('click', () => {
PT.smallGroup.preferences.toggleType(name) 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)
}) })
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()
}, },
}, },
}, },
@ -251,33 +270,9 @@ this.PT = {
*/ */
onPageLoad(isNew) { onPageLoad(isNew) {
if (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)
})

3
src/Publish-App.ps1 Normal file
View File

@ -0,0 +1,3 @@
Set-Location PrayerTracker
dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained false
Set-Location bin\Release\net5.0\linux-x64\publish

27
src/search-sql.txt Normal file
View File

@ -0,0 +1,27 @@
create extension pg_trgm;
set search_path=pt,public;
create index "IX_PrayerRequest_Requestor_TRGM" on "PrayerRequest" using GIN (COALESCE("Requestor", '') gin_trgm_ops);
create index "IX_PrayerRequest_Text_TRGM" on "PrayerRequest" using GIN ("Text" gin_trgm_ops);
alter table "ListPreference" add column "PageSize" int not null default 100;
alter table "ListPreference" add column "AsOfDateDisplay" varchar(1) not null default 'N';
/* RequestType to 1 character code */
update "PrayerRequest" set "RequestType" = 'C' where "RequestType" = 'Current';
update "PrayerRequest" set "RequestType" = 'L' where "RequestType" = 'Recurring';
update "PrayerRequest" set "RequestType" = 'P' where "RequestType" = 'Praise';
update "PrayerRequest" set "RequestType" = 'E' where "RequestType" = 'Expecting';
update "PrayerRequest" set "RequestType" = 'A' where "RequestType" = 'Announcement';
alter table "PrayerRequest" alter column "RequestType" set data type varchar(1);
/* Change expiration to a 1-character code field */
alter table "PrayerRequest" add column "Expiration" varchar(1);
update "PrayerRequest" set "Expiration" = case when "IsManuallyExpired" then 'F' when "DoNotExpire" then 'M' else 'A' end;
alter table "PrayerRequest" alter column "Expiration" set not null;
alter table "PrayerRequest" drop column "DoNotExpire";
alter table "PrayerRequest" drop column "IsManuallyExpired";
/* Change e-mail type to 1-character code field in list preferences and members */
update "ListPreference" set "DefaultEmailType" = 'H' where "DefaultEmailType" = 'Html';
update "ListPreference" set "DefaultEmailType" = 'P' where "DefaultEmailType" = 'Text';
alter table "ListPreference" alter column "DefaultEmailType" set default 'H';
alter table "ListPreference" alter column "DefaultEmailType" set data type varchar(1);
update "Member" set "Format" = 'H' where "Format" = 'Html';
update "Member" set "Format" = 'P' where "Format" = 'Text';
alter table "Member" alter column "Format" set data type varchar(1);