Skip to content
This repository was archived by the owner on Jun 29, 2024. It is now read-only.

Commit 13ace6c

Browse files
danieljsummersdanieljsummers
authored
Version 8 (#43)
* Use htmx for front end (#36) * Use short GUIDs in URLs and forms (#1) * Refresh theme (#38) * Use ASP.NET Core for log on/off (#39) * Fix date/time / time zone issues (#41) * Update help for v8 (#42) * Add FAKE build script (#37)
1 parent 58519f9 commit 13ace6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+7511
-7145
lines changed

‎.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"fake-cli": {
6+
"version": "5.23.0",
7+
"commands": [
8+
"fake"
9+
]
10+
}
11+
}
12+
}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,5 +332,6 @@ ASALocalRun/
332332
### --- ###
333333
src/PrayerTracker/appsettings.json
334334
docs/_site
335+
**/*.db*
335336

336337
.ionide

‎build.fsx

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#r "paket:
2+
nuget Fake.DotNet.Cli
3+
nuget Fake.DotNet.Testing.Expecto
4+
nuget Fake.IO.FileSystem
5+
nuget Fake.Core.Target //"
6+
#load ".fake/build.fsx/intellisense.fsx"
7+
open Fake.Core
8+
open Fake.DotNet
9+
open Fake.DotNet.Testing
10+
open Fake.IO
11+
open Fake.IO.Globbing.Operators
12+
open Fake.Core.TargetOperators
13+
14+
Target.initEnvironment ()
15+
16+
/// The root path to the projects within this solution
17+
let projPath = "src/PrayerTracker"
18+
19+
Target.create "Clean" (fun _ ->
20+
!! "src/**/bin"
21+
++ "src/**/obj"
22+
|> Shell.cleanDirs
23+
)
24+
25+
Target.create "Test" (fun _ ->
26+
let testPath = $"{projPath}.Tests"
27+
DotNet.build (fun opts -> { opts with NoLogo = true }) $"{testPath}/PrayerTracker.Tests.fsproj"
28+
Expecto.run
29+
(fun opts -> { opts with WorkingDirectory = $"{testPath}/bin/Release/net6.0" })
30+
[ "PrayerTracker.Tests.dll" ])
31+
32+
Target.create "Publish" (fun _ ->
33+
DotNet.publish
34+
(fun opts -> { opts with Runtime = Some "linux-x64"; SelfContained = Some false; NoLogo = true })
35+
$"{projPath}/PrayerTracker.fsproj")
36+
37+
Target.create "All" ignore
38+
39+
"Clean"
40+
==> "Test"
41+
==> "Publish"
42+
==> "All"
43+
44+
Target.runOrDefault "All"

‎build.fsx.lock

