Merge branch 'master' into version-2

.gitignore

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

src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj

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

src/app/package.json

@@ -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"

src/app/src/store/index.js

@@ -104,11 +104,13 @@ 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 === 'Prayed' && 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)) {
-          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)