From 96f2f2f7e079c9cb10aad5b6ed53d9b6cb3be684 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Tue, 14 Aug 2018 21:01:21 -0500
Subject: [PATCH 01/10] Added recurrence SQL; updated API

API should support recurrence (#16); also updated for new F# match! statement
---
 src/api/MyPrayerJournal.Api/Data.fs     | 39 ++++++++----
 src/api/MyPrayerJournal.Api/Handlers.fs | 85 +++++++++++++++----------
 src/api/MyPrayerJournal.Api/Program.fs  |  2 +-
 src/sql/16-recurrence.sql               | 31 +++++++++
 4 files changed, 112 insertions(+), 45 deletions(-)
 create mode 100644 src/sql/16-recurrence.sql

diff --git a/src/api/MyPrayerJournal.Api/Data.fs b/src/api/MyPrayerJournal.Api/Data.fs
index fefb8de..5fef05f 100644
--- a/src/api/MyPrayerJournal.Api/Data.fs
+++ b/src/api/MyPrayerJournal.Api/Data.fs
@@ -88,7 +88,7 @@ module Entities =
           m.Property(fun e -> e.notes).IsRequired () |> ignore)
       |> ignore
 
-  // Request is the identifying record for a prayer request.
+  /// Request is the identifying record for a prayer request
   and [<CLIMutable; NoComparison; NoEquality>] Request =
     { /// The ID of the request
       requestId    : RequestId
@@ -96,8 +96,14 @@ module Entities =
       enteredOn    : int64
       /// The ID of the user to whom this request belongs ("sub" from the JWT)
       userId       : string
-      /// The time that this request should reappear in the user's journal
+      /// The time at which this request should reappear in the user's journal by manual user choice
       snoozedUntil : int64
+      /// The time at which this request should reappear in the user's journal by recurrence
+      showAfter    : int64
+      /// The type of recurrence for this request
+      recurType    : string
+      /// How many of the recurrence intervals should occur between appearances in the journal
+      recurCount   : int16
       /// The history entries for this request
       history      : ICollection<History>
       /// The notes for this request
@@ -110,6 +116,9 @@ module Entities =
         enteredOn    = 0L
         userId       = ""
         snoozedUntil = 0L
+        showAfter    = 0L
+        recurType    = "immediate"
+        recurCount   = 0s
         history      = List<History> ()
         notes        = List<Note> ()
         }
@@ -123,6 +132,9 @@ module Entities =
           m.Property(fun e -> e.enteredOn).IsRequired () |> ignore
           m.Property(fun e -> e.userId).IsRequired () |> ignore
           m.Property(fun e -> e.snoozedUntil).IsRequired () |> ignore
+          m.Property(fun e -> e.showAfter).IsRequired () |> ignore
+          m.Property(fun e -> e.recurType).IsRequired() |> ignore
+          m.Property(fun e -> e.recurCount).IsRequired() |> ignore
           m.HasMany(fun e -> e.history :> IEnumerable<History>)
             .WithOne()
             .HasForeignKey(fun e -> e.requestId :> obj)
@@ -149,6 +161,12 @@ module Entities =
       lastStatus   : string
       /// The time that this request should reappear in the user's journal
       snoozedUntil : int64
+      /// The time after which this request should reappear in the user's journal by configured recurrence
+      showAfter    : int64
+      /// The type of recurrence for this request
+      recurType    : string
+      /// How many of the recurrence intervals should occur between appearances in the journal
+      recurCount   : int16
       /// History entries for the request
       history      : History list
       /// Note entries for the request
@@ -236,8 +254,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
   /// Retrieve notes for a request by its ID and user ID
   member this.NotesById reqId userId =
     task {
-      let! req = this.TryRequestById reqId userId
-      match req with
+      match! this.TryRequestById reqId userId with
       | Some _ -> return this.Notes.AsNoTracking().Where(fun n -> n.requestId = reqId) |> List.ofSeq
       | None -> return []
       }
@@ -252,16 +269,15 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
   /// Retrieve a request, including its history and notes, by its ID and user ID
   member this.TryCompleteRequestById requestId userId =
     task {
-      let! req = this.TryJournalById requestId userId
-      match req with
-      | Some r ->
+      match! this.TryJournalById requestId userId with
+      | Some req ->
           let! fullReq =
             this.Requests.AsNoTracking()
               .Include(fun r -> r.history)
               .Include(fun r -> r.notes)
               .FirstOrDefaultAsync(fun r -> r.requestId = requestId && r.userId = userId)
           match toOption fullReq with
-          | Some _ -> return Some { r with history = List.ofSeq fullReq.history; notes = List.ofSeq fullReq.notes }
+          | Some _ -> return Some { req with history = List.ofSeq fullReq.history; notes = List.ofSeq fullReq.notes }
           | None -> return None
       | None -> return None
       }
@@ -269,15 +285,14 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
   /// Retrieve a request, including its history, by its ID and user ID
   member this.TryFullRequestById requestId userId =
     task {
-      let! req = this.TryJournalById requestId userId
-      match req with
-      | Some r ->
+      match! this.TryJournalById requestId userId with
+      | Some req ->
           let! fullReq =
             this.Requests.AsNoTracking()
               .Include(fun r -> r.history)
               .FirstOrDefaultAsync(fun r -> r.requestId = requestId && r.userId = userId)
           match toOption fullReq with
-          | Some _ -> return Some { r with history = List.ofSeq fullReq.history }
+          | Some _ -> return Some { req with history = List.ofSeq fullReq.history }
           | None -> return None
       | None -> return None
       }
diff --git a/src/api/MyPrayerJournal.Api/Handlers.fs b/src/api/MyPrayerJournal.Api/Handlers.fs
index cf41c4c..7df9836 100644
--- a/src/api/MyPrayerJournal.Api/Handlers.fs
+++ b/src/api/MyPrayerJournal.Api/Handlers.fs
@@ -6,6 +6,14 @@ open Giraffe
 open MyPrayerJournal
 open System
 
+/// Handler to return Vue files
+module Vue =
+  
+  /// The application index page
+  let app : HttpHandler = htmlFile "wwwroot/index.html"
+
+
+/// Handlers for error conditions
 module Error =
 
   open Microsoft.Extensions.Logging
@@ -23,7 +31,7 @@ module Error =
       |> List.length
       |> function
       | 0 -> (setStatusCode 404 >=> json ([ "error", "not found" ] |> dict)) next ctx
-      | _ -> htmlFile "wwwroot/index.html" next ctx
+      | _ -> Vue.app next ctx
 
 
 /// Handler helpers
@@ -92,6 +100,10 @@ module Models =
   type Request =
     { /// The text of the request
       requestText : string
+      /// The recurrence type
+      recurType   : string
+      /// The recurrence count
+      recurCount  : int16 option
       }
   
   /// The time until which a request should not appear in the journal
@@ -119,6 +131,15 @@ module Request =
   
   open NCuid
   
+  /// Ticks per recurrence
+  let private recurrence =
+    [ "immediate",         0L
+      "hours",       3600000L
+      "days",       86400000L
+      "weeks",     604800000L
+      ]
+    |> Map.ofList
+
   /// POST /api/request
   let add : HttpHandler =
     authorize
@@ -130,10 +151,12 @@ module Request =
         let  usrId = userId ctx
         let  now   = jsNow ()
         { Request.empty with
-            requestId    = reqId
-            userId       = usrId
-            enteredOn    = now
-            snoozedUntil = 0L
+            requestId  = reqId
+            userId     = usrId
+            enteredOn  = now
+            showAfter  = now
+            recurType  = r.recurType
+            recurCount = defaultArg r.recurCount 0s
           }
         |> db.AddEntry
         { History.empty with
@@ -144,9 +167,8 @@ module Request =
             }
         |> db.AddEntry
         let! _   = db.SaveChangesAsync ()
-        let! req = db.TryJournalById reqId usrId
-        match req with
-        | Some rqst -> return! (setStatusCode 201 >=> json rqst) next ctx
+        match! db.TryJournalById reqId usrId with
+        | Some req -> return! (setStatusCode 201 >=> json req) next ctx
         | None -> return! Error.notFound next ctx
         }
 
@@ -155,18 +177,22 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let  db  = db ctx
-        let! req = db.TryRequestById reqId (userId ctx)
-        match req with
-        | Some _ ->
+        let db = db ctx
+        match! db.TryRequestById reqId (userId ctx) with
+        | Some req ->
             let! hist = ctx.BindJsonAsync<Models.HistoryEntry> ()
+            let  now  = jsNow ()
             { History.empty with
                 requestId = reqId
-                asOf      = jsNow ()
+                asOf      = now
                 status    = hist.status
                 text      = match hist.updateText with null | "" -> None | x -> Some x
               }
             |> db.AddEntry
+            match hist.status with
+            | "Prayed" ->
+                db.UpdateEntry { req with showAfter = now + (recurrence.[req.recurType] * int64 req.recurCount) }
+            | _ -> ()
             let! _ = db.SaveChangesAsync ()
             return! created next ctx
         | None -> return! Error.notFound next ctx
@@ -177,15 +203,14 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let  db  = db ctx
-        let! req = db.TryRequestById reqId (userId ctx)
-        match req with
+        let db = db ctx
+        match! db.TryRequestById reqId (userId ctx) with
         | Some _ ->
             let! notes = ctx.BindJsonAsync<Models.NoteEntry> ()
             { Note.empty with
                 requestId = reqId
-                asOf = jsNow ()
-                notes = notes.notes
+                asOf      = jsNow ()
+                notes     = notes.notes
               }
             |> db.AddEntry
             let! _ = db.SaveChangesAsync ()
@@ -206,9 +231,8 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let! req = (db ctx).TryJournalById reqId (userId ctx)
-        match req with
-        | Some r -> return! json r next ctx
+        match! (db ctx).TryJournalById reqId (userId ctx) with
+        | Some req -> return! json req next ctx
         | None -> return! Error.notFound next ctx
         }
   
@@ -217,9 +241,8 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let! req = (db ctx).TryCompleteRequestById reqId (userId ctx)
-        match req with
-        | Some r -> return! json r next ctx
+        match! (db ctx).TryCompleteRequestById reqId (userId ctx) with
+        | Some req -> return! json req next ctx
         | None -> return! Error.notFound next ctx
         }
   
@@ -228,9 +251,8 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let! req = (db ctx).TryFullRequestById reqId (userId ctx)
-        match req with
-        | Some r -> return! json r next ctx
+        match! (db ctx).TryFullRequestById reqId (userId ctx) with
+        | Some req -> return! json req next ctx
         | None -> return! Error.notFound next ctx
         }
   