Lines changed: 233 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,233 @@
1+
STORAGE: NONE
2+
RESTRICTION: || (== net6.0) (== netstandard2.0)
3+
NUGET
4+
remote: https://api.nuget.org/v3/index.json
5+
BlackFox.VsWhere (1.1)
6+
FSharp.Core (>= 4.2.3)
7+
Microsoft.Win32.Registry (>= 4.7)
8+
Fake.Core.CommandLineParsing (5.23)
9+
FParsec (>= 1.1.1)
10+
FSharp.Core (>= 6.0)
11+
Fake.Core.Context (5.23)
12+
FSharp.Core (>= 6.0)
13+
Fake.Core.Environment (5.23)
14+
FSharp.Core (>= 6.0)
15+
Fake.Core.FakeVar (5.23)
16+
Fake.Core.Context (>= 5.23)
17+
FSharp.Core (>= 6.0)
18+
Fake.Core.Process (5.23)
19+
Fake.Core.Environment (>= 5.23)
20+
Fake.Core.FakeVar (>= 5.23)
21+
Fake.Core.String (>= 5.23)
22+
Fake.Core.Trace (>= 5.23)
23+
Fake.IO.FileSystem (>= 5.23)
24+
FSharp.Core (>= 6.0)
25+
System.Collections.Immutable (>= 5.0)
26+
Fake.Core.SemVer (5.23)
27+
FSharp.Core (>= 6.0)
28+
Fake.Core.String (5.23)
29+
FSharp.Core (>= 6.0)
30+
Fake.Core.Target (5.23)
31+
Fake.Core.CommandLineParsing (>= 5.23)
32+
Fake.Core.Context (>= 5.23)
33+
Fake.Core.Environment (>= 5.23)
34+
Fake.Core.FakeVar (>= 5.23)
35+
Fake.Core.Process (>= 5.23)
36+
Fake.Core.String (>= 5.23)
37+
Fake.Core.Trace (>= 5.23)
38+
FSharp.Control.Reactive (>= 5.0.2)
39+
FSharp.Core (>= 6.0)
40+
Fake.Core.Tasks (5.23)
41+
Fake.Core.Trace (>= 5.23)
42+
FSharp.Core (>= 6.0)
43+
Fake.Core.Trace (5.23)
44+
Fake.Core.Environment (>= 5.23)
45+
Fake.Core.FakeVar (>= 5.23)
46+
FSharp.Core (>= 6.0)
47+
Fake.Core.Xml (5.23)
48+
Fake.Core.String (>= 5.23)
49+
FSharp.Core (>= 6.0)
50+
Fake.DotNet.Cli (5.23)
51+
Fake.Core.Environment (>= 5.23)
52+
Fake.Core.Process (>= 5.23)
53+
Fake.Core.String (>= 5.23)
54+
Fake.Core.Trace (>= 5.23)
55+
Fake.DotNet.MSBuild (>= 5.23)
56+
Fake.DotNet.NuGet (>= 5.23)
57+
Fake.IO.FileSystem (>= 5.23)
58+
FSharp.Core (>= 6.0)
59+
Mono.Posix.NETStandard (>= 1.0)
60+
Newtonsoft.Json (>= 13.0.1)
61+
Fake.DotNet.MSBuild (5.23)
62+
BlackFox.VsWhere (>= 1.1)
63+
Fake.Core.Environment (>= 5.23)
64+
Fake.Core.Process (>= 5.23)
65+
Fake.Core.String (>= 5.23)
66+
Fake.Core.Trace (>= 5.23)
67+
Fake.IO.FileSystem (>= 5.23)
68+
FSharp.Core (>= 6.0)
69+
MSBuild.StructuredLogger (>= 2.1.545)
70+
Fake.DotNet.NuGet (5.23)
71+
Fake.Core.Environment (>= 5.23)
72+
Fake.Core.Process (>= 5.23)
73+
Fake.Core.SemVer (>= 5.23)
74+
Fake.Core.String (>= 5.23)
75+
Fake.Core.Tasks (>= 5.23)
76+
Fake.Core.Trace (>= 5.23)
77+
Fake.Core.Xml (>= 5.23)
78+
Fake.IO.FileSystem (>= 5.23)
79+
Fake.Net.Http (>= 5.23)
80+
FSharp.Core (>= 6.0)
81+
Newtonsoft.Json (>= 13.0.1)
82+
NuGet.Protocol (>= 5.11)
83+
Fake.DotNet.Testing.Expecto (5.23)
84+
Fake.Core.Process (>= 5.23)
85+
Fake.Core.String (>= 5.23)
86+
Fake.Core.Trace (>= 5.23)
87+
Fake.IO.FileSystem (>= 5.23)
88+
Fake.Testing.Common (>= 5.23)
89+
FSharp.Core (>= 6.0)
90+
Fake.IO.FileSystem (5.23)
91+
Fake.Core.String (>= 5.23)
92+
FSharp.Core (>= 6.0)
93+
Fake.Net.Http (5.23)
94+
Fake.Core.Trace (>= 5.23)
95+
FSharp.Core (>= 6.0)
96+
Fake.Testing.Common (5.23)
97+
Fake.Core.Trace (>= 5.23)
98+
FSharp.Core (>= 6.0)
99+
FParsec (1.1.1)
100+
FSharp.Core (>= 4.3.4)
101+
FSharp.Control.Reactive (5.0.5)
102+
FSharp.Core (>= 4.7.2)
103+
System.Reactive (>= 5.0 < 6.0)
104+
FSharp.Core (6.0.5)
105+
Microsoft.Build (17.2)
106+
Microsoft.Build.Framework (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
107+
Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
108+
Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
109+
System.Collections.Immutable (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
110+
System.Configuration.ConfigurationManager (>= 4.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
111+
System.Reflection.Metadata (>= 1.6) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
112+
System.Security.Principal.Windows (>= 4.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
113+
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
114+
System.Text.Json (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
115+
System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
116+
Microsoft.Build.Framework (17.2)
117+
Microsoft.Win32.Registry (>= 4.3)
118+
System.Security.Permissions (>= 4.7)
119+
Microsoft.Build.Tasks.Core (17.2)
120+
Microsoft.Build.Framework (>= 17.2)
121+
Microsoft.Build.Utilities.Core (>= 17.2)
122+
Microsoft.NET.StringTools (>= 1.0)
123+
Microsoft.Win32.Registry (>= 4.3)
124+
System.CodeDom (>= 4.4)
125+
System.Collections.Immutable (>= 5.0)
126+
System.Reflection.Metadata (>= 1.6)
127+
System.Resources.Extensions (>= 4.6)
128+
System.Security.Cryptography.Pkcs (>= 4.7)
129+
System.Security.Cryptography.Xml (>= 4.7)
130+
System.Security.Permissions (>= 4.7)
131+
System.Threading.Tasks.Dataflow (>= 6.0)
132+
Microsoft.Build.Utilities.Core (17.2)
133+
Microsoft.Build.Framework (>= 17.2)
134+
Microsoft.NET.StringTools (>= 1.0)
135+
Microsoft.Win32.Registry (>= 4.3)
136+
System.Collections.Immutable (>= 5.0)
137+
System.Configuration.ConfigurationManager (>= 4.7)
138+
System.Security.Permissions (>= 4.7) - restriction: == netstandard2.0
139+
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: == netstandard2.0
140+
Microsoft.NET.StringTools (1.0)
141+
System.Memory (>= 4.5.4)
142+
System.Runtime.CompilerServices.Unsafe (>= 5.0)
143+
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)
144+
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard1.2)) (&& (== net6.0) (< netstandard1.3)) (&& (== net6.0) (< netstandard1.5)) (== netstandard2.0)
145+
Microsoft.Win32.Registry (5.0)
146+
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)
147+
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
148+
System.Security.AccessControl (>= 5.0)
149+
System.Security.Principal.Windows (>= 5.0)
150+
Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
151+
Mono.Posix.NETStandard (1.0)
152+
MSBuild.StructuredLogger (2.1.669)
153+
Microsoft.Build (>= 16.10)
154+
Microsoft.Build.Framework (>= 16.10)
155+
Microsoft.Build.Tasks.Core (>= 16.10)
156+
Microsoft.Build.Utilities.Core (>= 16.10)
157+
Newtonsoft.Json (13.0.1)
158+
NuGet.Common (6.3)
159+
NuGet.Frameworks (>= 6.3)
160+
NuGet.Configuration (6.3)
161+
NuGet.Common (>= 6.3)
162+
System.Security.Cryptography.ProtectedData (>= 4.4)
163+
NuGet.Frameworks (6.3)
164+
NuGet.Packaging (6.3)
165+
Newtonsoft.Json (>= 13.0.1)
166+
NuGet.Configuration (>= 6.3)
167+
NuGet.Versioning (>= 6.3)
168+
System.Security.Cryptography.Cng (>= 5.0)
169+
System.Security.Cryptography.Pkcs (>= 5.0)
170+
NuGet.Protocol (6.3)
171+
NuGet.Packaging (>= 6.3)
172+
NuGet.Versioning (6.3)
173+
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)
174+
System.CodeDom (6.0)
175+
System.Collections.Immutable (6.0)
176+
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
177+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
178+
System.Configuration.ConfigurationManager (6.0)
179+
System.Security.Cryptography.ProtectedData (>= 6.0)
180+
System.Security.Permissions (>= 6.0)
181+
System.Drawing.Common (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
182+
Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
183+
System.Formats.Asn1 (6.0)
184+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
185+
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
186+
System.Memory (4.5.5)
187+
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)
188+
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
189+
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)
190+
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
191+
System.Reactive (5.0)
192+
System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
193+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
194+
System.Reflection.Metadata (6.0.1)
195+
System.Collections.Immutable (>= 6.0)
196+
System.Resources.Extensions (6.0)
197+
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
198+
System.Runtime (4.3.1) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
199+
Microsoft.NETCore.Platforms (>= 1.1.1)
200+
Microsoft.NETCore.Targets (>= 1.1.3)
201+
System.Runtime.CompilerServices.Unsafe (6.0)
202+
System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
203+
System.Runtime (>= 4.3)
204+
System.Security.AccessControl (6.0)
205+
System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
206+
System.Security.Cryptography.Cng (5.0)
207+
System.Formats.Asn1 (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
208+
System.Security.Cryptography.Pkcs (6.0.1)
209+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
210+
System.Formats.Asn1 (>= 6.0)
211+
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
212+
System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
213+
System.Security.Cryptography.ProtectedData (6.0)
214+
System.Security.Cryptography.Xml (6.0.1)
215+
System.Memory (>= 4.5.4) - restriction: == netstandard2.0
216+
System.Security.AccessControl (>= 6.0)
217+
System.Security.Cryptography.Pkcs (>= 6.0.1)
218+
System.Security.Permissions (6.0)
219+
System.Security.AccessControl (>= 6.0)
220+
System.Windows.Extensions (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
221+
System.Security.Principal.Windows (5.0)
222+
System.Text.Encoding.CodePages (6.0)
223+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
224+
System.Text.Encodings.Web (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
225+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
226+
System.Text.Json (6.0.5) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
227+
System.Runtime.CompilerServices.Unsafe (>= 6.0)
228+
System.Text.Encodings.Web (>= 6.0)
229+
System.Threading.Tasks.Dataflow (6.0)
230+
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
231+
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)
232+
System.Windows.Extensions (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
233+
System.Drawing.Common (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))

‎docs/en/requests/maintain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If you are looking for a particular requests, enter some text in the search box
1414

1515
## Edit Request
1616
17-
To edit a request, click the blue pencil icon; it's the first icon under the “Actions” column heading.
17+
To edit a request, click the pencil icon; it's the first icon under the “Actions” column heading.
1818

1919
## Expire a Request
2020

@@ -26,4 +26,4 @@ When the page is first displayed, it does not display inactive requests. However
2626

2727
## Delete a Request
2828

29-
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.
29+
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 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.

‎docs/en/small-group/members.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ To add an e-mail address, click the icon or text in the center of the page, belo
1010

1111
## Edit Group Member
1212

13-
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.
13+
To edit an e-mail address, click the 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.
1414

1515
## Delete a Group Member
1616

17-
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.)
17+
To delete an e-mail address, click the 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.)

0 commit comments

Comments
 (0)