From 83b43e881667d34828d4959cb34c7b5698faf347 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 29 Jun 2021 09:57:46 +0200 Subject: [PATCH 1/7] Fix missing Diaspora Logo in share modal Signed-off-by: Thomas Citharel --- js/src/assets/diaspora-icon.svg | 4 ---- js/src/components/Event/ShareEventModal.vue | 8 ++----- js/src/components/Group/ShareGroupModal.vue | 8 ++----- js/src/components/Share/DiasporaLogo.vue | 26 +++++++++++++++++++++ 4 files changed, 30 insertions(+), 16 deletions(-) delete mode 100644 js/src/assets/diaspora-icon.svg create mode 100644 js/src/components/Share/DiasporaLogo.vue diff --git a/js/src/assets/diaspora-icon.svg b/js/src/assets/diaspora-icon.svg deleted file mode 100644 index 7a5b5cf3a..000000000 --- a/js/src/assets/diaspora-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue index f4055f2da..1095300d0 100644 --- a/js/src/components/Event/ShareEventModal.vue +++ b/js/src/components/Event/ShareEventModal.vue @@ -65,9 +65,7 @@ target="_blank" rel="nofollow noopener" > - - - + - - - + import { Component, Prop, Vue, Ref } from "vue-property-decorator"; import { GroupVisibility } from "@/types/enums"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -import DiasporaLogo from "../../assets/diaspora-icon.svg?inline"; +import DiasporaLogo from "../Share/DiasporaLogo.vue"; import { displayName, IGroup } from "@/types/actor"; @Component({ diff --git a/js/src/components/Share/DiasporaLogo.vue b/js/src/components/Share/DiasporaLogo.vue new file mode 100644 index 000000000..a2ce06903 --- /dev/null +++ b/js/src/components/Share/DiasporaLogo.vue @@ -0,0 +1,26 @@ + + From 4a63ff4487eaee68b47cf8a202e8ef05b91543f6 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 29 Jun 2021 09:58:04 +0200 Subject: [PATCH 2/7] Remove outdated vue logo Signed-off-by: Thomas Citharel --- js/src/assets/logo.png | Bin 6849 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 js/src/assets/logo.png diff --git a/js/src/assets/logo.png b/js/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 Date: Tue, 29 Jun 2021 10:26:12 +0200 Subject: [PATCH 3/7] Add Mastodon as a sharing provider Closes #227 Signed-off-by: Thomas Citharel --- js/src/components/Event/ShareEventModal.vue | 28 ++++++++++++++++++--- js/src/components/Group/ShareGroupModal.vue | 28 ++++++++++++++++++--- js/src/components/Share/MastodonLogo.vue | 25 ++++++++++++++++++ 3 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 js/src/components/Share/MastodonLogo.vue diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue index 1095300d0..d21f3ce34 100644 --- a/js/src/components/Event/ShareEventModal.vue +++ b/js/src/components/Event/ShareEventModal.vue @@ -53,6 +53,14 @@ + + + @@ -81,10 +89,12 @@ import { Component, Prop, Vue, Ref } from "vue-property-decorator"; import { EventStatus, EventVisibility } from "@/types/enums"; import { IEvent } from "../../types/event.model"; import DiasporaLogo from "../Share/DiasporaLogo.vue"; +import MastodonLogo from "../Share/MastodonLogo.vue"; @Component({ components: { DiasporaLogo, + MastodonLogo, }, }) export default class ShareEventModal extends Vue { @@ -129,6 +139,16 @@ export default class ShareEventModal extends Vue { )}&url=${encodeURIComponent(this.event.url)}`; } + get mastodonShareUrl(): string { + return `https://toot.karamoff.dev/?text=${encodeURIComponent( + this.basicTextToEncode + )}`; + } + + get basicTextToEncode(): string { + return `${this.event.title}\r\n${this.event.url}`; + } + copyURL(): void { this.eventURLInput.$refs.input.select(); document.execCommand("copy"); @@ -140,8 +160,10 @@ export default class ShareEventModal extends Vue { } diff --git a/js/src/components/Group/ShareGroupModal.vue b/js/src/components/Group/ShareGroupModal.vue index b394659c6..bb4b43ac9 100644 --- a/js/src/components/Group/ShareGroupModal.vue +++ b/js/src/components/Group/ShareGroupModal.vue @@ -43,6 +43,14 @@ + + + @@ -70,11 +78,13 @@ import { Component, Prop, Vue, Ref } from "vue-property-decorator"; import { GroupVisibility } from "@/types/enums"; import DiasporaLogo from "../Share/DiasporaLogo.vue"; +import MastodonLogo from "../Share/MastodonLogo.vue"; import { displayName, IGroup } from "@/types/actor"; @Component({ components: { DiasporaLogo, + MastodonLogo, }, }) export default class ShareGroupModal extends Vue { @@ -116,6 +126,16 @@ export default class ShareGroupModal extends Vue { )}&url=${encodeURIComponent(this.group.url)}`; } + get mastodonShareUrl(): string { + return `https://toot.karamoff.dev/?text=${encodeURIComponent( + this.basicTextToEncode + )}`; + } + + get basicTextToEncode(): string { + return `${displayName(this.group)}\r\n${this.group.url}`; + } + copyURL(): void { this.groupURLInput.$refs.input.select(); document.execCommand("copy"); @@ -127,8 +147,10 @@ export default class ShareGroupModal extends Vue { } diff --git a/js/src/components/Share/MastodonLogo.vue b/js/src/components/Share/MastodonLogo.vue new file mode 100644 index 000000000..c35ace269 --- /dev/null +++ b/js/src/components/Share/MastodonLogo.vue @@ -0,0 +1,25 @@ + + From d383d0ecffafd73c3fcaa6a8a65064e35c4eddf3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 29 Jun 2021 10:26:31 +0200 Subject: [PATCH 4/7] Add Whatsapp and Telegram sharing providers Signed-off-by: Thomas Citharel --- js/src/components/Event/ShareEventModal.vue | 16 ++++++++++++++++ js/src/components/Group/ShareGroupModal.vue | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue index d21f3ce34..82319ef76 100644 --- a/js/src/components/Event/ShareEventModal.vue +++ b/js/src/components/Event/ShareEventModal.vue @@ -64,6 +64,12 @@ + + @@ -129,6 +135,16 @@ export default class ShareEventModal extends Vue { )}&title=${this.event.title}`; } + get whatsAppShareUrl(): string { + return `https://wa.me/?text=${encodeURIComponent(this.basicTextToEncode)}`; + } + + get telegramShareUrl(): string { + return `https://t.me/share/url?url=${encodeURIComponent( + this.event.url + )}&text=${encodeURIComponent(this.event.title)}`; + } + get emailShareUrl(): string { return `mailto:?to=&body=${this.event.url}&subject=${this.event.title}`; } diff --git a/js/src/components/Group/ShareGroupModal.vue b/js/src/components/Group/ShareGroupModal.vue index bb4b43ac9..5dc5527aa 100644 --- a/js/src/components/Group/ShareGroupModal.vue +++ b/js/src/components/Group/ShareGroupModal.vue @@ -57,6 +57,12 @@ + + Date: Tue, 29 Jun 2021 10:41:40 +0200 Subject: [PATCH 5/7] Improve share modal accessibility Signed-off-by: Thomas Citharel --- js/src/components/Event/ShareEventModal.vue | 50 ++++++++++++++++----- js/src/components/Group/ShareGroupModal.vue | 50 ++++++++++++++++----- 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue index 82319ef76..83ddf3b92 100644 --- a/js/src/components/Event/ShareEventModal.vue +++ b/js/src/components/Event/ShareEventModal.vue @@ -27,8 +27,13 @@ {{ $t("All the places have already been taken") }} - - + +

- - - - - - - -
diff --git a/js/src/components/Group/ShareGroupModal.vue b/js/src/components/Group/ShareGroupModal.vue index 5dc5527aa..257b666e5 100644 --- a/js/src/components/Group/ShareGroupModal.vue +++ b/js/src/components/Group/ShareGroupModal.vue @@ -17,8 +17,13 @@ ) }} - - + +

