From 1be10b1511e4e1f1a5e4c8c53c39e529a1802f75 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 26 Nov 2023 18:20:15 -0700 Subject: [PATCH 1/5] add ability to copy the QR code (even though we don't have a way to read it in yet) --- src/views/ContactQRScanShowView.vue | 40 +++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue index f7a2999b8..7b42337a0 100644 --- a/src/views/ContactQRScanShowView.vue +++ b/src/views/ContactQRScanShowView.vue @@ -20,16 +20,18 @@ - - +
+ + +

Scan Contact Info

@@ -40,6 +42,7 @@ import QRCodeVue3 from "qr-code-generator-vue3"; import { Component, Vue } from "vue-facing-decorator"; import { QrcodeStream } from "vue-qrcode-reader"; +import { useClipboard } from "@vueuse/core"; import { accountsDB, db } from "@/db/index"; import { MASTER_SETTINGS_KEY } from "@/db/tables/settings"; @@ -179,5 +182,22 @@ export default class ContactQRScanShow extends Vue { -1, ); } + + onCopyToClipboard() { + useClipboard() + .copy(this.qrValue) + .then(() => { + console.log("Contact URL:", this.qrValue); + this.$notify( + { + group: "alert", + type: "toast", + title: "Copied", + text: "Contact URL was copied to clipboard.", + }, + 2000, + ); + }); + } } From 889b6d5737c6cad307344a07c163996617a5e21a Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 26 Nov 2023 18:22:35 -0700 Subject: [PATCH 2/5] update tasks --- project.task.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project.task.yaml b/project.task.yaml index 6312fb5fc..7595acbee 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -1,13 +1,14 @@ tasks: +- on project view screen, 'contributions' to & from shouldn't fall to next line (eg. Alpha Barbados Beach Cleanup Test) + - in endorser-push-server - mount folder for persistent sqlite DB outside of container - 40 notifications : - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew - .5 add project ID to the URL of the project-view, to make a project publicly-accessible - .5 add link to further project / people when a project pays ahead -- .5 show checkbox on "gave" modal to say that user is recipient (so it could be uncheked for someone unspecified) - .5 allow to manage their notifications even without an identity - .5 bug - on the discover page, enter a search term and search and see a duplicate project show at the end of the list @@ -32,8 +33,9 @@ tasks: - .5 Display a more appealing confirmation on the map when erasing the marker - .5 make a VC details page, or link to endorser.ch - .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc) -- .5 include the hash of the latest commit on help page next to version +- .5 include the hash of the latest commit on help page next to version (maybe Trent's git-hash branch) - .5 remove references to localStorage for projectId (now that it's pulling from the path) +- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent - contacts v+ : - 01 Import all the non-sensitive data (ie. contacts & settings). From 69576784742e6131faf103957b1cd11e2354ee22 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 26 Nov 2023 18:42:28 -0700 Subject: [PATCH 3/5] include project ID in the URLs to the project-details page --- project.task.yaml | 2 +- src/components/GiftedDialog.vue | 2 +- src/views/DiscoverView.vue | 2 +- src/views/ProjectsView.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.task.yaml b/project.task.yaml index 7595acbee..dd1b19222 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -7,7 +7,6 @@ tasks: - 40 notifications : - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew -- .5 add project ID to the URL of the project-view, to make a project publicly-accessible - .5 add link to further project / people when a project pays ahead - .5 allow to manage their notifications even without an identity @@ -36,6 +35,7 @@ tasks: - .5 include the hash of the latest commit on help page next to version (maybe Trent's git-hash branch) - .5 remove references to localStorage for projectId (now that it's pulling from the path) - bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent +- make identicons for contacts into more-memorable faces (and maybe change project identicons, too) - contacts v+ : - 01 Import all the non-sensitive data (ie. contacts & settings). diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue index c4cca052b..079116fa9 100644 --- a/src/components/GiftedDialog.vue +++ b/src/components/GiftedDialog.vue @@ -81,7 +81,7 @@ export default class GiftedDialog extends Vue { activeDid = ""; apiServer = ""; - giver?: GiverInputInfo; + giver?: GiverInputInfo; // undefined means no identified giver agent description = ""; givenToUser = false; hours = "0"; diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index 891a62a3d..7af51f16b 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -376,7 +376,7 @@ export default class DiscoverView extends Vue { onClickLoadProject(id: string) { localStorage.setItem("projectId", id); const route = { - name: "project", + path: "/project/" + encodeURIComponent(id), }; this.$router.push(route); } diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue index 6d2810ee2..2c2c6e354 100644 --- a/src/views/ProjectsView.vue +++ b/src/views/ProjectsView.vue @@ -174,7 +174,7 @@ export default class ProjectsView extends Vue { onClickLoadProject(id: string) { localStorage.setItem("projectId", id); const route = { - name: "project", + path: "/project/" + encodeURIComponent(id), }; this.$router.push(route); } From 1cf6660e6c0953cb138514e8f0ccc1aef30ebf5a Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 26 Nov 2023 18:49:48 -0700 Subject: [PATCH 4/5] move both the contributions to & from this project to the last column (for when they both show) --- project.task.yaml | 2 -- src/views/ProjectViewView.vue | 56 ++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/project.task.yaml b/project.task.yaml index dd1b19222..054fec661 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -7,8 +7,6 @@ tasks: - 40 notifications : - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew -- .5 add link to further project / people when a project pays ahead - - .5 allow to manage their notifications even without an identity - .5 bug - on the discover page, enter a search term and search and see a duplicate project show at the end of the list - 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue index 3a2f4d510..0bd14715d 100644 --- a/src/views/ProjectViewView.vue +++ b/src/views/ProjectViewView.vue @@ -210,35 +210,37 @@ -
-

- Contributions By This Project -

- -
+

+ Contributions To This Project +

+
    +
  • + +
    • +
+ -
-

- Contributions To This Project -

-
    -
  • - -
    • -
+
+

+ Contributions By This Project +

+ +
From c1176fa24d36fd3ca0e06ac6192ccd38f6751312 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 26 Nov 2023 20:08:30 -0700 Subject: [PATCH 5/5] clear search results on restarting search --- project.task.yaml | 2 ++ src/views/DiscoverView.vue | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/project.task.yaml b/project.task.yaml index 054fec661..6c7d3ac02 100644 --- a/project.task.yaml +++ b/project.task.yaml @@ -7,6 +7,7 @@ tasks: - 40 notifications : - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew +- .3 on DiscoverView QuickSearch, the 'keyup.enter' only runs searchAll, so do the right thing for searchLocal - .5 allow to manage their notifications even without an identity - .5 bug - on the discover page, enter a search term and search and see a duplicate project show at the end of the list - 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) @@ -49,6 +50,7 @@ tasks: - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie) - Release Minimum Viable Product : + - .5 deploy endorser.ch server above v 3.4.3 (to get plan searches by names as well as descriptions) - 08 thorough testing for errors & edge cases - 01 ensure ability to recover server remotely, and add redundant access - Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot). diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index 7af51f16b..637e71d17 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -213,6 +213,11 @@ export default class DiscoverView extends Vue { } public async searchAll(beforeId?: string) { + if (!beforeId) { + // this was an initial search so clear any previous results + this.projects = []; + } + let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms); if (beforeId) { @@ -280,8 +285,14 @@ export default class DiscoverView extends Vue { return; } + if (!beforeId) { + // this was an initial search so clear any previous results + this.projects = []; + } + const claimContents = "claimContents=" + encodeURIComponent(this.searchTerms); + let queryParams = [ claimContents, "minLocLat=" + this.searchBox.bbox.minLat,