From 548fc2fc9269c48f0406c482171a49e568a90a2f Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 28 Jun 2023 19:35:20 +0100 Subject: [PATCH 01/28] Nit for dear Wanda. --- components/OutcomeModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/OutcomeModal.vue b/components/OutcomeModal.vue index 97dc06e2..367f9f37 100644 --- a/components/OutcomeModal.vue +++ b/components/OutcomeModal.vue @@ -77,7 +77,7 @@ placeholder="e.g. Thanks for the interest. Sorry, this went to someone else." />

- We'll send this privately in Chat to each + We'll send this same message privately in Chat to each other freegler who replied to your post.

From 021b6cc4b07ce0a2d3e4ad123e987a261f998acc Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 28 Jun 2023 21:03:44 +0100 Subject: [PATCH 02/28] Click on chitchat notification not showing new comment if the thread has been viewed before. --- components/NotificationCommentOnComment.vue | 3 +++ components/NotificationCommentOnPost.vue | 3 +++ components/NotificationLovedComment.vue | 3 +++ components/NotificationLovedPost.vue | 3 +++ 4 files changed, 12 insertions(+) diff --git a/components/NotificationCommentOnComment.vue b/components/NotificationCommentOnComment.vue index 13c76314..f677b0a6 100644 --- a/components/NotificationCommentOnComment.vue +++ b/components/NotificationCommentOnComment.vue @@ -23,6 +23,7 @@ diff --git a/components/SupportLink.vue b/components/SupportLink.vue index 9d35e8ba..eb759f3b 100644 --- a/components/SupportLink.vue +++ b/components/SupportLink.vue @@ -14,14 +14,21 @@ export default { type: String, default: 'support@ilovefreegle.org', }, + info: { + type: String, + required: false, + default: '' + } }, computed: { href() { + const infostr = this.info ? ('%0D%0A%0D%0A' + this.info) : '' if (this.myid) { + return ( 'mailto:' + this.email + - '?body=%0D%0A%0D%0ANote to support: this freegler was logged in as user id: #' + + '?body=' + infostr + '%0D%0A%0D%0ANote to support: this freegler was logged in as user id: #' + this.myid + '.' ) @@ -29,7 +36,7 @@ export default { return ( 'mailto:' + this.email + - '?body=%0D%0A%0D%0ANote to support: this freegler was not logged in when contacting Support to send this mail.' + '?body=' + infostr + '%0D%0A%0D%0ANote to support: this freegler was not logged in when contacting Support to send this mail.' ) } }, diff --git a/pages/find/whoami.vue b/pages/find/whoami.vue index cb82a44c..9ca08616 100644 --- a/pages/find/whoami.vue +++ b/pages/find/whoami.vue @@ -43,7 +43,7 @@
Back
Back Date: Fri, 30 Jun 2023 19:02:41 +0100 Subject: [PATCH 08/28] Can't reply. --- components/ChatButton.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/ChatButton.vue b/components/ChatButton.vue index 7172e28d..32d00012 100644 --- a/components/ChatButton.vue +++ b/components/ChatButton.vue @@ -83,9 +83,11 @@ export default { }, setup() { const chatStore = useChatStore() + const messageStore = useMessageStore() return { chatStore, + messageStore, } }, methods: { From 863b6aba5c1d53b92108ea5598962a82a0c42346 Mon Sep 17 00:00:00 2001 From: edwh Date: Fri, 30 Jun 2023 20:01:13 +0100 Subject: [PATCH 09/28] Can't reply. --- components/ChatButton.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/ChatButton.vue b/components/ChatButton.vue index 32d00012..7286e3e7 100644 --- a/components/ChatButton.vue +++ b/components/ChatButton.vue @@ -31,6 +31,7 @@ diff --git a/components/EmailBelongsToSomeoneElse.vue b/components/EmailBelongsToSomeoneElse.vue index cca8a04b..cd3d5df0 100644 --- a/components/EmailBelongsToSomeoneElse.vue +++ b/components/EmailBelongsToSomeoneElse.vue @@ -6,19 +6,32 @@ {{ ours }}as {{ myid }}, but {{ theirs }} belongs to another account.

- If they are both yours, you can ask the {{ group?.namedisplay }} volunteers to merge your accounts. + If they are both yours, you can ask the + {{ group?.namedisplay }} volunteers to merge your accounts.

- Request merge - + Request merge + diff --git a/components/MessageList.vue b/components/MessageList.vue index 59d0e112..7342f507 100644 --- a/components/MessageList.vue +++ b/components/MessageList.vue @@ -125,6 +125,11 @@ export default { required: false, default: false, }, + none: { + type: Boolean, + required: false, + default: false, + }, }, async setup(props) { const groupStore = useGroupStore() diff --git a/components/MessageMap.vue b/components/MessageMap.vue index d77cd4ff..e7ecbaf3 100644 --- a/components/MessageMap.vue +++ b/components/MessageMap.vue @@ -98,7 +98,7 @@ export default { new this.L.marker([this.home.lat, this.home.lng]), ]) - let fitTo = fg.getBounds().pad(0.1) + const fitTo = fg.getBounds().pad(0.1) if (fitTo.isValid()) { themap.fitBounds(fitTo) } diff --git a/components/NotificationCommentOnComment.vue b/components/NotificationCommentOnComment.vue index f677b0a6..4ee138bf 100644 --- a/components/NotificationCommentOnComment.vue +++ b/components/NotificationCommentOnComment.vue @@ -22,8 +22,8 @@