Version 3 #67

Merged
danieljsummers merged 53 commits from version-3 into master 2021-10-26 23:39:59 +00:00
5 changed files with 2790 additions and 2248 deletions
Showing only changes of commit 266243423c - Show all commits

View File

@ -1,5 +1,5 @@
module.exports = { module.exports = {
presets: [ presets: [
'@vue/app' '@vue/cli-plugin-babel/preset'
] ]
} }

View File

@ -1,20 +1,21 @@
{ {
"name": "my-prayer-journal", "name": "my-prayer-journal",
"version": "2.1.5", "version": "2.1.5",
"private": true,
"description": "myPrayerJournal - Front End", "description": "myPrayerJournal - Front End",
"author": "Daniel J. Summers <daniel@bitbadger.solutions>", "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
"private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve --port 8081", "serve": "vue-cli-service serve --port 8081",
"build": "vue-cli-service build --modern", "build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"apistart": "cd ../MyPrayerJournal.Api && dotnet run", "apistart": "cd ../MyPrayerJournal.Api && dotnet run",
"vue": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet run", "publish": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet publish -c Release -r linux-x64 --self-contained false",
"publish": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet publish -c Release -r linux-x64 --self-contained false" "vue": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet run"
}, },
"dependencies": { "dependencies": {
"auth0-js": "^9.13.2", "auth0-js": "^9.13.2",
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^3.6.5",
"moment": "^2.18.1", "moment": "^2.18.1",
"vue": "^2.5.15", "vue": "^2.5.15",
"vue-material": "^1.0.0-beta-13", "vue-material": "^1.0.0-beta-13",
@ -22,10 +23,17 @@
"vuex": "^3.0.1" "vuex": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "^3.0.0", "@vue/cli-plugin-babel": "~4.5.11",
"@vue/cli-plugin-eslint": "^3.0.0", "@vue/cli-plugin-eslint": "~4.5.11",
"@vue/cli-service": "^3.0.0", "@vue/cli-service": "~4.5.11",
"@vue/eslint-config-standard": "^4.0.0", "@vue/eslint-config-standard": "^5.1.2",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"pug": "^3.0.1", "pug": "^3.0.1",
"pug-plain-loader": "^1.0.0", "pug-plain-loader": "^1.0.0",

View File

@ -15,12 +15,12 @@ export default {
* Set the bearer token for all future requests * Set the bearer token for all future requests
* @param {string} token The token to use to identify the user to the server * @param {string} token The token to use to identify the user to the server
*/ */
setBearer: token => { http.defaults.headers.common['Authorization'] = `Bearer ${token}` }, setBearer: token => { http.defaults.headers.common.Authorization = `Bearer ${token}` },
/** /**
* Remove the bearer token * Remove the bearer token
*/ */
removeBearer: () => delete http.defaults.headers.common['Authorization'], removeBearer: () => delete http.defaults.headers.common.Authorization,
/** /**
* Add a note for a prayer request * Add a note for a prayer request

View File

@ -79,7 +79,7 @@ export default new Vuex.Store({
state.journal.push(newRequest) state.journal.push(newRequest)
}, },
[mutations.REQUEST_UPDATED] (state, request) { [mutations.REQUEST_UPDATED] (state, request) {
let jrnl = state.journal.filter(it => it.requestId !== request.requestId) const jrnl = state.journal.filter(it => it.requestId !== request.requestId)
if (request.lastStatus !== 'Answered') jrnl.push(request) if (request.lastStatus !== 'Answered') jrnl.push(request)
state.journal = jrnl state.journal = jrnl
}, },
@ -137,7 +137,7 @@ export default new Vuex.Store({
progress.$emit('show', 'indeterminate') progress.$emit('show', 'indeterminate')
try { try {
await setBearer() await setBearer()
let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {} const oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {}
if (!(status === 'Prayed' && updateText === '')) { if (!(status === 'Prayed' && updateText === '')) {
if (status !== 'Answered' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) { if (status !== 'Answered' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
await api.updateRecurrence(requestId, recurType, recurCount) await api.updateRecurrence(requestId, recurType, recurCount)

File diff suppressed because it is too large Load Diff