From 72cb07ab4def10f0cb999dd7831130c279b5df24 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Fri, 24 Sep 2021 11:27:31 -0400
Subject: [PATCH] WIP on app layout

---
 .gitignore                                    |  4 +-
 src/MyPrayerJournal/Api/Data.fs               |  4 +-
 src/MyPrayerJournal/Api/Program.fs            |  4 +-
 src/MyPrayerJournal/Api/appsettings.json      |  3 ++
 src/MyPrayerJournal/App/package.json          |  2 +-
 src/MyPrayerJournal/App/src/App.vue           |  9 ++---
 .../App/src/components/NavigationBar.vue      | 38 +++++++++----------
 src/MyPrayerJournal/App/src/store/index.ts    | 11 ++++--
 src/MyPrayerJournal/App/vue.config.js         |  1 +
 src/MyPrayerJournal/Migrate/Program.fs        |  4 +-
 src/MyPrayerJournal/Migrate/mpj-log.db        |  0
 11 files changed, 39 insertions(+), 41 deletions(-)
 delete mode 100644 src/MyPrayerJournal/Migrate/mpj-log.db

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 @@
 <template lang="pug">
 .mpj-app
-  #nav
-    router-link(to="/") Home
-    | |
-    router-link(to="/about") About
+  navigation-bar
   router-view
 </template>
 
 <script setup lang="ts">
 import "bootstrap/dist/css/bootstrap.min.css"
+
+import NavigationBar from "@/components/NavigationBar.vue"
+
 </script>
 
 <style lang="sass">
@@ -16,7 +16,6 @@ import "bootstrap/dist/css/bootstrap.min.css"
   font-family: Avenir, Helvetica, Arial, sans-serif
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
-  text-align: center
   color: #2c3e50
 #nav
   padding: 30px
diff --git a/src/MyPrayerJournal/App/src/components/NavigationBar.vue b/src/MyPrayerJournal/App/src/components/NavigationBar.vue
index d6673e8..cf9aa3e 100644
--- a/src/MyPrayerJournal/App/src/components/NavigationBar.vue
+++ b/src/MyPrayerJournal/App/src/components/NavigationBar.vue
@@ -1,33 +1,32 @@
 <template lang="pug">
-.md-toolbar-row
-  md-tabs(md-sync-route).md-primary
-    template(v-if="isAuthenticated")
-      md-tab(md-label="Journal" to="/journal")
-      md-tab(md-label="Active" to="/requests/active")
-      md-tab(v-if="hasSnoozed" md-label="Snoozed" to="/requests/snoozed")
-      md-tab(md-label="Answered" to="/requests/answered")
-      md-tab(md-label="Log Off" href="/user/log-off" @click.prevent="logOff()")
-    template(v-else)
-      md-tab(md-label="Log On" href="/user/log-on" @click.prevent="logOn()")
-    md-tab(md-label="Docs" href="https://docs.prayerjournal.me" @click.prevent="showHelp()")
+nav.navbar
+  .container-fluid
+    router-link.navbar-brand(to="/") myPrayerJournal
+    ul.navbar-nav.me-auto.d-flex.flex-row
+      template(v-if="isAuthenticated")
+        li.nav-item: router-link(to="/journal") Journal
+        li.nav-item: router-link(to="/requests/active") Active
+        li.nav-item(v-if="hasSnoozed"): router-link(to="/requests/snoozed") Snoozed
+        li.nav-item: router-link(to="/requests/answered") Answered
+        li.nav-item: a(href="/user/log-off" @click.prevent="logOff()") Log Off
+      template(v-else)
+        li.nav-item: a(href="/user/log-on" @click.prevent="logOn()") Log On
+      li.nav-item: a(href="https://docs.prayerjournal.me" target="_blank") Docs
 </template>
 
 <script setup lang="ts">
-import { computed, inject } from "vue"
+import { computed } from "vue"
 import { useRouter } from "vue-router"
 
+import { useAuth } from "@/plugins/auth"
 import { useStore } from "@/store"
-import { AuthService } from "@/auth"
-import { AuthSymbol } from "@/App.vue"
 
 const store = useStore()
 const router = useRouter()
-
-/** The auth service */
-const auth = inject(AuthSymbol) as AuthService
+const auth = useAuth()
 
 /** Whether a user is authenticated */
-const isAuthenticated = computed(() => store.state.isAuthenticated)
+const isAuthenticated = computed(() => store?.state.isAuthenticated ?? false)
 
 /** Whether the user has any snoozed requests */
 const hasSnoozed = computed(() =>
@@ -43,7 +42,4 @@ const logOff = () => {
   auth.logout(store)
   router.push("/")
 }
-
-/** Open a new window/tab with help */
-const showHelp = () => { window.open("https://docs.prayerjournal.me", "_blank") }
 </script>
diff --git a/src/MyPrayerJournal/App/src/store/index.ts b/src/MyPrayerJournal/App/src/store/index.ts
index ee77adf..a10e237 100644
--- a/src/MyPrayerJournal/App/src/store/index.ts
+++ b/src/MyPrayerJournal/App/src/store/index.ts
@@ -3,7 +3,7 @@ import { createStore, Store, useStore as baseUseStore } from "vuex"
 import { useTitle } from "@vueuse/core"
 
 import api, { JournalRequest } from "@/api"
-import auth from "@/auth"
+import { useAuth } from "@/plugins/auth"
 
 import * as Actions from "./actions"
 import * as Mutations from "./mutations"
@@ -58,12 +58,15 @@ const sortValue = (it : JournalRequest) => it.showAfter === 0 ? it.asOf : it.sho
  * Sort journal requests either by asOf or showAfter
  */
 const journalSort = (a : JournalRequest, b : JournalRequest) => sortValue(a) - sortValue(b)
- 
+
+/** The authentication service */
+const auth = useAuth()
+
 export default createStore({
   state: () : State => ({
     pageTitle: appName,
-    user: auth.session.profile,
-    isAuthenticated: auth.isAuthenticated(),
+    user: auth?.session.profile ?? {},
+    isAuthenticated: auth?.isAuthenticated() ?? false,
     journal: [],
     isLoadingJournal: false
   }),
diff --git a/src/MyPrayerJournal/App/vue.config.js b/src/MyPrayerJournal/App/vue.config.js
index 2c57cc8..2635591 100644
--- a/src/MyPrayerJournal/App/vue.config.js
+++ b/src/MyPrayerJournal/App/vue.config.js
@@ -1,5 +1,6 @@
 module.exports = {
   lintOnSave: false,
+  outputDir: "../Api/wwwroot",
   configureWebpack: {
     module: {
       rules: [{
diff --git a/src/MyPrayerJournal/Migrate/Program.fs b/src/MyPrayerJournal/Migrate/Program.fs
index 2534f7c..cfd0012 100644
--- a/src/MyPrayerJournal/Migrate/Program.fs
+++ b/src/MyPrayerJournal/Migrate/Program.fs
@@ -49,9 +49,7 @@ let migrated =
         history      = Subdocs.history r?history
         notes        = Subdocs.notes r?notes
       })
-  |> Seq.iter (fun req ->
-      printfn "%A" req
-      db.GetCollection<Request>("request").Insert req |> ignore)
+  |> db.GetCollection<Request>("request").Insert
 
 db.Checkpoint ()
 
diff --git a/src/MyPrayerJournal/Migrate/mpj-log.db b/src/MyPrayerJournal/Migrate/mpj-log.db
deleted file mode 100644
index e69de29..0000000