bit-badger/myPrayerJournal
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 36 Activity

Merge branch 'master' into version-2

Browse Source
This commit is contained in:
Daniel J. Summers 2019-07-13 21:33:51 -05:00
commit 10a5c26903
5 changed files with 1647 additions and 1262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -252,6 +252,9 @@ paket-files/
.idea/ .idea/
*.sln.iml *.sln.iml
# Ionide VSCode extension
.ionide
# Compiled files / application # Compiled files / application
src/build src/build
src/MyPrayerJournal.Api/wwwroot/favicon.ico src/MyPrayerJournal.Api/wwwroot/favicon.ico

1
src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj
View File

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<Version>1.2.2.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

9
src/app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "my-prayer-journal", "name": "my-prayer-journal",
"version": "1.1.0", "version": "1.2.2",
"description": "myPrayerJournal - Front End", "description": "myPrayerJournal - Front End",
"author": "Daniel J. Summers <daniel@bitbadger.solutions>", "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
"private": true, "private": true,
@ -9,11 +9,12 @@
"build": "vue-cli-service build --modern", "build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"apistart": "cd ../api/MyPrayerJournal.Api && dotnet run", "apistart": "cd ../api/MyPrayerJournal.Api && dotnet run",
"vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run" "vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run",
"publish": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet publish -c Release"
}, },
"dependencies": { "dependencies": {
"auth0-js": "^9.7.3", "auth0-js": "^9.7.3",
"axios": "^0.18.0", "axios": "^0.19.0",
"moment": "^2.18.1", "moment": "^2.18.1",
"vue": "^2.5.15", "vue": "^2.5.15",
"vue-progressbar": "^0.7.3", "vue-progressbar": "^0.7.3",
@ -25,7 +26,7 @@
"@vue/cli-plugin-babel": "^3.0.0", "@vue/cli-plugin-babel": "^3.0.0",
"@vue/cli-plugin-eslint": "^3.0.0", "@vue/cli-plugin-eslint": "^3.0.0",
"@vue/cli-service": "^3.0.0", "@vue/cli-service": "^3.0.0",
"@vue/eslint-config-standard": "^3.0.0", "@vue/eslint-config-standard": "^4.0.0",
"pug": "^2.0.1", "pug": "^2.0.1",
"pug-plain-loader": "^1.0.0", "pug-plain-loader": "^1.0.0",
"vue-template-compiler": "^2.5.17" "vue-template-compiler": "^2.5.17"

10
src/app/src/store/index.js
View File

@ -104,11 +104,13 @@ export default new Vuex.Store({
progress.start() progress.start()
try { try {
let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {} let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {}
if (status !== 'Updated' || oldReq.text !== updateText) { if (!(status === 'Prayed' && updateText === '')) {
await api.updateRequest(requestId, status, updateText) if (status !== 'Answered' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
await api.updateRecurrence(requestId, recurType, recurCount)
}
} }
if (status === 'Updated' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) { if (status !== 'Updated' || oldReq.text !== updateText) {
await api.updateRecurrence(requestId, recurType, recurCount) await api.updateRequest(requestId, status, oldReq.text !== updateText ? updateText : '')
} }
const request = await api.getRequest(requestId) const request = await api.getRequest(requestId)
commit(mutations.REQUEST_UPDATED, request.data) commit(mutations.REQUEST_UPDATED, request.data)

2886
src/app/yarn.lock
View File

File diff suppressed because it is too large Load Diff