Prep for 0.8.2 release

- Adds ability to view answered requests (#3)
- Fixes multi-line request display (#7)
- Docs updated for 0.8.2

docs/index.md

@@ -10,25 +10,32 @@ The application is at <https://prayerjournal.me>.
 
 myPrayerJournal uses login services using Google or Microsoft accounts. The only information the application stores in its database is your user Id token it receives from these services, so there are no permissions you should have to accept from these provider other than establishing that you can log on with that account. Because of this, you'll want to pick the same one each time; the tokens between the two accounts are different, even if you use the same e-mail address to log on to both.
 
+## Your Prayer Journal
+
+Your current requests will be presented in three columns (or one, if you're using a mobile phone). Each request is in its own card, and the buttons at the bottom 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 in 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.
+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.
 
 ## 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 (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 will move up to the top.
+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.
 
 ## Editing Requests
 
-The second button for each request has a pencil icon. This allows you to edit the text of the request, pretty much the same way you entered it; it starts with the current text, and you can add to it, modify it, or completely replace it. By default, updates will go in with an "Updated" status; you have the option to also mark this update as "Prayed" or "Answered." Answered requests will drop off the journal list. _(There is currently no way to see answered requests once they have been answered; this functionality is planned soon.)_
+The second button for each request has a pencil icon. This allows you to edit the text of the request, pretty much the same way you entered it; it starts with the current text, and you can add to it, modify it, or completely replace it. By default, updates will go in with an "Updated" status; you have the option to also mark this update as "Prayed" or "Answered." Answered requests will drop off the journal list.
 
 ## Viewing a Request and Its History
 
-myPrayerJournal tracks all of the actions related to a request; the third 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.
+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.
+
+## Answered Requests
+
+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 with the magnifying class at the words "Show Full Request" behave the same way as the paragraph immediately preceding this describes. _(This will likely change before a 0.9.x release, but this gives at least some way to find and review answered requests.)_
 
 ## Known Issues
 
 See [the GitHub issues list](https://github.com/danieljsummers/myPrayerJournal/issues) for the most up-to-date list.
 
-- _There is no way to view "Answered" requests; the absence of this functionality is a big reason this is still considered alpha. Going back through requests to see how God has answered them is an encouraging benefit of taking the time to journal._
 - _If you try to do something an get an error notification instead of a green checkmark, try logging off and logging back on again. The site currently doesn't check to see if your session has expired, but the server with which it's communicating does._

src/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "my-prayer-journal-api",
   "private": true,
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Server API for myPrayerJournal",
   "main": "index.js",
   "author": "Daniel J. Summers <daniel@djs-consulting.com>",

src/api/src/routes/request.js

@@ -40,11 +40,6 @@ export default function (checkJwt) {
       }
       await next()
     })
-    // Get the least-recently-updated request (used for the "pray through the journal" feature)
-    .get('/:id/oldest', checkJwt, async (ctx, next) => {
-      ctx.body = await db.request.oldest(ctx.state.user.sub)
-      await next()
-    })
     .get('/answered', checkJwt, async (ctx, next) => {
       ctx.body = await db.request.answered(ctx.state.user.sub)
       ctx.response.status = 200

src/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-prayer-journal",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "myPrayerJournal - Front End",
   "author": "Daniel J. Summers <daniel@djs-consulting.com>",
   "private": true,

src/app/src/App.vue

@@ -6,7 +6,7 @@
     vue-progress-bar
     toast(ref='toast')
   footer
-    p.text-right: i myPrayerJournal v0.8.1
+    p.text-right: i myPrayerJournal v0.8.2
 </template>
 
 <script>
@@ -46,4 +46,7 @@ footer p {
   border-bottom: solid 1px lightgray;
   margin-bottom: 20px;
 }
+.mpj-request-text {
+  white-space: pre-line;
+}
 </style>

src/app/src/components/Answered.vue

@@ -3,11 +3,13 @@ article
   page-title(title='Answered Requests')
   p(v-if='!loaded') Loading answered requests...
   div(v-if='loaded')
-    p(v-for='req in requests')
+    p.mpj-request-text(v-for='req in requests')
       b-btn(@click='showFull(req.requestId)' size='sm' variant='outline-secondary')
         icon(name='search')
         |  View Full Request
-      |     {{ req.text }}
+      |     {{ req.text }}  
+      small.text-muted: em.
+        (Answered #[date-from-now(:value='req.asOf')])
   full-request(:events='eventBus')
 </template>
 

src/app/src/components/Navigation.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-b-navbar(toggleable='sm' type='dark' variant='primary' fixed='top')
+b-navbar(toggleable='sm' type='dark' variant='mpj' fixed='top')
   b-nav-toggle(target='nav_collapse')
   b-navbar-brand(to='/')
     span(style='font-weight:100;') my
@@ -40,3 +40,9 @@ export default {
   }
 }
 </script>
+
+<style>
+.bg-mpj {
+  background-color: #1e7e34 !important;
+}
+</style>

src/app/src/components/request/RequestListItem.vue

@@ -3,7 +3,7 @@ div
   b-card-group.w-100(deck)
     b-card(v-for='(request, idx) in row' border-variant='dark' no-body)
       b-card-body.p-0
-        p.card-text.request-card-text.mb-1.px-3.pt-3
+        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 '
@@ -49,9 +49,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.request-card-text {
-  white-space: pre-line;
-}
-</style>