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

myPrayerJournal v2 #27

Merged
danieljsummers merged 27 commits from version-2 into master 2019-09-03 00:01:26 +00:00
Conversation 0 Commits 27 Files Changed 44 +1647 -1262
5 changed files with 1647 additions and 1262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10a5c26903 - Show all commits

3
.gitignore vendored
View File

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

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

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

9
src/app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "my-prayer-journal",
"version": "1.1.0",
"version": "1.2.2",
"description": "myPrayerJournal - Front End",
"author": "Daniel J. Summers <daniel@bitbadger.solutions>",
"private": true,
@ -9,11 +9,12 @@
"build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint",
"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": {
"auth0-js": "^9.7.3",
"axios": "^0.18.0",
"axios": "^0.19.0",
"moment": "^2.18.1",
"vue": "^2.5.15",
"vue-progressbar": "^0.7.3",
@ -25,7 +26,7 @@
"@vue/cli-plugin-babel": "^3.0.0",
"@vue/cli-plugin-eslint": "^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-plain-loader": "^1.0.0",
"vue-template-compiler": "^2.5.17"

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

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

2886
src/app/yarn.lock
View File

File diff suppressed because it is too large Load Diff