- - - - - - - -
From b3f91237a34aa58d3d05fcc1c47d545bf7930ccb Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 29 Jun 2021 10:50:32 +0200 Subject: [PATCH 6/7] Update translations Signed-off-by: Thomas Citharel --- js/src/i18n/en_US.json | 5 ++++- js/src/i18n/fr_FR.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 445eece79..6b1574987 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -1060,5 +1060,8 @@ "We couldn't save your participation inside this browser. Not to worry, you have successfully confirmed your participation, we just couldn't save it's status in this browser because of a technical issue.": "We couldn't save your participation inside this browser. Not to worry, you have successfully confirmed your participation, we just couldn't save it's status in this browser because of a technical issue.", "This instance hasn't got push notifications enabled.": "This instance hasn't got push notifications enabled.", "enable the feature": "enable the feature", - "Ask your instance admin to {enable_feature}.": "Ask your instance admin to {enable_feature}." + "Ask your instance admin to {enable_feature}.": "Ask your instance admin to {enable_feature}.", + "Event URL": "Event URL", + "Copy URL to clipboard": "Copy URL to clipboard", + "Group URL": "Group URL" } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 584fd7839..7b635272c 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -1151,5 +1151,8 @@ "We couldn't save your participation inside this browser. Not to worry, you have successfully confirmed your participation, we just couldn't save it's status in this browser because of a technical issue.": "Nous n'avons pas pu sauvegarder votre participation dans ce navigateur. Aucune inquiétude, vous avez bien confirmé votre participation, nous n'avons juste pas pu enregistrer son statut dans ce navigateur à cause d'un souci technique.", "This instance hasn't got push notifications enabled.": "Cette instance n'a pas activé la fonctionnalité de notification push.", "enable the feature": "activer la fonctionnalité", - "Ask your instance admin to {enable_feature}.": "Demandez à l'administrateur⋅ice de votre instance d'{enable_feature}." + "Ask your instance admin to {enable_feature}.": "Demandez à l'administrateur⋅ice de votre instance d'{enable_feature}.", + "Event URL": "URL de l'événement", + "Copy URL to clipboard": "Copier l'URL dans le presse-papiers", + "Group URL": "URL du groupe" } From e1eb0e9d1681f143deeaac3ad1928893ae8cb358 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 29 Jun 2021 11:20:34 +0200 Subject: [PATCH 7/7] Fix test issue after 57b71cb85accfbc4aa3ce45235c8ded7fc89d00f Signed-off-by: Thomas Citharel --- test/tasks/users_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tasks/users_test.exs b/test/tasks/users_test.exs index 6c0463a39..7400be48b 100644 --- a/test/tasks/users_test.exs +++ b/test/tasks/users_test.exs @@ -160,7 +160,7 @@ defmodule Mix.Tasks.Mobilizon.UsersTest do test "enable and disable at the same time" do Modify.run([@email, "--disable", "--enable"]) assert_received {:mix_shell, :error, [message]} - assert message =~ "Can't use both --enabled and --disable options at the same time." + assert message =~ "Can't use both --enable and --disable options at the same time." end @modified_email "modified@email.tld"