Renamed Dashboard to Journal (#2)

This commit is contained in:
Daniel J. Summers 2017-09-25 21:28:08 -05:00
parent 647e79c59c
commit 51ec649e7f
5 changed files with 12 additions and 11 deletions

View File

@ -12,7 +12,7 @@ myPrayerJournal uses login services using Google or Microsoft accounts. The only
# Adding a Request # 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 # Praying for Requests

View File

@ -67,7 +67,7 @@ export default class AuthService {
this.userInfo(authResult.accessToken) this.userInfo(authResult.accessToken)
.then(user => { .then(user => {
store.commit(mutations.USER_LOGGED_ON, user) store.commit(mutations.USER_LOGGED_ON, user)
router.replace('/dashboard') router.replace('/journal')
}) })
} }
}) })

View File

@ -1,14 +1,15 @@
<template lang="pug"> <template lang="pug">
article article
page-title(:title="title") page-title(:title='title')
p(v-if="isLoadingJournal") Loading your prayer journal... p(v-if='isLoadingJournal') Loading your prayer journal...
template(v-if="!isLoadingJournal") template(v-if='!isLoadingJournal')
new-request new-request
el-row el-row
el-col(:span='4'): strong Actions el-col(:span='4'): strong Actions
el-col(:span='16'): strong Request el-col(:span='16'): strong Request
el-col(:span='4'): strong As Of 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> </template>
<script> <script>
@ -23,7 +24,7 @@ import RequestListItem from './request/RequestListItem'
import actions from '@/store/action-types' import actions from '@/store/action-types'
export default { export default {
name: 'dashboard', name: 'journal',
components: { components: {
PageTitle, PageTitle,
NewRequest, NewRequest,
@ -31,7 +32,7 @@ export default {
}, },
computed: { computed: {
title () { title () {
return `${this.user.given_name}'s Dashboard` return `${this.user.given_name}'s Prayer Journal`
}, },
...mapState(['user', 'journal', 'isLoadingJournal']) ...mapState(['user', 'journal', 'isLoadingJournal'])
}, },

View File

@ -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:100;') my
span(style='font-weight:600;') Prayer span(style='font-weight:600;') Prayer
span(style='font-weight:700;') Journal 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='3'): a(@click.stop='logOff()') Log Off
el-menu-item(v-if='!isAuthenticated' index='4'): a(@click.stop='logOn()') Log On 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 el-menu-item(index='5'): a(href='https://danieljsummers.github.io/myPrayerJournal/' target='_blank' @click.stop='') Docs

View File

@ -1,8 +1,8 @@
import Vue from 'vue' import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'
import Dashboard from '@/components/Dashboard'
import Home from '@/components/Home' import Home from '@/components/Home'
import Journal from '@/components/Journal'
import LogOn from '@/components/user/LogOn' import LogOn from '@/components/user/LogOn'
Vue.use(Router) Vue.use(Router)
@ -11,7 +11,7 @@ export default new Router({
mode: 'history', mode: 'history',
routes: [ routes: [
{ path: '/', name: 'Home', component: Home }, { 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 } { path: '/user/log-on', name: 'LogOn', component: LogOn }
] ]
}) })