From 7f1c60d173ec8ea2e6b4710494d673279d3cf013 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 5 Jun 2020 15:20:53 +0200 Subject: [PATCH] Add back share popup and use navigator.share when available Also handle better svg resources Signed-off-by: Thomas Citharel --- js/package.json | 3 +- js/src/components/Event/ShareEventModal.vue | 95 ++++ js/src/components/Logo.vue | 3 +- .../ParticipationWithAccount.vue | 4 +- js/src/views/Event/Event.vue | 64 ++- js/tsconfig.json | 2 +- js/vue.config.js | 7 - js/yarn.lock | 450 ++++++++++++------ 8 files changed, 438 insertions(+), 190 deletions(-) create mode 100644 js/src/components/Event/ShareEventModal.vue diff --git a/js/package.json b/js/package.json index a92393b29..a44f4d251 100644 --- a/js/package.json +++ b/js/package.json @@ -91,9 +91,8 @@ "sass-loader": "^8.0.2", "typescript": "~3.9.3", "vue-cli-plugin-styleguidist": "~4.24.0", + "vue-cli-plugin-svg": "~0.1.3", "vue-i18n-extract": "^1.0.2", - "vue-svg-inline-loader": "^1.3.0", - "vue-svg-loader": "^0.16.0", "vue-template-compiler": "^2.6.11", "webpack-cli": "^3.3.11" } diff --git a/js/src/components/Event/ShareEventModal.vue b/js/src/components/Event/ShareEventModal.vue new file mode 100644 index 000000000..273589a25 --- /dev/null +++ b/js/src/components/Event/ShareEventModal.vue @@ -0,0 +1,95 @@ + + + + diff --git a/js/src/components/Logo.vue b/js/src/components/Logo.vue index 88b05409b..a69fea72b 100644 --- a/js/src/components/Logo.vue +++ b/js/src/components/Logo.vue @@ -1,5 +1,4 @@ @@ -7,7 +6,7 @@ import { Component, Prop, Vue } from "vue-property-decorator"; // eslint-disable-next-line @typescript-eslint/ban-ts-ignore // @ts-ignore -import MobilizonLogo from "../assets/mobilizon_logo.svg"; +import MobilizonLogo from "../assets/mobilizon_logo.svg?inline"; @Component({ components: { MobilizonLogo, diff --git a/js/src/components/Participation/ParticipationWithAccount.vue b/js/src/components/Participation/ParticipationWithAccount.vue index a2fd999a5..a41cda71d 100644 --- a/js/src/components/Participation/ParticipationWithAccount.vue +++ b/js/src/components/Participation/ParticipationWithAccount.vue @@ -2,8 +2,8 @@