From 2201f6e1775dc5c61ada3fb49de32463a3c7bfec Mon Sep 17 00:00:00 2001 From: Dimitrie Stefanescu Date: Tue, 15 Dec 2020 20:36:54 +0000 Subject: [PATCH] feat(frontend): stream description editing and proper md rendering and sanitisation --- frontend/package-lock.json | 10 +++ frontend/package.json | 2 + .../dialogs/StreamDescriptionDialog.vue | 85 +++++++++++++++++++ frontend/src/views/Stream.vue | 59 ++++++++++--- 4 files changed, 142 insertions(+), 14 deletions(-) create mode 100644 frontend/src/components/dialogs/StreamDescriptionDialog.vue diff --git a/frontend/package-lock.json b/frontend/package-lock.json index cb9120868..812b40543 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6215,6 +6215,11 @@ "domelementtype": "1" } }, + "dompurify": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.4.tgz", + "integrity": "sha512-jE21SelIgWrGKoXGfGPA524Zt1IJFBnktwfFMHDlEYRx5FZOdc+4eEH9mkA6PuhExrq3HVpJnY8hMYUzAMl0OA==" + }, "domutils": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", @@ -9663,6 +9668,11 @@ "object-visit": "^1.0.0" } }, + "marked": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.6.tgz", + "integrity": "sha512-7vVuSEZ8g/HH3hK/BH/+7u/NJj7x9VY4EHzujLDcqAQLiOUeFJYAsfSAyoWtR17lKrx7b08qyIno4lffwrzTaA==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", diff --git a/frontend/package.json b/frontend/package.json index 6eb1bddcd..e50c7d7e1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,7 +13,9 @@ "@vuejs-community/vue-filter-date-parse": "^1.1.6", "core-js": "^3.8.1", "crypto-random-string": "^3.3.0", + "dompurify": "^2.2.4", "lodash.debounce": "^4.0.8", + "marked": "^1.2.6", "v-tooltip": "^2.0.3", "vue": "^2.6.12", "vue-apollo": "^3.0.5", diff --git a/frontend/src/components/dialogs/StreamDescriptionDialog.vue b/frontend/src/components/dialogs/StreamDescriptionDialog.vue new file mode 100644 index 000000000..a746464d5 --- /dev/null +++ b/frontend/src/components/dialogs/StreamDescriptionDialog.vue @@ -0,0 +1,85 @@ + + diff --git a/frontend/src/views/Stream.vue b/frontend/src/views/Stream.vue index 98fff678b..d0765a908 100644 --- a/frontend/src/views/Stream.vue +++ b/frontend/src/views/Stream.vue @@ -11,10 +11,29 @@ - Description - - {{ stream.description }} + + Description + + + No description provided. + + + + Edit Description + + + + + @@ -23,7 +42,7 @@ - mdi-source-branch + mdi-source-branch Branches @@ -41,14 +60,8 @@ {{ item.name }}   - - - {{ item.commits.totalCount }} - + + {{ item.commits.totalCount }} commits @@ -63,7 +76,7 @@ - Create a new branch + new branch