From 51ec649e7fe0d8fe1b0c5042b38a47fa002e6cfc Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Mon, 25 Sep 2017 21:28:08 -0500
Subject: [PATCH] Renamed Dashboard to Journal (#2)

---
 docs/index.md                                       |  2 +-
 src/app/src/auth/AuthService.js                     |  2 +-
 .../src/components/{Dashboard.vue => Journal.vue}   | 13 +++++++------
 src/app/src/components/Navigation.vue               |  2 +-
 src/app/src/router/index.js                         |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename src/app/src/components/{Dashboard.vue => Journal.vue} (65%)

diff --git a/docs/index.md b/docs/index.md
index f5c0d4f..61a77ea 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,7 +12,7 @@ myPrayerJournal uses login services using Google or Microsoft accounts. The only
 
 # Adding a Request
 
-To add a request, click the "Add a New Request" button in your "Dashboard" _(which will probably get renamed to "Journal" before this goes from alpha to beta)_. 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 in your "Dashboard" _("Journal" in v0.8.1)_. 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
 
diff --git a/src/app/src/auth/AuthService.js b/src/app/src/auth/AuthService.js
index e840abf..9562568 100644
--- a/src/app/src/auth/AuthService.js
+++ b/src/app/src/auth/AuthService.js
@@ -67,7 +67,7 @@ export default class AuthService {
           this.userInfo(authResult.accessToken)
             .then(user => {
               store.commit(mutations.USER_LOGGED_ON, user)
-              router.replace('/dashboard')
+              router.replace('/journal')
             })
         }
       })
diff --git a/src/app/src/components/Dashboard.vue b/src/app/src/components/Journal.vue
similarity index 65%
rename from src/app/src/components/Dashboard.vue
rename to src/app/src/components/Journal.vue
index 0d92eca..ce2aa1e 100644
--- a/src/app/src/components/Dashboard.vue
+++ b/src/app/src/components/Journal.vue
@@ -1,14 +1,15 @@
 <template lang="pug">
 article
-  page-title(:title="title")
-  p(v-if="isLoadingJournal") Loading your prayer journal...
-  template(v-if="!isLoadingJournal")
+  page-title(:title='title')
+  p(v-if='isLoadingJournal') Loading your prayer journal...
+  template(v-if='!isLoadingJournal')
     new-request
     el-row
       el-col(:span='4'): strong Actions
       el-col(:span='16'): strong Request
       el-col(:span='4'): strong As Of
-    request-list-item(v-for="request in journal" :request="request" :key="request.requestId")
+    request-list-item(v-if='journal.length > 0' v-for='request in journal' :request='request' :key='request.requestId')
+    p.text-center(v-if='journal.length === 0'): em No requests found; click the "Add a New Request" button to add one
 </template>
 
 <script>
@@ -23,7 +24,7 @@ import RequestListItem from './request/RequestListItem'
 import actions from '@/store/action-types'
 
 export default {
-  name: 'dashboard',
+  name: 'journal',
   components: {
     PageTitle,
     NewRequest,
@@ -31,7 +32,7 @@ export default {
   },
   computed: {
     title () {
-      return `${this.user.given_name}'s Dashboard`
+      return `${this.user.given_name}'s Prayer Journal`
     },
     ...mapState(['user', 'journal', 'isLoadingJournal'])
   },
diff --git a/src/app/src/components/Navigation.vue b/src/app/src/components/Navigation.vue
index 9a168b1..c646258 100644
--- a/src/app/src/components/Navigation.vue
+++ b/src/app/src/components/Navigation.vue
@@ -4,7 +4,7 @@ el-menu(theme='dark' mode='horizontal' class='mpj-top-nav' router='true')
     span(style='font-weight:100;') my
     span(style='font-weight:600;') Prayer
     span(style='font-weight:700;') Journal
-  el-menu-item(v-if='isAuthenticated' index='/dashboard') Dashboard
+  el-menu-item(v-if='isAuthenticated' index='/journal') Journal
   el-menu-item(v-if='isAuthenticated' index='3'): a(@click.stop='logOff()') Log Off
   el-menu-item(v-if='!isAuthenticated' index='4'): a(@click.stop='logOn()') Log On
   el-menu-item(index='5'): a(href='https://danieljsummers.github.io/myPrayerJournal/' target='_blank' @click.stop='') Docs
diff --git a/src/app/src/router/index.js b/src/app/src/router/index.js
index 0d5e5ad..7000677 100644
--- a/src/app/src/router/index.js
+++ b/src/app/src/router/index.js
@@ -1,8 +1,8 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
-import Dashboard from '@/components/Dashboard'
 import Home from '@/components/Home'
+import Journal from '@/components/Journal'
 import LogOn from '@/components/user/LogOn'
 
 Vue.use(Router)
@@ -11,7 +11,7 @@ export default new Router({
   mode: 'history',
   routes: [
     { path: '/', name: 'Home', component: Home },
-    { path: '/dashboard', name: 'Dashboard', component: Dashboard },
+    { path: '/journal', name: 'Journal', component: Journal },
     { path: '/user/log-on', name: 'LogOn', component: LogOn }
   ]
 })