From 3612ea42240c5e1b7d7eff29a39ff18f1b869b36 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Fri, 1 Mar 2024 15:54:50 -0700 Subject: [PATCH] bump to v 0.2.17; add "personalized" message and better confirmation-result messages --- CHANGELOG.md | 2 +- README.md | 13 +++++++------ package-lock.json | 4 ++-- package.json | 2 +- project.task.yaml | 1 + src/views/QuickActionBvcBeginView.vue | 12 ++++++------ src/views/QuickActionBvcEndView.vue | 15 +++++++++------ 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 534cae5..85ca1e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - ? -## [0.2.16] - 2024.03.01 +## [0.2.17] - 2024.03.01 ### Added - Shortcut page for Bountiful Voluntaryist Community ### Changed diff --git a/README.md b/README.md index 6546849..be28ce0 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,7 @@ npm run lint * `npx prettier --write ./sw_scripts/` -* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`, and commit. Then record the new hash in the changelog. - -* [Tag wth the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) - -... though maybe you do that after testing and release, since that isn't used in the build (and you often increment a lot during testing). +* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`. * If production: change src/constants/app.ts DEFAULT_*_SERVER to be "PROD" and package.json to remove "_Test". Also record what version is on production. @@ -46,7 +42,12 @@ npm run lint * `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari` -* Revert src/constants/app.ts and package.json (if that was prod), edit package.json to increment version & add "-beta", `npm install`, and commit. Tag if you didn't before. Also record what version is on production. +* Revert src/constants/app.ts and package.json (if that was prod). + +* Commit changes. Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Tag if you didn't before. Also record what version is on production. + +* [Tag wth the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) + diff --git a/package-lock.json b/package-lock.json index dc27e56..f133692 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "TimeSafari_Test", - "version": "0.2.16", + "version": "0.2.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "TimeSafari_Test", - "version": "0.2.16", + "version": "0.2.17", "dependencies": { "@dicebear/collection": "^5.3.5", "@dicebear/core": "^5.3.5", diff --git a/package.json b/package.json index ea5f278..12fda6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TimeSafari_Test", - "version": "0.2.16", + "version": "0.2.17", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/project.task.yaml b/project.task.yaml index 324ccf6..970760d 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -73,6 +73,7 @@ tasks : - create a help-desk document & add screenshots - .1 update "offer" units to have same functionality as "give" units +- .5 add a link to any 'give' records that fulfill an offer on ClaimView - 01 on home page, prompt for install check in addition to "supports notifications" check (since they won't get notified if Chrome is closed) - 01 on Mac (& Windows?) desktop, add a help blurb so that they can find it again (since it doesn't show in Application list) - bug (that is hard to reproduce) - got error adding on Firefox user #0 as contact for themselves diff --git a/src/views/QuickActionBvcBeginView.vue b/src/views/QuickActionBvcBeginView.vue index 1aaf51c..69b9b87 100644 --- a/src/views/QuickActionBvcBeginView.vue +++ b/src/views/QuickActionBvcBeginView.vue @@ -142,7 +142,7 @@ export default class QuickActionBvcBeginView extends Vue { if (timeResult.type === "success") { timeSuccess = true; } else { - console.error("Error sending give:", timeResult); + console.error("Error sending time:", timeResult); this.$notify( { group: "alert", @@ -169,7 +169,7 @@ export default class QuickActionBvcBeginView extends Vue { if (attendResult.type === "success") { attendedSuccess = true; } else { - console.error("Error sending give:", attendResult); + console.error("Error sending attendance:", attendResult); this.$notify( { group: "alert", @@ -187,16 +187,16 @@ export default class QuickActionBvcBeginView extends Vue { if (timeSuccess || attendedSuccess) { const actions = timeSuccess && attendedSuccess - ? "attendance and time have been" + ? "Your attendance and time have been recorded." : timeSuccess - ? "time has been" - : "attendance has been"; + ? "Your time has been recorded." + : "Your attendance has been recorded."; this.$notify( { group: "alert", type: "success", title: "Success", - text: `Your ${actions} recorded.`, + text: actions, }, -1, ); diff --git a/src/views/QuickActionBvcEndView.vue b/src/views/QuickActionBvcEndView.vue index af2b526..f158fbb 100644 --- a/src/views/QuickActionBvcEndView.vue +++ b/src/views/QuickActionBvcEndView.vue @@ -95,6 +95,8 @@ size="20" class="border border-slate-400 h-6 px-2" /> +
+ (Everyone likes personalized messages! 😁) ... @@ -326,7 +328,7 @@ export default class QuickActionBvcBeginView extends Vue { title: "Error", text: (giveResult as ErrorResult)?.error?.userMessage || - "There was an error sending the give.", + "There was an error sending that give.", }, -1, ); @@ -338,19 +340,20 @@ export default class QuickActionBvcBeginView extends Vue { confirmsSucceeded.length === 1 ? "confirmation" : "confirmations"; const actions = confirmsSucceeded.length > 0 && giveSucceeded - ? `${confirms} and give have been` + ? `Your ${confirms} and that give have been recorded.` : giveSucceeded - ? "give has been" - : confirms + + ? "That give has been recorded." + : "Your " + + confirms + " " + (confirmsSucceeded.length === 1 ? "has" : "have") + - " been"; + " been recorded."; this.$notify( { group: "alert", type: "success", title: "Success", - text: `Your ${actions} recorded.`, + text: actions, }, -1, );