diff --git a/.gitignore b/.gitignore
index 5e6f95f..1aa7499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -256,7 +256,7 @@ paket-files/
.ionide
# Compiled files / application
-src/build
+src/MyPrayerJournal/Api/*.db
src/MyPrayerJournal/Api/wwwroot/favicon.ico
src/MyPrayerJournal/Api/wwwroot/index.html
src/MyPrayerJournal/Api/wwwroot/*.js
@@ -264,5 +264,3 @@ src/MyPrayerJournal/Api/wwwroot/*.js.map
src/MyPrayerJournal/Api/wwwroot/css
src/MyPrayerJournal/Api/wwwroot/js
src/MyPrayerJournal/Api/appsettings.Development.json
-/build
-src/*.exe
diff --git a/src/MyPrayerJournal/Api/Data.fs b/src/MyPrayerJournal/Api/Data.fs
index 2e567dd..5f20e58 100644
--- a/src/MyPrayerJournal/Api/Data.fs
+++ b/src/MyPrayerJournal/Api/Data.fs
@@ -65,7 +65,7 @@ module Mapping =
doc.["recurType"] <- BsonValue (Recurrence.toString req.recurType)
doc.["recurCount"] <- BsonValue req.recurCount
doc.["history"] <- BsonArray (req.history |> List.map historyToBson |> Seq.ofList)
- doc.["notes"] <- BsonArray (req.notes |> List.map noteToBson |> Seq.ofList)
+ doc.["notes"] <- BsonArray (req.notes |> List.map noteToBson |> Seq.ofList)
upcast doc
/// Map a BSON document to a request
@@ -78,7 +78,7 @@ module Mapping =
recurType = Recurrence.fromString doc.["recurType"].AsString
recurCount = int16 doc.["recurCount"].AsInt32
history = doc.["history"].AsArray |> Seq.map historyFromBson |> List.ofSeq
- notes = doc.["notes"].AsArray |> Seq.map noteFromBson |> List.ofSeq
+ notes = doc.["notes"].AsArray |> Seq.map noteFromBson |> List.ofSeq
}
/// Set up the mapping
diff --git a/src/MyPrayerJournal/Api/Program.fs b/src/MyPrayerJournal/Api/Program.fs
index 5eb3905..205fbf7 100644
--- a/src/MyPrayerJournal/Api/Program.fs
+++ b/src/MyPrayerJournal/Api/Program.fs
@@ -18,8 +18,8 @@ module Configure =
let appConfiguration (bldr : WebApplicationBuilder) =
bldr.Configuration
.SetBasePath(bldr.Environment.ContentRootPath)
- .AddJsonFile("appsettings.json", optional = true, reloadOnChange = true)
- .AddJsonFile($"appsettings.{bldr.Environment.EnvironmentName}.json")
+ .AddJsonFile("appsettings.json", optional = false, reloadOnChange = true)
+ .AddJsonFile($"appsettings.{bldr.Environment.EnvironmentName}.json", optional = true, reloadOnChange = true)
.AddEnvironmentVariables ()
|> ignore
bldr
diff --git a/src/MyPrayerJournal/Api/appsettings.json b/src/MyPrayerJournal/Api/appsettings.json
index 9d278ae..2e2d592 100644
--- a/src/MyPrayerJournal/Api/appsettings.json
+++ b/src/MyPrayerJournal/Api/appsettings.json
@@ -1,4 +1,7 @@
{
+ "ConnectionStrings": {
+ "db": "Filename=./mpj.db"
+ },
"Kestrel": {
"EndPoints": {
"Http": {
diff --git a/src/MyPrayerJournal/App/package.json b/src/MyPrayerJournal/App/package.json
index f29f604..585cd23 100644
--- a/src/MyPrayerJournal/App/package.json
+++ b/src/MyPrayerJournal/App/package.json
@@ -10,7 +10,7 @@
"lint": "vue-cli-service lint",
"apistart": "cd ../Api && dotnet run",
"publish": "vue-cli-service build --modern && cd ../Api && dotnet publish -c Release -r linux-x64 --self-contained false",
- "vue": "vue-cli-service build --modern && cd ../Api && dotnet run"
+ "vue": "vue-cli-service build --development && cd ../Api && dotnet run"
},
"dependencies": {
"@vueuse/core": "^6.4.1",
diff --git a/src/MyPrayerJournal/App/src/App.vue b/src/MyPrayerJournal/App/src/App.vue
index 9ca976c..27845d3 100644
--- a/src/MyPrayerJournal/App/src/App.vue
+++ b/src/MyPrayerJournal/App/src/App.vue
@@ -1,14 +1,14 @@
.mpj-app
- #nav
- router-link(to="/") Home
- | |
- router-link(to="/about") About
+ navigation-bar
router-view