"Mark Prayed" works

This commit is contained in:
Daniel J. Summers
2017-09-22 22:30:00 -05:00
parent c703d717d8
commit 181dc5ea63
9 changed files with 127 additions and 87 deletions

View File

@@ -35,6 +35,11 @@ export default {
* Mark a prayer request as having been prayed
* @param {string} requestId The Id of the request
*/
markPrayed: requestId => http.post('request/${requestId}/history', { status: 'Prayed', updateText: '' })
markPrayed: requestId => http.post(`request/${requestId}/history`, { status: 'Prayed', updateText: '' }),
/**
* Get a prayer request
*/
getPrayerRequest: requestId => http.get(`request/${requestId}`)
}

View File

@@ -9,7 +9,7 @@
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" v-bind:request="request" v-bind:key="request.requestId")
request-list-item(v-for="request in journal" :request="request" :key="request.requestId")
</template>
<script>

View File

@@ -28,7 +28,10 @@ export default {
},
methods: {
saveRequest: async function () {
await this.$store.dispatch(actions.ADD_REQUEST, this.form.requestText)
await this.$store.dispatch(actions.ADD_REQUEST, {
progress: this.$Progress,
requestText: this.form.requestText
})
this.showNewVisible = false
}
}

View File

@@ -10,8 +10,12 @@
</template>
<script>
'use strict'
import moment from 'moment'
import actions from '@/store/action-types'
export default {
name: 'request-list-item',
props: ['request'],
@@ -20,8 +24,10 @@ export default {
},
methods: {
markPrayed () {
alert(`Marking ${this.request.requestId} prayed`)
// TODO: write function
this.$store.dispatch(actions.MARK_PRAYED, {
progress: this.$Progress,
requestId: this.request.requestId
})
}
},
computed: {

View File

@@ -4,5 +4,7 @@ export default {
/** Action to add a prayer request (pass request text) */
ADD_REQUEST: 'add-request',
/** Action to load the user's prayer journal */
LOAD_JOURNAL: 'load-journal'
LOAD_JOURNAL: 'load-journal',
/** Action to mark a request as prayed */
MARK_PRAYED: 'mark-prayed'
}

View File

@@ -38,17 +38,6 @@ export default new Vuex.Store({
isLoadingJournal: false
},
mutations: {
[mutations.USER_LOGGED_ON] (state, user) {
localStorage.setItem('user_profile', JSON.stringify(user))
state.user = user
api.setBearer(localStorage.getItem('id_token'))
state.isAuthenticated = true
},
[mutations.USER_LOGGED_OFF] (state) {
state.user = {}
api.removeBearer()
state.isAuthenticated = false
},
[mutations.LOADING_JOURNAL] (state, flag) {
state.isLoadingJournal = flag
},
@@ -57,9 +46,36 @@ export default new Vuex.Store({
},
[mutations.REQUEST_ADDED] (state, newRequest) {
state.journal.unshift(newRequest)
},
[mutations.REQUEST_UPDATED] (state, request) {
let jrnl = state.journal.filter(it => it.requestId !== request.requestId)
jrnl.unshift(request)
state.journal = jrnl
},
[mutations.USER_LOGGED_OFF] (state) {
state.user = {}
api.removeBearer()
state.isAuthenticated = false
},
[mutations.USER_LOGGED_ON] (state, user) {
localStorage.setItem('user_profile', JSON.stringify(user))
state.user = user
api.setBearer(localStorage.getItem('id_token'))
state.isAuthenticated = true
}
},
actions: {
async [actions.ADD_REQUEST] ({ commit }, { progress, requestText }) {
progress.start()
try {
const newRequest = await api.addRequest(requestText)
commit(mutations.REQUEST_ADDED, newRequest.data)
progress.finish()
} catch (err) {
logError(err)
progress.fail()
}
},
async [actions.LOAD_JOURNAL] ({ commit }, progress) {
commit(mutations.LOADED_JOURNAL, {})
progress.start()
@@ -68,19 +84,24 @@ export default new Vuex.Store({
try {
const jrnl = await api.journal()
commit(mutations.LOADED_JOURNAL, jrnl.data)
progress.finish()
} catch (err) {
logError(err)
progress.fail()
} finally {
commit(mutations.LOADING_JOURNAL, false)
progress.finish()
}
},
async [actions.ADD_REQUEST] ({ commit }, requestText) {
async [actions.MARK_PRAYED] ({ commit }, { progress, requestId }) {
try {
const newRequest = await api.addRequest(requestText)
commit(mutations.REQUEST_ADDED, newRequest.data)
progress.start()
await api.markPrayed(requestId)
const request = await api.getPrayerRequest(requestId)
commit(mutations.REQUEST_UPDATED, request.data)
progress.finish()
} catch (err) {
logError(err)
progress.fail()
}
}
},

View File

@@ -7,6 +7,8 @@ export default {
LOADED_JOURNAL: 'journal-loaded',
/** Mutation for adding a new prayer request (pass text) */
REQUEST_ADDED: 'request-added',
/** Mutation to replace a prayer request at the top of the current journal */
REQUEST_UPDATED: 'request-updated',
/** Mutation for logging a user off */
USER_LOGGED_OFF: 'user-logged-off',
/** Mutation for logging a user on (pass user) */