@@ -248,12 +270,11 @@ module Request =
     authorize
     >=> fun next ctx ->
       task {
-        let  db  = db ctx
-        let! req = db.TryRequestById reqId (userId ctx)
-        match req with
-        | Some r ->
+        let db = db ctx
+        match! db.TryRequestById reqId (userId ctx) with
+        | Some req ->
             let! until = ctx.BindJsonAsync<Models.SnoozeUntil> ()
-            { r with snoozedUntil = until.until }
+            { req with snoozedUntil = until.until; showAfter = until.until }
             |> db.UpdateEntry
             let! _ = db.SaveChangesAsync ()
             return! setStatusCode 204 next ctx
diff --git a/src/api/MyPrayerJournal.Api/Program.fs b/src/api/MyPrayerJournal.Api/Program.fs
index 9aa0ae7..a50e48a 100644
--- a/src/api/MyPrayerJournal.Api/Program.fs
+++ b/src/api/MyPrayerJournal.Api/Program.fs
@@ -53,7 +53,7 @@ module Configure =
   /// Routes for the available URLs within myPrayerJournal
   let webApp =
     router Handlers.Error.notFound [
-      route "/" (htmlFile "wwwroot/index.html")
+      route "/" Handlers.Vue.app
       subRoute "/api/" [
         GET [
           route    "journal" Handlers.Journal.journal
diff --git a/src/sql/16-recurrence.sql b/src/sql/16-recurrence.sql
new file mode 100644
index 0000000..33d05d6
--- /dev/null
+++ b/src/sql/16-recurrence.sql
@@ -0,0 +1,31 @@
+ALTER TABLE mpj.request
+  ADD COLUMN "showAfter" BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE mpj.request
+  ADD COLUMN "recurType" VARCHAR(10) NOT NULL DEFAULT 'immediate';
+ALTER TABLE mpj.request
+  ADD COLUMN "recurCount" SMALLINT NOT NULL DEFAULT 0;
+CREATE OR REPLACE VIEW mpj.journal AS
+  SELECT
+    request."requestId",
+    request."userId",
+    (SELECT "text"
+       FROM mpj.history
+      WHERE history."requestId" = request."requestId"
+        AND "text" IS NOT NULL
+      ORDER BY "asOf" DESC
+      LIMIT 1) AS "text",
+    (SELECT "asOf"
+       FROM mpj.history
+      WHERE history."requestId" = request."requestId"
+      ORDER BY "asOf" DESC
+      LIMIT 1) AS "asOf",
+    (SELECT "status"
+       FROM mpj.history
+      WHERE history."requestId" = request."requestId"
+      ORDER BY "asOf" DESC
+      LIMIT 1) AS "lastStatus",
+    request."snoozedUntil",
+    request."showAfter",
+    request."recurType",
+    request."recurCount"
+  FROM mpj.request;
\ No newline at end of file

From 5bba4992511331b6c614e520719787dcf89b7d61 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Thu, 16 Aug 2018 21:57:54 -0500
Subject: [PATCH 02/10] -BootstrapVue -VueAwesome

- All non-modals no longer reference Bootstrap or Font Awesome (#20)
- Removed "full request" button from journal page (#16)
- Added role attributes in many places
---
 src/app/package.json                          |   5 +-
 src/app/src/App.vue                           |  75 +++++++++-
 src/app/src/components/Answered.vue           |  12 +-
 src/app/src/components/AnsweredDetail.vue     |  27 ++--
 src/app/src/components/Home.vue               |   2 +-
 src/app/src/components/Journal.vue            |  12 +-
 src/app/src/components/Navigation.vue         |  75 +++++++---
 src/app/src/components/Snoozed.vue            |  16 +--
 .../components/common/MaterialDesignIcon.vue  |  15 ++
 src/app/src/components/request/NewRequest.vue |  35 ++++-
 .../src/components/request/RequestCard.vue    |  67 ++++++---
 src/app/src/main.js                           |  17 +--
 src/app/yarn.lock                             | 130 +-----------------
 13 files changed, 267 insertions(+), 221 deletions(-)
 create mode 100644 src/app/src/components/common/MaterialDesignIcon.vue

diff --git a/src/app/package.json b/src/app/package.json
index 4ece02c..c34c04e 100644
--- a/src/app/package.json
+++ b/src/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "my-prayer-journal",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "myPrayerJournal - Front End",
   "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
   "private": true,
@@ -18,12 +18,9 @@
   "dependencies": {
     "auth0-js": "^9.3.3",
     "axios": "^0.18.0",
-    "bootstrap": "^4.0.0",
-    "bootstrap-vue": "^1.0.0-beta.9",
     "moment": "^2.18.1",
     "pug": "^2.0.1",
     "vue": "^2.5.15",
-    "vue-awesome": "^2.3.3",
     "vue-progressbar": "^0.7.3",
     "vue-router": "^3.0.0",
     "vue-toast": "^3.1.0",
diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index 92f0291..eb13d49 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -1,12 +1,12 @@
 <template lang="pug">
-#app
+#app(role='application')
   navigation
-  #content.container
+  #content
     router-view
     vue-progress-bar
     toast(ref='toast')
-  footer
-    p.text-right.text-muted
+  footer.mpj-text-right.mpj-muted-text
+    p
       | myPrayerJournal v{{ version }}
       br
       em: small.
@@ -45,9 +45,27 @@ export default {
 <style>
 html, body {
   background-color: whitesmoke;
+  font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+  font-size: 1rem;
 }
 body {
-  padding-top: 60px;
+  padding-top: 50px;
+  margin: 0;
+}
+p {
+  margin-bottom: 0;
+}
+button,
+a[role="button"] {
+  border: solid 1px #050;
+  border-radius: .5rem;
+  background-color: whitesmoke;
+}
+button:hover,
+a[role="button"]:hover {
+  background-color: #050;
+  color: white;
+  text-decoration: none;
 }
 footer {
   border-top: solid 1px lightgray;
@@ -59,14 +77,59 @@ footer p {
 }
 a:link, a:visited {
   color: #050;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+.mpj-main-content {
+  max-width: 60rem;
+  margin: auto;
+}
+.mpj-main-content-wide {
+  margin: .5rem;
+}
+@media screen and (max-width: 21rem) {
+  .mpj-main-content-wide {
+    margin: 0;
+  }
 }
 .mpj-request-text {
   white-space: pre-line;
 }
-.bg-mpj {
+.mpj-request-log {
+  width: 100%;
+}
+.mpj-request-log thead th {
+  border-top: solid 1px lightgray;
+  border-bottom: solid 2px lightgray;
+  text-align: left;
+}
+.mpj-request-log tbody td {
+  border-bottom: dotted 1px lightgray;
+  vertical-align: top;
+}
+.mpj-bg {
   background-image: -webkit-gradient(linear, left top, left bottom, from(#050), to(whitesmoke));
   background-image: -webkit-linear-gradient(top, #050, whitesmoke);
   background-image: -moz-linear-gradient(top, #050, whitesmoke);
   background-image: linear-gradient(to bottom, #050, whitesmoke);
 }
+.mpj-text-center {
+  text-align: center;
+}
+.mpj-text-nowrap {
+  white-space: nowrap;
+}
+.mpj-text-right {
+  text-align: right;
+  color: rgba(0, 0, 0, .60);
+}
+.mpj-muted-text {
+  color: rgba(0, 0, 0, .60);
+}
+.mpj-margin {
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
 </style>
diff --git a/src/app/src/components/Answered.vue b/src/app/src/components/Answered.vue
index b7342d6..c82ff16 100644
--- a/src/app/src/components/Answered.vue
+++ b/src/app/src/components/Answered.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-article
+article.mpj-main-content(role='main')
   page-title(title='Answered Requests')
   p(v-if='!loaded') Loading answered requests...
   div(v-if='loaded').mpj-answered-list
@@ -9,12 +9,12 @@ article
       | {{ req.text }}
       br
       br
-      b-btn(:to='{ name: "AnsweredDetail", params: { id: req.requestId }}'
-            size='sm'
-            variant='outline-secondary')
-        icon(name='search')
+      router-link(:to='{ name: "AnsweredDetail", params: { id: req.requestId }}'
+                  role='button'
+                  title='View Full Request')
+        md-icon(icon='description')
         = ' View Full Request'
-      small.text-muted: em.
+      small.mpj-muted-text: em.
         &nbsp; Answered #[date-from-now(:value='req.asOf')]
 </template>
 
diff --git a/src/app/src/components/AnsweredDetail.vue b/src/app/src/components/AnsweredDetail.vue
index eeb1b12..9716cd2 100644
--- a/src/app/src/components/AnsweredDetail.vue
+++ b/src/app/src/components/AnsweredDetail.vue
@@ -1,16 +1,23 @@
 <template lang="pug">
-article
+article.mpj-main-content(role='main')
   page-title(title='Answered Request')
-  p(v-if='!request') Loading request...
   template(v-if='request')
     p.
       Answered {{ formatDate(answered) }} (#[date-from-now(:value='answered')]) &nbsp;
-      #[small: em.text-muted prayed {{ prayedCount }} times, open {{ openDays }} days]
+      #[small: em.mpj-muted-text prayed {{ prayedCount }} times, open {{ openDays }} days]
     p.mpj-request-text {{ lastText }}
-    b-table(small hover :fields='fields' :items='log')
-      template(slot='action' scope='data').
-        {{ data.item.status }} on #[span.text-nowrap {{ formatDate(data.item.asOf) }}]
-      template(slot='text' scope='data' v-if='data.item.text') {{ data.item.text.fields[0] }}
+    br
+    table.mpj-request-log
+      thead
+        tr
+          th Action
+          th Update / Notes
+      tbody
+        tr(v-for='item in log' :key='item.asOf')
+          td {{ item.status }} on #[span.mpj-text-nowrap {{ formatDate(item.asOf) }}]
+          td(v-if='item.text').mpj-request-text {{ item.text.fields[0] }}
+          td(v-else) &nbsp;
+  p(v-else) Loading request...
 </template>
 
 <script>
@@ -32,11 +39,7 @@ export default {
   },
   data () {
     return {
-      request: null,
-      fields: [
-        { key: 'action', label: 'Action' },
-        { key: 'text', label: 'Update / Notes' }
-      ]
+      request: null
     }
   },
   computed: {
diff --git a/src/app/src/components/Home.vue b/src/app/src/components/Home.vue
index 39b9c8b..41a7e68 100644
--- a/src/app/src/components/Home.vue
+++ b/src/app/src/components/Home.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-article
+article.mpj-main-content(role='main')
   page-title(title='Welcome!'
              hideOnPage='true')
   p &nbsp;
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index 1b65c13..778fdc5 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -1,11 +1,11 @@
 <template lang="pug">
-article
+article.mpj-main-content-wide(role='main')
   page-title(:title='title')
   p(v-if='isLoadingJournal') Loading your prayer journal...
   template(v-if='!isLoadingJournal')
     new-request
     br
-    b-row(v-if='journal.length > 0')
+    .mpj-journal(v-if='journal.length > 0')
       request-card(v-for='request in journal'
                    :key='request.requestId'
                    :request='request'
@@ -67,3 +67,11 @@ export default {
   }
 }
 </script>
+
+<style>
+.mpj-journal {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/app/src/components/Navigation.vue b/src/app/src/components/Navigation.vue
index 31d5f4d..52380f7 100644
--- a/src/app/src/components/Navigation.vue
+++ b/src/app/src/components/Navigation.vue
@@ -1,32 +1,38 @@
 <template lang="pug">
-b-navbar(toggleable='sm'
-         type='dark'
-         variant='mpj'
-         fixed='top')
-  b-nav-toggle(target='nav_collapse')
-  b-navbar-brand(to='/')
+nav.mpj-top-nav.mpj-bg(role='menubar')
+  router-link.title(:to="{ name: 'Home' }"
+                    role='menuitem')
     span(style='font-weight:100;') my
     span(style='font-weight:600;') Prayer
     span(style='font-weight:700;') Journal
-  b-collapse#nav_collapse(is-nav)
-    b-navbar-nav
-      b-nav-item(v-if='isAuthenticated'
-                 to='/journal') Journal
-      b-nav-item(v-if='hasSnoozed'
-                 to='/snoozed') Snoozed
-      b-nav-item(v-if='isAuthenticated'
-                 to='/answered') Answered
-      b-nav-item(v-if='isAuthenticated'): a(@click.stop='logOff()') Log Off
-      b-nav-item(v-if='!isAuthenticated'): a(@click.stop='logOn()') Log On
-      b-nav-item(href='https://bit-badger.github.io/myPrayerJournal/'
-                 target='_blank'
-                 @click.stop='') Docs
+  router-link(v-if='isAuthenticated'
+              :to="{ name: 'Journal' }"
+              role='menuitem') Journal
+  router-link(v-if='hasSnoozed'
+              :to="{ name: 'Snoozed' }"
+              role='menuitem') Snoozed
+  router-link(v-if='isAuthenticated'
+              :to="{ name: 'Answered' }"
+              role='menuitem') Answered
+  a(v-if='isAuthenticated'
+    href='#'
+    role='menuitem'
+    @click.stop='logOff()') Log Off
+  a(v-if='!isAuthenticated'
+    href='#'
+    role='menuitem'
+    @click.stop='logOn()') Log On
+  a(href='https://bit-badger.github.io/myPrayerJournal/'
+    target='_blank'
+    role='menuitem'
+    @click.stop='') Docs
 </template>
 
 <script>
 'use strict'
 
 import { mapState } from 'vuex'
+
 import AuthService from '@/auth/AuthService'
 
 export default {
@@ -54,3 +60,34 @@ export default {
   }
 }
 </script>
+
+<style>
+.mpj-top-nav {
+  position: fixed;
+  display: flex;
+  flex-flow: row wrap;
+  align-items: center;
+  top: 0;
+  left: 0;
+  width: 100%;
+  padding-left: .5rem;
+  min-height: 50px;
+}
+.mpj-top-nav a:link,
+.mpj-top-nav a:visited {
+  text-decoration: none;
+  color: rgba(255, 255, 255, .75);
+  padding-left: 1rem;
+}
+.mpj-top-nav a:link.router-link-active,
+.mpj-top-nav a:visited.router-link-active,
+.mpj-top-nav a:hover {
+  color: white;
+}
+.mpj-top-nav .title {
+  font-size: 1.25rem;
+  color: white;
+  padding-left: 1.25rem;
+  padding-right: 1.25rem;
+}
+</style>
\ No newline at end of file
diff --git a/src/app/src/components/Snoozed.vue b/src/app/src/components/Snoozed.vue
index 62fcfc1..d484912 100644
--- a/src/app/src/components/Snoozed.vue
+++ b/src/app/src/components/Snoozed.vue
@@ -1,21 +1,19 @@
 <template lang="pug">
-article
+article.mpj-main-content(role='main')
   page-title(title='Snoozed Requests')
-  p(v-if='!loaded') Loading journal...
   div(v-if='loaded').mpj-snoozed-list
-    p.text-center(v-if='requests.length === 0'): em.
+    p.mpj-text-center(v-if='requests.length === 0'): em.
       No snoozed requests found; return to #[router-link(:to='{ name: "Journal" } ') your journal]
-    p.mpj-snoozed-text(v-for='req in requests' :key='req.requestId')
+    p.mpj-request-text(v-for='req in requests' :key='req.requestId')
       | {{ req.text }}
       br
       br
-      b-btn(@click='cancelSnooze(req.requestId)'
-            size='sm'
-            variant='outline-secondary')
-        icon(name='times')
+      button(@click='cancelSnooze(req.requestId)')
+        md-icon(icon='restore')
         = ' Cancel Snooze'
-      small.text-muted: em.
+      small.mpj-muted-text: em.
         &nbsp; Snooze expires #[date-from-now(:value='req.snoozedUntil')]
+  p(v-else) Loading journal...
 </template>
 
 <script>
diff --git a/src/app/src/components/common/MaterialDesignIcon.vue b/src/app/src/components/common/MaterialDesignIcon.vue
new file mode 100644
index 0000000..e4ebce0
--- /dev/null
+++ b/src/app/src/components/common/MaterialDesignIcon.vue
@@ -0,0 +1,15 @@
+<template lang="pug">
+i.material-icons(v-html='icon')
+</template>
+
+<script>
+export default {
+  name: 'md-icon',
+  props: {
+    icon: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
diff --git a/src/app/src/components/request/NewRequest.vue b/src/app/src/components/request/NewRequest.vue
index 2d8f56a..98a0cfb 100644
--- a/src/app/src/components/request/NewRequest.vue
+++ b/src/app/src/components/request/NewRequest.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 div
-  b-btn(@click='openDialog()' size='sm' variant='primary')
-    icon(name='plus')
+  button(@click='openDialog()')
+    md-icon(icon='add_box')
     | &nbsp; Add a New Request
   b-modal(v-model='showNewVisible'
           header-bg-variant='mpj'
@@ -16,8 +16,26 @@ div
                                 v-model='form.requestText'
                                 :rows='10'
                                 @blur='trimText()')
+      b-form-group(label='Recurrence')
+        | After prayer, request reappears
+        b-radio(v-model='form.recur.typ'
+                label='Immediately'
+                value='immediately'
+                checked='checked'
+                @click='checkRadios')
+        b-radio(v-model='form.recur.typ'
+                label='Every...'
+                value='other'
+                @click='checkRadios')
+        b-input(v-model='form.recur.count'
+                placeholder='##')
+        b-select(v-model='form.recur.other')
+          b-option(value='hours') hours
+          b-option(value='days') days
+          b-option(value='weeks') weeks
     div.w-100.text-right(slot='modal-footer')
       b-btn(variant='primary'
+            :disabled='!isValid'
             @click='saveRequest()') Save
       | &nbsp; &nbsp;
       b-btn(variant='outline-secondary'
@@ -36,7 +54,12 @@ export default {
     return {
       showNewVisible: false,
       form: {
-        requestText: ''
+        requestText: '',
+        recur: {
+          typ: 'immediate',
+          other: '',
+          count: ''
+        }
       },
       formLabelWidth: '120px'
     }
@@ -44,6 +67,12 @@ export default {
   mounted () {
     this.$refs.toast.setOptions({ position: 'bottom right' })
   },
+  computed: {
+    isValid () {
+      // TODO disallow submission if recurrence is too long
+      return true
+    }
+  },
   methods: {
     closeDialog () {
       this.form.requestText = ''
diff --git a/src/app/src/components/request/RequestCard.vue b/src/app/src/components/request/RequestCard.vue
index ac4f83d..850ab20 100644
--- a/src/app/src/components/request/RequestCard.vue
+++ b/src/app/src/components/request/RequestCard.vue
@@ -1,19 +1,17 @@
 <template lang="pug">
-b-col(v-if="!isSnoozed" md='6' lg='4')
-  .mpj-request-card
-    b-card-header.text-center.py-1.
-      #[b-btn(@click='markPrayed()' variant='outline-primary' title='Pray' size='sm'): icon(name='check')]
-      #[b-btn(@click.stop='showEdit()' variant='outline-secondary' title='Edit' size='sm'): icon(name='pencil')]
-      #[b-btn(@click.stop='showNotes()' variant='outline-secondary' title='Add Notes' size='sm'): icon(name='file-text-o')]
-      #[b-btn(@click.stop='showFull()' variant='outline-secondary' title='View Full Request' size='sm'): icon(name='search')]
-      #[b-btn(@click.stop='snooze()' variant='outline-secondary' title='Snooze Request' size='sm'): icon(name='clock-o')]
-    b-card-body.p-0
-      p.card-text.mpj-request-text.mb-1.px-3.pt-3
-        | {{ request.text }}
-      p.card-text.p-0.pr-1.text-right: small.text-muted: em
-        = '(last activity '
-        date-from-now(:value='request.asOf')
-        | )
+.mpj-request-card
+  header.mpj-card-header.mpj-bg(role='toolbar').
+    #[button.pray(@click='markPrayed()' title='Pray' size='sm'): md-icon(icon='done')]
+    #[button(@click.stop='showEdit()' title='Edit' size='sm'): md-icon(icon='edit')]
+    #[button(@click.stop='showNotes()' title='Add Notes' size='sm'): md-icon(icon='comment')]
+    #[button(@click.stop='snooze()' title='Snooze Request' size='sm'): md-icon(icon='schedule')]
+  div
+    p.card-text.mpj-request-text
+      | {{ request.text }}
+    p.as-of.mpj-text-right: small.mpj-muted-text: em
+      = '(last activity '
+      date-from-now(:value='request.asOf')
+      | )
 </template>
 
 <script>
@@ -29,8 +27,8 @@ export default {
     events: { required: true }
   },
   computed: {
-    isSnoozed () {
-      return Date.now() < this.request.snoozedUntil
+    shouldDisplay () {
+      return Date.now() >= this.request.showAfter
     }
   },
   methods: {
@@ -63,6 +61,39 @@ export default {
 .mpj-request-card {
   border: solid 1px darkgray;
   border-radius: 5px;
-  margin-bottom: 15px;
+  width: 20rem;
+  margin: .5rem;
+}
+@media screen and (max-width: 20rem) {
+  .mpj-request-card {
+    width: 100%;
+  }
+}
+.mpj-card-header {
+  display: flex;
+  flex-flow: row;
+  justify-content: center;
+}
+.mpj-card-header button {
+  background-color: rgba(255, 255, 255, .75);
+  border-radius: .25rem;
+  margin: .25rem;
+  border: solid #050 1px;
+  font-size: .8rem;
+}
+.mpj-card-header button:hover {
+  cursor: pointer;
+  background-color: white;
+  color: #050;
+}
+.mpj-card-header button.pray {
+  background-color: white;
+}
+.mpj-request-card .card-text {
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
+.mpj-request-card .as-of {
+  margin-right: .25rem;
 }
 </style>
diff --git a/src/app/src/main.js b/src/app/src/main.js
index a2131e8..4f3c3a5 100644
--- a/src/app/src/main.js
+++ b/src/app/src/main.js
@@ -1,33 +1,20 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue'
-import BootstrapVue from 'bootstrap-vue'
-import Icon from 'vue-awesome/components/Icon'
 import VueProgressBar from 'vue-progressbar'
 import VueToast from 'vue-toast'
 
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-import 'bootstrap/dist/css/bootstrap.css'
 import 'vue-toast/dist/vue-toast.min.css'
 
-// Only import the icons we need; the whole set is ~500K!
-import 'vue-awesome/icons/check'
-import 'vue-awesome/icons/clock-o'
-import 'vue-awesome/icons/file-text-o'
-import 'vue-awesome/icons/pencil'
-import 'vue-awesome/icons/plus'
-import 'vue-awesome/icons/search'
-import 'vue-awesome/icons/times'
-
 import App from './App'
 import router from './router'
 import store from './store'
 import DateFromNow from './components/common/DateFromNow'
+import MaterialDesignIcon from './components/common/MaterialDesignIcon'
 import PageTitle from './components/common/PageTitle'
 
 Vue.config.productionTip = false
 
-Vue.use(BootstrapVue)
 Vue.use(VueProgressBar, {
   color: 'yellow',
   failedColor: 'red',
@@ -39,8 +26,8 @@ Vue.use(VueProgressBar, {
   }
 })
 
-Vue.component('icon', Icon)
 Vue.component('date-from-now', DateFromNow)
+Vue.component('md-icon', MaterialDesignIcon)
 Vue.component('page-title', PageTitle)
 Vue.component('toast', VueToast)
 
diff --git a/src/app/yarn.lock b/src/app/yarn.lock
index c5ed8d4..76b2011 100644
--- a/src/app/yarn.lock
+++ b/src/app/yarn.lock
@@ -811,14 +811,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-polyfill@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
 babel-preset-env@^1.3.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@@ -1051,19 +1043,6 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
-bootstrap-vue@^1.0.0-beta.9:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-1.5.1.tgz#0baa713d3b34a6c39197323f93989f7af55bc286"
-  dependencies:
-    lodash.startcase "^4.4.0"
-    opencollective "^1.0.3"
-    popper.js "^1.12.9"
-    vue-functional-data-merge "^2.0.3"
-
-bootstrap@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
-
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1324,7 +1303,7 @@ chai@^3.5.0:
     deep-eql "^0.1.3"
     type-detect "^1.0.0"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1348,10 +1327,6 @@ character-parser@^2.1.1:
   dependencies:
     is-regex "^1.0.3"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-
 check-types@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
@@ -2249,12 +2224,6 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  dependencies:
-    iconv-lite "~0.4.13"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -2678,14 +2647,6 @@ extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
-
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -2760,12 +2721,6 @@ figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -3426,7 +3381,7 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.23, iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
@@ -3513,24 +3468,6 @@ inject-loader@^3.0.1:
   dependencies:
     babel-core "~6"
 
-inquirer@3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    chalk "^1.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.1"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx "^4.1.0"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
@@ -3786,7 +3723,7 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-promise@^2.0.0, is-promise@^2.1.0:
+is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
@@ -4311,10 +4248,6 @@ lodash.rest@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/lodash.rest/-/lodash.rest-4.0.5.tgz#954ef75049262038c96d1fc98b28fdaf9f0772aa"
 
-lodash.startcase@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8"
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -4671,10 +4604,6 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
 nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -4749,13 +4678,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-fetch@1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
@@ -4943,28 +4865,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-opencollective@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
-  dependencies:
-    babel-polyfill "6.23.0"
-    chalk "1.1.3"
-    inquirer "3.0.6"
-    minimist "1.2.0"
-    node-fetch "1.6.3"
-    opn "4.0.2"
-
 opener@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
 
-opn@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
 opn@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
@@ -5267,10 +5171,6 @@ pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
-popper.js@^1.12.9:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -5927,10 +5827,6 @@ regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.10.0:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -6134,12 +6030,6 @@ run-async@^0.1.0:
   dependencies:
     once "^1.3.0"
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  dependencies:
-    is-promise "^2.1.0"
-
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -6150,10 +6040,6 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-rx@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -6772,7 +6658,7 @@ tmp@0.0.31:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x, tmp@^0.0.33:
+tmp@0.0.x:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -7063,14 +6949,6 @@ void-elements@^2.0.0, void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-vue-awesome@^2.3.3:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/vue-awesome/-/vue-awesome-2.3.5.tgz#fe7fcf185cff794cb37a3c45d16eeb851e94fd9c"
-
-vue-functional-data-merge@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-2.0.6.tgz#f08055adfb92458debcf2ad10c3aa712277f7fc2"
-
 vue-hot-reload-api@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"

From c0dd6b5dd6d1fb6549e4f8ded88a4b9fc6f9d0ac Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Thu, 16 Aug 2018 22:09:39 -0500
Subject: [PATCH 03/10] A few more minor tweaks

---
 src/app/src/App.vue                 | 4 ++--
 src/app/src/components/Answered.vue | 2 +-
 src/app/src/components/Journal.vue  | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index eb13d49..f68c23d 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -12,8 +12,8 @@
       em: small.
         #[router-link(:to="{ name: 'PrivacyPolicy' }") Privacy Policy] &bull;
         #[router-link(:to="{ name: 'TermsOfService' }") Terms of Service] &bull;
-        #[a(href='https://github.com/bit-badger/myprayerjournal') Developed] and hosted by
-        #[a(href='https://bitbadger.solutions') Bit Badger Solutions]
+        #[a(href='https://github.com/bit-badger/myprayerjournal' target='_blank') Developed] and hosted by
+        #[a(href='https://bitbadger.solutions' target='_blank') Bit Badger Solutions]
 </template>
 
 <script>
diff --git a/src/app/src/components/Answered.vue b/src/app/src/components/Answered.vue
index c82ff16..939c047 100644
--- a/src/app/src/components/Answered.vue
+++ b/src/app/src/components/Answered.vue
@@ -1,7 +1,6 @@
 <template lang="pug">
 article.mpj-main-content(role='main')
   page-title(title='Answered Requests')
-  p(v-if='!loaded') Loading answered requests...
   div(v-if='loaded').mpj-answered-list
     p.text-center(v-if='requests.length === 0'): em.
       No answered requests found; once you have marked one as &ldquo;Answered&rdquo;, it will appear here
@@ -16,6 +15,7 @@ article.mpj-main-content(role='main')
         = ' View Full Request'
       small.mpj-muted-text: em.
         &nbsp; Answered #[date-from-now(:value='req.asOf')]
+  p(v-else) Loading answered requests...
 </template>
 
 <script>
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index 778fdc5..6cee922 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -2,7 +2,7 @@
 article.mpj-main-content-wide(role='main')
   page-title(:title='title')
   p(v-if='isLoadingJournal') Loading your prayer journal...
-  template(v-if='!isLoadingJournal')
+  template(v-else)
     new-request
     br
     .mpj-journal(v-if='journal.length > 0')
@@ -11,13 +11,12 @@ article.mpj-main-content-wide(role='main')
                    :request='request'
                    :events='eventBus'
                    :toast='toast')
-    p.text-center(v-if='journal.length === 0'): em.
+    p.text-center(v-else): em.
       No requests found; click the &ldquo;Add a New Request&rdquo; button to add one
     edit-request(:events='eventBus'
                  :toast='toast')
     notes-edit(:events='eventBus'
                :toast='toast')
-    full-request(:events='eventBus')
     snooze-request(:events='eventBus'
                    :toast='toast')
 </template>
@@ -29,7 +28,6 @@ import Vue from 'vue'
 import { mapState } from 'vuex'
 
 import EditRequest from './request/EditRequest'
-import FullRequest from './request/FullRequest'
 import NewRequest from './request/NewRequest'
 import NotesEdit from './request/NotesEdit'
 import RequestCard from './request/RequestCard'
@@ -41,7 +39,6 @@ export default {
   name: 'journal',
   components: {
     EditRequest,
-    FullRequest,
     NewRequest,
     NotesEdit,
     RequestCard,

From d3aff4a11056dc2480eca4aab759fd1866f4bc19 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Fri, 17 Aug 2018 20:59:57 -0500
Subject: [PATCH 04/10] Add/Edit request works

No longer a modal (#20)
---
 src/api/MyPrayerJournal.Api/Handlers.fs       |   2 +-
 src/app/src/App.vue                           |  12 ++
 src/app/src/api/index.js                      |   2 +-
 src/app/src/components/Journal.vue            |  11 +-
 .../src/components/request/EditRequest.vue    | 148 ++++++++++++------
 .../src/components/request/RequestCard.vue    |  30 ++--
 src/app/src/router/index.js                   |   7 +
 src/app/src/store/index.js                    |   8 +-
 8 files changed, 135 insertions(+), 85 deletions(-)

diff --git a/src/api/MyPrayerJournal.Api/Handlers.fs b/src/api/MyPrayerJournal.Api/Handlers.fs
index 7df9836..5073d76 100644
--- a/src/api/MyPrayerJournal.Api/Handlers.fs
+++ b/src/api/MyPrayerJournal.Api/Handlers.fs
@@ -26,7 +26,7 @@ module Error =
   /// Handle 404s from the API, sending known URL paths to the Vue app so that they can be handled there
   let notFound : HttpHandler =
     fun next ctx ->
-      [ "/answered"; "/journal"; "/snoozed"; "/user" ]
+      [ "/answered"; "/journal"; "/legal"; "/request"; "/snoozed"; "/user" ]
       |> List.filter ctx.Request.Path.Value.StartsWith
       |> List.length
       |> function
diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index f68c23d..be30745 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -61,8 +61,17 @@ a[role="button"] {
   border-radius: .5rem;
   background-color: whitesmoke;
 }
+a[role="button"] {
+  padding: .25rem;
+}
+button.primary,
+a[role="button"].primary {
+  background-color: white;
+  border-width: 3px;
+}
 button:hover,
 a[role="button"]:hover {
+  cursor: pointer;
   background-color: #050;
   color: white;
   text-decoration: none;
@@ -132,4 +141,7 @@ a:hover {
   margin-left: 1rem;
   margin-right: 1rem;
 }
+.material-icons {
+  vertical-align: middle;
+}
 </style>
diff --git a/src/app/src/api/index.js b/src/app/src/api/index.js
index 5d24c4d..5720496 100644
--- a/src/app/src/api/index.js
+++ b/src/app/src/api/index.js
@@ -31,7 +31,7 @@ export default {
    * Add a new prayer request
    * @param {string} requestText The text of the request to be added
    */
-  addRequest: requestText => http.post('request', { requestText }),
+  addRequest: requestText => http.post('request', { requestText, recurType: 'immediate' }),
 
   /**
    * Get all answered requests, along with the text they had when it was answered
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index 6cee922..d2747be 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -3,7 +3,10 @@ article.mpj-main-content-wide(role='main')
   page-title(:title='title')
   p(v-if='isLoadingJournal') Loading your prayer journal...
   template(v-else)
-    new-request
+    router-link(:to="{ name: 'EditRequest', params: { id: 'new' } }"
+                role='button')
+      md-icon(icon='add_box')
+      | &nbsp; Add a New Request
     br
     .mpj-journal(v-if='journal.length > 0')
       request-card(v-for='request in journal'
@@ -13,8 +16,6 @@ article.mpj-main-content-wide(role='main')
                    :toast='toast')
     p.text-center(v-else): em.
       No requests found; click the &ldquo;Add a New Request&rdquo; button to add one
-    edit-request(:events='eventBus'
-                 :toast='toast')
     notes-edit(:events='eventBus'
                :toast='toast')
     snooze-request(:events='eventBus'
@@ -27,8 +28,6 @@ article.mpj-main-content-wide(role='main')
 import Vue from 'vue'
 import { mapState } from 'vuex'
 
-import EditRequest from './request/EditRequest'
-import NewRequest from './request/NewRequest'
 import NotesEdit from './request/NotesEdit'
 import RequestCard from './request/RequestCard'
 import SnoozeRequest from './request/SnoozeRequest'
@@ -38,8 +37,6 @@ import actions from '@/store/action-types'
 export default {
   name: 'journal',
   components: {
-    EditRequest,
-    NewRequest,
     NotesEdit,
     RequestCard,
     SnoozeRequest
diff --git a/src/app/src/components/request/EditRequest.vue b/src/app/src/components/request/EditRequest.vue
index 77e9544..235cd12 100644
--- a/src/app/src/components/request/EditRequest.vue
+++ b/src/app/src/components/request/EditRequest.vue
@@ -1,46 +1,62 @@
 <template lang="pug">
-b-modal(v-model='editVisible'
-        header-bg-variant='mpj'
-        header-text-variant='light'
-        size='lg'
-        title='Edit Prayer Request'
-        @edit='openDialog()'
-        @shows='focusRequestText')
-  b-form
-    b-form-group(label='Prayer Request'
-                 label-for='request_text')
-      b-textarea#request_text(ref='toFocus'
-                              v-model='form.requestText'
-                              :rows='10'
-                              @blur='trimText()')
-    b-form-group(label='Also Mark As')
-      b-radio-group(v-model='form.status'
-                    buttons)
-        b-radio(value='Updated') Updated
-        b-radio(value='Prayed') Prayed
-        b-radio(value='Answered') Answered
-  div.w-100.text-right(slot='modal-footer')
-    b-btn(variant='primary'
-          @click='saveRequest()') Save
+article.mpj-main-content(role='main')
+  page-title(:title='title')
+  form.mpj-edit-request-form
+    label(for='request_text') Prayer Request
+    br
+    textarea#request_text(v-model='form.requestText'
+                          :rows='10'
+                          @blur='trimText()'
+                          autofocus)
+    br
+    template(v-if='!isNew')
+      label Also Mark As
+      br
+      input(type='radio'
+            id='status_updated'
+            value='Updated'
+            v-model='form.status')
+      label(for='status_updated')= ' Updated'
+      input(type='radio'
+            id='status_prayed'
+            value='Prayed'
+            v-model='form.status')
+      label(for='status_prayed')= ' Prayed'
+      input(type='radio'
+            id='status_answered'
+            value='Answered'
+            v-model='form.status')
+      label(for='status_answered')= ' Answered'
+    br(v-else)
+  div.mpj-edit-request-form.mpj-text-right
+    button(@click.stop='saveRequest()').primary
+      md-icon(icon='save')
+      = ' Save'
     | &nbsp; &nbsp;
-    b-btn(variant='outline-secondary'
-          @click='closeDialog()') Cancel
+    button(@click.stop='goBack()')
+      md-icon(icon='arrow_back')
+      = ' Cancel'
 </template>
 
 <script>
 'use strict'
 
+import { mapState } from 'vuex'
+
 import actions from '@/store/action-types'
 
 export default {
   name: 'edit-request',
   props: {
-    toast: { required: true },
-    events: { required: true }
+    id: {
+      type: String,
+      required: true
+    }
   },
   data () {
     return {
-      editVisible: false,
+      title: 'Edit Prayer Request',
+      isNew: false,
       form: {
         requestId: '',
         requestText: '',
@@ -48,42 +64,70 @@ export default {
       }
     }
   },
-  created () {
-    this.events.$on('edit', this.openDialog)
+  computed: {
+    toast () {
+      return this.$parent.$refs.toast
+    },
+    ...mapState(['journal'])
   },
-  methods: {
-    closeDialog () {
+  async mounted () {
+    if (this.id === 'new') {
+      this.title = 'Add Prayer Request'
+      this.isNew = true
       this.form.requestId = ''
       this.form.requestText = ''
+      this.form.status = 'Created'
+    } else {
+      this.title = 'Edit Prayer Request'
+      this.isNew = false
+      if (this.journal.length === 0) {
+        await this.$store.dispatch(actions.LOAD_JOURNAL, this.$Progress)
+      }
+      const req = this.journal.filter(r => r.requestId === this.id)[0]
+      this.form.requestId = this.id
+      this.form.requestText = req.text
       this.form.status = 'Updated'
-      this.editVisible = false
-    },
-    focusRequestText (e) {
-      this.$refs.toFocus.focus()
-    },
-    openDialog (request) {
-      this.form.requestId = request.requestId
-      this.form.requestText = request.text
-      this.editVisible = true
-      this.focusRequestText(null)
+    }
+  },
+  methods: {
+    goBack () {
+      this.$router.go(-1)
     },
     trimText () {
       this.form.requestText = this.form.requestText.trim()
     },
     async saveRequest () {
-      await this.$store.dispatch(actions.UPDATE_REQUEST, {
-        progress: this.$Progress,
-        requestId: this.form.requestId,
-        updateText: this.form.requestText,
-        status: this.form.status
-      })
-      if (this.form.status === 'Answered') {
-        this.toast.showToast('Request updated and removed from active journal', { theme: 'success' })
+      if (this.isNew) {
+        await this.$store.dispatch(actions.ADD_REQUEST, {
+          progress: this.$Progress,
+          requestText: this.form.requestText
+        })
+        this.toast.showToast('New prayer request added', { theme: 'success' })
       } else {
-        this.toast.showToast('Request updated', { theme: 'success' })
+        await this.$store.dispatch(actions.UPDATE_REQUEST, {
+          progress: this.$Progress,
+          requestId: this.form.requestId,
+          updateText: this.form.requestText,
+          status: this.form.status
+        })
+        if (this.form.status === 'Answered') {
+          this.toast.showToast('Request updated and removed from active journal', { theme: 'success' })
+        } else {
+          this.toast.showToast('Request updated', { theme: 'success' })
+        }
       }
-      this.closeDialog()
+      this.goBack()
     }
   }
 }
 </script>
+
+<style>
+.mpj-edit-request-form {
+  max-width: 40rem;
+  margin: auto;
+}
+#request_text {
+  width: 100%;
+}
+</style>
diff --git a/src/app/src/components/request/RequestCard.vue b/src/app/src/components/request/RequestCard.vue
index 850ab20..bb226b9 100644
--- a/src/app/src/components/request/RequestCard.vue
+++ b/src/app/src/components/request/RequestCard.vue
@@ -1,10 +1,10 @@
 <template lang="pug">
 .mpj-request-card
-  header.mpj-card-header.mpj-bg(role='toolbar').
-    #[button.pray(@click='markPrayed()' title='Pray' size='sm'): md-icon(icon='done')]
-    #[button(@click.stop='showEdit()' title='Edit' size='sm'): md-icon(icon='edit')]
-    #[button(@click.stop='showNotes()' title='Add Notes' size='sm'): md-icon(icon='comment')]
-    #[button(@click.stop='snooze()' title='Snooze Request' size='sm'): md-icon(icon='schedule')]
+  header.mpj-card-header(role='toolbar').
+    #[button.primary(@click='markPrayed()' title='Pray'): md-icon(icon='done')]
+    #[button(@click.stop='showEdit()' title='Edit'): md-icon(icon='edit')]
+    #[button(@click.stop='showNotes()' title='Add Notes'): md-icon(icon='comment')]
+    #[button(@click.stop='snooze()' title='Snooze Request'): md-icon(icon='schedule')]
   div
     p.card-text.mpj-request-text
       | {{ request.text }}
@@ -42,10 +42,7 @@ export default {
       this.toast.showToast('Request marked as prayed', { theme: 'success' })
     },
     showEdit () {
-      this.events.$emit('edit', this.request)
-    },
-    showFull () {
-      this.events.$emit('full', this.request.requestId)
+      this.$router.push({ name: 'EditRequest', params: { id: this.request.requestId } })
     },
     showNotes () {
       this.events.$emit('notes', this.request)
@@ -73,22 +70,15 @@ export default {
   display: flex;
   flex-flow: row;
   justify-content: center;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(lightgray), to(whitesmoke));
+  background-image: -webkit-linear-gradient(top, lightgray, whitesmoke);
+  background-image: -moz-linear-gradient(top, lightgray, whitesmoke);
+  background-image: linear-gradient(to bottom, lightgray, whitesmoke);
 }
 .mpj-card-header button {
-  background-color: rgba(255, 255, 255, .75);
-  border-radius: .25rem;
   margin: .25rem;
-  border: solid #050 1px;
   font-size: .8rem;
 }
-.mpj-card-header button:hover {
-  cursor: pointer;
-  background-color: white;
-  color: #050;
-}
-.mpj-card-header button.pray {
-  background-color: white;
-}
 .mpj-request-card .card-text {
   margin-left: 1rem;
   margin-right: 1rem;
diff --git a/src/app/src/router/index.js b/src/app/src/router/index.js
index 1e75a2f..ea2f9d5 100644
--- a/src/app/src/router/index.js
+++ b/src/app/src/router/index.js
@@ -3,6 +3,7 @@ import Router from 'vue-router'
 
 import Answered from '@/components/Answered'
 import AnsweredDetail from '@/components/AnsweredDetail'
+import EditRequest from '@/components/request/EditRequest'
 import Home from '@/components/Home'
 import Journal from '@/components/Journal'
 import LogOn from '@/components/user/LogOn'
@@ -46,6 +47,12 @@ export default new Router({
       name: 'TermsOfService',
       component: TermsOfService
     },
+    {
+      path: '/request/:id/edit',
+      name: 'EditRequest',
+      component: EditRequest,
+      props: true
+    },
     {
       path: '/snoozed',
       name: 'Snoozed',
diff --git a/src/app/src/store/index.js b/src/app/src/store/index.js
index 4f8c939..74ee607 100644
--- a/src/app/src/store/index.js
+++ b/src/app/src/store/index.js
@@ -9,7 +9,7 @@ import actions from './action-types'
 
 Vue.use(Vuex)
 
-this.auth0 = new AuthService()
+const auth0 = new AuthService()
 
 const logError = function (error) {
   if (error.response) {
@@ -34,11 +34,11 @@ export default new Vuex.Store({
   state: {
     user: JSON.parse(localStorage.getItem('user_profile') || '{}'),
     isAuthenticated: (() => {
-      this.auth0.scheduleRenewal()
-      if (this.auth0.isAuthenticated()) {
+      auth0.scheduleRenewal()
+      if (auth0.isAuthenticated()) {
         api.setBearer(localStorage.getItem('id_token'))
       }
-      return this.auth0.isAuthenticated()
+      return auth0.isAuthenticated()
     })(),
     journal: {},
     isLoadingJournal: false

From e351fe5b565d116be169de36f8c32bab74f46e68 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Fri, 17 Aug 2018 22:12:14 -0500
Subject: [PATCH 05/10] Active request page (#16)

Also:
- refactored snoozed and answered list pages to use a common list format
- reworked the URLs to make them more consistent
- eliminated current "full" API endpoint, and renamed existing "complete" endpoint to "full"
---
 src/api/MyPrayerJournal.Api/Data.fs           |  17 +--
 src/api/MyPrayerJournal.Api/Handlers.fs       |  12 +--
 src/api/MyPrayerJournal.Api/Program.fs        |   1 -
 src/app/src/App.vue                           |   6 ++
 src/app/src/api/index.js                      |   9 +-
 src/app/src/components/AnsweredDetail.vue     |  86 ---------------
 src/app/src/components/Journal.vue            |   1 +
 src/app/src/components/Navigation.vue         |   7 +-
 .../src/components/request/ActiveRequests.vue |  63 +++++++++++
 .../AnsweredRequests.vue}                     |  34 ++----
 .../src/components/request/FullRequest.vue    | 101 ++++++++++++------
 .../components/request/FullRequestHistory.vue |  28 -----
 .../components/request/RequestListItem.vue    |  65 +++++++++++
 .../SnoozedRequests.vue}                      |  32 ++----
 src/app/src/router/index.js                   |  42 +++++---
 src/app/src/store/index.js                    |   2 +
 16 files changed, 261 insertions(+), 245 deletions(-)
 delete mode 100644 src/app/src/components/AnsweredDetail.vue
 create mode 100644 src/app/src/components/request/ActiveRequests.vue
 rename src/app/src/components/{Answered.vue => request/AnsweredRequests.vue} (59%)
 delete mode 100644 src/app/src/components/request/FullRequestHistory.vue
 create mode 100644 src/app/src/components/request/RequestListItem.vue
 rename src/app/src/components/{Snoozed.vue => request/SnoozedRequests.vue} (71%)

diff --git a/src/api/MyPrayerJournal.Api/Data.fs b/src/api/MyPrayerJournal.Api/Data.fs
index 5fef05f..ab9fdc8 100644
--- a/src/api/MyPrayerJournal.Api/Data.fs
+++ b/src/api/MyPrayerJournal.Api/Data.fs
@@ -267,7 +267,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
       }
   
   /// Retrieve a request, including its history and notes, by its ID and user ID
-  member this.TryCompleteRequestById requestId userId =
+  member this.TryFullRequestById requestId userId =
     task {
       match! this.TryJournalById requestId userId with
       | Some req ->
@@ -281,18 +281,3 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
           | None -> return None
       | None -> return None
       }
-  
-  /// Retrieve a request, including its history, by its ID and user ID
-  member this.TryFullRequestById requestId userId =
-    task {
-      match! this.TryJournalById requestId userId with
-      | Some req ->
-          let! fullReq =
-            this.Requests.AsNoTracking()
-              .Include(fun r -> r.history)
-              .FirstOrDefaultAsync(fun r -> r.requestId = requestId && r.userId = userId)
-          match toOption fullReq with
-          | Some _ -> return Some { req with history = List.ofSeq fullReq.history }
-          | None -> return None
-      | None -> return None
-      }
diff --git a/src/api/MyPrayerJournal.Api/Handlers.fs b/src/api/MyPrayerJournal.Api/Handlers.fs
index 5073d76..be7dc8e 100644
--- a/src/api/MyPrayerJournal.Api/Handlers.fs
+++ b/src/api/MyPrayerJournal.Api/Handlers.fs
@@ -26,7 +26,7 @@ module Error =
   /// Handle 404s from the API, sending known URL paths to the Vue app so that they can be handled there
   let notFound : HttpHandler =
     fun next ctx ->
-      [ "/answered"; "/journal"; "/legal"; "/request"; "/snoozed"; "/user" ]
+      [ "/journal"; "/legal"; "/request"; "/user" ]
       |> List.filter ctx.Request.Path.Value.StartsWith
       |> List.length
       |> function
@@ -236,16 +236,6 @@ module Request =
         | None -> return! Error.notFound next ctx
         }
   
-  /// GET /api/request/[req-id]/complete
-  let getComplete reqId : HttpHandler =
-    authorize
-    >=> fun next ctx ->
-      task {
-        match! (db ctx).TryCompleteRequestById reqId (userId ctx) with
-        | Some req -> return! json req next ctx
-        | None -> return! Error.notFound next ctx
-        }
-  
   /// GET /api/request/[req-id]/full
   let getFull reqId : HttpHandler =
     authorize
diff --git a/src/api/MyPrayerJournal.Api/Program.fs b/src/api/MyPrayerJournal.Api/Program.fs
index a50e48a..73f0884 100644
--- a/src/api/MyPrayerJournal.Api/Program.fs
+++ b/src/api/MyPrayerJournal.Api/Program.fs
@@ -59,7 +59,6 @@ module Configure =
           route    "journal" Handlers.Journal.journal
           subRoute "request" [
             route  "s/answered"   Handlers.Request.answered
-            routef "/%s/complete" Handlers.Request.getComplete
             routef "/%s/full"     Handlers.Request.getFull
             routef "/%s/notes"    Handlers.Request.getNotes
             routef "/%s"          Handlers.Request.get
diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index be30745..427708c 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -106,6 +106,12 @@ a:hover {
 .mpj-request-text {
   white-space: pre-line;
 }
+.mpj-request-list p {
+  border-top: solid 1px lightgray;
+}
+.mpj-request-list p:first-child {
+  border-top: none;
+}
 .mpj-request-log {
   width: 100%;
 }
diff --git a/src/app/src/api/index.js b/src/app/src/api/index.js
index 5720496..1adab6c 100644
--- a/src/app/src/api/index.js
+++ b/src/app/src/api/index.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import axios from 'axios'
 
 const http = axios.create({
@@ -39,7 +41,7 @@ export default {
   getAnsweredRequests: () => http.get('requests/answered'),
 
   /**
-   * Get a prayer request (full; includes all history)
+   * Get a prayer request (full; includes all history and notes)
    * @param {string} requestId The Id of the request to retrieve
    */
   getFullRequest: requestId => http.get(`request/${requestId}/full`),
@@ -56,11 +58,6 @@ export default {
    */
   getRequest: requestId => http.get(`request/${requestId}`),
 
-  /**
-   * Get a complete request; equivalent of "full" and "notes" combined
-   */
-  getRequestComplete: requestId => http.get(`request/${requestId}/complete`),
-
   /**
    * Get all prayer requests and their most recent updates
    */
diff --git a/src/app/src/components/AnsweredDetail.vue b/src/app/src/components/AnsweredDetail.vue
deleted file mode 100644
index 9716cd2..0000000
--- a/src/app/src/components/AnsweredDetail.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template lang="pug">
-article.mpj-main-content(role='main')
-  page-title(title='Answered Request')
-  template(v-if='request')
-    p.
-      Answered {{ formatDate(answered) }} (#[date-from-now(:value='answered')]) &nbsp;
-      #[small: em.mpj-muted-text prayed {{ prayedCount }} times, open {{ openDays }} days]
-    p.mpj-request-text {{ lastText }}
-    br
-    table.mpj-request-log
-      thead
-        tr
-          th Action
-          th Update / Notes
-      tbody
-        tr(v-for='item in log' :key='item.asOf')
-          td {{ item.status }} on #[span.mpj-text-nowrap {{ formatDate(item.asOf) }}]
-          td(v-if='item.text').mpj-request-text {{ item.text.fields[0] }}
-          td(v-else) &nbsp;
-  p(v-else) Loading request...
-</template>
-
-<script>
-'use strict'
-
-import moment from 'moment'
-
-import api from '@/api'
-
-const asOfDesc = (a, b) => b.asOf - a.asOf
-
-export default {
-  name: 'answer-detail',
-  props: {
-    id: {
-      type: String,
-      required: true
-    }
-  },
-  data () {
-    return {
-      request: null
-    }
-  },
-  computed: {
-    answered () {
-      return this.request.history.find(hist => hist.status === 'Answered').asOf
-    },
-    lastText () {
-      return this.request.history
-        .filter(hist => hist.text)
-        .sort(asOfDesc)[0].text.fields[0]
-    },
-    log () {
-      return (this.request.notes || [])
-        .map(note => ({ asOf: note.asOf, text: { case: 'Some', fields: [ note.notes ] }, status: 'Notes' }))
-        .concat(this.request.history)
-        .sort(asOfDesc)
-        .slice(1)
-    },
-    openDays () {
-      return Math.floor(
-        (this.answered - this.request.history.find(hist => hist.status === 'Created').asOf) / 1000 / 60 / 60 / 24)
-    },
-    prayedCount () {
-      return this.request.history.filter(hist => hist.status === 'Prayed').length
-    }
-  },
-  async mounted () {
-    this.$Progress.start()
-    try {
-      const req = await api.getRequestComplete(this.id)
-      this.request = req.data
-      this.$Progress.finish()
-    } catch (e) {
-      console.log(e)
-      this.$Progress.fail()
-    }
-  },
-  methods: {
-    formatDate (asOf) {
-      return moment(asOf).format('LL')
-    }
-  }
-}
-</script>
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index d2747be..b6ccc46 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -67,5 +67,6 @@ export default {
   display: flex;
   flex-flow: row wrap;
   justify-content: center;
+  align-items: flex-start;
 }
 </style>
\ No newline at end of file
diff --git a/src/app/src/components/Navigation.vue b/src/app/src/components/Navigation.vue
index 52380f7..b7979db 100644
--- a/src/app/src/components/Navigation.vue
+++ b/src/app/src/components/Navigation.vue
@@ -8,11 +8,14 @@ nav.mpj-top-nav.mpj-bg(role='menubar')
   router-link(v-if='isAuthenticated'
               :to="{ name: 'Journal' }"
               role='menuitem') Journal
+  router-link(v-if='isAuthenticated'
+              :to="{ name: 'ActiveRequests' }"
+              role='menuitem') Active
   router-link(v-if='hasSnoozed'
-              :to="{ name: 'Snoozed' }"
+              :to="{ name: 'SnoozedRequests' }"
               role='menuitem') Snoozed
   router-link(v-if='isAuthenticated'
-              :to="{ name: 'Answered' }"
+              :to="{ name: 'AnsweredRequests' }"
               role='menuitem') Answered
   a(v-if='isAuthenticated'
     href='#'
diff --git a/src/app/src/components/request/ActiveRequests.vue b/src/app/src/components/request/ActiveRequests.vue
new file mode 100644
index 0000000..4f3025c
--- /dev/null
+++ b/src/app/src/components/request/ActiveRequests.vue
@@ -0,0 +1,63 @@
+<template lang="pug">
+article.mpj-main-content(role='main')
+  page-title(title='Active Requests')
+  div(v-if='loaded').mpj-request-list
+    p.mpj-text-center(v-if='requests.length === 0'): em.
+      No active requests found; return to #[router-link(:to='{ name: "Journal" } ') your journal]
+    request-list-item(v-for='req in requests'
+                      :key='req.requestId'
+                      :request='req')
+  p(v-else) Loading journal...
+</template>
+
+<script>
+'use strict'
+
+import { mapState } from 'vuex'
+
+import RequestListItem from '@/components/request/RequestListItem'
+
+import actions from '@/store/action-types'
+
+export default {
+  name: 'active-requests',
+  components: {
+    RequestListItem
+  },
+  data () {
+    return {
+      requests: [],
+      loaded: false
+    }
+  },
+  computed: {
+    toast () {
+      return this.$parent.$refs.toast
+    },
+    ...mapState(['journal', 'isLoadingJournal'])
+  },
+  methods: {
+    async ensureJournal () {
+      if (!Array.isArray(this.journal)) {
+        this.loaded = false
+        await this.$store.dispatch(actions.LOAD_JOURNAL, this.$Progress)
+      }
+      this.requests = this.journal
+        .sort((a, b) => a.showAfter - b.showAfter)
+      this.loaded = true
+    },
+    async cancelSnooze (requestId) {
+      await this.$store.dispatch(actions.SNOOZE_REQUEST, {
+        progress: this.$Progress,
+        requestId: requestId,
+        until: 0
+      })
+      this.toast.showToast('Request un-snoozed', { theme: 'success' })
+      this.ensureJournal()
+    }
+  },
+  async mounted () {
+    await this.ensureJournal()
+  }
+}
+</script>
diff --git a/src/app/src/components/Answered.vue b/src/app/src/components/request/AnsweredRequests.vue
similarity index 59%
rename from src/app/src/components/Answered.vue
rename to src/app/src/components/request/AnsweredRequests.vue
index 939c047..dedca7f 100644
--- a/src/app/src/components/Answered.vue
+++ b/src/app/src/components/request/AnsweredRequests.vue
@@ -1,30 +1,27 @@
 <template lang="pug">
 article.mpj-main-content(role='main')
   page-title(title='Answered Requests')
-  div(v-if='loaded').mpj-answered-list
+  div(v-if='loaded').mpj-request-list
     p.text-center(v-if='requests.length === 0'): em.
       No answered requests found; once you have marked one as &ldquo;Answered&rdquo;, it will appear here
-    p.mpj-request-text(v-for='req in requests' :key='req.requestId')
-      | {{ req.text }}
-      br
-      br
-      router-link(:to='{ name: "AnsweredDetail", params: { id: req.requestId }}'
-                  role='button'
-                  title='View Full Request')
-        md-icon(icon='description')
-        = ' View Full Request'
-      small.mpj-muted-text: em.
-        &nbsp; Answered #[date-from-now(:value='req.asOf')]
+    request-list-item(v-for='req in requests'
+                      :key='req.requestId'
+                      :request='req')
   p(v-else) Loading answered requests...
 </template>
 
 <script>
-'use static'
+'use strict'
 
 import api from '@/api'
 
+import RequestListItem from '@/components/request/RequestListItem'
+
 export default {
-  name: 'answered',
+  name: 'answered-requests',
+  components: {
+    RequestListItem
+  },
   data () {
     return {
       requests: [],
@@ -52,12 +49,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.mpj-answered-list p {
-  border-top: solid 1px lightgray;
-}
-.mpj-answered-list p:first-child {
-  border-top: none;
-}
-</style>
diff --git a/src/app/src/components/request/FullRequest.vue b/src/app/src/components/request/FullRequest.vue
index 5bf6994..55db339 100644
--- a/src/app/src/components/request/FullRequest.vue
+++ b/src/app/src/components/request/FullRequest.vue
@@ -1,56 +1,89 @@
 <template lang="pug">
-span
-  b-modal(v-model='historyVisible'
-          header-bg-variant='mpj'
-          header-text-variant='light'
-          size='lg'
-          title='Prayer Request History'
-          @shows='focusRequestText')
-    b-list-group(v-if='null !== full'
-                 flush)
-      full-request-history(v-for='item in full.history'
-                           :key='item.asOf'
-                           :history='item')
-    div.w-100.text-right(slot='modal-footer')
-      b-btn(variant='primary'
-            @click='closeDialog()') Close
+article.mpj-main-content(role='main')
+  page-title(title='Full Prayer Request')
+  template(v-if='request')
+    p
+      span(v-if='isAnswered') Answered {{ formatDate(answered) }} (#[date-from-now(:value='answered')]) &nbsp;
+      small: em.mpj-muted-text prayed {{ prayedCount }} times, open {{ openDays }} days
+    p.mpj-request-text {{ lastText }}
+    br
+    table.mpj-request-log
+      thead
+        tr
+          th Action
+          th Update / Notes
+      tbody
+        tr(v-for='item in log' :key='item.asOf')
+          td {{ item.status }} on #[span.mpj-text-nowrap {{ formatDate(item.asOf) }}]
+          td(v-if='item.text').mpj-request-text {{ item.text.fields[0] }}
+          td(v-else) &nbsp;
+  p(v-else) Loading request...
 </template>
 
 <script>
 'use strict'
 
-import FullRequestHistory from './FullRequestHistory'
+import moment from 'moment'
 
 import api from '@/api'
 
+const asOfDesc = (a, b) => b.asOf - a.asOf
+
 export default {
   name: 'full-request',
-  components: {
-    FullRequestHistory
-  },
   props: {
-    events: { required: true }
+    id: {
+      type: String,
+      required: true
+    }
   },
   data () {
     return {
-      historyVisible: false,
-      full: null
+      request: null
     }
   },
-  created () {
-    this.events.$on('full', this.openDialog)
+  computed: {
+    answered () {
+      return this.request.history.find(hist => hist.status === 'Answered').asOf
+    },
+    isAnswered () {
+      return this.request.history.filter(hist => hist.status === 'Answered').length > 0
+    },
+    lastText () {
+      return this.request.history
+        .filter(hist => hist.text)
+        .sort(asOfDesc)[0].text.fields[0]
+    },
+    log () {
+      return (this.request.notes || [])
+        .map(note => ({ asOf: note.asOf, text: { case: 'Some', fields: [ note.notes ] }, status: 'Notes' }))
+        .concat(this.request.history)
+        .sort(asOfDesc)
+        .slice(1)
+    },
+    openDays () {
+      const asOf = this.isAnswered ? this.answered : Date.now()
+      return Math.floor(
+        (asOf - this.request.history.find(hist => hist.status === 'Created').asOf) / 1000 / 60 / 60 / 24)
+    },
+    prayedCount () {
+      return this.request.history.filter(hist => hist.status === 'Prayed').length
+    }
+  },
+  async mounted () {
+    this.$Progress.start()
+    try {
+      const req = await api.getFullRequest(this.id)
+      this.request = req.data
+      this.$Progress.finish()
+    } catch (e) {
+      console.log(e)
+      this.$Progress.fail()
+    }
   },
   methods: {
-    closeDialog () {
-      this.full = null
-      this.historyVisible = false
-    },
-    async openDialog (requestId) {
-      this.historyVisible = true
-      this.$Progress.start()
-      const req = await api.getFullRequest(requestId)
-      this.full = req.data
-      this.$Progress.finish()
+    formatDate (asOf) {
+      return moment(asOf).format('LL')
     }
   }
 }
diff --git a/src/app/src/components/request/FullRequestHistory.vue b/src/app/src/components/request/FullRequestHistory.vue
deleted file mode 100644
index dce2da2..0000000
--- a/src/app/src/components/request/FullRequestHistory.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template lang="pug">
-b-list-group-item
-  | {{ history.status }}
-  |
-  small.text-muted(:title='actualDate') {{ asOf }}
-  div(v-if='history.text').mpj-request-text {{ history.text.fields[0] }}
-</template>
-
-<script>
-'use strict'
-
-import moment from 'moment'
-
-export default {
-  name: 'full-request-history',
-  props: {
-    history: { required: true }
-  },
-  computed: {
-    asOf () {
-      return moment(this.history.asOf).fromNow()
-    },
-    actualDate () {
-      return moment(this.history.asOf).format('LLLL')
-    }
-  }
-}
-</script>
diff --git a/src/app/src/components/request/RequestListItem.vue b/src/app/src/components/request/RequestListItem.vue
new file mode 100644
index 0000000..6fa306d
--- /dev/null
+++ b/src/app/src/components/request/RequestListItem.vue
@@ -0,0 +1,65 @@
+<template lang="pug">
+p.mpj-request-text
+  | {{ request.text }}
+  br
+  br
+  router-link(:to="{ name: 'FullRequest', params: { id: request.requestId } }"
+              role='button'
+              title='View Full Request')
+    md-icon(icon='description')
+    = ' View Full Request'
+  | &nbsp;
+  router-link(v-if='!isAnswered'
+              :to="{ name: 'EditRequest', params: { id: request.requestId } }"
+              role='button'
+              title='Edit Request')
+    md-icon(icon='edit')
+    = ' Edit Request'
+  | &nbsp;
+  button(v-if='isSnoozed' @click='cancelSnooze()')
+    md-icon(icon='restore')
+    = ' Cancel Snooze'
+  br(v-if='isSnoozed || isAnswered')
+  small(v-if='isSnoozed').mpj-muted-text: em.
+    &nbsp; Snooze expires #[date-from-now(:value='request.snoozedUntil')]
+  small(v-if='isAnswered').mpj-muted-text: em.
+    &nbsp; Answered #[date-from-now(:value='request.asOf')]
+</template>
+
+<script>
+'use strict'
+
+import actions from '@/store/action-types'
+
+export default {
+  name: 'request-list-item',
+  props: {
+    request: { required: true }
+  },
+  data () {
+    return {}
+  },
+  computed: {
+    answered () {
+      return this.request.history.find(hist => hist.status === 'Answered').asOf
+    },
+    isAnswered () {
+      return this.request.lastStatus === 'Answered'
+    },
+    isSnoozed () {
+      return this.request.snoozedUntil > Date.now()
+    }
+  },
+  methods: {
+    async cancelSnooze () {
+      await this.$store.dispatch(actions.SNOOZE_REQUEST, {
+        progress: this.$Progress,
+        requestId: this.request.requestId,
+        until: 0
+      })
+      this.toast.showToast('Request un-snoozed', { theme: 'success' })
+      // FIXME: communicate with the parent to refresh // this.ensureJournal()
+    }
+  }
+}
+</script>
diff --git a/src/app/src/components/Snoozed.vue b/src/app/src/components/request/SnoozedRequests.vue
similarity index 71%
rename from src/app/src/components/Snoozed.vue
rename to src/app/src/components/request/SnoozedRequests.vue
index d484912..711729b 100644
--- a/src/app/src/components/Snoozed.vue
+++ b/src/app/src/components/request/SnoozedRequests.vue
@@ -1,30 +1,29 @@
 <template lang="pug">
 article.mpj-main-content(role='main')
   page-title(title='Snoozed Requests')
-  div(v-if='loaded').mpj-snoozed-list
+  div(v-if='loaded').mpj-request-list
     p.mpj-text-center(v-if='requests.length === 0'): em.
       No snoozed requests found; return to #[router-link(:to='{ name: "Journal" } ') your journal]
-    p.mpj-request-text(v-for='req in requests' :key='req.requestId')
-      | {{ req.text }}
-      br
-      br
-      button(@click='cancelSnooze(req.requestId)')
-        md-icon(icon='restore')
-        = ' Cancel Snooze'
-      small.mpj-muted-text: em.
-        &nbsp; Snooze expires #[date-from-now(:value='req.snoozedUntil')]
+    request-list-item(v-for='req in requests'
+                      :key='req.requestId'
+                      :request='req')
   p(v-else) Loading journal...
 </template>
 
 <script>
-'use static'
+'use strict'
 
 import { mapState } from 'vuex'
 
 import actions from '@/store/action-types'
 
+import RequestListItem from '@/components/request/RequestListItem'
+
 export default {
-  name: 'answered',
+  name: 'snoozed-requests',
+  components: {
+    RequestListItem
+  },
   data () {
     return {
       requests: [],
@@ -63,12 +62,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.mpj-snoozed-list p {
-  border-top: solid 1px lightgray;
-}
-.mpj-snoozed-list p:first-child {
-  border-top: none;
-}
-</style>
diff --git a/src/app/src/router/index.js b/src/app/src/router/index.js
index ea2f9d5..fc2dce2 100644
--- a/src/app/src/router/index.js
+++ b/src/app/src/router/index.js
@@ -1,14 +1,17 @@
+'use strict'
+
 import Vue from 'vue'
 import Router from 'vue-router'
 
-import Answered from '@/components/Answered'
-import AnsweredDetail from '@/components/AnsweredDetail'
+import ActiveRequests from '@/components/request/ActiveRequests'
+import AnsweredRequests from '@/components/request/AnsweredRequests'
 import EditRequest from '@/components/request/EditRequest'
+import FullRequest from '@/components/request/FullRequest'
 import Home from '@/components/Home'
 import Journal from '@/components/Journal'
 import LogOn from '@/components/user/LogOn'
 import PrivacyPolicy from '@/components/legal/PrivacyPolicy'
-import Snoozed from '@/components/Snoozed'
+import SnoozedRequests from '@/components/request/SnoozedRequests'
 import TermsOfService from '@/components/legal/TermsOfService'
 
 Vue.use(Router)
@@ -21,17 +24,6 @@ export default new Router({
       name: 'Home',
       component: Home
     },
-    {
-      path: '/answered/:id',
-      name: 'AnsweredDetail',
-      component: AnsweredDetail,
-      props: true
-    },
-    {
-      path: '/answered',
-      name: 'Answered',
-      component: Answered
-    },
     {
       path: '/journal',
       name: 'Journal',
@@ -54,9 +46,25 @@ export default new Router({
       props: true
     },
     {
-      path: '/snoozed',
-      name: 'Snoozed',
-      component: Snoozed
+      path: '/request/:id/full',
+      name: 'FullRequest',
+      component: FullRequest,
+      props: true
+    },
+    {
+      path: '/requests/active',
+      name: 'ActiveRequests',
+      component: ActiveRequests
+    },
+    {
+      path: '/requests/answered',
+      name: 'AnsweredRequests',
+      component: AnsweredRequests
+    },
+    {
+      path: '/requests/snoozed',
+      name: 'SnoozedRequests',
+      component: SnoozedRequests
     },
     {
       path: '/user/log-on',
diff --git a/src/app/src/store/index.js b/src/app/src/store/index.js
index 74ee607..c573d38 100644
--- a/src/app/src/store/index.js
+++ b/src/app/src/store/index.js
@@ -1,3 +1,5 @@
+'use strict'
+
 import Vue from 'vue'
 import Vuex from 'vuex'
 

From a6144f67ec39bfe9a214ad91d8072d7dd9b5491c Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 09:13:38 -0500
Subject: [PATCH 06/10] Converted notes modal (#20)

---
 src/app/src/App.vue                           | 48 +++++++++++-
 .../src/components/request/EditRequest.vue    | 24 +++---
 src/app/src/components/request/NotesEdit.vue  | 75 ++++++++++---------
 3 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index 427708c..c69faae 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -52,6 +52,9 @@ body {
   padding-top: 50px;
   margin: 0;
 }
+h1, h2, h3, h4, h5 {
+  font-weight: 500;
+}
 p {
   margin-bottom: 0;
 }
@@ -138,10 +141,51 @@ a:hover {
 }
 .mpj-text-right {
   text-align: right;
-  color: rgba(0, 0, 0, .60);
 }
 .mpj-muted-text {
-  color: rgba(0, 0, 0, .60);
+  color: rgba(0, 0, 0, .6);
+}
+.mpj-narrow {
+  max-width: 40rem;
+  margin: auto;
+}
+.mpj-modal {
+  position: fixed;
+  z-index: 8;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(0, 0, 0, .4);
+}
+.mpj-modal-content {
+  background-color: whitesmoke;
+  border: solid 1px #050;
+  border-radius: .5rem;
+  animation-name: animatetop;
+  animation-duration: 0.4s;
+  padding: 1rem;
+  margin-top: 4rem;
+}
+@keyframes animatetop {
+  from {
+    top: -300px;
+    opacity: 0;
+  }
+  to {
+    top: 0;
+    opacity: 1;
+  }
+}
+.mpj-modal-content header {
+  margin: -1rem -1rem .5rem;
+  border-radius: .4rem;
+}
+.mpj-modal-content header h3 {
+  color: white;
+  margin: 0;
+  padding: 1rem;
 }
 .mpj-margin {
   margin-left: 1rem;
diff --git a/src/app/src/components/request/EditRequest.vue b/src/app/src/components/request/EditRequest.vue
index 235cd12..22a35d9 100644
--- a/src/app/src/components/request/EditRequest.vue
+++ b/src/app/src/components/request/EditRequest.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 article.mpj-main-content(role='main')
   page-title(:title='title')
-  form.mpj-edit-request-form
+  .mpj-narrow
     label(for='request_text') Prayer Request
     br
     textarea#request_text(v-model='form.requestText'
@@ -28,14 +28,14 @@ article.mpj-main-content(role='main')
             v-model='form.status')
       label(for='status_answered')= ' Answered'
     br(v-else)
-  div.mpj-edit-request-form.mpj-text-right
-    button(@click.stop='saveRequest()').primary
-      md-icon(icon='save')
-      = ' Save'
-    | &nbsp; &nbsp;
-    button(@click.stop='goBack()')
-      md-icon(icon='arrow_back')
-      = ' Cancel'
+    .mpj-text-right
+      button(@click.stop='saveRequest()').primary
+        md-icon(icon='save')
+        = ' Save'
+      | &nbsp; &nbsp;
+      button(@click.stop='goBack()')
+        md-icon(icon='arrow_back')
+        = ' Cancel'
 </template>
 
 <script>
@@ -122,11 +122,7 @@ export default {
 }
 </script>
 
-<style>
-.mpj-edit-request-form {
-  max-width: 40rem;
-  margin: auto;
-}
+<style scoped>
 #request_text {
   width: 100%;
 }
diff --git a/src/app/src/components/request/NotesEdit.vue b/src/app/src/components/request/NotesEdit.vue
index 5053603..d73b182 100644
--- a/src/app/src/components/request/NotesEdit.vue
+++ b/src/app/src/components/request/NotesEdit.vue
@@ -1,36 +1,33 @@
 <template lang="pug">
-b-modal(v-model='notesVisible'
-        header-bg-variant='mpj'
-        header-text-variant='light'
-        size='lg'
-        title='Add Notes to Prayer Request'
-        @edit='openDialog()'
-        @shows='focusNotes')
-  b-form
-    b-form-group(label='Notes'
-                 label-for='notes')
-      b-textarea#notes(ref='toFocus'
-                       v-model='form.notes'
-                       :rows='10'
-                       @blur='trimText()')
-  div(v-if='hasPriorNotes')
-    p.text-center: strong Prior Notes for This Request
-    b-list-group(flush)
-      b-list-group-item(v-for='note in priorNotes'
-                        :key='note.asOf')
-        small.text-muted: date-from-now(:value='note.asOf')
-        br
-        div.mpj-request-text {{ note.notes }}
-  div(v-else-if='noPriorNotes').text-center.text-muted There are no prior notes for this request
-  div(v-else).text-center
-    b-btn(variant='outline-secondary'
-          @click='loadNotes()') Load Prior Notes
-  div.w-100.text-right(slot='modal-footer')
-    b-btn(variant='primary'
-          @click='saveNotes()') Save
-    | &nbsp; &nbsp;
-    b-btn(variant='outline-secondary'
-          @click='closeDialog()') Cancel
+.mpj-modal(v-show='notesVisible'
+           @edit='openDialog()')
+  .mpj-modal-content.mpj-narrow
+    header.mpj-bg
+      h3 Add Notes to Prayer Request
+    label(for='notes') Notes
+    br
+    textarea#notes(v-model='form.notes'
+                   :rows='10'
+                   @blur='trimText()')
+    .mpj-text-right
+      button(@click='saveNotes()').primary.
+        #[md-icon(icon='save')] Save
+      | &nbsp; &nbsp;
+      button(@click='closeDialog()').
+        #[md-icon(icon='undo')] Cancel
+    hr
+    div(v-if='hasPriorNotes')
+      p.mpj-text-center: strong Prior Notes for This Request
+      .mpj-note-list
+        p(v-for='note in priorNotes'
+          :key='note.asOf')
+          small.mpj-muted-text: date-from-now(:value='note.asOf')
+          br
+          span.mpj-request-text {{ note.notes }}
+    div(v-else-if='noPriorNotes').mpj-text-center.mpj-muted-text There are no prior notes for this request
+    div(v-else).mpj-text-center
+      button(@click='loadNotes()').
+        #[md-icon(icon='cloud_download')] Load Prior Notes
 </template>
 
 <script>
@@ -74,9 +71,6 @@ export default {
       this.priorNotesLoaded = false
       this.notesVisible = false
     },
-    focusNotes (e) {
-      this.$refs.toFocus.focus()
-    },
     async loadNotes () {
       this.$Progress.start()
       try {
@@ -92,9 +86,9 @@ export default {
       }
     },
     openDialog (request) {
+      console.log('Received openDialog event')
       this.form.requestId = request.requestId
       this.notesVisible = true
-      this.focusNotes(null)
     },
     async saveNotes () {
       this.$Progress.start()
@@ -114,3 +108,12 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+#notes {
+  width: 100%;
+}
+.mpj-note-list p {
+  border-top: dotted 1px lightgray;
+}
+</style>

From 0c21e6c1c0a237cec4ef02a67323c3e00e073164 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 11:07:30 -0500
Subject: [PATCH 07/10] Unsnooze works; #20 is complete

also:
- wrapped up some other stylings
- snoozed requests still show in the journal; this logic will change with recurrence work, so that bug is deferred
---
 src/app/src/App.vue                           | 34 ++++++++++++++--
 src/app/src/components/Journal.vue            |  8 ++--
 .../src/components/request/ActiveRequests.vue | 15 +++----
 .../components/request/AnsweredRequests.vue   |  3 +-
 src/app/src/components/request/NotesEdit.vue  |  5 +--
 .../src/components/request/RequestCard.vue    |  8 +++-
 .../components/request/RequestListItem.vue    | 39 ++++++++++---------
 .../src/components/request/SnoozeRequest.vue  | 37 +++++++++---------
 .../components/request/SnoozedRequests.vue    | 15 +++----
 9 files changed, 93 insertions(+), 71 deletions(-)

diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index c69faae..0b39c32 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -54,18 +54,40 @@ body {
 }
 h1, h2, h3, h4, h5 {
   font-weight: 500;
+  margin-top: 0;
+}
+h1 {
+  font-size: 2.5rem;
+}
+h2 {
+  font-size: 2rem;
+}
+h3 {
+  font-size: 1.75rem;
+}
+h4 {
+  font-size: 1.5rem;
+}
+h5 {
+  font-size: 1.25rem;
 }
 p {
   margin-bottom: 0;
 }
+input, textarea {
+  border-radius: .25rem;
+}
 button,
 a[role="button"] {
   border: solid 1px #050;
   border-radius: .5rem;
-  background-color: whitesmoke;
-}
-a[role="button"] {
+  background-color: rgb(235, 235, 235);
   padding: .25rem;
+  font-size: 1rem;
+}
+a[role="button"]:link,
+a[role="button"]:visited {
+  color: black;
 }
 button.primary,
 a[role="button"].primary {
@@ -149,6 +171,10 @@ a:hover {
   max-width: 40rem;
   margin: auto;
 }
+.mpj-skinny {
+  max-width: 20rem;
+  margin: auto;
+}
 .mpj-modal {
   position: fixed;
   z-index: 8;
@@ -182,7 +208,7 @@ a:hover {
   margin: -1rem -1rem .5rem;
   border-radius: .4rem;
 }
-.mpj-modal-content header h3 {
+.mpj-modal-content header h5 {
   color: white;
   margin: 0;
   padding: 1rem;
diff --git a/src/app/src/components/Journal.vue b/src/app/src/components/Journal.vue
index b6ccc46..db7129f 100644
--- a/src/app/src/components/Journal.vue
+++ b/src/app/src/components/Journal.vue
@@ -3,10 +3,10 @@ article.mpj-main-content-wide(role='main')
   page-title(:title='title')
   p(v-if='isLoadingJournal') Loading your prayer journal...
   template(v-else)
-    router-link(:to="{ name: 'EditRequest', params: { id: 'new' } }"
-                role='button')
-      md-icon(icon='add_box')
-      | &nbsp; Add a New Request
+    .mpj-text-center
+      router-link(:to="{ name: 'EditRequest', params: { id: 'new' } }"
+                  role='button').
+        #[md-icon(icon='add_box')] Add a New Request
     br
     .mpj-journal(v-if='journal.length > 0')
       request-card(v-for='request in journal'
diff --git a/src/app/src/components/request/ActiveRequests.vue b/src/app/src/components/request/ActiveRequests.vue
index 4f3025c..dba8ebc 100644
--- a/src/app/src/components/request/ActiveRequests.vue
+++ b/src/app/src/components/request/ActiveRequests.vue
@@ -6,7 +6,8 @@ article.mpj-main-content(role='main')
       No active requests found; return to #[router-link(:to='{ name: "Journal" } ') your journal]
     request-list-item(v-for='req in requests'
                       :key='req.requestId'
-                      :request='req')
+                      :request='req'
+                      :toast='toast')
   p(v-else) Loading journal...
 </template>
 
@@ -36,6 +37,9 @@ export default {
     },
     ...mapState(['journal', 'isLoadingJournal'])
   },
+  created () {
+    this.$on('requestSnoozed', this.ensureJournal)
+  },
   methods: {
     async ensureJournal () {
       if (!Array.isArray(this.journal)) {
@@ -45,15 +49,6 @@ export default {
       this.requests = this.journal
         .sort((a, b) => a.showAfter - b.showAfter)
       this.loaded = true
-    },
-    async cancelSnooze (requestId) {
-      await this.$store.dispatch(actions.SNOOZE_REQUEST, {
-        progress: this.$Progress,
-        requestId: requestId,
-        until: 0
-      })
-      this.toast.showToast('Request un-snoozed', { theme: 'success' })
-      this.ensureJournal()
     }
   },
   async mounted () {
diff --git a/src/app/src/components/request/AnsweredRequests.vue b/src/app/src/components/request/AnsweredRequests.vue
index dedca7f..260ffb9 100644
--- a/src/app/src/components/request/AnsweredRequests.vue
+++ b/src/app/src/components/request/AnsweredRequests.vue
@@ -6,7 +6,8 @@ article.mpj-main-content(role='main')
       No answered requests found; once you have marked one as &ldquo;Answered&rdquo;, it will appear here
     request-list-item(v-for='req in requests'
                       :key='req.requestId'
-                      :request='req')
+                      :request='req'
+                      :toast='toast')
   p(v-else) Loading answered requests...
 </template>
 
diff --git a/src/app/src/components/request/NotesEdit.vue b/src/app/src/components/request/NotesEdit.vue
index d73b182..278e0fa 100644
--- a/src/app/src/components/request/NotesEdit.vue
+++ b/src/app/src/components/request/NotesEdit.vue
@@ -1,9 +1,8 @@
 <template lang="pug">
-.mpj-modal(v-show='notesVisible'
-           @edit='openDialog()')
+.mpj-modal(v-show='notesVisible')
   .mpj-modal-content.mpj-narrow
     header.mpj-bg
-      h3 Add Notes to Prayer Request
+      h5 Add Notes to Prayer Request
     label(for='notes') Notes
     br
     textarea#notes(v-model='form.notes'
diff --git a/src/app/src/components/request/RequestCard.vue b/src/app/src/components/request/RequestCard.vue
index bb226b9..38795ca 100644
--- a/src/app/src/components/request/RequestCard.vue
+++ b/src/app/src/components/request/RequestCard.vue
@@ -28,7 +28,8 @@ export default {
   },
   computed: {
     shouldDisplay () {
-      return Date.now() >= this.request.showAfter
+      const now = Date.now()
+      return Math.max(now, this.request.showAfter, this.request.snoozedUntil) === now
     }
   },
   methods: {
@@ -77,7 +78,10 @@ export default {
 }
 .mpj-card-header button {
   margin: .25rem;
-  font-size: .8rem;
+  padding: 0 .25rem;
+}
+.mpj-card-header button .material-icons {
+  font-size: 1.3rem;
 }
 .mpj-request-card .card-text {
   margin-left: 1rem;
diff --git a/src/app/src/components/request/RequestListItem.vue b/src/app/src/components/request/RequestListItem.vue
index 6fa306d..8486c93 100644
--- a/src/app/src/components/request/RequestListItem.vue
+++ b/src/app/src/components/request/RequestListItem.vue
@@ -3,22 +3,18 @@ p.mpj-request-text
   | {{ request.text }}
   br
   br
-  router-link(:to="{ name: 'FullRequest', params: { id: request.requestId } }"
-              role='button'
-              title='View Full Request')
-    md-icon(icon='description')
-    = ' View Full Request'
-  | &nbsp;
-  router-link(v-if='!isAnswered'
-              :to="{ name: 'EditRequest', params: { id: request.requestId } }"
-              role='button'
-              title='Edit Request')
-    md-icon(icon='edit')
-    = ' Edit Request'
-  | &nbsp;
-  button(v-if='isSnoozed' @click='cancelSnooze()')
-    md-icon(icon='restore')
-    = ' Cancel Snooze'
+  button(@click='viewFull'
+         title='View Full Request').
+    #[md-icon(icon='description')] View Full Request
+  | &nbsp; &nbsp;
+  button(v-if='!isAnswered'
+         @click='editRequest'
+         title='Edit Request').
+    #[md-icon(icon='edit')] Edit Request
+  | &nbsp; &nbsp;
+  button(v-if='isSnoozed'
+         @click='cancelSnooze()').
+    #[md-icon(icon='restore')] Cancel Snooze
   br(v-if='isSnoozed || isAnswered')
   small(v-if='isSnoozed').mpj-muted-text: em.
     &nbsp; Snooze expires #[date-from-now(:value='request.snoozedUntil')]
@@ -34,7 +30,8 @@ import actions from '@/store/action-types'
 export default {
   name: 'request-list-item',
   props: {
-    request: { required: true }
+    request: { required: true },
+    toast: { required: true }
   },
   data () {
     return {}
@@ -58,7 +55,13 @@ export default {
         until: 0
       })
       this.toast.showToast('Request un-snoozed', { theme: 'success' })
-      // FIXME: communicate with the parent to refresh // this.ensureJournal()
+      this.$parent.$emit('requestUnsnoozed')
+    },
+    editRequest () {
+      this.$router.push({ name: 'EditRequest', params: { id: this.request.requestId } })
+    },
+    viewFull () {
+      this.$router.push({ name: 'FullRequest', params: { id: this.request.requestId } })
     }
   }
 }
diff --git a/src/app/src/components/request/SnoozeRequest.vue b/src/app/src/components/request/SnoozeRequest.vue
index b77fe02..aa2d9de 100644
--- a/src/app/src/components/request/SnoozeRequest.vue
+++ b/src/app/src/components/request/SnoozeRequest.vue
@@ -1,23 +1,22 @@
 <template lang="pug">
-b-modal(v-model='snoozeVisible'
-        header-bg-variant='mpj'
-        header-text-variant='light'
-        size='lg'
-        title='Snooze Prayer Request'
-        @edit='openDialog()')
-  b-form
-    b-form-group(label='Until'
-                 label-for='until')
-      b-input#until(type='date'
-                    v-model='form.snoozedUntil'
-                    autofocus)
-  div.w-100.text-right(slot='modal-footer')
-    b-btn(variant='primary'
-          :disabled='!isValid'
-          @click='snoozeRequest()') Snooze
-    | &nbsp; &nbsp;
-    b-btn(variant='outline-secondary'
-          @click='closeDialog()') Cancel
+.mpj-modal(v-show='snoozeVisible')
+  .mpj-modal-content.mpj-skinny
+    header.mpj-bg
+      h5 Snooze Prayer Request
+    p.mpj-text-center
+      label(for='until') Until
+      = ' '
+      input#until(type='date'
+                  v-model='form.snoozedUntil'
+                  autofocus)
+    br
+    .mpj-text-right
+      button.primary(:disabled='!isValid'
+                     @click='snoozeRequest()').
+        #[md-icon(icon='snooze')] Snooze
+      | &nbsp; &nbsp;
+      button(@click='closeDialog()').
+        #[md-icon(icon='undo')] Cancel
 </template>
 
 <script>
diff --git a/src/app/src/components/request/SnoozedRequests.vue b/src/app/src/components/request/SnoozedRequests.vue
index 711729b..bec1909 100644
--- a/src/app/src/components/request/SnoozedRequests.vue
+++ b/src/app/src/components/request/SnoozedRequests.vue
@@ -6,7 +6,8 @@ article.mpj-main-content(role='main')
       No snoozed requests found; return to #[router-link(:to='{ name: "Journal" } ') your journal]
     request-list-item(v-for='req in requests'
                       :key='req.requestId'
-                      :request='req')
+                      :request='req'
+                      :toast='toast')
   p(v-else) Loading journal...
 </template>
 
@@ -36,6 +37,9 @@ export default {
     },
     ...mapState(['journal', 'isLoadingJournal'])
   },
+  created () {
+    this.$on('requestUnsnoozed', this.ensureJournal)
+  },
   methods: {
     async ensureJournal () {
       if (!Array.isArray(this.journal)) {
@@ -46,15 +50,6 @@ export default {
         .filter(req => req.snoozedUntil > Date.now())
         .sort((a, b) => a.snoozedUntil - b.snoozedUntil)
       this.loaded = true
-    },
-    async cancelSnooze (requestId) {
-      await this.$store.dispatch(actions.SNOOZE_REQUEST, {
-        progress: this.$Progress,
-        requestId: requestId,
-        until: 0
-      })
-      this.toast.showToast('Request un-snoozed', { theme: 'success' })
-      this.ensureJournal()
     }
   },
   async mounted () {

From 9f1e258180841dd02ef33b8b39082e716f093b99 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 13:46:03 -0500
Subject: [PATCH 08/10] Added recurrence to new request add/edit page (#16)

still need to get the actual non-immediate recurrence stuff to work correctly
---
 src/app/src/App.vue                           |  8 ++
 .../src/components/request/EditRequest.vue    | 87 +++++++++++++++----
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index 0b39c32..a034b44 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -101,6 +101,14 @@ a[role="button"]:hover {
   color: white;
   text-decoration: none;
 }
+label {
+  font-variant: small-caps;
+  font-size: 1.1rem;
+}
+label.normal {
+  font-variant: unset;
+  font-size: unset;
+}
 footer {
   border-top: solid 1px lightgray;
   margin-top: 1rem;
diff --git a/src/app/src/components/request/EditRequest.vue b/src/app/src/components/request/EditRequest.vue
index 22a35d9..6d1f876 100644
--- a/src/app/src/components/request/EditRequest.vue
+++ b/src/app/src/components/request/EditRequest.vue
@@ -12,22 +12,52 @@ article.mpj-main-content(role='main')
     template(v-if='!isNew')
       label Also Mark As
       br
-      input(type='radio'
-            id='status_updated'
-            value='Updated'
-            v-model='form.status')
-      label(for='status_updated')= ' Updated'
-      input(type='radio'
-            id='status_prayed'
-            value='Prayed'
-            v-model='form.status')
-      label(for='status_prayed')= ' Prayed'
-      input(type='radio'
-            id='status_answered'
-            value='Answered'
-            v-model='form.status')
-      label(for='status_answered')= ' Answered'
-    br(v-else)
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Updated')
+        | Updated
+      | &nbsp; &nbsp;
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Prayed')
+        | Prayed
+      | &nbsp; &nbsp;
+      label.normal
+        input(v-model='form.status'
+              type='radio'
+              name='status'
+              value='Answered')
+        | Answered
+      br
+    label Recurrence
+    | &nbsp; &nbsp;
+    em.mpj-muted-text After prayer, request reappears...
+    br
+    label.normal
+      input(v-model='form.recur.typ'
+            type='radio'
+            name='recur'
+            value='immediate')
+      | Immediately
+    | &nbsp; &nbsp;
+    label.normal
+      input(v-model='form.recur.typ'
+            type='radio'
+            name='recur'
+            value='other')
+      | Every...
+    input#recur_count(v-model='form.recur.count'
+                      type='number'
+                      :disabled='!showRecurrence')
+    select(v-model='form.recur.other'
+           :disabled='!showRecurrence')
+      option(value='hours') hours
+      option(value='days') days
+      option(value='weeks') weeks
     .mpj-text-right
       button(@click.stop='saveRequest()').primary
         md-icon(icon='save')
@@ -60,7 +90,12 @@ export default {
       form: {
         requestId: '',
         requestText: '',
-        status: 'Updated'
+        status: 'Updated',
+        recur: {
+          typ: 'immediate',
+          other: '',
+          count: ''
+        }
       }
     }
   },
@@ -68,6 +103,9 @@ export default {
     toast () {
       return this.$parent.$refs.toast
     },
+    showRecurrence () {
+      this.form.recur.typ !== 'immediate'
+    },
     ...mapState(['journal'])
   },
   async mounted () {
@@ -77,6 +115,9 @@ export default {
       this.form.requestId = ''
       this.form.requestText = ''
       this.form.status = 'Created'
+      this.form.recur.typ = 'immediate'
+      this.form.recur.other = ''
+      this.form.recur.count = ''
     } else {
       this.title = 'Edit Prayer Request'
       this.isNew = false
@@ -87,6 +128,15 @@ export default {
       this.form.requestId = this.id
       this.form.requestText = req.text
       this.form.status = 'Updated'
+      if (req.recurType === 'immediate') {
+        this.form.recur.typ = 'immediate'
+        this.form.recur.other = ''
+        this.form.recur.count = ''
+      } else {
+        this.form.recur.typ = 'other'
+        this.form.recur.other = req.recurType
+        this.form.recur.count = req.recurCount
+      }
     }
   },
   methods: {
@@ -126,4 +176,7 @@ export default {
 #request_text {
   width: 100%;
 }
+#recur_count {
+  width: 3rem;
+}
 </style>

From 2c34650cebe6ba11f3ff3cdcdab9cbe5ebba1ab8 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 19:32:48 -0500
Subject: [PATCH 09/10] Completed recurrence work (#16)

Requests can now:
- be entered with recurrence
- be updated with recurrence
- manually skip recurrence period

Also did an app-wide clean-up to ensure that everything is done the same way in all places
---
 src/api/MyPrayerJournal.Api/Data.fs           |   2 +-
 src/api/MyPrayerJournal.Api/Handlers.fs       |  54 +++++++++-
 src/api/MyPrayerJournal.Api/Program.fs        |  16 ++-
 src/app/src/App.vue                           |  14 ++-
 src/app/src/api/index.js                      |  38 +++++--
 .../components/{ => common}/Navigation.vue    |   0
 .../src/components/request/ActiveRequests.vue |   3 +-
 .../src/components/request/EditRequest.vue    |  74 ++++++++-----
 .../src/components/request/FullRequest.vue    |   5 +-
 src/app/src/components/request/NewRequest.vue | 100 ------------------
 src/app/src/components/request/NotesEdit.vue  |  18 ++--
 .../src/components/request/RequestCard.vue    |   4 +-
 .../components/request/RequestListItem.vue    |  36 +++++--
 .../src/components/request/SnoozeRequest.vue  |  10 +-
 src/app/src/components/user/LogOn.vue         |   2 +-
 src/app/src/router/index.js                   |   7 ++
 src/app/src/store/action-types.js             |   2 +
 src/app/src/store/index.js                    |  26 ++++-
 18 files changed, 228 insertions(+), 183 deletions(-)
 rename src/app/src/components/{ => common}/Navigation.vue (100%)
 delete mode 100644 src/app/src/components/request/NewRequest.vue

diff --git a/src/api/MyPrayerJournal.Api/Data.fs b/src/api/MyPrayerJournal.Api/Data.fs
index ab9fdc8..3a2d948 100644
--- a/src/api/MyPrayerJournal.Api/Data.fs
+++ b/src/api/MyPrayerJournal.Api/Data.fs
@@ -245,7 +245,7 @@ type AppDbContext (opts : DbContextOptions<AppDbContext>) =
       .OrderBy(fun r -> r.asOf)
   
   /// Retrieve a request by its ID and user ID
-  member this.TryRequestById reqId userId : Task<Request option> =
+  member this.TryRequestById reqId userId =
     task {
       let! req = this.Requests.AsNoTracking().FirstOrDefaultAsync(fun r -> r.requestId = reqId && r.userId = userId)
       return toOption req
diff --git a/src/api/MyPrayerJournal.Api/Handlers.fs b/src/api/MyPrayerJournal.Api/Handlers.fs
index be7dc8e..2991d81 100644
--- a/src/api/MyPrayerJournal.Api/Handlers.fs
+++ b/src/api/MyPrayerJournal.Api/Handlers.fs
@@ -95,6 +95,15 @@ module Models =
       notes : string
       }
   
+  /// Recurrence update
+  [<CLIMutable>]
+  type Recurrence =
+    { /// The recurrence type
+      recurType  : string
+      /// The recurrence cound
+      recurCount : int16
+      }
+
   /// A prayer request
   [<CLIMutable>]
   type Request =
@@ -103,9 +112,16 @@ module Models =
       /// The recurrence type
       recurType   : string
       /// The recurrence count
-      recurCount  : int16 option
+      recurCount  : int16
       }
   
+  /// Reset the "showAfter" property on a request
+  [<CLIMutable>]
+  type Show =
+    { /// The time after which the request should appear
+      showAfter : int64
+      }
+
   /// The time until which a request should not appear in the journal
   [<CLIMutable>]
   type SnoozeUntil =
@@ -156,7 +172,7 @@ module Request =
             enteredOn  = now
             showAfter  = now
             recurType  = r.recurType
-            recurCount = defaultArg r.recurCount 0s
+            recurCount = r.recurCount
           }
         |> db.AddEntry
         { History.empty with
@@ -255,7 +271,23 @@ module Request =
         return! json notes next ctx
         }
   
-  /// POST /api/request/[req-id]/snooze
+  /// PATCH /api/request/[req-id]/show
+  let show reqId : HttpHandler =
+    authorize
+    >=> fun next ctx ->
+      task {
+        let db = db ctx
+        match! db.TryRequestById reqId (userId ctx) with
+        | Some req ->
+            let! show = ctx.BindJsonAsync<Models.Show> ()
+            { req with showAfter = show.showAfter }
+            |> db.UpdateEntry
+            let! _ = db.SaveChangesAsync ()
+            return! setStatusCode 204 next ctx
+        | None -> return! Error.notFound next ctx
+        }
+  
+  /// PATCH /api/request/[req-id]/snooze
   let snooze reqId : HttpHandler =
     authorize
     >=> fun next ctx ->
@@ -270,3 +302,19 @@ module Request =
             return! setStatusCode 204 next ctx
         | None -> return! Error.notFound next ctx
         }
+
+  /// PATCH /api/request/[req-id]/recurrence
+  let updateRecurrence reqId : HttpHandler =
+    authorize
+    >=> fun next ctx ->
+      task {
+        let db = db ctx
+        match! db.TryRequestById reqId (userId ctx) with
+        | Some req ->
+            let! recur = ctx.BindJsonAsync<Models.Recurrence> ()
+            { req with recurType = recur.recurType; recurCount = recur.recurCount }
+            |> db.UpdateEntry
+            let! _ = db.SaveChangesAsync ()
+            return! setStatusCode 204 next ctx
+        | None -> return! Error.notFound next ctx
+        }
diff --git a/src/api/MyPrayerJournal.Api/Program.fs b/src/api/MyPrayerJournal.Api/Program.fs
index 73f0884..2e21bd3 100644
--- a/src/api/MyPrayerJournal.Api/Program.fs
+++ b/src/api/MyPrayerJournal.Api/Program.fs
@@ -58,10 +58,17 @@ module Configure =
         GET [
           route    "journal" Handlers.Journal.journal
           subRoute "request" [
-            route  "s/answered"   Handlers.Request.answered
-            routef "/%s/full"     Handlers.Request.getFull
-            routef "/%s/notes"    Handlers.Request.getNotes
-            routef "/%s"          Handlers.Request.get
+            route  "s/answered" Handlers.Request.answered
+            routef "/%s/full"   Handlers.Request.getFull
+            routef "/%s/notes"  Handlers.Request.getNotes
+            routef "/%s"        Handlers.Request.get
+            ]
+          ]
+        PATCH [
+          subRoute "request" [
+            routef "/%s/recurrence" Handlers.Request.updateRecurrence
+            routef "/%s/show"       Handlers.Request.show
+            routef "/%s/snooze"     Handlers.Request.snooze
             ]
           ]
         POST [
@@ -69,7 +76,6 @@ module Configure =
             route  ""            Handlers.Request.add
             routef "/%s/history" Handlers.Request.addHistory
             routef "/%s/note"    Handlers.Request.addNote
-            routef "/%s/snooze"  Handlers.Request.snooze
             ]
           ]
         ]
diff --git a/src/app/src/App.vue b/src/app/src/App.vue
index a034b44..a7e6f02 100644
--- a/src/app/src/App.vue
+++ b/src/app/src/App.vue
@@ -19,7 +19,7 @@
 <script>
 'use strict'
 
-import Navigation from './components/Navigation.vue'
+import Navigation from './components/common/Navigation.vue'
 
 import { version } from '../package.json'
 
@@ -74,8 +74,15 @@ h5 {
 p {
   margin-bottom: 0;
 }
-input, textarea {
+input, textarea, select {
   border-radius: .25rem;
+  font-size: 1rem;
+}
+textarea {
+  font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
+}
+input, select {
+  font-family: inherit;
 }
 button,
 a[role="button"] {
@@ -183,6 +190,9 @@ a:hover {
   max-width: 20rem;
   margin: auto;
 }
+.mpj-full-width {
+  width: 100%;
+}
 .mpj-modal {
   position: fixed;
   z-index: 8;
diff --git a/src/app/src/api/index.js b/src/app/src/api/index.js
index 1adab6c..ac1046a 100644
--- a/src/app/src/api/index.js
+++ b/src/app/src/api/index.js
@@ -32,8 +32,10 @@ export default {
   /**
    * Add a new prayer request
    * @param {string} requestText The text of the request to be added
+   * @param {string} recurType The type of recurrence for this request
+   * @param {number} recurCount The number of intervals of recurrence
    */
-  addRequest: requestText => http.post('request', { requestText, recurType: 'immediate' }),
+  addRequest: (requestText, recurType, recurCount) => http.post('request', { requestText, recurType, recurCount }),
 
   /**
    * Get all answered requests, along with the text they had when it was answered
@@ -64,19 +66,33 @@ export default {
   journal: () => http.get('journal'),
 
   /**
-   * Snooze a request until the given time
-   * @param requestId {string} The ID of the prayer request to be snoozed
-   * @param until {number} The ticks until which the request should be snoozed
+   * Show a request after the given date (used for "show now")
+   * @param {string} requestId The ID of the request which should be shown
+   * @param {number} showAfter The ticks after which the request should be shown
    */
-  snoozeRequest: (requestId, until) => http.post(`request/${requestId}/snooze`, { until }),
+  showRequest: (requestId, showAfter) => http.patch(`request/${requestId}/show`, { showAfter }),
+
+  /**
+   * Snooze a request until the given time
+   * @param {string} requestId The ID of the prayer request to be snoozed
+   * @param {number} until The ticks until which the request should be snoozed
+   */
+  snoozeRequest: (requestId, until) => http.patch(`request/${requestId}/snooze`, { until }),
+
+  /**
+   * Update recurrence for a prayer request
+   * @param {string} requestId The ID of the prayer request for which recurrence is being updated
+   * @param {string} recurType The type of recurrence to set
+   * @param {number} recurCount The number of recurrence intervals to set
+   */
+  updateRecurrence: (requestId, recurType, recurCount) =>
+    http.patch(`request/${requestId}/recurrence`, { recurType, recurCount }),
 
   /**
    * Update a prayer request
-   * @param request The request (should have requestId, status, and updateText properties)
+   * @param {string} requestId The ID of the request to be updated
+   * @param {string} status The status of the update
+   * @param {string} updateText The text of the update (optional)
    */
-  updateRequest: request => http.post(`request/${request.requestId}/history`, {
-    status: request.status,
-    updateText: request.updateText
-  })
-
+  updateRequest: (requestId, status, updateText) => http.post(`request/${requestId}/history`, { status, updateText })
 }
diff --git a/src/app/src/components/Navigation.vue b/src/app/src/components/common/Navigation.vue
similarity index 100%
rename from src/app/src/components/Navigation.vue
rename to src/app/src/components/common/Navigation.vue
diff --git a/src/app/src/components/request/ActiveRequests.vue b/src/app/src/components/request/ActiveRequests.vue
index dba8ebc..a5d67b7 100644
--- a/src/app/src/components/request/ActiveRequests.vue
+++ b/src/app/src/components/request/ActiveRequests.vue
@@ -38,7 +38,8 @@ export default {
     ...mapState(['journal', 'isLoadingJournal'])
   },
   created () {
-    this.$on('requestSnoozed', this.ensureJournal)
+    this.$on('requestUnsnoozed', this.ensureJournal)
+    this.$on('requestNowShown', this.ensureJournal)
   },
   methods: {
     async ensureJournal () {
diff --git a/src/app/src/components/request/EditRequest.vue b/src/app/src/components/request/EditRequest.vue
index 6d1f876..9221e26 100644
--- a/src/app/src/components/request/EditRequest.vue
+++ b/src/app/src/components/request/EditRequest.vue
@@ -2,12 +2,13 @@
 article.mpj-main-content(role='main')
   page-title(:title='title')
   .mpj-narrow
-    label(for='request_text') Prayer Request
-    br
-    textarea#request_text(v-model='form.requestText'
-                          :rows='10'
-                          @blur='trimText()'
-                          autofocus)
+    label(for='request_text')
+      | Prayer Request
+      br
+      textarea(v-model='form.requestText'
+               :rows='10'
+               @blur='trimText()'
+               autofocus).mpj-full-width
     br
     template(v-if='!isNew')
       label Also Mark As
@@ -50,22 +51,21 @@ article.mpj-main-content(role='main')
             name='recur'
             value='other')
       | Every...
-    input#recur_count(v-model='form.recur.count'
-                      type='number'
-                      :disabled='!showRecurrence')
+    input(v-model='form.recur.count'
+          type='number'
+          :disabled='!showRecurrence').mpj-recur-count
     select(v-model='form.recur.other'
-           :disabled='!showRecurrence')
+           :disabled='!showRecurrence').mpj-recur-type
       option(value='hours') hours
       option(value='days') days
       option(value='weeks') weeks
     .mpj-text-right
-      button(@click.stop='saveRequest()').primary
-        md-icon(icon='save')
-        = ' Save'
+      button(:disabled='!isValidRecurrence'
+             @click.stop='saveRequest()').primary.
+        #[md-icon(icon='save')] Save
       | &nbsp; &nbsp;
-      button(@click.stop='goBack()')
-        md-icon(icon='arrow_back')
-        = ' Cancel'
+      button(@click.stop='goBack()').
+        #[md-icon(icon='arrow_back')] Cancel
 </template>
 
 <script>
@@ -100,15 +100,25 @@ export default {
     }
   },
   computed: {
-    toast () {
-      return this.$parent.$refs.toast
+    isValidRecurrence () {
+      if (this.form.recur.typ === 'immediate') return true
+      const count = Number.parseInt(this.form.recur.count)
+      if (isNaN(count) || this.form.recur.other === '') return false
+      if (this.form.recur.other === 'hours' && count > (365 * 24)) return false
+      if (this.form.recur.other === 'days' && count > 365) return false
+      if (this.form.recur.other === 'weeks' && count > 52) return false
+      return true
     },
     showRecurrence () {
-      this.form.recur.typ !== 'immediate'
+      return this.form.recur.typ !== 'immediate'
+    },
+    toast () {
+      return this.$parent.$refs.toast
     },
     ...mapState(['journal'])
   },
   async mounted () {
+    await this.ensureJournal()
     if (this.id === 'new') {
       this.title = 'Add Prayer Request'
       this.isNew = true
@@ -146,11 +156,18 @@ export default {
     trimText () {
       this.form.requestText = this.form.requestText.trim()
     },
+    async ensureJournal () {
+      if (!Array.isArray(this.journal)) {
+        await this.$store.dispatch(actions.LOAD_JOURNAL, this.$Progress)
+      }
+    },
     async saveRequest () {
       if (this.isNew) {
         await this.$store.dispatch(actions.ADD_REQUEST, {
           progress: this.$Progress,
-          requestText: this.form.requestText
+          requestText: this.form.requestText,
+          recurType: this.form.recur.typ === 'immediate' ? 'immediate' : this.form.recur.other,
+          recurCount: this.form.recur.typ === 'immediate' ? 0 : Number.parseInt(this.form.recur.count)
         })
         this.toast.showToast('New prayer request added', { theme: 'success' })
       } else {
@@ -158,7 +175,9 @@ export default {
           progress: this.$Progress,
           requestId: this.form.requestId,
           updateText: this.form.requestText,
-          status: this.form.status
+          status: this.form.status,
+          recurType: this.form.recur.typ === 'immediate' ? 'immediate' : this.form.recur.other,
+          recurCount: this.form.recur.typ === 'immediate' ? 0 : Number.parseInt(this.form.recur.count)
         })
         if (this.form.status === 'Answered') {
           this.toast.showToast('Request updated and removed from active journal', { theme: 'success' })
@@ -172,11 +191,14 @@ export default {
 }
 </script>
 
-<style scoped>
-#request_text {
-  width: 100%;
-}
-#recur_count {
+<style>
+.mpj-recur-count {
   width: 3rem;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.mpj-recur-type {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 </style>
diff --git a/src/app/src/components/request/FullRequest.vue b/src/app/src/components/request/FullRequest.vue
index 55db339..480a724 100644
--- a/src/app/src/components/request/FullRequest.vue
+++ b/src/app/src/components/request/FullRequest.vue
@@ -55,11 +55,12 @@ export default {
         .sort(asOfDesc)[0].text.fields[0]
     },
     log () {
-      return (this.request.notes || [])
+      const allHistory = (this.request.notes || [])
         .map(note => ({ asOf: note.asOf, text: { case: 'Some', fields: [ note.notes ] }, status: 'Notes' }))
         .concat(this.request.history)
         .sort(asOfDesc)
-        .slice(1)
+      // Skip the first entry for answered requests; that info is already displayed
+      return this.isAnswered ? allHistory.slice(1) : allHistory
     },
     openDays () {
       const asOf = this.isAnswered ? this.answered : Date.now()
diff --git a/src/app/src/components/request/NewRequest.vue b/src/app/src/components/request/NewRequest.vue
deleted file mode 100644
index 98a0cfb..0000000
--- a/src/app/src/components/request/NewRequest.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template lang="pug">
-div
-  button(@click='openDialog()')
-    md-icon(icon='add_box')
-    | &nbsp; Add a New Request
-  b-modal(v-model='showNewVisible'
-          header-bg-variant='mpj'
-          header-text-variant='light'
-          size='lg'
-          title='Add a New Prayer Request'
-          @shown='focusRequestText')
-    b-form
-      b-form-group(label='Prayer Request'
-                   label-for='request_text')
-        b-textarea#request_text(ref='toFocus'
-                                v-model='form.requestText'
-                                :rows='10'
-                                @blur='trimText()')
-      b-form-group(label='Recurrence')
-        | After prayer, request reappears
-        b-radio(v-model='form.recur.typ'
-                label='Immediately'
-                value='immediately'
-                checked='checked'
-                @click='checkRadios')
-        b-radio(v-model='form.recur.typ'
-                label='Every...'
-                value='other'
-                @click='checkRadios')
-        b-input(v-model='form.recur.count'
-                placeholder='##')
-        b-select(v-model='form.recur.other')
-          b-option(value='hours') hours
-          b-option(value='days') days
-          b-option(value='weeks') weeks
-    div.w-100.text-right(slot='modal-footer')
-      b-btn(variant='primary'
-            :disabled='!isValid'
-            @click='saveRequest()') Save
-      | &nbsp; &nbsp;
-      b-btn(variant='outline-secondary'
-            @click='closeDialog()') Cancel
-  toast(ref='toast')
-</template>
-
-<script>
-'use strict'
-
-import actions from '@/store/action-types'
-
-export default {
-  name: 'new-request',
-  data () {
-    return {
-      showNewVisible: false,
-      form: {
-        requestText: '',
-        recur: {
-          typ: 'immediate',
-          other: '',
-          count: ''
-        }
-      },
-      formLabelWidth: '120px'
-    }
-  },
-  mounted () {
-    this.$refs.toast.setOptions({ position: 'bottom right' })
-  },
-  computed: {
-    isValid () {
-      // TODO disallow submission if recurrence is too long
-      return true
-    }
-  },
-  methods: {
-    closeDialog () {
-      this.form.requestText = ''
-      this.showNewVisible = false
-    },
-    focusRequestText (e) {
-      this.$refs.toFocus.focus()
-    },
-    openDialog () {
-      this.showNewVisible = true
-    },
-    trimText () {
-      this.form.requestText = this.form.requestText.trim()
-    },
-    async saveRequest () {
-      await this.$store.dispatch(actions.ADD_REQUEST, {
-        progress: this.$Progress,
-        requestText: this.form.requestText
-      })
-      this.$refs.toast.showToast('New prayer request added', { theme: 'success' })
-      this.closeDialog()
-    }
-  }
-}
-</script>
diff --git a/src/app/src/components/request/NotesEdit.vue b/src/app/src/components/request/NotesEdit.vue
index 278e0fa..85c28e1 100644
--- a/src/app/src/components/request/NotesEdit.vue
+++ b/src/app/src/components/request/NotesEdit.vue
@@ -3,11 +3,12 @@
   .mpj-modal-content.mpj-narrow
     header.mpj-bg
       h5 Add Notes to Prayer Request
-    label(for='notes') Notes
-    br
-    textarea#notes(v-model='form.notes'
-                   :rows='10'
-                   @blur='trimText()')
+    label
+      | Notes
+      br
+      textarea(v-model='form.notes'
+               :rows='10'
+               @blur='trimText()').mpj-full-width
     .mpj-text-right
       button(@click='saveNotes()').primary.
         #[md-icon(icon='save')] Save
@@ -75,7 +76,6 @@ export default {
       try {
         const notes = await api.getNotes(this.form.requestId)
         this.priorNotes = notes.data
-        console.log(this.priorNotes)
         this.$Progress.finish()
       } catch (e) {
         console.error(e)
@@ -85,7 +85,6 @@ export default {
       }
     },
     openDialog (request) {
-      console.log('Received openDialog event')
       this.form.requestId = request.requestId
       this.notesVisible = true
     },
@@ -108,10 +107,7 @@ export default {
 }
 </script>
 
-<style scoped>
-#notes {
-  width: 100%;
-}
+<style>
 .mpj-note-list p {
   border-top: dotted 1px lightgray;
 }
diff --git a/src/app/src/components/request/RequestCard.vue b/src/app/src/components/request/RequestCard.vue
index 38795ca..e287784 100644
--- a/src/app/src/components/request/RequestCard.vue
+++ b/src/app/src/components/request/RequestCard.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
-.mpj-request-card
+.mpj-request-card(v-if='shouldDisplay')
   header.mpj-card-header(role='toolbar').
-    #[button.primary(@click='markPrayed()' title='Pray'): md-icon(icon='done')]
+    #[button(@click='markPrayed()' title='Pray').primary: md-icon(icon='done')]
     #[button(@click.stop='showEdit()' title='Edit'): md-icon(icon='edit')]
     #[button(@click.stop='showNotes()' title='Add Notes'): md-icon(icon='comment')]
     #[button(@click.stop='snooze()' title='Snooze Request'): md-icon(icon='schedule')]
diff --git a/src/app/src/components/request/RequestListItem.vue b/src/app/src/components/request/RequestListItem.vue
index 8486c93..b855ebe 100644
--- a/src/app/src/components/request/RequestListItem.vue
+++ b/src/app/src/components/request/RequestListItem.vue
@@ -7,17 +7,23 @@ p.mpj-request-text
          title='View Full Request').
     #[md-icon(icon='description')] View Full Request
   | &nbsp; &nbsp;
-  button(v-if='!isAnswered'
-         @click='editRequest'
-         title='Edit Request').
-    #[md-icon(icon='edit')] Edit Request
-  | &nbsp; &nbsp;
-  button(v-if='isSnoozed'
-         @click='cancelSnooze()').
-    #[md-icon(icon='restore')] Cancel Snooze
-  br(v-if='isSnoozed || isAnswered')
+  template(v-if='!isAnswered')
+    button(@click='editRequest'
+           title='Edit Request').
+      #[md-icon(icon='edit')] Edit Request
+    | &nbsp; &nbsp;
+  template(v-if='isSnoozed')
+    button(@click='cancelSnooze()').
+      #[md-icon(icon='restore')] Cancel Snooze
+    | &nbsp; &nbsp;
+  template(v-if='isPending')
+    button(@click='showNow()').
+      #[md-icon(icon='restore')] Show Now
+  br(v-if='isSnoozed || isPending || isAnswered')
   small(v-if='isSnoozed').mpj-muted-text: em.
     &nbsp; Snooze expires #[date-from-now(:value='request.snoozedUntil')]
+  small(v-if='isPending').mpj-muted-text: em.
+    &nbsp; Request scheduled to reappear #[date-from-now(:value='request.showAfter')]
   small(v-if='isAnswered').mpj-muted-text: em.
     &nbsp; Answered #[date-from-now(:value='request.asOf')]
 </template>
@@ -43,6 +49,9 @@ export default {
     isAnswered () {
       return this.request.lastStatus === 'Answered'
     },
+    isPending () {
+      return !this.isSnoozed && this.request.showAfter > Date.now()
+    },
     isSnoozed () {
       return this.request.snoozedUntil > Date.now()
     }
@@ -60,6 +69,15 @@ export default {
     editRequest () {
       this.$router.push({ name: 'EditRequest', params: { id: this.request.requestId } })
     },
+    async showNow () {
+      await this.$store.dispatch(actions.SHOW_REQUEST_NOW, {
+        progress: this.$Progress,
+        requestId: this.request.requestId,
+        showAfter: Date.now()
+      })
+      this.toast.showToast('Recurrence skipped; request now shows in journal', { theme: 'success' })
+      this.$parent.$emit('requestNowShown')
+    },
     viewFull () {
       this.$router.push({ name: 'FullRequest', params: { id: this.request.requestId } })
     }
diff --git a/src/app/src/components/request/SnoozeRequest.vue b/src/app/src/components/request/SnoozeRequest.vue
index aa2d9de..0fb1cb1 100644
--- a/src/app/src/components/request/SnoozeRequest.vue
+++ b/src/app/src/components/request/SnoozeRequest.vue
@@ -4,11 +4,11 @@
     header.mpj-bg
       h5 Snooze Prayer Request
     p.mpj-text-center
-      label(for='until') Until
-      = ' '
-      input#until(type='date'
-                  v-model='form.snoozedUntil'
-                  autofocus)
+      label
+        = 'Until '
+        input(v-model='form.snoozedUntil'
+              type='date'
+              autofocus)
     br
     .mpj-text-right
       button.primary(:disabled='!isValid'
diff --git a/src/app/src/components/user/LogOn.vue b/src/app/src/components/user/LogOn.vue
index 62fd1f3..35a96d9 100644
--- a/src/app/src/components/user/LogOn.vue
+++ b/src/app/src/components/user/LogOn.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-article
+article.mpj-main-content(role='main')
   pageTitle(title='Logging On')
   p Logging you on...
 </template>
diff --git a/src/app/src/router/index.js b/src/app/src/router/index.js
index fc2dce2..24a0c21 100644
--- a/src/app/src/router/index.js
+++ b/src/app/src/router/index.js
@@ -18,6 +18,13 @@ Vue.use(Router)
 
 export default new Router({
   mode: 'history',
+  scrollBehavior (to, from, savedPosition) {
+    if (savedPosition) {
+      return savedPosition
+    } else {
+      return { x: 0, y: 0 }
+    }
+  },
   routes: [
     {
       path: '/',
diff --git a/src/app/src/store/action-types.js b/src/app/src/store/action-types.js
index b671bab..958bba8 100644
--- a/src/app/src/store/action-types.js
+++ b/src/app/src/store/action-types.js
@@ -7,6 +7,8 @@ export default {
   LOAD_JOURNAL: 'load-journal',
   /** Action to update a request */
   UPDATE_REQUEST: 'update-request',
+  /** Action to skip the remaining recurrence period */
+  SHOW_REQUEST_NOW: 'show-request-now',
   /** Action to snooze a request */
   SNOOZE_REQUEST: 'snooze-request'
 }
diff --git a/src/app/src/store/index.js b/src/app/src/store/index.js
index c573d38..be80ff7 100644
--- a/src/app/src/store/index.js
+++ b/src/app/src/store/index.js
@@ -73,10 +73,10 @@ export default new Vuex.Store({
     }
   },
   actions: {
-    async [actions.ADD_REQUEST] ({ commit }, { progress, requestText }) {
+    async [actions.ADD_REQUEST] ({ commit }, { progress, requestText, recurType, recurCount }) {
       progress.start()
       try {
-        const newRequest = await api.addRequest(requestText)
+        const newRequest = await api.addRequest(requestText, recurType, recurCount)
         commit(mutations.REQUEST_ADDED, newRequest.data)
         progress.finish()
       } catch (err) {
@@ -100,10 +100,28 @@ export default new Vuex.Store({
         commit(mutations.LOADING_JOURNAL, false)
       }
     },
-    async [actions.UPDATE_REQUEST] ({ commit }, { progress, requestId, status, updateText }) {
+    async [actions.UPDATE_REQUEST] ({ commit, state }, { progress, requestId, status, updateText, recurType, recurCount }) {
       progress.start()
       try {
-        await api.updateRequest({ requestId, status, updateText })
+        let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {}
+        if (status !== 'Updated' || oldReq.text !== updateText) {
+          await api.updateRequest(requestId, status, updateText)
+        }
+        if (status === 'Updated' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
+          await api.updateRecurrence(requestId, recurType, recurCount)
+        }
+        const request = await api.getRequest(requestId)
+        commit(mutations.REQUEST_UPDATED, request.data)
+        progress.finish()
+      } catch (err) {
+        logError(err)
+        progress.fail()
+      }
+    },
+    async [actions.SHOW_REQUEST_NOW] ({ commit }, { progress, requestId, showAfter }) {
+      progress.start()
+      try {
+        await api.showRequest(requestId, showAfter)
         const request = await api.getRequest(requestId)
         commit(mutations.REQUEST_UPDATED, request.data)
         progress.finish()

From ee9326d7a542ec98234ffaeca6030292b4273621 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Sat, 18 Aug 2018 20:12:30 -0500
Subject: [PATCH 10/10] Updated docs for recurrence (#16)

---
 docs/index.md | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 8dc436e..86f6a0e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -16,15 +16,19 @@ myPrayerJournal uses login services using Google or Microsoft accounts. The only
 
 ## Your Prayer Journal
 
-Your current requests will be presented in three columns (or two or one, depending on the size of your screen or device). Each request is in its own card, and the buttons at the top of each card apply to that request. The last line of each request also tells you how long it has been since anything has been done on that request. Any time you see something like "a few minutes ago," you can hover over that to see the actual date/time the action was taken.
+Your current requests will be presented in columns (usually three, but it could be more or less, depending on the size of your screen or device). Each request is in its own card, and the buttons at the top of each card apply to that request. The last line of each request also tells you how long it has been since anything has been done on that request. Any time you see something like "a few minutes ago," you can hover over that to see the actual date/time the action was taken.
 
 ## Adding a Request
 
 To add a request, click the "Add a New Request" button at the top of your journal. Then, enter the text of the request as you see fit; there is no right or wrong way, and you are the only person who will see the text you enter. When you save the request, it will go to the bottom of the list of requests.
 
+## Setting Request Recurrence
+
+When you add or update a request, you can choose whether requests go to the bottom of the journal once they have been marked "Prayed" or whether they will reappear after a delay. You can set recurrence in terms of hours, days, or weeks, but it cannot be longer than 365 days. If you decide you want a request to reappear sooner, you can skip the current delay; click the "Active" menu link, find the request in the list (likely near the bottom), and click the "Show Now" button.
+
 ## Praying for Requests
 
-The first button for each request has a checkmark icon; clicking this button will mark the request as "Prayed" and move it to the bottom of the list. This allows you, if you're praying through your requests, to start at the top left (with the request that it's been the longest since you've prayed) and click the button as you pray; when the request goes to the bottom of the list, the next-least-recently-prayed request will take the top spot.
+The first button for each request has a checkmark icon; clicking this button will mark the request as "Prayed" and move it to the bottom of the list (or off, if you've set a recurrence period for the request). This allows you, if you're praying through your requests, to start at the top left (with the request that it's been the longest since you've prayed) and click the button as you pray; when the request move below or away, the next-least-recently-prayed request will take the top spot.
 
 ## Editing Requests
 
@@ -32,22 +36,20 @@ The second button for each request has a pencil icon. This allows you to edit th
 
 ## Adding Notes
 
-The third button for each request has an icon that looks like a piece of paper with writing; this lets you record notes about the request. If there is something you want to record that doesn't change the text of the request, this is the place to do it. For example, you may be praying for a long-term health issue, and that person tells you that their status is the same; or, you may want to record something God said to you while you were praying for that request.
-
-## Viewing a Request and Its History
-
-myPrayerJournal tracks all of the actions related to a request; the fourth button, with the magnifying glass icon, will show you the entire history, including the text as it changed, and all the times "Prayed" was recorded.
+The third button for each request has an icon that looks like a speech bubble with lines on it; this lets you record notes about the request. If there is something you want to record that doesn't change the text of the request, this is the place to do it. For example, you may be praying for a long-term health issue, and that person tells you that their status is the same; or, you may want to record something God said to you while you were praying for that request.
 
 ## Snoozing Requests
 
-There may be a time where a request does not need to appear. The fifth button, with the clock icon, allows you to snooze requests until the day you specify. Additionally, if you have any snoozed requests, a "Snoozed" menu item will appear next to the "Journal" one; this page allows you to see what requests are snoozed, and return them to your journal by canceling the snooze.
+There may be a time where a request does not need to appear. The fourth button, with the clock icon, allows you to snooze requests until the day you specify. Additionally, if you have any snoozed requests, a "Snoozed" menu item will appear next to the "Journal" one; this page allows you to see what requests are snoozed, and return them to your journal by canceling the snooze.
 
-## Answered Requests
+## Viewing a Request and Its History
 
-Next to "Journal" on the top navigation is the word "Answered." This page lists all answered requests, from most recent to least recent, along with the text of the request at the time it was marked as answered. It will also show you when it was marked answered. The button at the bottom of each request, with the magnifying glass and the words "Show Full Request", link to a page that shows that request's complete history and notes, along with a few statistics about that request. The history and notes are listed from most recent to least recent; if you want to read it chronologically, just press the "End" key on your keyboard and read it from the bottom up.
+myPrayerJournal tracks all of the actions related to a request; from the "Active" and "Answered" menu links (and "Snoozed", if it's showing), there is a "View Full Request" button. That page will show the current text of the request; how many times it has been marked as prayed; how long it has been an active request; and a log of all updates, prayers, and notes you have recorded. That log is listed from most recent to least recent; if you want to read it chronologically, just press the "End" key on your keyboard and read it from the bottom up.
+
+The "Active" link will show all requests that have not yet been marked answered, including snoozed and recurring requests. If requests are snoozed, or in a recurrence period off the journal, there will be a button where you can return the request to the list (either "Cancel Snooze" or "Show Now"). The "Answered" link shows all requests that have been marked answered. The "Snoozed" link just shows snoozed requests.
 
 ## Final Notes
 
-- myPrayerJournal is currently in public beta. If you encounter errors, please [file an issue on GitHub](https://github.com/bit-badger/myPrayerJournal/issues) with as much detail as possible. You can also browse the list of issues to see what has been done and what is still left to do.
+- myPrayerJournal is nearing the end of its public beta, approaching its first official release. If you encounter errors, please [file an issue on GitHub](https://github.com/bit-badger/myPrayerJournal/issues) with as much detail as possible. You can also browse the list of issues to see what has been done and what is still left to do.
 - Prayer requests and their history are securely backed up nightly along with other Bit Badger Solutions data.
 - Prayer changes things - most of all, the one doing the praying. I pray that this tool enables you to deepen and strengthen your prayer life.