From 07d4db5ce94924b625b55ea52cbff93b6a81bc4a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 28 May 2019 18:55:02 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Add=20tiptap=20editor=20for=20description?= =?UTF-8?q?=20=E2=9D=A4=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Citharel --- js/package.json | 3 +- js/src/components/Editor.vue | 390 ++++++++++++++++++++++++++++++++++ js/src/main.ts | 2 - js/src/views/Event/Create.vue | 12 +- js/src/views/Event/Event.vue | 4 +- js/yarn.lock | 372 ++++++++++++++++++++++++-------- 6 files changed, 689 insertions(+), 94 deletions(-) create mode 100644 js/src/components/Editor.vue diff --git a/js/package.json b/js/package.json index 58a014302..27f0fedad 100644 --- a/js/package.json +++ b/js/package.json @@ -27,6 +27,8 @@ "lodash": "^4.17.11", "ngeohash": "^0.6.3", "register-service-worker": "^1.6.2", + "tiptap": "^1.20.1", + "tiptap-extensions": "^1.20.1", "typeface-signika": "0.0.72", "vue": "^2.6.10", "vue-apollo": "^3.0.0-beta.28", @@ -34,7 +36,6 @@ "vue-gettext": "^2.1.3", "vue-property-decorator": "^8.1.0", "vue-router": "^3.0.6", - "vue-simple-markdown": "^1.0.9", "vue2-leaflet": "^2.0.3", "vuex": "^3.1.0" }, diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue new file mode 100644 index 000000000..fe8b43044 --- /dev/null +++ b/js/src/components/Editor.vue @@ -0,0 +1,390 @@ + + + + diff --git a/js/src/main.ts b/js/src/main.ts index 5610610b0..7ef88bf0b 100644 --- a/js/src/main.ts +++ b/js/src/main.ts @@ -1,7 +1,6 @@ // The Vue build version to load with the `import` command // (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from 'vue'; -import VueSimpleMarkdown from 'vue-simple-markdown'; import Buefy from 'buefy'; import GetTextPlugin from 'vue-gettext'; import App from '@/App.vue'; @@ -12,7 +11,6 @@ const translations = require('@/i18n/translations.json'); Vue.config.productionTip = false; -Vue.use(VueSimpleMarkdown); Vue.use(Buefy, { defaultContainerElement: '#mobilizon', }); diff --git a/js/src/views/Event/Create.vue b/js/src/views/Event/Create.vue index 60055caf1..414423877 100644 --- a/js/src/views/Event/Create.vue +++ b/js/src/views/Event/Create.vue @@ -4,14 +4,19 @@ Create a new event
Loading...
-
-
+
+ +
+ + +
+