From e4c7c1125da6f8fa259241b4d3838b1e7b1e24a2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 23 Sep 2019 09:11:41 +0200
Subject: [PATCH 001/212] zwischenspeichern

---
 backend/public/providers.json                 | 257 ++++++++++++++++++
 .../resolvers/embeds/findProvider.spec.js     |   2 +-
 webapp/assets/json/providers.json             | 257 ++++++++++++++++++
 webapp/locales/de.json                        |  18 +-
 webapp/pages/settings.vue                     |   4 +-
 webapp/pages/settings/allow-embeds.vue        |  94 +++++++
 6 files changed, 627 insertions(+), 5 deletions(-)
 create mode 100644 backend/public/providers.json
 create mode 100644 webapp/assets/json/providers.json
 create mode 100644 webapp/pages/settings/allow-embeds.vue

diff --git a/backend/public/providers.json b/backend/public/providers.json
new file mode 100644
index 000000000..ef9f04bff
--- /dev/null
+++ b/backend/public/providers.json
@@ -0,0 +1,257 @@
+[
+    {
+        "provider_name": "Codepen",
+        "provider_url": "https:\/\/codepen.io",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/codepen.io\/*",
+                    "https:\/\/codepen.io\/*"
+                ],
+                "url": "http:\/\/codepen.io\/api\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "DTube",
+        "provider_url": "https:\/\/d.tube\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/d.tube\/v\/*"
+                ],
+                "url": "https:\/\/api.d.tube\/oembed",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Facebook (Post)",
+        "provider_url": "https:\/\/www.facebook.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/www.facebook.com\/*\/posts\/*",
+                    "https:\/\/www.facebook.com\/photos\/*",
+                    "https:\/\/www.facebook.com\/*\/photos\/*",
+                    "https:\/\/www.facebook.com\/photo.php*",
+                    "https:\/\/www.facebook.com\/photo.php",
+                    "https:\/\/www.facebook.com\/*\/activity\/*",
+                    "https:\/\/www.facebook.com\/permalink.php",
+                    "https:\/\/www.facebook.com\/media\/set?set=*",
+                    "https:\/\/www.facebook.com\/questions\/*",
+                    "https:\/\/www.facebook.com\/notes\/*\/*\/*"
+                ],
+                "url": "https:\/\/www.facebook.com\/plugins\/post\/oembed.json",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Facebook (Video)",
+        "provider_url": "https:\/\/www.facebook.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/www.facebook.com\/*\/videos\/*",
+                    "https:\/\/www.facebook.com\/video.php"
+                ],
+                "url": "https:\/\/www.facebook.com\/plugins\/video\/oembed.json",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Flickr",
+        "provider_url": "https:\/\/www.flickr.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/*.flickr.com\/photos\/*",
+                    "http:\/\/flic.kr\/p\/*",
+                    "https:\/\/*.flickr.com\/photos\/*",
+                    "https:\/\/flic.kr\/p\/*"
+                ],
+                "url": "https:\/\/www.flickr.com\/services\/oembed\/",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "GIPHY",
+        "provider_url": "https:\/\/giphy.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/giphy.com\/gifs\/*",
+                    "http:\/\/gph.is\/*",
+                    "https:\/\/media.giphy.com\/media\/*\/giphy.gif"
+                ],
+                "url": "https:\/\/giphy.com\/services\/oembed",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Instagram",
+        "provider_url": "https:\/\/instagram.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/instagram.com\/p\/*",
+                    "http:\/\/instagr.am\/p\/*",
+                    "http:\/\/www.instagram.com\/p\/*",
+                    "http:\/\/www.instagr.am\/p\/*",
+                    "https:\/\/instagram.com\/p\/*",
+                    "https:\/\/instagr.am\/p\/*",
+                    "https:\/\/www.instagram.com\/p\/*",
+                    "https:\/\/www.instagr.am\/p\/*"
+                ],
+                "url": "https:\/\/api.instagram.com\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "Meetup",
+        "provider_url": "http:\/\/www.meetup.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/meetup.com\/*",
+                    "https:\/\/www.meetup.com\/*",
+                    "https:\/\/meetup.com\/*",
+                    "http:\/\/meetu.ps\/*"
+                ],
+                "url": "https:\/\/api.meetup.com\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "MixCloud",
+        "provider_url": "https:\/\/mixcloud.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/www.mixcloud.com\/*\/*\/",
+                    "https:\/\/www.mixcloud.com\/*\/*\/"
+                ],
+                "url": "https:\/\/www.mixcloud.com\/oembed\/"
+            }
+        ]
+    },
+    {
+        "provider_name": "Reddit",
+        "provider_url": "https:\/\/reddit.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/reddit.com\/r\/*\/comments\/*\/*",
+                    "https:\/\/www.reddit.com\/r\/*\/comments\/*\/*"
+                ],
+                "url": "https:\/\/www.reddit.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "SlideShare",
+        "provider_url": "http:\/\/www.slideshare.net\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/www.slideshare.net\/*\/*",
+                    "http:\/\/fr.slideshare.net\/*\/*",
+                    "http:\/\/de.slideshare.net\/*\/*",
+                    "http:\/\/es.slideshare.net\/*\/*",
+                    "http:\/\/pt.slideshare.net\/*\/*"
+                ],
+                "url": "http:\/\/www.slideshare.net\/api\/oembed\/2",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "SoundCloud",
+        "provider_url": "http:\/\/soundcloud.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/soundcloud.com\/*",
+                    "https:\/\/soundcloud.com\/*"
+                ],
+                "url": "https:\/\/soundcloud.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "Twitch",
+        "provider_url": "https:\/\/www.twitch.tv",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/clips.twitch.tv\/*",
+                    "https:\/\/clips.twitch.tv\/*",
+                    "http:\/\/www.twitch.tv\/*",
+                    "https:\/\/www.twitch.tv\/*",
+                    "http:\/\/twitch.tv\/*",
+                    "https:\/\/twitch.tv\/*"
+                ],
+                "url": "https:\/\/api.twitch.tv\/v4\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "Twitter",
+        "provider_url": "http:\/\/www.twitter.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/twitter.com\/*\/status\/*",
+                    "https:\/\/*.twitter.com\/*\/status\/*"
+                ],
+                "url": "https:\/\/publish.twitter.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "Vimeo",
+        "provider_url": "https:\/\/vimeo.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/vimeo.com\/*",
+                    "https:\/\/vimeo.com\/album\/*\/video\/*",
+                    "https:\/\/vimeo.com\/channels\/*\/*",
+                    "https:\/\/vimeo.com\/groups\/*\/videos\/*",
+                    "https:\/\/vimeo.com\/ondemand\/*\/*",
+                    "https:\/\/player.vimeo.com\/video\/*"
+                ],
+                "url": "https:\/\/vimeo.com\/api\/oembed.{format}",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "YouTube",
+        "provider_url": "https:\/\/www.youtube.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/*.youtube.com\/watch*",
+                    "https:\/\/*.youtube.com\/v\/*",
+                    "https:\/\/youtu.be\/*"
+                ],
+                "url": "https:\/\/www.youtube.com\/oembed",
+                "discovery": true
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/backend/src/schema/resolvers/embeds/findProvider.spec.js b/backend/src/schema/resolvers/embeds/findProvider.spec.js
index 963b255ab..878fe741c 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.spec.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.spec.js
@@ -1,4 +1,4 @@
-import findProvider from './findProvider'
+import findProvider from '~/json/findProvider'
 
 describe('Vimeo', () => {
   it('matches `https://vimeo.com/showcase/2098620/video/4082288`', () => {
diff --git a/webapp/assets/json/providers.json b/webapp/assets/json/providers.json
new file mode 100644
index 000000000..ef9f04bff
--- /dev/null
+++ b/webapp/assets/json/providers.json
@@ -0,0 +1,257 @@
+[
+    {
+        "provider_name": "Codepen",
+        "provider_url": "https:\/\/codepen.io",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/codepen.io\/*",
+                    "https:\/\/codepen.io\/*"
+                ],
+                "url": "http:\/\/codepen.io\/api\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "DTube",
+        "provider_url": "https:\/\/d.tube\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/d.tube\/v\/*"
+                ],
+                "url": "https:\/\/api.d.tube\/oembed",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Facebook (Post)",
+        "provider_url": "https:\/\/www.facebook.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/www.facebook.com\/*\/posts\/*",
+                    "https:\/\/www.facebook.com\/photos\/*",
+                    "https:\/\/www.facebook.com\/*\/photos\/*",
+                    "https:\/\/www.facebook.com\/photo.php*",
+                    "https:\/\/www.facebook.com\/photo.php",
+                    "https:\/\/www.facebook.com\/*\/activity\/*",
+                    "https:\/\/www.facebook.com\/permalink.php",
+                    "https:\/\/www.facebook.com\/media\/set?set=*",
+                    "https:\/\/www.facebook.com\/questions\/*",
+                    "https:\/\/www.facebook.com\/notes\/*\/*\/*"
+                ],
+                "url": "https:\/\/www.facebook.com\/plugins\/post\/oembed.json",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Facebook (Video)",
+        "provider_url": "https:\/\/www.facebook.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/www.facebook.com\/*\/videos\/*",
+                    "https:\/\/www.facebook.com\/video.php"
+                ],
+                "url": "https:\/\/www.facebook.com\/plugins\/video\/oembed.json",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Flickr",
+        "provider_url": "https:\/\/www.flickr.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/*.flickr.com\/photos\/*",
+                    "http:\/\/flic.kr\/p\/*",
+                    "https:\/\/*.flickr.com\/photos\/*",
+                    "https:\/\/flic.kr\/p\/*"
+                ],
+                "url": "https:\/\/www.flickr.com\/services\/oembed\/",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "GIPHY",
+        "provider_url": "https:\/\/giphy.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/giphy.com\/gifs\/*",
+                    "http:\/\/gph.is\/*",
+                    "https:\/\/media.giphy.com\/media\/*\/giphy.gif"
+                ],
+                "url": "https:\/\/giphy.com\/services\/oembed",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "Instagram",
+        "provider_url": "https:\/\/instagram.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/instagram.com\/p\/*",
+                    "http:\/\/instagr.am\/p\/*",
+                    "http:\/\/www.instagram.com\/p\/*",
+                    "http:\/\/www.instagr.am\/p\/*",
+                    "https:\/\/instagram.com\/p\/*",
+                    "https:\/\/instagr.am\/p\/*",
+                    "https:\/\/www.instagram.com\/p\/*",
+                    "https:\/\/www.instagr.am\/p\/*"
+                ],
+                "url": "https:\/\/api.instagram.com\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "Meetup",
+        "provider_url": "http:\/\/www.meetup.com",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/meetup.com\/*",
+                    "https:\/\/www.meetup.com\/*",
+                    "https:\/\/meetup.com\/*",
+                    "http:\/\/meetu.ps\/*"
+                ],
+                "url": "https:\/\/api.meetup.com\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "MixCloud",
+        "provider_url": "https:\/\/mixcloud.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/www.mixcloud.com\/*\/*\/",
+                    "https:\/\/www.mixcloud.com\/*\/*\/"
+                ],
+                "url": "https:\/\/www.mixcloud.com\/oembed\/"
+            }
+        ]
+    },
+    {
+        "provider_name": "Reddit",
+        "provider_url": "https:\/\/reddit.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/reddit.com\/r\/*\/comments\/*\/*",
+                    "https:\/\/www.reddit.com\/r\/*\/comments\/*\/*"
+                ],
+                "url": "https:\/\/www.reddit.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "SlideShare",
+        "provider_url": "http:\/\/www.slideshare.net\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/www.slideshare.net\/*\/*",
+                    "http:\/\/fr.slideshare.net\/*\/*",
+                    "http:\/\/de.slideshare.net\/*\/*",
+                    "http:\/\/es.slideshare.net\/*\/*",
+                    "http:\/\/pt.slideshare.net\/*\/*"
+                ],
+                "url": "http:\/\/www.slideshare.net\/api\/oembed\/2",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "SoundCloud",
+        "provider_url": "http:\/\/soundcloud.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/soundcloud.com\/*",
+                    "https:\/\/soundcloud.com\/*"
+                ],
+                "url": "https:\/\/soundcloud.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "Twitch",
+        "provider_url": "https:\/\/www.twitch.tv",
+        "endpoints": [
+            {
+                "schemes": [
+                    "http:\/\/clips.twitch.tv\/*",
+                    "https:\/\/clips.twitch.tv\/*",
+                    "http:\/\/www.twitch.tv\/*",
+                    "https:\/\/www.twitch.tv\/*",
+                    "http:\/\/twitch.tv\/*",
+                    "https:\/\/twitch.tv\/*"
+                ],
+                "url": "https:\/\/api.twitch.tv\/v4\/oembed",
+                "formats": [
+                    "json"
+                ]
+            }
+        ]
+    },
+    {
+        "provider_name": "Twitter",
+        "provider_url": "http:\/\/www.twitter.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/twitter.com\/*\/status\/*",
+                    "https:\/\/*.twitter.com\/*\/status\/*"
+                ],
+                "url": "https:\/\/publish.twitter.com\/oembed"
+            }
+        ]
+    },
+    {
+        "provider_name": "Vimeo",
+        "provider_url": "https:\/\/vimeo.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/vimeo.com\/*",
+                    "https:\/\/vimeo.com\/album\/*\/video\/*",
+                    "https:\/\/vimeo.com\/channels\/*\/*",
+                    "https:\/\/vimeo.com\/groups\/*\/videos\/*",
+                    "https:\/\/vimeo.com\/ondemand\/*\/*",
+                    "https:\/\/player.vimeo.com\/video\/*"
+                ],
+                "url": "https:\/\/vimeo.com\/api\/oembed.{format}",
+                "discovery": true
+            }
+        ]
+    },
+    {
+        "provider_name": "YouTube",
+        "provider_url": "https:\/\/www.youtube.com\/",
+        "endpoints": [
+            {
+                "schemes": [
+                    "https:\/\/*.youtube.com\/watch*",
+                    "https:\/\/*.youtube.com\/v\/*",
+                    "https:\/\/youtu.be\/*"
+                ],
+                "url": "https:\/\/www.youtube.com\/oembed",
+                "discovery": true
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 5b83821f5..e101cf67d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -2,7 +2,7 @@
   "maintenance": {
     "title": "Human Connection befindet sich in der Wartung",
     "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.",
-    "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" 
+    "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an"
   },
   "index": {
     "no-results": "Keine Beiträge gefunden.",
@@ -306,6 +306,20 @@
       "submit": "Kommentiere",
       "submitted": "Kommentar Gesendet",
       "updated": "Änderungen gespeichert"
+    },
+    "allowEmbeds": {
+      "name": "Drittanbieter",
+      "description": "In unseren Beiträgen können aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text eingebunden werden.",
+      "statustext": "Momentan ist das automatische einbinden:",
+      "statuschange": "Einstellung ändern",
+      "false": "Abgestellt",
+      "true": "Zugelassen",
+      "button-tofalse": "Abstellen",
+      "button-toonlysession": "Zugelassen für diese Sitzung",
+      "button-totrue": "dauerhaft zulassen",
+      "third-party-false": "Es wird kein Service von Drittanbietern automatisch eingebunden.",
+      "third-party-onlysession": "Sie haben das automatische einbinden für diese Sitzung zugelassen. Nach einem neuen Login ist es wieder abgestellt.",
+      "third-party-true": "Das einbinden der Services von Drittanbietern ist dauerhaft zugelassen und gespeichert für komende Sitzungen."
     }
   },
   "comment": {
@@ -592,4 +606,4 @@
     "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎",
     "closing": "Herzlichst <br><br> Euer Human Connection Team"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue
index 67493c333..11fde8c75 100644
--- a/webapp/pages/settings.vue
+++ b/webapp/pages/settings.vue
@@ -32,8 +32,8 @@ export default {
           path: `/settings/my-social-media`,
         },
         {
-          name: this.$t('settings.blocked-users.name'),
-          path: `/settings/blocked-users`,
+          name: this.$t('post.allowEmbeds.name'),
+          path: `/settings/allow-embeds`,
         },
         {
           name: this.$t('settings.deleteUserAccount.name'),
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
new file mode 100644
index 000000000..143211510
--- /dev/null
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -0,0 +1,94 @@
+<template>
+  <div>
+      <ds-card :header="$t('post.allowEmbeds.name')">
+
+            <ds-container width="large">
+      <ds-placeholder>
+           <h3>{{ this.allowEmbeds_h3 }}</h3>
+          <div>{{ this.allowEmbeds_desc }}</div>
+        </ds-placeholder>
+    </ds-container>
+
+       <p>{{ $t('post.allowEmbeds.description') }}</p>
+      <div>
+          <ds-container>
+              <ds-placeholder>
+        <ds-list ordered>
+            <ds-list-item>http://www.dailymotion.com</ds-list-item>
+            <ds-list-item>https://www.facebook.com</ds-list-item>
+            <ds-list-item>https://giphy.com</ds-list-item>
+            <ds-list-item>https://www.flickr.com</ds-list-item>
+            <ds-list-item>https://d.tube</ds-list-item>
+            <ds-list-item>https://codepen.io</ds-list-item>
+            <ds-list-item>http://www.meetup.com</ds-list-item>
+            <ds-list-item>https://mixcloud.com</ds-list-item>
+            <ds-list-item>https://reddit.com</ds-list-item>
+            <ds-list-item>http://www.slideshare.net</ds-list-item> 
+            <ds-list-item>http://soundcloud.com</ds-list-item>
+            <ds-list-item>https://www.twitch.tv</ds-list-item>
+            <ds-list-item>http://www.twitter.com</ds-list-item>
+            <ds-list-item>https://vimeo.com</ds-list-item>
+            <ds-list-item>https://www.youtube.com</ds-list-item>
+        </ds-list>
+        </ds-placeholder>
+        </ds-container>
+      </div>
+      <p>{{ $t('post.allowEmbeds.statustext') }}</p>
+      <div>  
+    <ds-container width="large">
+      <ds-placeholder>
+           <h3>{{ this.allowEmbeds_h3 }}</h3>
+          <div>{{ this.allowEmbeds_desc }}</div>
+        </ds-placeholder>
+    </ds-container>
+     <p>{{ $t('post.allowEmbeds.statuschange') }}</p>
+      <ds-button @click="toFalse" size="x-large">{{ $t('post.allowEmbeds.button-tofalse') }}</ds-button>
+       <ds-button @click="toOnlySession" size="x-large">{{ $t('post.allowEmbeds.button-toonlysession') }}</ds-button>
+        <ds-button @click="toTrue" size="x-large">{{ $t('post.allowEmbeds.button-totrue') }}</ds-button>
+    </div>
+   </ds-card>
+  </div>
+
+     
+
+</template>
+
+<script>
+import json from '../assets/providers.json'
+
+export default {
+  data() {
+    return {
+        allowEmbeds_h3: this.$t('post.allowEmbeds.false'),
+        allowEmbeds_desc: this.$t('post.allowEmbeds.third-party-false'),
+    }
+  },
+  methods: {
+    toFalse: function(){        
+        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.false')
+        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-false')
+      
+    },
+    toOnlySession: function(){
+         
+        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
+        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-toonlysession')
+    },
+    toTrue: function(){
+        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
+        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-true')
+    },
+ 
+  fetchData(){
+    
+        console.log(json);
+    
+  }
+},
+  
+}
+</script>
+
+<style lang="scss">
+ 
+</style>

From 4b1116868719d7896b8e2664ef81f1ba4a9779f4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 23 Sep 2019 16:11:20 +0200
Subject: [PATCH 002/212] confirm embeded iframes only frontend style

---
 .../schema/resolvers/embeds/findProvider.js   |   5 +-
 .../resolvers/embeds/findProvider.spec.js     |   2 +-
 webapp/assets/json/providers.json             | 257 ------------------
 webapp/locales/de.json                        |   8 +-
 webapp/pages/settings/allow-embeds.vue        | 132 ++++-----
 5 files changed, 65 insertions(+), 339 deletions(-)
 delete mode 100644 webapp/assets/json/providers.json

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index 491cbb9e8..c7d910918 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -2,7 +2,10 @@ import fs from 'fs'
 import path from 'path'
 import minimatch from 'minimatch'
 
-let oEmbedProvidersFile = fs.readFileSync(path.join(__dirname, './providers.json'), 'utf8')
+let oEmbedProvidersFile = fs.readFileSync(
+  path.join(__dirname, '../../../../public/providers.json'),
+  'utf8',
+)
 // some providers allow a format parameter
 // we need JSON
 oEmbedProvidersFile = oEmbedProvidersFile.replace(/\{format\}/g, 'json')
diff --git a/backend/src/schema/resolvers/embeds/findProvider.spec.js b/backend/src/schema/resolvers/embeds/findProvider.spec.js
index 878fe741c..963b255ab 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.spec.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.spec.js
@@ -1,4 +1,4 @@
-import findProvider from '~/json/findProvider'
+import findProvider from './findProvider'
 
 describe('Vimeo', () => {
   it('matches `https://vimeo.com/showcase/2098620/video/4082288`', () => {
diff --git a/webapp/assets/json/providers.json b/webapp/assets/json/providers.json
deleted file mode 100644
index ef9f04bff..000000000
--- a/webapp/assets/json/providers.json
+++ /dev/null
@@ -1,257 +0,0 @@
-[
-    {
-        "provider_name": "Codepen",
-        "provider_url": "https:\/\/codepen.io",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/codepen.io\/*",
-                    "https:\/\/codepen.io\/*"
-                ],
-                "url": "http:\/\/codepen.io\/api\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "DTube",
-        "provider_url": "https:\/\/d.tube\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/d.tube\/v\/*"
-                ],
-                "url": "https:\/\/api.d.tube\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Post)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/posts\/*",
-                    "https:\/\/www.facebook.com\/photos\/*",
-                    "https:\/\/www.facebook.com\/*\/photos\/*",
-                    "https:\/\/www.facebook.com\/photo.php*",
-                    "https:\/\/www.facebook.com\/photo.php",
-                    "https:\/\/www.facebook.com\/*\/activity\/*",
-                    "https:\/\/www.facebook.com\/permalink.php",
-                    "https:\/\/www.facebook.com\/media\/set?set=*",
-                    "https:\/\/www.facebook.com\/questions\/*",
-                    "https:\/\/www.facebook.com\/notes\/*\/*\/*"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/post\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Video)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/videos\/*",
-                    "https:\/\/www.facebook.com\/video.php"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/video\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Flickr",
-        "provider_url": "https:\/\/www.flickr.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/*.flickr.com\/photos\/*",
-                    "http:\/\/flic.kr\/p\/*",
-                    "https:\/\/*.flickr.com\/photos\/*",
-                    "https:\/\/flic.kr\/p\/*"
-                ],
-                "url": "https:\/\/www.flickr.com\/services\/oembed\/",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "GIPHY",
-        "provider_url": "https:\/\/giphy.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/giphy.com\/gifs\/*",
-                    "http:\/\/gph.is\/*",
-                    "https:\/\/media.giphy.com\/media\/*\/giphy.gif"
-                ],
-                "url": "https:\/\/giphy.com\/services\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Instagram",
-        "provider_url": "https:\/\/instagram.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/instagram.com\/p\/*",
-                    "http:\/\/instagr.am\/p\/*",
-                    "http:\/\/www.instagram.com\/p\/*",
-                    "http:\/\/www.instagr.am\/p\/*",
-                    "https:\/\/instagram.com\/p\/*",
-                    "https:\/\/instagr.am\/p\/*",
-                    "https:\/\/www.instagram.com\/p\/*",
-                    "https:\/\/www.instagr.am\/p\/*"
-                ],
-                "url": "https:\/\/api.instagram.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Meetup",
-        "provider_url": "http:\/\/www.meetup.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/meetup.com\/*",
-                    "https:\/\/www.meetup.com\/*",
-                    "https:\/\/meetup.com\/*",
-                    "http:\/\/meetu.ps\/*"
-                ],
-                "url": "https:\/\/api.meetup.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "MixCloud",
-        "provider_url": "https:\/\/mixcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.mixcloud.com\/*\/*\/",
-                    "https:\/\/www.mixcloud.com\/*\/*\/"
-                ],
-                "url": "https:\/\/www.mixcloud.com\/oembed\/"
-            }
-        ]
-    },
-    {
-        "provider_name": "Reddit",
-        "provider_url": "https:\/\/reddit.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/reddit.com\/r\/*\/comments\/*\/*",
-                    "https:\/\/www.reddit.com\/r\/*\/comments\/*\/*"
-                ],
-                "url": "https:\/\/www.reddit.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "SlideShare",
-        "provider_url": "http:\/\/www.slideshare.net\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.slideshare.net\/*\/*",
-                    "http:\/\/fr.slideshare.net\/*\/*",
-                    "http:\/\/de.slideshare.net\/*\/*",
-                    "http:\/\/es.slideshare.net\/*\/*",
-                    "http:\/\/pt.slideshare.net\/*\/*"
-                ],
-                "url": "http:\/\/www.slideshare.net\/api\/oembed\/2",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "SoundCloud",
-        "provider_url": "http:\/\/soundcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/soundcloud.com\/*",
-                    "https:\/\/soundcloud.com\/*"
-                ],
-                "url": "https:\/\/soundcloud.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitch",
-        "provider_url": "https:\/\/www.twitch.tv",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/clips.twitch.tv\/*",
-                    "https:\/\/clips.twitch.tv\/*",
-                    "http:\/\/www.twitch.tv\/*",
-                    "https:\/\/www.twitch.tv\/*",
-                    "http:\/\/twitch.tv\/*",
-                    "https:\/\/twitch.tv\/*"
-                ],
-                "url": "https:\/\/api.twitch.tv\/v4\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitter",
-        "provider_url": "http:\/\/www.twitter.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/twitter.com\/*\/status\/*",
-                    "https:\/\/*.twitter.com\/*\/status\/*"
-                ],
-                "url": "https:\/\/publish.twitter.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Vimeo",
-        "provider_url": "https:\/\/vimeo.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/vimeo.com\/*",
-                    "https:\/\/vimeo.com\/album\/*\/video\/*",
-                    "https:\/\/vimeo.com\/channels\/*\/*",
-                    "https:\/\/vimeo.com\/groups\/*\/videos\/*",
-                    "https:\/\/vimeo.com\/ondemand\/*\/*",
-                    "https:\/\/player.vimeo.com\/video\/*"
-                ],
-                "url": "https:\/\/vimeo.com\/api\/oembed.{format}",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "YouTube",
-        "provider_url": "https:\/\/www.youtube.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/*.youtube.com\/watch*",
-                    "https:\/\/*.youtube.com\/v\/*",
-                    "https:\/\/youtu.be\/*"
-                ],
-                "url": "https:\/\/www.youtube.com\/oembed",
-                "discovery": true
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e101cf67d..d8e380449 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -309,17 +309,15 @@
     },
     "allowEmbeds": {
       "name": "Drittanbieter",
-      "description": "In unseren Beiträgen können aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text eingebunden werden.",
+      "description": "In unseren Beiträgen können / werden aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text eingebunden werden.",
       "statustext": "Momentan ist das automatische einbinden:",
       "statuschange": "Einstellung ändern",
       "false": "Abgestellt",
       "true": "Zugelassen",
       "button-tofalse": "Abstellen",
-      "button-toonlysession": "Zugelassen für diese Sitzung",
       "button-totrue": "dauerhaft zulassen",
-      "third-party-false": "Es wird kein Service von Drittanbietern automatisch eingebunden.",
-      "third-party-onlysession": "Sie haben das automatische einbinden für diese Sitzung zugelassen. Nach einem neuen Login ist es wieder abgestellt.",
-      "third-party-true": "Das einbinden der Services von Drittanbietern ist dauerhaft zugelassen und gespeichert für komende Sitzungen."
+      "third-party-false": "Es wird <b style='color:red'>kein</b> Service von Drittanbietern automatisch eingebunden.",
+      "third-party-true": "Das einbinden der Services von Drittanbietern ist <b style='color:red'>dauerhaft zugelassen</b> und gespeichert für komende Sitzungen."
     }
   },
   "comment": {
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
index 143211510..31380380d 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -1,94 +1,76 @@
 <template>
-  <div>
-      <ds-card :header="$t('post.allowEmbeds.name')">
-
-            <ds-container width="large">
-      <ds-placeholder>
-           <h3>{{ this.allowEmbeds_h3 }}</h3>
-          <div>{{ this.allowEmbeds_desc }}</div>
-        </ds-placeholder>
-    </ds-container>
-
-       <p>{{ $t('post.allowEmbeds.description') }}</p>
-      <div>
-          <ds-container>
-              <ds-placeholder>
-        <ds-list ordered>
-            <ds-list-item>http://www.dailymotion.com</ds-list-item>
-            <ds-list-item>https://www.facebook.com</ds-list-item>
-            <ds-list-item>https://giphy.com</ds-list-item>
-            <ds-list-item>https://www.flickr.com</ds-list-item>
-            <ds-list-item>https://d.tube</ds-list-item>
-            <ds-list-item>https://codepen.io</ds-list-item>
-            <ds-list-item>http://www.meetup.com</ds-list-item>
-            <ds-list-item>https://mixcloud.com</ds-list-item>
-            <ds-list-item>https://reddit.com</ds-list-item>
-            <ds-list-item>http://www.slideshare.net</ds-list-item> 
-            <ds-list-item>http://soundcloud.com</ds-list-item>
-            <ds-list-item>https://www.twitch.tv</ds-list-item>
-            <ds-list-item>http://www.twitter.com</ds-list-item>
-            <ds-list-item>https://vimeo.com</ds-list-item>
-            <ds-list-item>https://www.youtube.com</ds-list-item>
-        </ds-list>
-        </ds-placeholder>
-        </ds-container>
-      </div>
-      <p>{{ $t('post.allowEmbeds.statustext') }}</p>
-      <div>  
+  <ds-card :header="$t('post.allowEmbeds.name')">
+    <p>{{ $t('post.allowEmbeds.statustext') }}</p>
     <ds-container width="large">
-      <ds-placeholder>
-           <h3>{{ this.allowEmbeds_h3 }}</h3>
-          <div>{{ this.allowEmbeds_desc }}</div>
-        </ds-placeholder>
+      <h3 v-html="allowEmbeds_h3" />
+      <div v-html="allowEmbeds_desc" />
     </ds-container>
-     <p>{{ $t('post.allowEmbeds.statuschange') }}</p>
-      <ds-button @click="toFalse" size="x-large">{{ $t('post.allowEmbeds.button-tofalse') }}</ds-button>
-       <ds-button @click="toOnlySession" size="x-large">{{ $t('post.allowEmbeds.button-toonlysession') }}</ds-button>
-        <ds-button @click="toTrue" size="x-large">{{ $t('post.allowEmbeds.button-totrue') }}</ds-button>
+    <div>
+      <ds-space />
+      <ds-space />
+      <p>{{ $t('post.allowEmbeds.statuschange') }}</p>
+      <ds-container width="large">
+        <ds-flex>
+          <ds-flex-item>
+            <ds-button @click="toFalse" primary :disabled="disabled">
+              {{ $t('post.allowEmbeds.button-tofalse') }}
+            </ds-button>
+          </ds-flex-item>
+          <ds-flex-item>
+            <ds-button @click="toTrue" danger :disabled="!disabled">
+              {{ $t('post.allowEmbeds.button-totrue') }}
+            </ds-button>
+          </ds-flex-item>
+        </ds-flex>
+      </ds-container>
     </div>
-   </ds-card>
-  </div>
-
-     
+    <ds-space />
+    <ds-space />
 
+    <div v-show="!disabled">
+      <p>{{ $t('post.allowEmbeds.description') }}</p>
+      <ds-container>
+        <ds-placeholder>
+          <ul>
+            <li v-for="provider in providers" :key="provider.provider_name">
+              {{ provider.provider_name }},
+              <small>{{ provider.provider_url }}</small>
+            </li>
+          </ul>
+        </ds-placeholder>
+      </ds-container>
+    </div>
+  </ds-card>
 </template>
 
 <script>
-import json from '../assets/providers.json'
+import axios from 'axios'
 
 export default {
   data() {
     return {
-        allowEmbeds_h3: this.$t('post.allowEmbeds.false'),
-        allowEmbeds_desc: this.$t('post.allowEmbeds.third-party-false'),
+      allowEmbeds_h3: this.$t('post.allowEmbeds.false'),
+      allowEmbeds_desc: this.$t('post.allowEmbeds.third-party-false'),
+      disabled: true,
+      providers: [],
     }
   },
+  mounted() {
+    axios.get('../api/providers.json').then(response => {
+      this.providers = response.data
+    })
+  },
   methods: {
-    toFalse: function(){        
-        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.false')
-        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-false')
-      
+    toFalse: function() {
+      this.allowEmbeds_h3 = this.$t('post.allowEmbeds.false')
+      this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-false')
+      this.disabled = true
     },
-    toOnlySession: function(){
-         
-        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
-        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-toonlysession')
+    toTrue: function() {
+      this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
+      this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-true')
+      this.disabled = false
     },
-    toTrue: function(){
-        this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
-        this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-true')
-    },
- 
-  fetchData(){
-    
-        console.log(json);
-    
-  }
-},
-  
+  },
 }
 </script>
-
-<style lang="scss">
- 
-</style>

From 044e2bfed958e2dc1c4654f1897f66235d16a7d5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 23 Sep 2019 20:08:45 +0200
Subject: [PATCH 003/212] Allow embedded code in posts permanent in database

---
 backend/src/models/User.js                 |  4 ++
 backend/src/schema/resolvers/users.js      |  1 +
 backend/src/schema/resolvers/users.spec.js |  1 +
 backend/src/schema/types/type/User.gql     |  3 +
 backend/src/seed/factories/users.js        |  1 +
 webapp/locales/en.json                     | 16 +++++-
 webapp/middleware/termsAndConditions.js    |  1 +
 webapp/pages/settings/allow-embeds.vue     | 64 +++++++++++++++++++---
 webapp/store/auth.js                       |  5 ++
 9 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 72cef4093..736b7b1ab 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -104,4 +104,8 @@ module.exports = {
     target: 'Location',
     direction: 'out',
   },
+  allowEmbedIframes: {
+    type: 'boolean',
+    default: false,
+  },
 }
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index ea9220d5e..7ec6d6d46 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -175,6 +175,7 @@ export default {
         'about',
         'termsAndConditionsAgreedVersion',
         'termsAndConditionsAgreedAt',
+        'allowEmbedIframes',
       ],
       boolean: {
         followedByCurrentUser:
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 784a48c06..986f4a41f 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -86,6 +86,7 @@ describe('UpdateUser', () => {
       name: 'John Doe',
       termsAndConditionsAgreedVersion: null,
       termsAndConditionsAgreedAt: null,
+      allowEmbedIframes: false,
     }
 
     variables = {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index f1c38b8d6..d9084dd90 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -27,6 +27,8 @@ type User {
 	termsAndConditionsAgreedVersion: String
 	termsAndConditionsAgreedAt: String
 
+	allowEmbedIframes: Boolean
+
 	friends: [User]! @relation(name: "FRIENDS", direction: "BOTH")
 	friendsCount: Int! @cypher(statement: "MATCH (this)<-[: FRIENDS]->(r: User) RETURN COUNT(DISTINCT r)")
 
@@ -166,6 +168,7 @@ type Mutation {
 	about: String
 	termsAndConditionsAgreedVersion: String
 	termsAndConditionsAgreedAt: String
+	allowEmbedIframes: Boolean
 	): User
 
 	DeleteUser(id: ID!, resource: [Deletable]): User
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index 962f92781..b65be795d 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -16,6 +16,7 @@ export default function create() {
         about: faker.lorem.paragraph(),
         termsAndConditionsAgreedVersion: '0.0.1',
         termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
+        allowEmbedIframes: false,
       }
       defaults.slug = slugify(defaults.name, { lower: true })
       args = {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 39220d318..e97360b55 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -2,7 +2,7 @@
   "maintenance": {
     "title": "Human Connection is under maintenance",
     "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
-    "questions": "Any Questions or concerns, send an email to" 
+    "questions": "Any Questions or concerns, send an email to"
   },
   "index": {
     "no-results": "No contributions found.",
@@ -307,6 +307,18 @@
       "submit": "Comment",
       "submitted": "Comment Submitted",
       "updated": "Changes Saved"
+    },
+    "allowEmbeds": {
+      "name": "Third party providers",
+      "description": "In our contributions can / will be included from the following list of providers foreign code from other providers (third parties) in the form of embedded videos, images or text.",
+      "statustext": "At the moment this is automatic embedding:",
+      "statuschange": "Change setting",
+      "false": "Turned off",
+      "true": "Admitted",
+      "button-tofalse": "turn-off",
+      "button-totrue": "allow permanently",
+      "third-party-false": "It automatically integrates <b style='color:red'>no </b> third-party providers' service.",
+      "third-party-true": "The inclusion of third-party services is <b style='color:red'>permanently allowed</b> and stored for future sessions."
     }
   },
   "comment": {
@@ -593,4 +605,4 @@
     "have-fun": "Now have fun with the alpha version of Human Connection! For the first universal peace. ♥︎",
     "closing": "Thank you very much <br> <br> your Human Connection Team"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/middleware/termsAndConditions.js b/webapp/middleware/termsAndConditions.js
index 64141eed0..68ad49bf8 100644
--- a/webapp/middleware/termsAndConditions.js
+++ b/webapp/middleware/termsAndConditions.js
@@ -6,6 +6,7 @@ export default async ({ store, env, route, redirect }) => {
   if (publicPages.indexOf(route.name) >= 0) {
     return true
   }
+
   if (route.name === 'terms-and-conditions-confirm') return true // avoid endless loop
 
   if (store.getters['auth/termsAndConditionsAgreed']) return true
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
index 31380380d..61f544af9 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -12,12 +12,12 @@
       <ds-container width="large">
         <ds-flex>
           <ds-flex-item>
-            <ds-button @click="toFalse" primary :disabled="disabled">
+            <ds-button @click="toFalse" primary :disabled="!disabled">
               {{ $t('post.allowEmbeds.button-tofalse') }}
             </ds-button>
           </ds-flex-item>
           <ds-flex-item>
-            <ds-button @click="toTrue" danger :disabled="!disabled">
+            <ds-button @click="toTrue" danger :disabled="disabled">
               {{ $t('post.allowEmbeds.button-totrue') }}
             </ds-button>
           </ds-flex-item>
@@ -27,7 +27,7 @@
     <ds-space />
     <ds-space />
 
-    <div v-show="!disabled">
+    <div v-show="disabled">
       <p>{{ $t('post.allowEmbeds.description') }}</p>
       <ds-container>
         <ds-placeholder>
@@ -45,13 +45,33 @@
 
 <script>
 import axios from 'axios'
-
+import gql from 'graphql-tag'
+import { mapGetters, mapMutations } from 'vuex'
+const mutation = gql`
+  mutation($id: ID!, $allowEmbedIframes: Boolean) {
+    UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) {
+      id
+      allowEmbedIframes
+    }
+  }
+`
 export default {
+  head() {
+    return {
+      title: this.$t('post.allowEmbeds.name'),
+    }
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'auth/user',
+      allowEmbedIframes: 'auth/allowEmbedIframes',
+    }),
+  },
   data() {
     return {
       allowEmbeds_h3: this.$t('post.allowEmbeds.false'),
       allowEmbeds_desc: this.$t('post.allowEmbeds.third-party-false'),
-      disabled: true,
+      disabled: null,
       providers: [],
     }
   },
@@ -59,17 +79,43 @@ export default {
     axios.get('../api/providers.json').then(response => {
       this.providers = response.data
     })
+    this.disabled = this.currentUser.allowEmbedIframes
   },
   methods: {
-    toFalse: function() {
+    ...mapMutations({
+      setCurrentUser: 'auth/SET_USER',
+    }),
+    toFalse() {
       this.allowEmbeds_h3 = this.$t('post.allowEmbeds.false')
       this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-false')
-      this.disabled = true
+      this.submit()
     },
-    toTrue: function() {
+    toTrue() {
       this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
       this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-true')
-      this.disabled = false
+      this.submit()
+    },
+    async submit() {
+      try {
+        await this.$apollo.mutate({
+          mutation,
+          variables: {
+            id: this.currentUser.id,
+            allowEmbedIframes: !this.disabled,
+          },
+          update: (store, { data: { UpdateUser } }) => {
+            const { allowEmbedIframes } = UpdateUser
+            this.setCurrentUser({
+              ...this.currentUser,
+              allowEmbedIframes,
+            })
+          },
+        })
+        this.$toast.success(this.$t('site.thanks') + ' ' + this.allowEmbeds_h3)
+        this.disabled = !this.disabled
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
     },
   },
 }
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 498477660..ce4d877bf 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -6,6 +6,7 @@ export const state = () => {
     user: null,
     token: null,
     pending: false,
+    allowEmbedIframes: false,
   }
 }
 
@@ -46,6 +47,9 @@ export const getters = {
   termsAndConditionsAgreed(state) {
     return state.user && state.user.termsAndConditionsAgreedVersion === VERSION
   },
+  allowEmbedIframes(state) {
+    return state.allowEmbedIframes
+  },
 }
 
 export const actions = {
@@ -86,6 +90,7 @@ export const actions = {
             locationName
             contributionsCount
             commentedCount
+            allowEmbedIframes
             termsAndConditionsAgreedVersion
             socialMedia {
               id

From e8f771b59aca0ff25df41f0867ec9b4d443c8473 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 25 Sep 2019 18:39:01 +0200
Subject: [PATCH 004/212] first mega PR crazy update, all work

---
 webapp/components/Editor/nodes/Embed.js | 140 +++++++++++++++++++++++-
 webapp/graphql/User.js                  |  11 ++
 webapp/pages/settings/allow-embeds.vue  |  14 +--
 webapp/store/auth.js                    |   4 -
 4 files changed, 153 insertions(+), 16 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 0a12e06ef..60f5eab76 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -1,6 +1,8 @@
 import { Node } from 'tiptap'
 import pasteRule from '../commands/pasteRule'
 import { compileToFunctions } from 'vue-template-compiler'
+import { mapGetters, mapMutations } from 'vuex'
+import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `
   <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">
@@ -8,7 +10,58 @@ const template = `
     <em> {{ dataEmbedUrl }} </em>
   </a>
 `
+
+const templateVideoPreview = `
+<div>
+ 
+  <ds-container width="small">
+    <ds-placeholder>
+      <div style="font-size: 1em"><span style="color:#17b53f">{{embedPublisher}}</span> - <b>@{{ embedAuthor }}</b> </div>
+      <ds-icon
+        name="play-circle"
+        v-if="!showEmbed"
+        style="
+          position: absolute;
+          font-size: 4em; 
+          color:#17b53f;
+          border-radius: 67px;
+          background-color: cornsilk;
+          margin: 80px;
+          opacity: 0.9;
+          z-index: 1"
+      />
+      <div style="height:270px">
+        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:100%;position:absolute;z-index:1">
+          <ds-placeholder>
+            Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ausgetauscht!
+            <ds-button @click="setConfirm">dauerhaft speichern</ds-button>
+            <ds-button size="x-large" @click="allowEmbedTemporar('openIframe', embedHtml)" >jetzt ansehen</ds-button>           
+          </ds-placeholder>
+        </ds-section>
+        <ds-section primary v-if="showchangeEmbedStatus"  style="height: 270px;width:100%;position:absolute;z-index:1">
+          <ds-placeholder>
+            Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ausgetauscht!
+            <ds-button v-if="!this.currentUser.allowEmbedIframes" @click="setConfirm">dauerhaft speichern</ds-button>
+            <ds-button v-if="this.currentUser.allowEmbedIframes" size="x-large" @click="setCancel" >abstellen</ds-button>         
+          </ds-placeholder>
+        </ds-section>
+        <img v-if="!showEmbed"  :src="embedImage" @click="clickPreview"  height="270" width="auto" style="position:absolute" />             
+        <div v-if="showEmbed" v-html="embedHtml" />        
+      </div>      
+      <div style="font-size: 1.5em">{{ embedTitle }}</div>
+      <div style="font-size: 1em">{{ embedDescription }}</div>
+      <div style="font-size: 1em"><a  :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank" ><em> {{ dataEmbedUrl }} </em></a></div>
+      <ds-text v-if="!currentUser.allowEmbedIframes" size="small" align="right" color="softer">
+      automatisches Einbinden <b>abgestellt</b> | <a href="#" @click="modalOpen">ändern</a></ds-text>
+      <ds-text v-else size="small" align="right" color="softer">
+      automatisches Einbinden <b>zugelassen</b> | <a href="#" @click="modalOpen">ändern</a></ds-text>
+    </ds-placeholder>
+  </ds-container>
+</div>
+`
+
 const compiledTemplate = compileToFunctions(template)
+const compiledTemplateVideoPreview = compileToFunctions(templateVideoPreview)
 
 export default class Embed extends Node {
   get name() {
@@ -65,12 +118,22 @@ export default class Embed extends Node {
       props: ['node', 'updateAttrs', 'options'],
       data: () => ({
         embedData: {},
+        showEmbed: true,
+        showOverlay: false,
+        embedcode: null,
+        isOpen: false,
+        showchangeEmbedStatus: false,
+        // allowEmbedIframes: this.currentUser.allowEmbedIframes
       }),
       async created() {
         if (!this.options) return {}
         this.embedData = await this.options.onEmbed({ url: this.dataEmbedUrl })
+        this.showEmbed = this.currentUser.allowEmbedIframes
       },
       computed: {
+        ...mapGetters({
+          currentUser: 'auth/user',
+        }),
         embedClass() {
           return this.embedHtml ? 'embed' : ''
         },
@@ -78,6 +141,26 @@ export default class Embed extends Node {
           const { html = '' } = this.embedData
           return html
         },
+        embedImage() {
+          const { image = '' } = this.embedData
+          return image
+        },
+        embedPublisher() {
+          const { publisher = '' } = this.embedData
+          return publisher
+        },
+        embedTitle() {
+          const { title = '' } = this.embedData
+          return title
+        },
+        embedAuthor() {
+          const { author = '' } = this.embedData
+          return author
+        },
+        embedDescription() {
+          const { description = '' } = this.embedData
+          return description
+        },
         dataEmbedUrl: {
           get() {
             return this.node.attrs.dataEmbedUrl
@@ -89,8 +172,63 @@ export default class Embed extends Node {
           },
         },
       },
+      methods: {
+        ...mapMutations({
+          setCurrentUser: 'auth/SET_USER',
+        }),
+        clickPreview: function(xx, html) {
+          this.showOverlay = true
+        },
+        allowEmbedTemporar: function(xx, html) {
+          if (xx === 'openIframe') {
+            this.embedcode = html
+            this.showEmbed = true
+          } else {
+            this.embedcode = null
+            this.showEmbed = false
+          }
+          this.showOverlay = false
+        },
+        modalOpen: function() {
+          this.showOverlay = false
+          this.showchangeEmbedStatus = true
+        },
+        setConfirm: function() {
+          this.submit(true)
+          this.showOverlay = false
+          this.showchangeEmbedStatus = false
+        },
+        setCancel: function() {
+          this.submit(false)
+          this.showchangeEmbedStatus = false
+        },
+        async submit(allowEmbedIframes) {
+          try {
+            await this.$apollo.mutate({
+              mutation: allowEmbedIframesMutation(),
+              variables: {
+                id: this.currentUser.id,
+                allowEmbedIframes,
+              },
+              update: (store, { data: { UpdateUser } }) => {
+                const { allowEmbedIframes } = UpdateUser
+                this.setCurrentUser({
+                  ...this.currentUser,
+                  allowEmbedIframes,
+                })
+              },
+            })
+            this.$toast.success(this.$t('contribution.success'))
+            this.showEmbed = this.currentUser.allowEmbedIframes
+          } catch (err) {
+            this.$toast.error(err.message)
+          }
+        },
+      },
       render(createElement) {
-        return compiledTemplate.render.call(this, createElement)
+        if (this.embedHtml !== '')
+          return compiledTemplateVideoPreview.render.call(this, createElement)
+        if (this.embedHtml === '') return compiledTemplate.render.call(this, createElement)
       },
     }
   }
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 11149f398..d3c32362f 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -134,3 +134,14 @@ export const unfollowUserMutation = i18n => {
     }
   `
 }
+
+export const allowEmbedIframesMutation = () => {
+  return gql`
+    mutation($id: ID!, $allowEmbedIframes: Boolean) {
+      UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) {
+        id
+        allowEmbedIframes
+      }
+    }
+  `
+}
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
index 61f544af9..db6e7552e 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -45,16 +45,9 @@
 
 <script>
 import axios from 'axios'
-import gql from 'graphql-tag'
 import { mapGetters, mapMutations } from 'vuex'
-const mutation = gql`
-  mutation($id: ID!, $allowEmbedIframes: Boolean) {
-    UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) {
-      id
-      allowEmbedIframes
-    }
-  }
-`
+import { allowEmbedIframesMutation } from '~/graphql/User.js'
+
 export default {
   head() {
     return {
@@ -64,7 +57,6 @@ export default {
   computed: {
     ...mapGetters({
       currentUser: 'auth/user',
-      allowEmbedIframes: 'auth/allowEmbedIframes',
     }),
   },
   data() {
@@ -98,7 +90,7 @@ export default {
     async submit() {
       try {
         await this.$apollo.mutate({
-          mutation,
+          mutation: allowEmbedIframesMutation(),
           variables: {
             id: this.currentUser.id,
             allowEmbedIframes: !this.disabled,
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index ce4d877bf..90c59a8f5 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -6,7 +6,6 @@ export const state = () => {
     user: null,
     token: null,
     pending: false,
-    allowEmbedIframes: false,
   }
 }
 
@@ -47,9 +46,6 @@ export const getters = {
   termsAndConditionsAgreed(state) {
     return state.user && state.user.termsAndConditionsAgreedVersion === VERSION
   },
-  allowEmbedIframes(state) {
-    return state.allowEmbedIframes
-  },
 }
 
 export const actions = {

From 7f7bde9ab9f9fef7dd4ff34b97da3a923c944713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 26 Sep 2019 10:03:09 +0200
Subject: [PATCH 005/212] Started to implement report infos

---
 webapp/components/Modal/ReportModal.vue | 29 +++++++++++++++++++++++++
 webapp/locales/en.json                  | 20 +++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 16b6a469b..603220634 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -8,6 +8,18 @@
 
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
+    <ds-select
+      model="XXX"
+      :options="form.reasonCategoryOptions"
+      icon="comment"
+      :label="$t('report.reason.addText.label')"
+      :placeholder="$t('report.reason.addText.placeholder')"
+    />
+    <ds-input
+      id="text"
+      :label="$t('report.reason.addText.label')"
+      :placeholder="$t('report.reason.addText.placeholder')"
+    />
 
     <template slot="footer">
       <ds-button class="cancel" icon="close" @click="cancel">{{ $t('report.cancel') }}</ds-button>
@@ -44,6 +56,23 @@ export default {
       isOpen: true,
       success: false,
       loading: false,
+      form: {
+        reasonCategory: null,
+        reasonCategoryOptions: [
+          this.$t('report.reason.category.options.discrimination-etc'),
+          this.$t('report.reason.category.options.pornographic-content-links'),
+          this.$t('report.reason.category.options.glorific-trivia-of-cruel-inhuman-acts'),
+          this.$t('report.reason.category.options.unauthorized-disclosure-personalinformation'),
+          this.$t('report.reason.category.options.intentional-intimidation-stalking-persecution'),
+          this.$t('report.reason.category.options.advert-products-services-commercial'),
+          this.$t('report.reason.category.options.criminal-behavior-violation-german-law'),
+          this.$t('report.reason.category.options.other'),
+        ],
+        reasonAddText: '',
+      },
+      formSchema: {
+        reasonAddText: { required: true, min: 0, max: 150 },
+      },
     }
   },
   computed: {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 592fc57e4..a68023664 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -433,6 +433,26 @@
       "type": "Comment",
       "message": "Do you really want to report the comment from \"<b>{name}</b>\"?",
       "error": "You have already reported the comment!"
+    },
+    "reason": {
+      "category": {
+        "label": "Why you like to report this?",
+        "placeholder": "Additional information …",
+        "options": {
+          "discrimination-etc": "Discriminatory posts, comments, utterances or insults",
+          "pornographic-content-links": "Posting or linking of clearly pornographic material",
+          "glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence",
+          "unauthorized-disclosure-personalinformation": "The disclosure of others' personal information without their consent or threat there of (\"doxing\")",
+          "intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution",
+          "advert-products-services-commercial": "Advertising products and services with commercial intent",
+          "criminal-behavior-violation-german-law": "Criminal behavior or violation of German law",
+          "other": "Other"
+        }
+      },
+      "addText": {
+        "label": "Why you like to report this?",
+        "placeholder": "Additional information …"
+      }
     }
   },
   "followButton": {

From 27121a1077eaed9a55116dc879bd3e18092b739d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 30 Sep 2019 11:29:43 +0200
Subject: [PATCH 006/212] break two

---
 webapp/components/Editor/Editor.story.js      |  24 +++-
 webapp/components/Editor/nodes/Embed.js       | 118 ++++++------------
 .../components/Editor/plugins/eventHandler.js |   2 -
 webapp/package.json                           |   2 +-
 4 files changed, 57 insertions(+), 89 deletions(-)

diff --git a/webapp/components/Editor/Editor.story.js b/webapp/components/Editor/Editor.story.js
index aaaa0eb58..7a69b347f 100644
--- a/webapp/components/Editor/Editor.story.js
+++ b/webapp/components/Editor/Editor.story.js
@@ -5,8 +5,12 @@ import helpers from '~/storybook/helpers'
 import Vue from 'vue'
 
 const embed = {
+  image: 'https://i.ytimg.com/vi/ptCcgLM-p8k/maxresdefault_live.jpg',
+  title: 'Video Titel',
+  // html: null,
+  description: 'Video Description',
   html:
-    '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+    '<iframe width="auto" height="250" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
 }
 
 const plugins = [
@@ -114,15 +118,12 @@ storiesOf('Editor', module)
     }),
     template: `<hc-editor :users="users" :value="content" />`,
   }))
-  .add('Embeds', () => ({
+  .add('Embeds with iframe', () => ({
     components: { HcEditor },
     store: helpers.store,
     data: () => ({
       users,
       content: `
-        <p>
-          The following link should render a youtube video in addition to the link.
-        </p>
         <a class="embed" href="https://www.youtube.com/watch?v=qkdXAtO40Fo">
           <em>https://www.youtube.com/watch?v=qkdXAtO40Fo</em>
         </a>
@@ -130,3 +131,16 @@ storiesOf('Editor', module)
     }),
     template: `<hc-editor :users="users" :value="content" />`,
   }))
+  .add('Embeds with plain link', () => ({
+    components: { HcEditor },
+    store: helpers.store,
+    data: () => ({
+      users,
+      content: `
+       <a class="embed" href="https://telegram.org/">
+         <em>https://telegram.org/</em>
+       </a>
+      `,
+    }),
+    template: `<hc-editor :users="users" :value="content" />`,
+  }))
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 60f5eab76..7e63f2170 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -5,67 +5,38 @@ import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `
-  <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">
-    <div v-if="embedHtml" v-html="embedHtml" />
-    <em> {{ dataEmbedUrl }} </em>
-  </a>
-`
-
-const templateVideoPreview = `
-<div>
- 
-  <ds-container width="small">
-    <ds-placeholder>
-      <div style="font-size: 1em"><span style="color:#17b53f">{{embedPublisher}}</span> - <b>@{{ embedAuthor }}</b> </div>
-      <ds-icon
-        name="play-circle"
-        v-if="!showEmbed"
-        style="
-          position: absolute;
-          font-size: 4em; 
-          color:#17b53f;
-          border-radius: 67px;
-          background-color: cornsilk;
-          margin: 80px;
-          opacity: 0.9;
-          z-index: 1"
-      />
-      <div style="height:270px">
-        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:100%;position:absolute;z-index:1">
-          <ds-placeholder>
-            Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ausgetauscht!
-            <ds-button @click="setConfirm">dauerhaft speichern</ds-button>
-            <ds-button size="x-large" @click="allowEmbedTemporar('openIframe', embedHtml)" >jetzt ansehen</ds-button>           
-          </ds-placeholder>
+  
+    <a  class="embed" :href="dataEmbedUrl" style="cursor: none">
+      <ds-container width="medium">
+        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:92%;position:absolute;z-index:3">
+          <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
+          <ds-button size="x-large" @click.prevent="allowEmbedTemporar('openIframe')" >jetzt ansehen</ds-button>      
+          <ds-text v-if="!currentUser.allowEmbedIframes" size="small" align="right" color="softer">
+            automatisches Einbinden <b>zulassen?</b> | 
+          </ds-text>
+          <ds-text v-else size="small" align="right" color="softer">
+            automatisches Einbinden <b>zugelassen</b> | 
+          </ds-text>   
+          <input type="checkbox" v-model="currentUser.allowEmbedIframes"  @click.prevent="check($event)">  
         </ds-section>
-        <ds-section primary v-if="showchangeEmbedStatus"  style="height: 270px;width:100%;position:absolute;z-index:1">
-          <ds-placeholder>
-            Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ausgetauscht!
-            <ds-button v-if="!this.currentUser.allowEmbedIframes" @click="setConfirm">dauerhaft speichern</ds-button>
-            <ds-button v-if="this.currentUser.allowEmbedIframes" size="x-large" @click="setCancel" >abstellen</ds-button>         
-          </ds-placeholder>
-        </ds-section>
-        <img v-if="!showEmbed"  :src="embedImage" @click="clickPreview"  height="270" width="auto" style="position:absolute" />             
-        <div v-if="showEmbed" v-html="embedHtml" />        
-      </div>      
-      <div style="font-size: 1.5em">{{ embedTitle }}</div>
-      <div style="font-size: 1em">{{ embedDescription }}</div>
-      <div style="font-size: 1em"><a  :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank" ><em> {{ dataEmbedUrl }} </em></a></div>
-      <ds-text v-if="!currentUser.allowEmbedIframes" size="small" align="right" color="softer">
-      automatisches Einbinden <b>abgestellt</b> | <a href="#" @click="modalOpen">ändern</a></ds-text>
-      <ds-text v-else size="small" align="right" color="softer">
-      automatisches Einbinden <b>zugelassen</b> | <a href="#" @click="modalOpen">ändern</a></ds-text>
-    </ds-placeholder>
-  </ds-container>
-</div>
+        <p v-if="!showEmbed" style="cursor: pointer" >
+          <img :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
+        <div v-else v-html="embedHtml" />
+        <p style="color:black">
+        <div style="font-size: 1.5em">{{ embedTitle }}</div>
+        <div style="font-size: 1em">{{ embedDescription }}</div>
+        <a  class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
+          <em> {{ dataEmbedUrl }} </em>
+        </a>
+      </ds-container>
+    </a>
 `
 
 const compiledTemplate = compileToFunctions(template)
-const compiledTemplateVideoPreview = compileToFunctions(templateVideoPreview)
 
 export default class Embed extends Node {
   get name() {
-    return 'embed'
+    return 'embedUrl'
   }
 
   get defaultOptions() {
@@ -120,10 +91,6 @@ export default class Embed extends Node {
         embedData: {},
         showEmbed: true,
         showOverlay: false,
-        embedcode: null,
-        isOpen: false,
-        showchangeEmbedStatus: false,
-        // allowEmbedIframes: this.currentUser.allowEmbedIframes
       }),
       async created() {
         if (!this.options) return {}
@@ -134,9 +101,6 @@ export default class Embed extends Node {
         ...mapGetters({
           currentUser: 'auth/user',
         }),
-        embedClass() {
-          return this.embedHtml ? 'embed' : ''
-        },
         embedHtml() {
           const { html = '' } = this.embedData
           return html
@@ -176,32 +140,26 @@ export default class Embed extends Node {
         ...mapMutations({
           setCurrentUser: 'auth/SET_USER',
         }),
-        clickPreview: function(xx, html) {
+        clickPreview() {
           this.showOverlay = true
         },
-        allowEmbedTemporar: function(xx, html) {
+        allowEmbedTemporar(xx) {
           if (xx === 'openIframe') {
-            this.embedcode = html
             this.showEmbed = true
+            this.showOverlay = false
           } else {
-            this.embedcode = null
             this.showEmbed = false
+            this.showOverlay = true
+          }
+        },
+        check(e) {
+          if (e.target.checked) {
+            this.submit(true)
+          } else {
+            this.submit(false)
           }
           this.showOverlay = false
         },
-        modalOpen: function() {
-          this.showOverlay = false
-          this.showchangeEmbedStatus = true
-        },
-        setConfirm: function() {
-          this.submit(true)
-          this.showOverlay = false
-          this.showchangeEmbedStatus = false
-        },
-        setCancel: function() {
-          this.submit(false)
-          this.showchangeEmbedStatus = false
-        },
         async submit(allowEmbedIframes) {
           try {
             await this.$apollo.mutate({
@@ -226,9 +184,7 @@ export default class Embed extends Node {
         },
       },
       render(createElement) {
-        if (this.embedHtml !== '')
-          return compiledTemplateVideoPreview.render.call(this, createElement)
-        if (this.embedHtml === '') return compiledTemplate.render.call(this, createElement)
+        return compiledTemplate.render.call(this, createElement)
       },
     }
   }
diff --git a/webapp/components/Editor/plugins/eventHandler.js b/webapp/components/Editor/plugins/eventHandler.js
index c390a066d..807949aa8 100644
--- a/webapp/components/Editor/plugins/eventHandler.js
+++ b/webapp/components/Editor/plugins/eventHandler.js
@@ -10,7 +10,6 @@ export default class EventHandler extends Extension {
       new Plugin({
         props: {
           transformPastedText(text) {
-            // console.log('#### transformPastedText', text)
             return text.trim()
           },
           transformPastedHTML(html) {
@@ -33,7 +32,6 @@ export default class EventHandler extends Extension {
               .replace(/<p>(\s*<br ?\/?>\s*)+/gim, '<p>')
               // remove additional linebreaks when last child inside p tags
               .replace(/(\s*<br ?\/?>\s*)+<\/p>/gim, '</p>')
-            // console.log('#### transformPastedHTML', html)
             return html
           },
           // transformPasted(slice) {
diff --git a/webapp/package.json b/webapp/package.json
index 656d94e80..6195654c3 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -129,4 +129,4 @@
     "vue-svg-loader": "~0.12.0",
     "vue-template-compiler": "^2.6.10"
   }
-}
+}
\ No newline at end of file

From 63d51404202fe6d68ec46f4e8d7d67ba6e8f274b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 30 Sep 2019 11:38:29 +0200
Subject: [PATCH 007/212] break two - two

---
 webapp/components/Editor/nodes/Embed.js | 8 +++++++-
 webapp/graphql/User.js                  | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 7e63f2170..8a9343311 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -19,7 +19,7 @@ const template = `
           </ds-text>   
           <input type="checkbox" v-model="currentUser.allowEmbedIframes"  @click.prevent="check($event)">  
         </ds-section>
-        <p v-if="!showEmbed" style="cursor: pointer" >
+        <p v-if="!showEmbed || linkOnly" style="cursor: pointer" >
           <img :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
         <div v-else v-html="embedHtml" />
         <p style="color:black">
@@ -91,6 +91,7 @@ export default class Embed extends Node {
         embedData: {},
         showEmbed: true,
         showOverlay: false,
+        linkOnly: false,
       }),
       async created() {
         if (!this.options) return {}
@@ -103,6 +104,11 @@ export default class Embed extends Node {
         }),
         embedHtml() {
           const { html = '' } = this.embedData
+          if (html === '') {
+            this.linkOnly = true
+          } else {
+            this.linkOnly = false
+          }
           return html
         },
         embedImage() {
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 91204cbef..8e3ff06af 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -153,4 +153,3 @@ export const checkSlugAvailableQuery = gql`
     }
   }
 `
-

From 78b43b05a41daae189104bdc16cb78bae578a7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 30 Sep 2019 13:34:11 +0200
Subject: [PATCH 008/212] Next step

---
 webapp/components/Modal/ReportModal.vue | 85 ++++++++++++++-----------
 webapp/locales/en.json                  | 10 +--
 2 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 603220634..ed01fd26a 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -1,5 +1,10 @@
 <template>
-  <ds-modal :title="title" :is-open="isOpen" @cancel="cancel">
+  <ds-modal
+    :title="title"
+    :is-open="isOpen"
+    :width="{ base: '100%', sm: '200px', md: '200px', lg: '200px' }"
+    @cancel="cancel"
+  >
     <transition name="ds-transition-fade">
       <ds-flex v-if="success" class="hc-modal-success" centered>
         <sweetalert-icon icon="success" />
@@ -8,18 +13,18 @@
 
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
-    <ds-select
-      model="XXX"
+    <ds-radio
+      :model="form.reasonCategory"
+      :label="$t('report.reason.category.label')"
       :options="form.reasonCategoryOptions"
-      icon="comment"
-      :label="$t('report.reason.addText.label')"
-      :placeholder="$t('report.reason.addText.placeholder')"
+      :placeholder="$t('report.reason.category.placeholder')"
     />
     <ds-input
       id="text"
       :label="$t('report.reason.addText.label')"
       :placeholder="$t('report.reason.addText.placeholder')"
     />
+    <ds-space />
 
     <template slot="footer">
       <ds-button class="cancel" icon="close" @click="cancel">{{ $t('report.cancel') }}</ds-button>
@@ -28,6 +33,7 @@
         danger
         class="confirm"
         icon="exclamation-circle"
+        :disabled="failsValidations"
         :loading="loading"
         @click="confirm"
       >
@@ -56,13 +62,14 @@ export default {
       isOpen: true,
       success: false,
       loading: false,
+      failsValidations: true,
       form: {
         reasonCategory: null,
         reasonCategoryOptions: [
           this.$t('report.reason.category.options.discrimination-etc'),
           this.$t('report.reason.category.options.pornographic-content-links'),
           this.$t('report.reason.category.options.glorific-trivia-of-cruel-inhuman-acts'),
-          this.$t('report.reason.category.options.unauthorized-disclosure-personalinformation'),
+          this.$t('report.reason.category.options.doxing'),
           this.$t('report.reason.category.options.intentional-intimidation-stalking-persecution'),
           this.$t('report.reason.category.options.advert-products-services-commercial'),
           this.$t('report.reason.category.options.criminal-behavior-violation-german-law'),
@@ -71,7 +78,7 @@ export default {
         reasonAddText: '',
       },
       formSchema: {
-        reasonAddText: { required: true, min: 0, max: 150 },
+        reasonAddText: { required: true, min: 0, max: 200 },
       },
     }
   },
@@ -94,11 +101,13 @@ export default {
       }, 1000)
     },
     async confirm() {
+      const { reasonCategory, reasonAddText } = this.form
+
       this.loading = true
-      try {
-        // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
-        // await this.modalData.buttons.confirm.callback()
-        await this.$apollo.mutate({
+      // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
+      // await this.modalData.buttons.confirm.callback()
+      this.$apollo
+        .mutate({
           mutation: gql`
             mutation($id: ID!) {
               report(id: $id) {
@@ -108,32 +117,34 @@ export default {
           `,
           variables: { id: this.id },
         })
-        this.success = true
-        this.$toast.success(this.$t('report.success'))
-        setTimeout(() => {
-          this.isOpen = false
+        .then(({ _data }) => {
+          this.success = true
+          this.$toast.success(this.$t('report.success'))
           setTimeout(() => {
-            this.success = false
-            this.$emit('close')
-          }, 500)
-        }, 1500)
-      } catch (err) {
-        this.$emit('close')
-        this.success = false
-        switch (err.message) {
-          case 'GraphQL error: User':
-            this.$toast.error(this.$t('report.user.error'))
-            break
-          case 'GraphQL error: Post':
-            this.$toast.error(this.$t('report.contribution.error'))
-            break
-          case 'GraphQL error: Comment':
-            this.$toast.error(this.$t('report.comment.error'))
-            break
-        }
-      } finally {
-        this.loading = false
-      }
+            this.isOpen = false
+            setTimeout(() => {
+              this.success = false
+              this.$emit('close')
+            }, 500)
+          }, 1500)
+          this.loading = false
+        })
+        .catch(err => {
+          this.$emit('close')
+          this.success = false
+          switch (err.message) {
+            case 'GraphQL error: User':
+              this.$toast.error(this.$t('report.user.error'))
+              break
+            case 'GraphQL error: Post':
+              this.$toast.error(this.$t('report.contribution.error'))
+              break
+            case 'GraphQL error: Comment':
+              this.$toast.error(this.$t('report.comment.error'))
+              break
+          }
+          this.loading = false
+        })
     },
   },
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a68023664..8a477747c 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -2,7 +2,7 @@
   "maintenance": {
     "title": "Human Connection is under maintenance",
     "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
-    "questions": "Any Questions or concerns, send an email to" 
+    "questions": "Any Questions or concerns, send an email to"
   },
   "index": {
     "no-results": "No contributions found.",
@@ -436,13 +436,13 @@
     },
     "reason": {
       "category": {
-        "label": "Why you like to report this?",
-        "placeholder": "Additional information …",
+        "label": "Select a category:",
+        "placeholder": "Category …",
         "options": {
           "discrimination-etc": "Discriminatory posts, comments, utterances or insults",
           "pornographic-content-links": "Posting or linking of clearly pornographic material",
           "glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence",
-          "unauthorized-disclosure-personalinformation": "The disclosure of others' personal information without their consent or threat there of (\"doxing\")",
+          "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\")",
           "intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution",
           "advert-products-services-commercial": "Advertising products and services with commercial intent",
           "criminal-behavior-violation-german-law": "Criminal behavior or violation of German law",
@@ -450,7 +450,7 @@
         }
       },
       "addText": {
-        "label": "Why you like to report this?",
+        "label": "Please explain why you like to report this?",
         "placeholder": "Additional information …"
       }
     }

From 17323aeb258f01e59dcf8fe720c45dcfd2cd50c8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 1 Oct 2019 11:00:14 +0200
Subject: [PATCH 009/212] logic ok

---
 webapp/components/Editor/nodes/Embed.js | 83 ++++++++++++++-----------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 8a9343311..4be49ee0c 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -4,28 +4,31 @@ import { compileToFunctions } from 'vue-template-compiler'
 import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
-const template = `
-  
-    <a  class="embed" :href="dataEmbedUrl" style="cursor: none">
-      <ds-container width="medium">
-        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:92%;position:absolute;z-index:3">
-          <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
-          <ds-button size="x-large" @click.prevent="allowEmbedTemporar('openIframe')" >jetzt ansehen</ds-button>      
-          <ds-text v-if="!currentUser.allowEmbedIframes" size="small" align="right" color="softer">
-            automatisches Einbinden <b>zulassen?</b> | 
-          </ds-text>
-          <ds-text v-else size="small" align="right" color="softer">
-            automatisches Einbinden <b>zugelassen</b> | 
-          </ds-text>   
-          <input type="checkbox" v-model="currentUser.allowEmbedIframes"  @click.prevent="check($event)">  
+const template = `  
+    <a  class="embed" href="" style="cursor: none">
+      <ds-container width="small">
+        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:80%;position:absolute;z-index:3">
+          <ds-text v-if="!isOnlyLink">Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
+          <ds-text v-else >Du verlässt jetzt Human Connection! Du wirst zu ({{embedPublisher}}) weitergeleitet!</ds-text>
+          <ds-button v-if="!isOnlyLink" size="x-large" @click.prevent="allowEmbedTemporar('openIframe')" >jetzt ansehen</ds-button>
+          <ds-button  v-else size="x-large" > <a :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank" >Webseite aufrufen   </a>  </ds-button>
+          <p v-show="!isOnlyLink">      
+          <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />
+      
+            <lable v-if="!currentUser.allowEmbedIframes" for="dataEmbedUrl" size="small">
+              automatisches Einbinden <b>zulassen?</b> |
+            </lable>
+            <lable v-else size="small" for="dataEmbedUrl" >
+              automatisches Einbinden <b>zugelassen</b> |
+            </lable>
+          </p>
         </ds-section>
-        <p v-if="!showEmbed || linkOnly" style="cursor: pointer" >
-          <img :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
-        <div v-else v-html="embedHtml" />
+        <img  v-show="showPreviewImage" style="cursor: pointer"  :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
+         <div v-show="!showPreviewImage" v-html="embedHtml" />
         <p style="color:black">
-        <div style="font-size: 1.5em">{{ embedTitle }}</div>
-        <div style="font-size: 1em">{{ embedDescription }}</div>
-        <a  class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
+        <div >{{ embedTitle }}</div>
+        <div>{{ embedDescription }}</div>
+        <a  :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
           <em> {{ dataEmbedUrl }} </em>
         </a>
       </ds-container>
@@ -89,9 +92,10 @@ export default class Embed extends Node {
       props: ['node', 'updateAttrs', 'options'],
       data: () => ({
         embedData: {},
-        showEmbed: true,
-        showOverlay: false,
-        linkOnly: false,
+        showPreviewImage: true,
+        showEmbed: null,
+        showOverlay: null,
+        isOnlyLink: false,
       }),
       async created() {
         if (!this.options) return {}
@@ -104,11 +108,18 @@ export default class Embed extends Node {
         }),
         embedHtml() {
           const { html = '' } = this.embedData
-          if (html === '') {
-            this.linkOnly = true
-          } else {
-            this.linkOnly = false
+          if (this.embedData.html === null) {
+            this.isOnlyLink = true
           }
+
+          if (this.showEmbed && !this.isOnlyLink) {
+            this.showPreviewImage = false
+          }
+
+          if (!this.showEmbed && this.isOnlyLink) {
+            this.showPreviewImage = true
+          }
+
           return html
         },
         embedImage() {
@@ -149,15 +160,6 @@ export default class Embed extends Node {
         clickPreview() {
           this.showOverlay = true
         },
-        allowEmbedTemporar(xx) {
-          if (xx === 'openIframe') {
-            this.showEmbed = true
-            this.showOverlay = false
-          } else {
-            this.showEmbed = false
-            this.showOverlay = true
-          }
-        },
         check(e) {
           if (e.target.checked) {
             this.submit(true)
@@ -166,6 +168,15 @@ export default class Embed extends Node {
           }
           this.showOverlay = false
         },
+        allowEmbedTemporar(xx) {
+          if (!this.isOnlyLink) {
+            this.showEmbed = true
+            this.showOverlay = false
+          } else {
+            this.showEmbed = false
+            this.showOverlay = false
+          }
+        },
         async submit(allowEmbedIframes) {
           try {
             await this.$apollo.mutate({

From ec12171e803f3bb80f9c3eba7e3b10d1320fccfb Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 15:11:43 +0200
Subject: [PATCH 010/212] style embed overlay

---
 webapp/components/Editor/Editor.vue     | 33 ++++++++++++++++
 webapp/components/Editor/nodes/Embed.js | 50 +++++++++++--------------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 8d3ce281b..2cdff0814 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -342,4 +342,37 @@ li > p {
     margin: 0 0 $space-x-small;
   }
 }
+
+.embed-container {
+  position: relative;
+  border-radius: $border-radius-base;
+  border: 1px solid $color-neutral-70;
+  padding: $space-x-small;
+  overflow: hidden;
+}
+
+.embed-overlay {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+
+  padding: $space-large;
+  background-color: $color-neutral-100;
+}
+
+.embed-buttons {
+  button {
+    margin-right: $space-small;
+  }
+}
+
+.embed-checkbox {
+  display: flex;
+
+  input {
+    margin-right: $space-small;
+  }
+}
 </style>
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 4be49ee0c..92aee59fc 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -4,35 +4,28 @@ import { compileToFunctions } from 'vue-template-compiler'
 import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
-const template = `  
-    <a  class="embed" href="" style="cursor: none">
-      <ds-container width="small">
-        <ds-section secondary v-if="showOverlay"  style="height: 270px;width:80%;position:absolute;z-index:3">
-          <ds-text v-if="!isOnlyLink">Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
-          <ds-text v-else >Du verlässt jetzt Human Connection! Du wirst zu ({{embedPublisher}}) weitergeleitet!</ds-text>
-          <ds-button v-if="!isOnlyLink" size="x-large" @click.prevent="allowEmbedTemporar('openIframe')" >jetzt ansehen</ds-button>
-          <ds-button  v-else size="x-large" > <a :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank" >Webseite aufrufen   </a>  </ds-button>
-          <p v-show="!isOnlyLink">      
-          <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />
-      
-            <lable v-if="!currentUser.allowEmbedIframes" for="dataEmbedUrl" size="small">
-              automatisches Einbinden <b>zulassen?</b> |
-            </lable>
-            <lable v-else size="small" for="dataEmbedUrl" >
-              automatisches Einbinden <b>zugelassen</b> |
-            </lable>
-          </p>
-        </ds-section>
-        <img  v-show="showPreviewImage" style="cursor: pointer"  :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
-         <div v-show="!showPreviewImage" v-html="embedHtml" />
-        <p style="color:black">
-        <div >{{ embedTitle }}</div>
-        <div>{{ embedDescription }}</div>
-        <a  :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
-          <em> {{ dataEmbedUrl }} </em>
-        </a>
-      </ds-container>
+const template = `
+  <ds-container width="small" class="embed-container">
+    <aside v-if="showOverlay" class="embed-overlay">
+      <ds-text v-if="!isOnlyLink">Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
+      <div class="embed-buttons">
+      <ds-button primary @click.prevent="allowEmbedTemporar('openIframe')">jetzt ansehen</ds-button>
+      <ds-button ghost @click.prevent="showOverlay = false">Abbrechen</ds-button>
+      </div>
+      <label class="embed-checkbox">
+        <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />
+        <span>Inhalte von Drittanbietern immer zulassen</span>
+      </label>
+    </aside>
+    <img  v-show="showPreviewImage" style="cursor: pointer"  :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
+      <div v-show="!showPreviewImage" v-html="embedHtml" />
+    <p style="color:black">
+    <div >{{ embedTitle }}</div>
+    <div>{{ embedDescription }}</div>
+    <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
+      <em> {{ dataEmbedUrl }} </em>
     </a>
+  </ds-container>
 `
 
 const compiledTemplate = compileToFunctions(template)
@@ -166,7 +159,6 @@ export default class Embed extends Node {
           } else {
             this.submit(false)
           }
-          this.showOverlay = false
         },
         allowEmbedTemporar(xx) {
           if (!this.isOnlyLink) {

From 0517e388730262b4d713272a448c6b71326c8868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 2 Oct 2019 15:17:53 +0200
Subject: [PATCH 011/212] Implement a form schema that works

A `ds-form` has not worked for any reason.
---
 webapp/components/Modal/ReportModal.vue | 103 ++++++++++++++++++++----
 1 file changed, 89 insertions(+), 14 deletions(-)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index ed01fd26a..f8c790889 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -13,18 +13,42 @@
 
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
+
+    <!-- Wolle <ds-form ref="reportForm" v-model="form" :schema="formSchema"> -->
+    <!-- Wolle <ds-radio
+        model="reasonCategory"
+        :label="$t('report.reason.category.label')"
+        :options="form.reasonCategoryOptions"
+        :placeholder="$t('report.reason.category.placeholder')"
+      /> -->
     <ds-radio
-      :model="form.reasonCategory"
+      :value="form.reasonCategory"
+      :schema="formSchema.reasonCategory"
       :label="$t('report.reason.category.label')"
       :options="form.reasonCategoryOptions"
-      :placeholder="$t('report.reason.category.placeholder')"
     />
+    <!-- Wolle <ds-input
+        model="reasonAddText"
+        :label="$t('report.reason.addText.label')"
+        :placeholder="$t('report.reason.addText.placeholder')"
+        type="textarea"
+        rows="5"
+        class="reasonAddText"
+      /> -->
     <ds-input
-      id="text"
+      :value="form.reasonAddText"
+      :schema="formSchema.reasonAddText"
       :label="$t('report.reason.addText.label')"
       :placeholder="$t('report.reason.addText.placeholder')"
+      type="textarea"
+      rows="5"
+      class="reasonAddText"
     />
+    <small class="smallTag">
+      {{ form.reasonAddText.length }}/{{ formSchema.reasonAddText.max }}
+    </small>
     <ds-space />
+    <!-- Wolle </ds-form> -->
 
     <template slot="footer">
       <ds-button class="cancel" icon="close" @click="cancel">{{ $t('report.cancel') }}</ds-button>
@@ -58,6 +82,24 @@ export default {
     id: { type: String, required: true },
   },
   data() {
+    const valuesReasonCategoryOptions = [
+      'discrimination-etc',
+      'pornographic-content-links',
+      'glorific-trivia-of-cruel-inhuman-acts',
+      'doxing',
+      'intentional-intimidation-stalking-persecution',
+      'advert-products-services-commercial',
+      'criminal-behavior-violation-german-law',
+      'other',
+    ]
+    let reasonCategoryOptions = []
+    valuesReasonCategoryOptions.forEach((categoryId, index) => {
+      reasonCategoryOptions[index] = {
+        label: this.$t('report.reason.category.options.' + categoryId),
+        value: categoryId,
+      }
+    })
+
     return {
       isOpen: true,
       success: false,
@@ -65,20 +107,32 @@ export default {
       failsValidations: true,
       form: {
         reasonCategory: null,
-        reasonCategoryOptions: [
-          this.$t('report.reason.category.options.discrimination-etc'),
-          this.$t('report.reason.category.options.pornographic-content-links'),
-          this.$t('report.reason.category.options.glorific-trivia-of-cruel-inhuman-acts'),
-          this.$t('report.reason.category.options.doxing'),
-          this.$t('report.reason.category.options.intentional-intimidation-stalking-persecution'),
-          this.$t('report.reason.category.options.advert-products-services-commercial'),
-          this.$t('report.reason.category.options.criminal-behavior-violation-german-law'),
-          this.$t('report.reason.category.options.other'),
-        ],
+        // Wolle reasonCategory: reasonCategoryOptions[0],
+        reasonCategoryOptions,
         reasonAddText: '',
       },
       formSchema: {
-        reasonAddText: { required: true, min: 0, max: 200 },
+        reasonCategory: {
+          type: 'enum',
+          required: true,
+          validator: (rule, value, callback, source, options) => {
+            // Wolle console.log('value: ', value)
+            this.form.reasonCategory = value
+            // Wolle console.log('this.form.reasonCategory: ', this.form.reasonCategory)
+            this.failsValidations = !this.form.reasonCategory
+            // Wolle console.log('this.failsValidations: ', this.failsValidations)
+            callback()
+          },
+        },
+        reasonAddText: {
+          type: 'string',
+          min: 0,
+          max: 200,
+          validator: (rule, value, callback, source, options) => {
+            this.form.reasonAddText = value
+            callback()
+          },
+        },
       },
     }
   },
@@ -92,6 +146,15 @@ export default {
     },
   },
   methods: {
+    // Wolle toggleReasonCategory(reasonCategory) {
+    //   console.log('reasonCategory: ', reasonCategory)
+    //   console.log('this.form.reasonCategory: ', this.form.reasonCategory)
+    //   this.failsValidations = false
+    // },
+    // Wolle inputReasonAddText(reasonAddText) {
+    //   console.log('reasonAddText: ', reasonAddText)
+    //   this.form.reasonAddText = reasonAddText
+    // },
     async cancel() {
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
       // await this.modalData.buttons.cancel.callback()
@@ -102,6 +165,8 @@ export default {
     },
     async confirm() {
       const { reasonCategory, reasonAddText } = this.form
+      console.log('reasonCategory: ', reasonCategory)
+      console.log('reasonAddText: ', reasonAddText)
 
       this.loading = true
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
@@ -151,6 +216,16 @@ export default {
 </script>
 
 <style lang="scss">
+.reasonAddText {
+  margin-top: $space-x-small;
+  margin-bottom: $space-xxx-small;
+}
+.smallTag {
+  width: 100%;
+  position: relative;
+  left: 90%;
+  margin-top: $space-xxx-small;
+}
 .hc-modal-success {
   pointer-events: none;
   position: absolute;

From 99629991d090814b09fb37fff7067e982ea726e4 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 15:49:23 +0200
Subject: [PATCH 012/212] style embed preview

---
 webapp/components/Editor/Editor.vue     | 27 +++++++++++++++++++++++--
 webapp/components/Editor/nodes/Embed.js | 20 +++++++++---------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 2cdff0814..ca632aa16 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -345,10 +345,33 @@ li > p {
 
 .embed-container {
   position: relative;
+  padding: 0;
+  margin: $space-small auto;
+  overflow: hidden;
   border-radius: $border-radius-base;
   border: 1px solid $color-neutral-70;
-  padding: $space-x-small;
-  overflow: hidden;
+  background-color: $color-neutral-90;
+}
+
+.embed-content {
+  width: 100%;
+  height: 100%;
+  cursor: pointer;
+
+  h4 {
+    margin: $space-small 0 0 $space-small;
+  }
+
+  p,
+  a {
+    display: block;
+    margin: 0 0 0 $space-small;
+  }
+}
+
+.embed-preview-image {
+  width: 100%;
+  height: auto;
 }
 
 .embed-overlay {
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 92aee59fc..3513b6c41 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -6,25 +6,25 @@ import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `
   <ds-container width="small" class="embed-container">
+    <section @click.prevent="clickPreview" class="embed-content">
+      <img v-show="showPreviewImage" :src="embedImage" class="embed-preview-image" />
+      <div v-show="!showPreviewImage" v-html="embedHtml" />
+      <h4>{{embedTitle}}</h4>
+      <p>{{embedDescription}}</p>
+      <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
+    </section>
     <aside v-if="showOverlay" class="embed-overlay">
-      <ds-text v-if="!isOnlyLink">Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
+      <h3>Achte auf deine Daten!</h3>
+      <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
       <div class="embed-buttons">
       <ds-button primary @click.prevent="allowEmbedTemporar('openIframe')">jetzt ansehen</ds-button>
       <ds-button ghost @click.prevent="showOverlay = false">Abbrechen</ds-button>
       </div>
       <label class="embed-checkbox">
-        <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />
+        <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" />
         <span>Inhalte von Drittanbietern immer zulassen</span>
       </label>
     </aside>
-    <img  v-show="showPreviewImage" style="cursor: pointer"  :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
-      <div v-show="!showPreviewImage" v-html="embedHtml" />
-    <p style="color:black">
-    <div >{{ embedTitle }}</div>
-    <div>{{ embedDescription }}</div>
-    <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
-      <em> {{ dataEmbedUrl }} </em>
-    </a>
   </ds-container>
 `
 

From c46c13dbdf175ca42543d93ad8c10adef9d40009 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 16:37:52 +0200
Subject: [PATCH 013/212] toggle overlay with methods

---
 webapp/components/Editor/Editor.vue     |  8 ++++++++
 webapp/components/Editor/nodes/Embed.js | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index ca632aa16..73ca5fcde 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -374,6 +374,14 @@ li > p {
   height: auto;
 }
 
+.embed-html {
+  width: 100%;
+
+  iframe {
+    width: 100%;
+  }
+}
+
 .embed-overlay {
   position: absolute;
   top: 0;
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 3513b6c41..bbac8fad5 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -6,9 +6,9 @@ import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `
   <ds-container width="small" class="embed-container">
-    <section @click.prevent="clickPreview" class="embed-content">
-      <img v-show="showPreviewImage" :src="embedImage" class="embed-preview-image" />
-      <div v-show="!showPreviewImage" v-html="embedHtml" />
+    <section @click.prevent="openOverlay()" class="embed-content">
+      <div v-if="!showPreviewImage" v-html="embedHtml" class="embed-html" />
+      <img v-else :src="embedImage" class="embed-preview-image" />
       <h4>{{embedTitle}}</h4>
       <p>{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
@@ -18,7 +18,7 @@ const template = `
       <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
       <div class="embed-buttons">
       <ds-button primary @click.prevent="allowEmbedTemporar('openIframe')">jetzt ansehen</ds-button>
-      <ds-button ghost @click.prevent="showOverlay = false">Abbrechen</ds-button>
+      <ds-button ghost @click.prevent="closeOverlay()">Abbrechen</ds-button>
       </div>
       <label class="embed-checkbox">
         <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" />
@@ -87,7 +87,7 @@ export default class Embed extends Node {
         embedData: {},
         showPreviewImage: true,
         showEmbed: null,
-        showOverlay: null,
+        showOverlay: false,
         isOnlyLink: false,
       }),
       async created() {
@@ -150,9 +150,12 @@ export default class Embed extends Node {
         ...mapMutations({
           setCurrentUser: 'auth/SET_USER',
         }),
-        clickPreview() {
+        openOverlay() {
           this.showOverlay = true
         },
+        closeOverlay() {
+          this.showOverlay = false
+        },
         check(e) {
           if (e.target.checked) {
             this.submit(true)
@@ -163,11 +166,10 @@ export default class Embed extends Node {
         allowEmbedTemporar(xx) {
           if (!this.isOnlyLink) {
             this.showEmbed = true
-            this.showOverlay = false
           } else {
             this.showEmbed = false
-            this.showOverlay = false
           }
+          this.closeOverlay()
         },
         async submit(allowEmbedIframes) {
           try {

From 4aeaa58eb614268e4463b80d19643672e1bee251 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 2 Oct 2019 16:53:24 +0200
Subject: [PATCH 014/212] Max aspect ratio of 1:1 for Post index page

- we are currently enforcing a 1:1 max ratio on the root path and would
like to maintain consistency
---
 webapp/pages/post/_id/_slug/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0fda144d0..bbcb1cda3 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -197,7 +197,7 @@ export default {
 
     .ds-card-image {
       img {
-        height: 300px;
+        max-height: 710px;
         object-fit: cover;
         object-position: center;
       }

From 8c78fef45798cf98cedb96c0ef1d7fc003ffe36e Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 16:55:30 +0200
Subject: [PATCH 015/212] toggle preview image with showEmbed

---
 webapp/components/Editor/Editor.vue     |  2 +-
 webapp/components/Editor/nodes/Embed.js | 30 +++++--------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 73ca5fcde..0f96607ee 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -356,7 +356,6 @@ li > p {
 .embed-content {
   width: 100%;
   height: 100%;
-  cursor: pointer;
 
   h4 {
     margin: $space-small 0 0 $space-small;
@@ -372,6 +371,7 @@ li > p {
 .embed-preview-image {
   width: 100%;
   height: auto;
+  cursor: pointer;
 }
 
 .embed-html {
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index bbac8fad5..72c59c32b 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -6,9 +6,9 @@ import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `
   <ds-container width="small" class="embed-container">
-    <section @click.prevent="openOverlay()" class="embed-content">
-      <div v-if="!showPreviewImage" v-html="embedHtml" class="embed-html" />
-      <img v-else :src="embedImage" class="embed-preview-image" />
+    <section class="embed-content">
+      <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
+      <img v-else :src="embedImage" class="embed-preview-image" @click.prevent="openOverlay()" />
       <h4>{{embedTitle}}</h4>
       <p>{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
@@ -17,7 +17,7 @@ const template = `
       <h3>Achte auf deine Daten!</h3>
       <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
       <div class="embed-buttons">
-      <ds-button primary @click.prevent="allowEmbedTemporar('openIframe')">jetzt ansehen</ds-button>
+      <ds-button primary @click.prevent="allowEmbedTemporarily()">jetzt ansehen</ds-button>
       <ds-button ghost @click.prevent="closeOverlay()">Abbrechen</ds-button>
       </div>
       <label class="embed-checkbox">
@@ -85,10 +85,8 @@ export default class Embed extends Node {
       props: ['node', 'updateAttrs', 'options'],
       data: () => ({
         embedData: {},
-        showPreviewImage: true,
         showEmbed: null,
         showOverlay: false,
-        isOnlyLink: false,
       }),
       async created() {
         if (!this.options) return {}
@@ -101,18 +99,6 @@ export default class Embed extends Node {
         }),
         embedHtml() {
           const { html = '' } = this.embedData
-          if (this.embedData.html === null) {
-            this.isOnlyLink = true
-          }
-
-          if (this.showEmbed && !this.isOnlyLink) {
-            this.showPreviewImage = false
-          }
-
-          if (!this.showEmbed && this.isOnlyLink) {
-            this.showPreviewImage = true
-          }
-
           return html
         },
         embedImage() {
@@ -163,12 +149,8 @@ export default class Embed extends Node {
             this.submit(false)
           }
         },
-        allowEmbedTemporar(xx) {
-          if (!this.isOnlyLink) {
-            this.showEmbed = true
-          } else {
-            this.showEmbed = false
-          }
+        allowEmbedTemporarily() {
+          this.showEmbed = true
           this.closeOverlay()
         },
         async submit(allowEmbedIframes) {

From 3a013d0607580730d6cacdda9ffc7e76b2da5500 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 17:10:08 +0200
Subject: [PATCH 016/212] update settings on button click instead of checkbox
 click

---
 webapp/components/Editor/nodes/Embed.js | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 72c59c32b..1275fe3d2 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -17,11 +17,11 @@ const template = `
       <h3>Achte auf deine Daten!</h3>
       <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
       <div class="embed-buttons">
-      <ds-button primary @click.prevent="allowEmbedTemporarily()">jetzt ansehen</ds-button>
+      <ds-button primary @click.prevent="allowEmbed()">jetzt ansehen</ds-button>
       <ds-button ghost @click.prevent="closeOverlay()">Abbrechen</ds-button>
       </div>
       <label class="embed-checkbox">
-        <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" />
+        <input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />
         <span>Inhalte von Drittanbietern immer zulassen</span>
       </label>
     </aside>
@@ -85,13 +85,16 @@ export default class Embed extends Node {
       props: ['node', 'updateAttrs', 'options'],
       data: () => ({
         embedData: {},
-        showEmbed: null,
+        checkedAlwaysAllowEmbeds: false,
+        showEmbed: false,
         showOverlay: false,
       }),
       async created() {
-        if (!this.options) return {}
-        this.embedData = await this.options.onEmbed({ url: this.dataEmbedUrl })
-        this.showEmbed = this.currentUser.allowEmbedIframes
+        if (this.options) {
+          this.embedData = await this.options.onEmbed({ url: this.dataEmbedUrl })
+          this.showEmbed = this.currentUser.allowEmbedIframes
+          this.checkedAlwaysAllowEmbeds = this.currentUser.allowEmbedIframes
+        }
       },
       computed: {
         ...mapGetters({
@@ -142,18 +145,15 @@ export default class Embed extends Node {
         closeOverlay() {
           this.showOverlay = false
         },
-        check(e) {
-          if (e.target.checked) {
-            this.submit(true)
-          } else {
-            this.submit(false)
-          }
-        },
-        allowEmbedTemporarily() {
+        allowEmbed() {
           this.showEmbed = true
           this.closeOverlay()
+
+          if (this.checkedAlwaysAllowEmbeds !== this.currentUser.allowEmbedIframes) {
+            this.updateEmbedSettings(this.checkedAlwaysAllowEmbeds)
+          }
         },
-        async submit(allowEmbedIframes) {
+        async updateEmbedSettings(allowEmbedIframes) {
           try {
             await this.$apollo.mutate({
               mutation: allowEmbedIframesMutation(),

From 6ad9dc27e937eb263914846c073172906aa661e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 2 Oct 2019 17:25:17 +0200
Subject: [PATCH 017/212] Write and refactor backend test which are supposed to
 fail at first

Implemented the new properties in the GraphQL schema.
---
 backend/src/schema/resolvers/reports.spec.js | 302 ++++++++++---------
 backend/src/schema/types/schema.gql          |   2 +-
 webapp/components/Modal/ReportModal.vue      |  20 +-
 3 files changed, 176 insertions(+), 148 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 512d8d956..cfebbed81 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -7,7 +7,7 @@ const factory = Factory()
 const instance = neode()
 
 describe('report', () => {
-  let mutation
+  let reportMutation
   let headers
   let returnedObject
   let variables
@@ -16,9 +16,11 @@ describe('report', () => {
   const categoryIds = ['cat9']
 
   beforeEach(async () => {
-    returnedObject = '{ description }'
+    returnedObject = '{ id }'
     variables = {
       id: 'whatever',
+      reasonCategory: 'reason-category-dummy',
+      description: 'Violates code of conduct !!!',
     }
     headers = {}
     user = await factory.create('User', {
@@ -45,54 +47,69 @@ describe('report', () => {
 
   let client
   const action = () => {
-    mutation = `
-      mutation($id: ID!) {
-        report(
-          id: $id,
-          description: "Violates code of conduct"
-        ) ${returnedObject}
+    // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
+    reportMutation = `
+      mutation($id: ID!, $reasonCategory: String!, $description: String!) {
+        report( id: $id, reasonCategory: $reasonCategory, description: $description) ${returnedObject}
       }
     `
     client = new GraphQLClient(host, {
       headers,
     })
-    return client.request(mutation, variables)
+    return client.request(reportMutation, variables)
   }
 
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       await expect(action()).rejects.toThrow('Not Authorised')
     })
+  })
 
-    describe('authenticated', () => {
-      beforeEach(async () => {
-        headers = await login({
-          email: 'test@example.org',
-          password: '1234',
+  describe('authenticated', () => {
+    beforeEach(async () => {
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+    })
+
+    describe('invalid resource id', () => {
+      it('returns null', async () => {
+        await expect(action()).resolves.toEqual({
+          report: null,
         })
       })
+    })
 
-      describe('invalid resource id', () => {
-        it('returns null', async () => {
-          await expect(action()).resolves.toEqual({
-            report: null,
-          })
-        })
-      })
-
-      describe('valid resource id', () => {
+    describe('valid resource id', () => {
+      describe('reported resource is a user', () => {
         beforeEach(async () => {
           variables = {
+            ...variables,
             id: 'u2',
           }
         })
-        /*
-                it('creates a report', async () => {
-                  await expect(action()).resolves.toEqual({
-                    type: null,
-                  })
-                })
-        */
+
+        it('returns type "User"', async () => {
+          returnedObject = '{ type }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              type: 'User',
+            },
+          })
+        })
+
+        it('returns resource in user attribute', async () => {
+          returnedObject = '{ user { name } }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              user: {
+                name: 'abusive-user',
+              },
+            },
+          })
+        })
+
         it('returns the submitter', async () => {
           returnedObject = '{ submitter { email } }'
           await expect(action()).resolves.toEqual({
@@ -104,138 +121,145 @@ describe('report', () => {
           })
         })
 
-        describe('reported resource is a user', () => {
-          it('returns type "User"', async () => {
-            returnedObject = '{ type }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                type: 'User',
-              },
-            })
-          })
-
-          it('returns resource in user attribute', async () => {
-            returnedObject = '{ user { name } }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                user: {
-                  name: 'abusive-user',
-                },
-              },
-            })
+        it('returns the reason category', async () => {
+          variables = {
+            ...variables,
+            reasonCategory: 'my-category',
+          }
+          returnedObject = '{ reasonCategory }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              reasonCategory: 'my-category',
+            },
           })
         })
 
-        describe('reported resource is a post', () => {
-          beforeEach(async () => {
-            await factory.create('Post', {
-              author: user,
-              id: 'p23',
-              title: 'Matt and Robert having a pair-programming',
-              categoryIds,
-            })
-            variables = {
-              id: 'p23',
-            }
+        it('returns the reason description', async () => {
+          variables = {
+            ...variables,
+            description: 'My reason!',
+          }
+          returnedObject = '{ description }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              description: 'My reason!',
+            },
           })
+        })
+      })
 
-          it('returns type "Post"', async () => {
-            returnedObject = '{ type }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                type: 'Post',
-              },
-            })
+      describe('reported resource is a post', () => {
+        beforeEach(async () => {
+          await factory.create('Post', {
+            author: user,
+            id: 'p23',
+            title: 'Matt and Robert having a pair-programming',
+            categoryIds,
           })
+          variables = {
+            ...variables,
+            id: 'p23',
+          }
+        })
 
-          it('returns resource in post attribute', async () => {
-            returnedObject = '{ post { title } }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                post: {
-                  title: 'Matt and Robert having a pair-programming',
-                },
-              },
-            })
-          })
-
-          it('returns null in user attribute', async () => {
-            returnedObject = '{ user { name } }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                user: null,
-              },
-            })
+        it('returns type "Post"', async () => {
+          returnedObject = '{ type }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              type: 'Post',
+            },
           })
         })
 
-        /* An der Stelle würde ich den p23 noch mal prüfen, diesmal muss aber eine error meldung kommen.
+        it('returns resource in post attribute', async () => {
+          returnedObject = '{ post { title } }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              post: {
+                title: 'Matt and Robert having a pair-programming',
+              },
+            },
+          })
+        })
+
+        it('returns null in user attribute', async () => {
+          returnedObject = '{ user { name } }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              user: null,
+            },
+          })
+        })
+      })
+
+      /* An der Stelle würde ich den p23 noch mal prüfen, diesmal muss aber eine error meldung kommen.
            At this point I would check the p23 again, but this time there must be an error message. */
 
-        describe('reported resource is a comment', () => {
-          beforeEach(async () => {
-            createPostVariables = {
-              id: 'p1',
-              title: 'post to comment on',
-              content: 'please comment on me',
-              categoryIds,
-            }
-            await factory.create('Post', { ...createPostVariables, author: user })
-            await factory.create('Comment', {
-              author: user,
-              postId: 'p1',
-              id: 'c34',
-              content: 'Robert getting tired.',
-            })
-            variables = {
-              id: 'c34',
-            }
+      describe('reported resource is a comment', () => {
+        beforeEach(async () => {
+          createPostVariables = {
+            id: 'p1',
+            title: 'post to comment on',
+            content: 'please comment on me',
+            categoryIds,
+          }
+          await factory.create('Post', { ...createPostVariables, author: user })
+          await factory.create('Comment', {
+            author: user,
+            postId: 'p1',
+            id: 'c34',
+            content: 'Robert getting tired.',
           })
+          variables = {
+            ...variables,
+            id: 'c34',
+          }
+        })
 
-          it('returns type "Comment"', async () => {
-            returnedObject = '{ type }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                type: 'Comment',
-              },
-            })
-          })
-
-          it('returns resource in comment attribute', async () => {
-            returnedObject = '{ comment { content } }'
-            await expect(action()).resolves.toEqual({
-              report: {
-                comment: {
-                  content: 'Robert getting tired.',
-                },
-              },
-            })
+        it('returns type "Comment"', async () => {
+          returnedObject = '{ type }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              type: 'Comment',
+            },
           })
         })
 
-        /* An der Stelle würde ich den c34 noch mal prüfen, diesmal muss aber eine error meldung kommen.
+        it('returns resource in comment attribute', async () => {
+          returnedObject = '{ comment { content } }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              comment: {
+                content: 'Robert getting tired.',
+              },
+            },
+          })
+        })
+      })
+
+      /* An der Stelle würde ich den c34 noch mal prüfen, diesmal muss aber eine error meldung kommen.
            At this point I would check the c34 again, but this time there must be an error message. */
 
-        describe('reported resource is a tag', () => {
-          beforeEach(async () => {
-            await factory.create('Tag', {
-              id: 't23',
-            })
-            variables = {
-              id: 't23',
-            }
-          })
-
-          it('returns null', async () => {
-            await expect(action()).resolves.toEqual({
-              report: null,
-            })
+      describe('reported resource is a tag', () => {
+        beforeEach(async () => {
+          await factory.create('Tag', {
+            id: 't23',
           })
+          variables = {
+            ...variables,
+            id: 't23',
+          }
         })
 
-        /* An der Stelle würde ich den t23 noch mal prüfen, diesmal muss aber eine error meldung kommen.
-           At this point I would check the t23 again, but this time there must be an error message. */
+        it('returns null', async () => {
+          await expect(action()).resolves.toEqual({
+            report: null,
+          })
+        })
       })
+
+      /* An der Stelle würde ich den t23 noch mal prüfen, diesmal muss aber eine error meldung kommen.
+           At this point I would check the t23 again, but this time there must be an error message. */
     })
   })
 })
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 06d0e061b..0adb72d85 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -24,7 +24,7 @@ type Mutation {
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
-  report(id: ID!, description: String): Report
+  report(id: ID!, reasonCategory: String!, description: String!): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
   # Shout the given Type and ID
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index f8c790889..a55c12f42 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -93,10 +93,10 @@ export default {
       'other',
     ]
     let reasonCategoryOptions = []
-    valuesReasonCategoryOptions.forEach((categoryId, index) => {
+    valuesReasonCategoryOptions.forEach((reasonCategory, index) => {
       reasonCategoryOptions[index] = {
-        label: this.$t('report.reason.category.options.' + categoryId),
-        value: categoryId,
+        label: this.$t('report.reason.category.options.' + reasonCategory),
+        value: reasonCategory,
       }
     })
 
@@ -165,8 +165,8 @@ export default {
     },
     async confirm() {
       const { reasonCategory, reasonAddText } = this.form
-      console.log('reasonCategory: ', reasonCategory)
-      console.log('reasonAddText: ', reasonAddText)
+      // Wolle console.log('reasonCategory: ', reasonCategory.value)
+      // Wolle console.log('reasonAddText: ', reasonAddText)
 
       this.loading = true
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
@@ -174,13 +174,17 @@ export default {
       this.$apollo
         .mutate({
           mutation: gql`
-            mutation($id: ID!) {
-              report(id: $id) {
+            mutation($id: ID!, $reasonCategory: String!, $description: String!) {
+              report(id: $id, reasonCategory: $reasonCategory, description: $description) {
                 id
               }
             }
           `,
-          variables: { id: this.id },
+          variables: {
+            id: this.id,
+            reasonCategory: reasonCategory.value,
+            description: reasonAddText,
+          },
         })
         .then(({ _data }) => {
           this.success = true

From 1f93c690beee31713002c0451936eca555260356 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 18:05:29 +0200
Subject: [PATCH 018/212] only display available data

---
 webapp/components/Editor/Editor.vue     |  7 +++++++
 webapp/components/Editor/nodes/Embed.js | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 0f96607ee..2b65131a8 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -406,4 +406,11 @@ li > p {
     margin-right: $space-small;
   }
 }
+
+.embed-close-button {
+  position: absolute;
+  top: $space-x-small;
+  right: $space-x-small;
+  background-color: rgba(250, 249, 250, 0.6);
+}
 </style>
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 1275fe3d2..fb24eadd1 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -8,9 +8,9 @@ const template = `
   <ds-container width="small" class="embed-container">
     <section class="embed-content">
       <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
-      <img v-else :src="embedImage" class="embed-preview-image" @click.prevent="openOverlay()" />
-      <h4>{{embedTitle}}</h4>
-      <p>{{embedDescription}}</p>
+      <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" @click.prevent="openOverlay()" />
+      <h4 v-if="embedTitle">{{embedTitle}}</h4>
+      <p v-if="embedDescription">{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
     </section>
     <aside v-if="showOverlay" class="embed-overlay">
@@ -25,6 +25,7 @@ const template = `
         <span>Inhalte von Drittanbietern immer zulassen</span>
       </label>
     </aside>
+    <ds-button icon="close" ghost size="small" class="embed-close-button" @click.prevent="removeEmbed()" />
   </ds-container>
 `
 
@@ -153,6 +154,10 @@ export default class Embed extends Node {
             this.updateEmbedSettings(this.checkedAlwaysAllowEmbeds)
           }
         },
+        removeEmbed() {
+          // TODO: replace the whole Embed with a proper Link node
+          console.log('I want to be a Link!')
+        },
         async updateEmbedSettings(allowEmbedIframes) {
           try {
             await this.$apollo.mutate({

From 4a1ca2610aedd5503740e0415ea5fc95105f6854 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 18:23:30 +0200
Subject: [PATCH 019/212] show overlay only for embedded html

---
 webapp/components/Editor/Editor.vue     | 3 +++
 webapp/components/Editor/nodes/Embed.js | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 2b65131a8..6ab4a0db6 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -371,6 +371,9 @@ li > p {
 .embed-preview-image {
   width: 100%;
   height: auto;
+}
+
+.embed-preview-image--clickable {
   cursor: pointer;
 }
 
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index fb24eadd1..6e3449e38 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -8,7 +8,10 @@ const template = `
   <ds-container width="small" class="embed-container">
     <section class="embed-content">
       <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
-      <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" @click.prevent="openOverlay()" />
+      <template v-else>
+        <img v-if="embedHtml && embedImage" :src="embedImage" class="embed-preview-image embed-preview-image--clickable" @click.prevent="openOverlay()" />
+        <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" />
+      </template>
       <h4 v-if="embedTitle">{{embedTitle}}</h4>
       <p v-if="embedDescription">{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>

From ad7f5e34f72f7586b639715ce7f383ecef2753eb Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 2 Oct 2019 23:12:34 +0200
Subject: [PATCH 020/212] remove language toggle from email template

---
 .../email/templates/emailVerification.html    |  4 --
 .../middleware/email/templates/layout.html    | 62 +------------------
 .../email/templates/resetPassword.html        |  4 --
 .../middleware/email/templates/signup.html    |  4 --
 .../email/templates/wrongAccount.html         |  4 --
 5 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html
index e185beb53..5b5564ebf 100644
--- a/backend/src/middleware/email/templates/emailVerification.html
+++ b/backend/src/middleware/email/templates/emailVerification.html
@@ -1,10 +1,6 @@
 <!-- Email Body German : BEGIN -->
 <table class="email-german" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
   style="margin: auto;">
-  <tr>
-    <td style="padding: 20px 0; text-align: center">
-    </td>
-  </tr>
 
   <!-- Hero Image, Flush : BEGIN -->
   <tr>
diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html
index 014288229..7e1c39ace 100644
--- a/backend/src/middleware/email/templates/layout.html
+++ b/backend/src/middleware/email/templates/layout.html
@@ -142,60 +142,6 @@
       }
     }
   </style>
-
-  <!-- LANGUAGE TOGGLE -->
-  <style>
-    .toggle+label {
-      display: inline-block;
-      height: 40px;
-      padding: 0 12px;
-      margin-top: 40px;
-      line-height: 38px;
-      font-family: Lato, sans-serif;
-      font-size: 16px;
-      border: 1px solid #cbc7d1;
-      cursor: pointer;
-    }
-
-    .toggle+label:hover {
-      background-color: #bee876;
-    }
-
-    .toggle:checked+label {
-      background-color: #19c243;
-      color: white;
-    }
-
-    .toggle-english+label {
-      border-bottom-right-radius: 50px;
-      border-top-right-radius: 50px;
-      border-left: none;
-      margin-left: -2px;
-    }
-
-    .toggle-german+label {
-      border-bottom-left-radius: 50px;
-      border-top-left-radius: 50px;
-      border-right: none;
-      margin-right: -2px;
-    }
-
-    .toggle-german:checked~table.email-german {
-      display: block;
-    }
-
-    .toggle-german:checked~table.email-english {
-      display: none;
-    }
-
-    .toggle-english:checked~table.email-english {
-      display: block;
-    }
-
-    .toggle-english:checked~table.email-german {
-      display: none;
-    }
-  </style>
 </head>
 
 <body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f5f4f6;">
@@ -213,13 +159,7 @@
             <td>
       <![endif]-->
 
-      <!-- LANGUAGE TOGGLE -->
-      <input type="radio" name="language" class="toggle toggle-german" style="display: none;" id="toggle-german"
-        checked="checked">
-      <label for="toggle-german">Deutsch</label>
-      <input type="radio" name="language" class="toggle toggle-english" style="display:none;" id="toggle-english">
-      <label for="toggle-english">English</label>
-      <p style="margin: 0;"></p>
+      <p style="color:#19c243; font-style: italic; font-family: Lato, sans-serif; font-size: 16px; padding-top: 20px;">English version below!</p>
 
       {{> content}}
 
diff --git a/backend/src/middleware/email/templates/resetPassword.html b/backend/src/middleware/email/templates/resetPassword.html
index ff8be01f2..768051070 100644
--- a/backend/src/middleware/email/templates/resetPassword.html
+++ b/backend/src/middleware/email/templates/resetPassword.html
@@ -1,10 +1,6 @@
 <!-- Email Body German : BEGIN -->
 <table class="email-german" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
   style="margin: auto;">
-  <tr>
-    <td style="padding: 20px 0; text-align: center">
-    </td>
-  </tr>
 
   <!-- Hero Image, Flush : BEGIN -->
   <tr>
diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html
index 4d875ff57..79894b584 100644
--- a/backend/src/middleware/email/templates/signup.html
+++ b/backend/src/middleware/email/templates/signup.html
@@ -1,10 +1,6 @@
 <!-- Email Body German : BEGIN -->
 <table class="email-german" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
   style="margin: auto;">
-  <tr>
-    <td style="padding: 20px 0; text-align: center">
-    </td>
-  </tr>
 
   <!-- Hero Image, Flush : BEGIN -->
   <tr>
diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html
index 3cea69c4f..90f8cd357 100644
--- a/backend/src/middleware/email/templates/wrongAccount.html
+++ b/backend/src/middleware/email/templates/wrongAccount.html
@@ -1,10 +1,6 @@
 <!-- Email Body German : BEGIN -->
 <table class="email-german" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
   style="margin: auto;">
-  <tr>
-    <td style="padding: 20px 0; text-align: center">
-    </td>
-  </tr>
 
   <!-- Hero Image, Flush : BEGIN -->
   <tr>

From 6b6e031b2c749ea6ac2c83e34c466a7972749d6e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2019 05:20:23 +0000
Subject: [PATCH 021/212] build(deps-dev): bump cross-env from 6.0.2 to 6.0.3

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c546dfa21..62020c4e4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "bcryptjs": "^2.4.3",
     "codecov": "^3.6.1",
-    "cross-env": "^6.0.2",
+    "cross-env": "^6.0.3",
     "cypress": "^3.4.1",
     "cypress-cucumber-preprocessor": "^1.16.0",
     "cypress-file-upload": "^3.3.4",
diff --git a/yarn.lock b/yarn.lock
index 90581a2c8..e5b36f7f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -740,7 +740,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
+"@babel/runtime@^7.5.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
@@ -1772,12 +1772,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.2.tgz#2ec3c4b9b90cc074fed375415fc229cb7d6ce612"
-  integrity sha512-lA44HlqWCzrv7/l2pY3sfLDvMhXXhx8oztvD6rg34PdCIcP0yk77UwOL2nacsZXlrzPUMtbfagVbK6Itx8pwng==
+cross-env@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
+  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
   dependencies:
-    "@babel/runtime" "^7.6.2"
     cross-spawn "^7.0.0"
 
 cross-fetch@2.2.2:

From a6309aeb70aead99bbae24ebdf5beff31ec39ed4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2019 05:21:23 +0000
Subject: [PATCH 022/212] build(deps): bump @hapi/joi from 16.1.4 to 16.1.5 in
 /backend

Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.4 to 16.1.5.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.4...v16.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 4cebba408..b7e52eb8a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,7 +41,7 @@
     ]
   },
   "dependencies": {
-    "@hapi/joi": "^16.1.4",
+    "@hapi/joi": "^16.1.5",
     "@sentry/node": "^5.6.2",
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index d3f9b12fd..6b11cb1d7 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -766,10 +766,10 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/joi@^16.1.4":
-  version "16.1.4"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.4.tgz#b039fe474a0ab838c1a90620c53a208fcef75d99"
-  integrity sha512-m7ctezhxjob+dSpXnCNlgAj6rrEpdSsaWu3GWL3g1AybQCU36mlAo9IwGFJwIxD+oHgdO6mYyviYlaejX+qN6g==
+"@hapi/joi@^16.1.5":
+  version "16.1.5"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.5.tgz#06bdfec1084f46bff6be8f6b4076d8314c81cea2"
+  integrity sha512-FnVe0t1YQbF0H4fhFM6qBL7lIP4wdVHdFFBkloxgCkpKKdaCB6Z2UaNI0UalaDRHbRM9BvfTfyUKJg7tGtBSXg==
   dependencies:
     "@hapi/address" "^2.1.2"
     "@hapi/formula" "^1.2.0"

From 7fd4899797cf6b421a9184166caea6874ed13eb1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2019 05:21:55 +0000
Subject: [PATCH 023/212] build(deps): bump cross-env from 6.0.2 to 6.0.3 in
 /webapp

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index eda2b14bf..d4a453b95 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
     "cookie-universal-nuxt": "~2.0.18",
-    "cross-env": "~6.0.2",
+    "cross-env": "~6.0.3",
     "date-fns": "2.4.1",
     "express": "~4.17.1",
     "graphql": "~14.5.8",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 29069e8d8..18ebe84c7 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -767,14 +767,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
-  integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.5.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
@@ -5551,12 +5544,11 @@ create-react-context@^0.2.1:
     fbjs "^0.8.0"
     gud "^1.0.0"
 
-cross-env@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.2.tgz#2ec3c4b9b90cc074fed375415fc229cb7d6ce612"
-  integrity sha512-lA44HlqWCzrv7/l2pY3sfLDvMhXXhx8oztvD6rg34PdCIcP0yk77UwOL2nacsZXlrzPUMtbfagVbK6Itx8pwng==
+cross-env@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
+  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
   dependencies:
-    "@babel/runtime" "^7.6.2"
     cross-spawn "^7.0.0"
 
 cross-fetch@^3.0.4:

From 3607bf955154e6286f043972a8c9fd2e4ceae7df Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 3 Oct 2019 09:20:17 +0200
Subject: [PATCH 024/212] befor alinas work

---
 webapp/components/Editor/nodes/Embed.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 4be49ee0c..b2a8ffec8 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -5,16 +5,14 @@ import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = `  
-    <a  class="embed" href="" style="cursor: none">
-      <ds-container width="small">
+    <a  class="embed" href="" style="cursor: none"> 
         <ds-section secondary v-if="showOverlay"  style="height: 270px;width:80%;position:absolute;z-index:3">
           <ds-text v-if="!isOnlyLink">Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
           <ds-text v-else >Du verlässt jetzt Human Connection! Du wirst zu ({{embedPublisher}}) weitergeleitet!</ds-text>
           <ds-button v-if="!isOnlyLink" size="x-large" @click.prevent="allowEmbedTemporar('openIframe')" >jetzt ansehen</ds-button>
           <ds-button  v-else size="x-large" > <a :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank" >Webseite aufrufen   </a>  </ds-button>
           <p v-show="!isOnlyLink">      
-          <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />
-      
+          <input type="checkbox" v-model="currentUser.allowEmbedIframes" @click.prevent="check($event)" id="dataEmbedUrl" />      
             <lable v-if="!currentUser.allowEmbedIframes" for="dataEmbedUrl" size="small">
               automatisches Einbinden <b>zulassen?</b> |
             </lable>
@@ -26,12 +24,11 @@ const template = `
         <img  v-show="showPreviewImage" style="cursor: pointer"  :src="embedImage" alt="dataEmbedUrl"  @click.prevent="clickPreview" height="270" width="auto" />
          <div v-show="!showPreviewImage" v-html="embedHtml" />
         <p style="color:black">
-        <div >{{ embedTitle }}</div>
+        <div>{{ embedTitle }}</div>
         <div>{{ embedDescription }}</div>
-        <a  :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
+        <a @click.prevent="clickPreview" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank"  >
           <em> {{ dataEmbedUrl }} </em>
-        </a>
-      </ds-container>
+        </a>      
     </a>
 `
 
@@ -39,7 +36,7 @@ const compiledTemplate = compileToFunctions(template)
 
 export default class Embed extends Node {
   get name() {
-    return 'embedUrl'
+    return 'embed'
   }
 
   get defaultOptions() {
@@ -96,6 +93,7 @@ export default class Embed extends Node {
         showEmbed: null,
         showOverlay: null,
         isOnlyLink: false,
+        findimg: null,
       }),
       async created() {
         if (!this.options) return {}

From 6f1c5e3efa3b77e72172592a0b5e4ea52158e642 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 11:04:23 +0200
Subject: [PATCH 025/212] Set hasMore to false when returned Posts are equal to
 pageSize

- this was causing bugs on User profile page, and saves a database call
---
 backend/src/seed/seed-db.js        | 92 ++++++++++++++++--------------
 webapp/pages/index.vue             |  4 +-
 webapp/pages/profile/_id/_slug.vue |  2 +-
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 8c87a3214..de4628891 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -24,10 +24,8 @@ import { gql } from '../jest/helpers'
     })
     const { mutate } = createTestClient(server)
 
-    const f = Factory()
-
     const [Hamburg, Berlin, Germany, Paris, France] = await Promise.all([
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.5127278006398860',
         name: 'Hamburg',
         type: 'region',
@@ -42,7 +40,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Hamburg',
         namePL: 'Hamburg',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.14880313158564380',
         type: 'region',
         name: 'Berlin',
@@ -57,7 +55,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Berlijn',
         namePL: 'Berlin',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'country.10743216036480410',
         name: 'Germany',
         type: 'country',
@@ -70,7 +68,7 @@ import { gql } from '../jest/helpers'
         nameIT: 'Germania',
         nameEN: 'Germany',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.9397217726497330',
         name: 'Paris',
         type: 'region',
@@ -85,7 +83,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Parijs',
         namePL: 'Paryż',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'country.9759535382641660',
         name: 'France',
         type: 'country',
@@ -106,27 +104,27 @@ import { gql } from '../jest/helpers'
     ])
 
     const [racoon, rabbit, wolf, bear, turtle, rhino] = await Promise.all([
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_racoon',
         icon: '/img/badges/indiegogo_en_racoon.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_rabbit',
         icon: '/img/badges/indiegogo_en_rabbit.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_wolf',
-        icon: '/img/badges/indiegogo_en_wolf.svg',
+        icon: '/img/badges/indiegogo_en_wolfactory.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_bear',
         icon: '/img/badges/indiegogo_en_bear.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_turtle',
         icon: '/img/badges/indiegogo_en_turtle.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_rhino',
         icon: '/img/badges/indiegogo_en_rhino.svg',
       }),
@@ -141,49 +139,49 @@ import { gql } from '../jest/helpers'
       louie,
       dagobert,
     ] = await Promise.all([
-      f.create('User', {
+      factory.create('User', {
         id: 'u1',
         name: 'Peter Lustig',
         slug: 'peter-lustig',
         role: 'admin',
         email: 'admin@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u2',
         name: 'Bob der Baumeister',
         slug: 'bob-der-baumeister',
         role: 'moderator',
         email: 'moderator@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u3',
         name: 'Jenny Rostock',
         slug: 'jenny-rostock',
         role: 'user',
         email: 'user@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u4',
         name: 'Huey',
         slug: 'huey',
         role: 'user',
         email: 'huey@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u5',
         name: 'Dewey',
         slug: 'dewey',
         role: 'user',
         email: 'dewey@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u6',
         name: 'Louie',
         slug: 'louie',
         role: 'user',
         email: 'louie@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u7',
         name: 'Dagobert',
         slug: 'dagobert',
@@ -226,97 +224,97 @@ import { gql } from '../jest/helpers'
     ])
 
     await Promise.all([
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat1',
         name: 'Just For Fun',
         slug: 'just-for-fun',
         icon: 'smile',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat2',
         name: 'Happiness & Values',
         slug: 'happiness-values',
         icon: 'heart-o',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat3',
         name: 'Health & Wellbeing',
         slug: 'health-wellbeing',
         icon: 'medkit',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat4',
         name: 'Environment & Nature',
         slug: 'environment-nature',
         icon: 'tree',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat5',
         name: 'Animal Protection',
         slug: 'animal-protection',
         icon: 'paw',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat6',
         name: 'Human Rights & Justice',
         slug: 'human-rights-justice',
         icon: 'balance-scale',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat7',
         name: 'Education & Sciences',
         slug: 'education-sciences',
         icon: 'graduation-cap',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat8',
         name: 'Cooperation & Development',
         slug: 'cooperation-development',
         icon: 'users',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat9',
         name: 'Democracy & Politics',
         slug: 'democracy-politics',
         icon: 'university',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat10',
         name: 'Economy & Finances',
         slug: 'economy-finances',
         icon: 'money',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat11',
         name: 'Energy & Technology',
         slug: 'energy-technology',
         icon: 'flash',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat12',
         name: 'IT, Internet & Data Privacy',
         slug: 'it-internet-data-privacy',
         icon: 'mouse-pointer',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat13',
         name: 'Art, Culture & Sport',
         slug: 'art-culture-sport',
         icon: 'paint-brush',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat14',
         name: 'Freedom of Speech',
         slug: 'freedom-of-speech',
         icon: 'bullhorn',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat15',
         name: 'Consumption & Sustainability',
         slug: 'consumption-sustainability',
         icon: 'shopping-cart',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat16',
         name: 'Global Peace & Nonviolence',
         slug: 'global-peace-nonviolence',
@@ -325,16 +323,16 @@ import { gql } from '../jest/helpers'
     ])
 
     const [environment, nature, democracy, freedom] = await Promise.all([
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Environment',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Nature',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Democracy',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Freedom',
       }),
     ])
@@ -684,10 +682,18 @@ import { gql } from '../jest/helpers'
 
     await Promise.all(
       [...Array(30).keys()].map(i => {
-        return f.create('User')
+        return factory.create('User')
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(30).keys()].map(() => {
+        return factory.create('Post', {
+          author: jennyRostock,
+          image: faker.image.unsplash.objects(),
+        })
       }),
     )
-
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     process.exit(0)
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 31e07f382..d41e7d440 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -50,7 +50,7 @@
       :infinite-scroll-throttle-delay="800"
       :infinite-scroll-immediate-check="true"
     >
-      <hc-load-more v-if="true" :loading="$apollo.loading" @click="showMoreContributions" />
+      <hc-load-more :loading="$apollo.loading" @click="showMoreContributions" />
     </div>
   </div>
 </template>
@@ -151,7 +151,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 29a94022d..8879190f5 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -385,7 +385,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {

From af803ce0e63f9e20e4db1e0e0d54bd2bdc48e446 Mon Sep 17 00:00:00 2001
From: Vasily Belolapotkov <belolapotkov.v@gmail.com>
Date: Thu, 3 Oct 2019 12:54:04 +0300
Subject: [PATCH 026/212] fix invites count calculation for admin dashboard

---
 backend/src/schema/resolvers/statistics.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/statistics.js b/backend/src/schema/resolvers/statistics.js
index 466c1ef70..cae29f40c 100644
--- a/backend/src/schema/resolvers/statistics.js
+++ b/backend/src/schema/resolvers/statistics.js
@@ -9,7 +9,7 @@ export default {
           countPosts: 'Post',
           countComments: 'Comment',
           countNotifications: 'NOTIFIED',
-          countInvites: 'InvitationCode',
+          countEmails: 'EmailAddress',
           countFollows: 'FOLLOWS',
           countShouts: 'SHOUTED',
         }
@@ -28,6 +28,11 @@ export default {
           const stat = statistics[mapping[key]]
           response[key] = stat ? stat.toNumber() : 0
         })
+
+        /*
+        * Note: invites count is calculated this way because invitation codes are not in use yet
+        */
+        response.countInvites = response.countEmails - response.countUsers
       } finally {
         session.close()
       }

From a5e3c52e1d9e1da77177ae2e45c5f4d3e4ea7f8c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 12:01:04 +0200
Subject: [PATCH 027/212] Show that a Post/Comment has been edited

---
 webapp/components/Comment/Comment.vue | 43 +++++++++++++++++++--------
 webapp/graphql/CommentMutations.js    |  2 ++
 webapp/graphql/Fragments.js           |  2 ++
 webapp/locales/de.json                | 10 ++++---
 webapp/locales/en.json                |  6 ++--
 webapp/locales/pt.json                | 22 +++++++++++---
 webapp/pages/post/_id/_slug/index.vue | 33 +++++++++++++-------
 7 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index 31bbc811f..6fc076c7b 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -12,20 +12,33 @@
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card :id="anchor">
       <ds-space margin-bottom="small" margin-top="small">
-        <hc-user :user="author" :date-time="comment.createdAt" />
+        <ds-flex>
+          <ds-flex-item width="40%">
+            <hc-user :user="author" :date-time="comment.createdAt" />
+          </ds-flex-item>
+          <ds-flex-item>
+            <ds-text v-if="comment.createdAt !== comment.updatedAt" color="softer" class="italics">
+              {{ this.$t('comment.edited') }}
+            </ds-text>
+          </ds-flex-item>
+          <ds-flex-item>
+            <ds-space margin-top="base">
+              <client-only>
+                <content-menu
+                  v-show="!openEditCommentMenu"
+                  placement="bottom-end"
+                  resource-type="comment"
+                  :resource="comment"
+                  :modalsData="menuModalsData"
+                  class="float-right"
+                  :is-owner="isAuthor(author.id)"
+                  @showEditCommentMenu="editCommentMenu"
+                />
+              </client-only>
+            </ds-space>
+          </ds-flex-item>
+        </ds-flex>
         <!-- Content Menu (can open Modals) -->
-        <client-only>
-          <content-menu
-            v-show="!openEditCommentMenu"
-            placement="bottom-end"
-            resource-type="comment"
-            :resource="comment"
-            :modalsData="menuModalsData"
-            class="float-right"
-            :is-owner="isAuthor(author.id)"
-            @showEditCommentMenu="editCommentMenu"
-          />
-        </client-only>
       </ds-space>
       <div v-if="openEditCommentMenu">
         <hc-comment-form
@@ -199,4 +212,8 @@ span.show-more-or-less {
   margin: 0px 20px;
   cursor: pointer;
 }
+
+.ds-text.italics {
+  font-style: italic;
+}
 </style>
diff --git a/webapp/graphql/CommentMutations.js b/webapp/graphql/CommentMutations.js
index dd8d1d3a0..133b61f18 100644
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@@ -10,6 +10,7 @@ export default i18n => {
           contentExcerpt
           content
           createdAt
+          updatedAt
           disabled
           deleted
           author {
@@ -39,6 +40,7 @@ export default i18n => {
           contentExcerpt
           content
           createdAt
+          updatedAt
           disabled
           deleted
           author {
diff --git a/webapp/graphql/Fragments.js b/webapp/graphql/Fragments.js
index e50d4bbe1..e0c6e699e 100644
--- a/webapp/graphql/Fragments.js
+++ b/webapp/graphql/Fragments.js
@@ -40,6 +40,7 @@ export const postFragment = lang => gql`
     content
     contentExcerpt
     createdAt
+    updatedAt
     disabled
     deleted
     slug
@@ -64,6 +65,7 @@ export const commentFragment = lang => gql`
   fragment comment on Comment {
     id
     createdAt
+    updatedAt
     disabled
     deleted
     content
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c547e063f..b6ee3f320 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -2,7 +2,7 @@
   "maintenance": {
     "title": "Human Connection befindet sich in der Wartung",
     "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.",
-    "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an" 
+    "questions": "Bei Fragen oder Problemen erreichst du uns per E-Mail an"
   },
   "index": {
     "no-results": "Keine Beiträge gefunden.",
@@ -335,7 +335,8 @@
       "submit": "Kommentiere",
       "submitted": "Kommentar Gesendet",
       "updated": "Änderungen gespeichert"
-    }
+    },
+    "edited": "bearbeitet"
   },
   "comment": {
     "content": {
@@ -348,10 +349,11 @@
     "show": {
       "more": "mehr anzeigen",
       "less": "weniger anzeigen"
-    }
+    },
+    "edited": "bearbeitet"
   },
   "quotes": {
-    "african": {
+  "african": {
       "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
       "author": "Afrikanisches Sprichwort"
     }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 48fd36c0d..b243e39a3 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -336,7 +336,8 @@
       "submit": "Comment",
       "submitted": "Comment Submitted",
       "updated": "Changes Saved"
-    }
+    },
+    "edited": "edited"
   },
   "comment": {
     "content": {
@@ -349,7 +350,8 @@
     "show": {
       "more": "show more",
       "less": "show less"
-    }
+    },
+    "edited": "edited"
   },
   "quotes": {
     "african": {
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index d08d569c2..b43711998 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -118,7 +118,11 @@
     },
     "takeAction": {
       "name": "Tomar uma ação"
-    }
+    },
+    "comment": {
+      "submit": "Commentar"
+    },
+    "edited": "editado"
   },
   "quotes": {
     "african": {
@@ -202,8 +206,18 @@
     "delete": "Apagar Contribuição"
   },
   "comment": {
-    "edit": "Editar Comentário",
-    "delete": "Apagar Comentário"
+    "content": {
+      "unavailable-placeholder": "… este commenttário não está disponível"
+    },
+    "menu": {
+      "edit": "Editar Comentário",
+      "delete": "Apagar Comentário"
+    },
+    "show": {
+      "more": "mostrar mais",
+      "less": "mostrar menos"
+    },
+    "edited": "editado"
   },
   "followButton": {
     "follow": "Seguir",
@@ -212,4 +226,4 @@
   "shoutButton": {
     "shouted": "Aclamou"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0fda144d0..0c45c0ca3 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -6,17 +6,30 @@
       :class="{ 'post-card': true, 'disabled-content': post.disabled }"
     >
       <ds-space margin-bottom="small" />
-      <hc-user :user="post.author" :date-time="post.createdAt" />
+      <ds-flex>
+        <ds-flex-item width="40%">
+          <hc-user :user="post.author" :date-time="post.createdAt" />
+        </ds-flex-item>
+        <ds-flex-item>
+          <ds-text v-if="post.createdAt !== post.updatedAt" color="softer" class="italics">
+            {{ this.$t('post.edited') }}
+          </ds-text>
+        </ds-flex-item>
+        <ds-flex-item>
+          <ds-space margin-top="base">
+            <client-only>
+              <content-menu
+                placement="bottom-end"
+                resource-type="contribution"
+                :resource="post"
+                :modalsData="menuModalsData"
+                :is-owner="isAuthor(post.author ? post.author.id : null)"
+              />
+            </client-only>
+          </ds-space>
+        </ds-flex-item>
+      </ds-flex>
       <!-- Content Menu (can open Modals) -->
-      <client-only>
-        <content-menu
-          placement="bottom-end"
-          resource-type="contribution"
-          :resource="post"
-          :modalsData="menuModalsData"
-          :is-owner="isAuthor(post.author ? post.author.id : null)"
-        />
-      </client-only>
       <ds-space margin-bottom="small" />
       <ds-heading tag="h3" no-margin class="hyphenate-text">{{ post.title }}</ds-heading>
       <ds-space margin-bottom="small" />

From a6d86f78f4700428e0f4174315bca7a8dfb47220 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 12:04:07 +0200
Subject: [PATCH 028/212] Fix lint

---
 backend/src/seed/seed-db.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index de4628891..afdd6adef 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -685,7 +685,7 @@ import { gql } from '../jest/helpers'
         return factory.create('User')
       }),
     )
-    
+
     await Promise.all(
       [...Array(30).keys()].map(() => {
         return factory.create('Post', {

From eae19ca33d9d19851cc3d6337c31bff3927ec785 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Thu, 3 Oct 2019 14:31:39 +0300
Subject: [PATCH 029/212] Display user email for administrators

---
 webapp/pages/admin/users.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index e58b413aa..8797d6a22 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -33,6 +33,16 @@
             <b>{{ scope.row.name | truncate(20) }}</b>
           </nuxt-link>
         </template>
+        <template slot="email" slot-scope="scope">
+          <nuxt-link
+            :to="{
+              name: 'profile-id-slug',
+              params: { id: scope.row.id, slug: scope.row.slug },
+            }"
+          >
+            <b>{{ scope.row.email }}</b>
+          </nuxt-link>
+        </template>
         <template slot="slug" slot-scope="scope">
           <nuxt-link
             :to="{
@@ -128,6 +138,7 @@ export default {
               id
               name
               slug
+              email
               role
               createdAt
               contributionsCount

From b1573cc25aab22eb6876524ca096c271f10870ea Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 1 Oct 2019 14:35:17 +0200
Subject: [PATCH 030/212] Update neo4j to Enterprise edition

- accept license agreement
---
 docker-compose.yml | 1 +
 neo4j/Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e937feeed..c5ce3a20f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,6 +57,7 @@ services:
     environment:
       - NEO4J_AUTH=none
       - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
+      - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
     ports:
       - 7687:7687
       - 7474:7474
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index 597ed50b7..7c0e83ea7 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -1,4 +1,4 @@
-FROM neo4j:3.5.11
+FROM neo4j:3.5.11-enterprise
 LABEL Description="Neo4J database of the Social Network Human-Connection.org with preinstalled database constraints and indices" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
 
 ARG BUILD_COMMIT

From a02ad972d4a72250287019b9eff2000991b3a7a7 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 16:07:11 +0200
Subject: [PATCH 031/212] Add documentation for online backups/restoring after
 disaster

---
 .../volumes/neo4j-online-backup/README.md     | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 deployment/volumes/neo4j-online-backup/README.md

diff --git a/deployment/volumes/neo4j-online-backup/README.md b/deployment/volumes/neo4j-online-backup/README.md
new file mode 100644
index 000000000..f096c769f
--- /dev/null
+++ b/deployment/volumes/neo4j-online-backup/README.md
@@ -0,0 +1,57 @@
+# Backup (online)
+
+## Online backups are only avaible with a Neo4j Enterprise and a license, see https://neo4j.com/licensing/ for the different licenses available
+
+This tutorial explains how to carry out an online backup of your Neo4J
+database in a kubernetes cluster.
+
+One of the benefits of doing an online backup is that the Neo4j database does not need to be stopped, so there is no downtime. Read [the docs](https://neo4j.com/docs/operations-manual/current/backup/performing/)
+
+To use Neo4j Enterprise you must add this line to your configmap, if using, or your deployment `nitro-neo4j` env.
+
+```
+NEO4J_ACCEPT_LICENSE_AGREEMENT: "yes"
+```
+## Create a Backup in Kubernetes
+
+```sh
+# Backup the database with one command, this will get the nitro-neo4j pod, ssh into it, and run the backup command
+kubectl -n=human-connection exec -it $(kubectl -n=human-connection get pods | grep nitro-neo4j | awk '{ print $1 }') -- neo4j-admin backup --backup-dir=/var/lib/neo4j --name=neo4j-backup
+# Download the file from the pod to your computer.
+kubectl cp human-connection/$(kubectl -n=human-connection get pods | grep nitro-neo4j | awk '{ print $1 }'):/var/lib/neo4j/neo4j-backup ./neo4j-backup/
+```
+
+You should now have a backup of the database locally. If you want, you can simulate disaster recovery by sshing into the nitro-neo4j pod, deleting all data and restoring from backup
+
+## Disaster where database data is gone somehow
+
+```sh
+kubectl -n=human-connection exec -it $(kubectl -n=human-connection get pods | grep nitro-neo4j |awk '{ print $1 }') bash
+# Enter cypher-shell
+cypher-shell
+# Delete all data
+> MATCH (n) DETACH DELETE (n);
+
+exit
+```
+
+## Restore a backup in Kubernetes 
+
+Restoration must be done while the database is not running, see [our docs](https://docs.human-connection.org/human-connection/deployment/volumes/neo4j-offline-backup#stop-and-restart-neo-4-j-database-in-kubernetes) for how to stop the database, but keep the container running
+
+After, you have stopped the database, and have the pod running, you can restore the database by running these commands:
+
+```sh
+kubectl --namespace=human-connection get pods
+# Copy the ID of the pod running Neo4J.
+# Then upload your local backup to the pod. Note that once the pod gets deleted
+# e.g. if you change the deployment, the backup file is gone with it.
+kubectl cp ./neo4j-backup/ human-connection/<POD-ID>:/root/
+kubectl --namespace=human-connection exec -it <POD-ID> bash
+# Once you're in the pod restore the backup and overwrite the default database
+# called `graph.db` with `--force`.
+# This will delete all existing data in database `graph.db`!
+neo4j-admin restore --from=/root/neo4j-backup --force
+exit
+```
+Revert your changes to deployment `nitro-neo4j` which will restart the database.
\ No newline at end of file

From 976288d6259a6f4dd10f3c682d694f514a1cb798 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 16:39:32 +0200
Subject: [PATCH 032/212] Fix lint

---
 backend/src/schema/resolvers/statistics.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/statistics.js b/backend/src/schema/resolvers/statistics.js
index cae29f40c..7b06f8705 100644
--- a/backend/src/schema/resolvers/statistics.js
+++ b/backend/src/schema/resolvers/statistics.js
@@ -30,8 +30,8 @@ export default {
         })
 
         /*
-        * Note: invites count is calculated this way because invitation codes are not in use yet
-        */
+         * Note: invites count is calculated this way because invitation codes are not in use yet
+         */
         response.countInvites = response.countEmails - response.countUsers
       } finally {
         session.close()

From 57c3d949cf80b97785bc58289949d7170894d758 Mon Sep 17 00:00:00 2001
From: Ivy <yunjilim@gmail.com>
Date: Thu, 3 Oct 2019 13:08:06 -0700
Subject: [PATCH 033/212] fixes#1305 lastActiveAt

---
 backend/src/jwt/decode.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/jwt/decode.js b/backend/src/jwt/decode.js
index d022f3512..842f8f537 100644
--- a/backend/src/jwt/decode.js
+++ b/backend/src/jwt/decode.js
@@ -14,6 +14,7 @@ export default async (driver, authorizationHeader) => {
   const session = driver.session()
   const query = `
     MATCH (user:User {id: $id, deleted: false, disabled: false })
+    SET user.lastActiveAt = toString(datetime())
     RETURN user {.id, .slug, .name, .avatar, .email, .role, .disabled, .actorId}
     LIMIT 1
   `

From c1effbe46c9b64ca465145b3091f5bd7246ae0e4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2019 21:32:39 +0000
Subject: [PATCH 034/212] build(deps): bump cross-env from 6.0.2 to 6.0.3 in
 /backend

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index b7e52eb8a..44f51709f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -53,7 +53,7 @@
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
-    "cross-env": "~6.0.2",
+    "cross-env": "~6.0.3",
     "date-fns": "2.4.1",
     "debug": "~4.1.1",
     "dotenv": "~8.1.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6b11cb1d7..990464fdb 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -688,7 +688,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.5.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
@@ -2626,12 +2626,11 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-cross-env@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.2.tgz#2ec3c4b9b90cc074fed375415fc229cb7d6ce612"
-  integrity sha512-lA44HlqWCzrv7/l2pY3sfLDvMhXXhx8oztvD6rg34PdCIcP0yk77UwOL2nacsZXlrzPUMtbfagVbK6Itx8pwng==
+cross-env@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
+  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
   dependencies:
-    "@babel/runtime" "^7.6.2"
     cross-spawn "^7.0.0"
 
 cross-fetch@2.2.2:

From 9221c54017ed6533a29714c74125259a719840ef Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2019 21:33:16 +0000
Subject: [PATCH 035/212] build(deps): bump nuxt from 2.9.2 to 2.10.0 in
 /webapp

Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.9.2 to 2.10.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.9.2...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 552 +++++++++++++++++++++++++++++---------------
 2 files changed, 365 insertions(+), 189 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index d4a453b95..be343570e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -70,7 +70,7 @@
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.2.0",
     "node-fetch": "^2.6.0",
-    "nuxt": "~2.9.2",
+    "nuxt": "~2.10.0",
     "nuxt-dropzone": "^1.0.4",
     "nuxt-env": "~0.1.0",
     "stack-utils": "^1.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 18ebe84c7..6e0fc69b8 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -56,7 +56,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.5.5", "@babel/core@~7.6.2":
+"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.2":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
   integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
@@ -121,18 +121,6 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/helper-create-class-features-plugin@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
-  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.4.4"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-
 "@babel/helper-create-class-features-plugin@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
@@ -145,6 +133,18 @@
     "@babel/helper-replace-supers" "^7.5.5"
     "@babel/helper-split-export-declaration" "^7.4.4"
 
+"@babel/helper-create-class-features-plugin@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f"
+  integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.5.5"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.5.5"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+
 "@babel/helper-define-map@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
@@ -185,13 +185,6 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
-"@babel/helper-member-expression-to-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
-  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
 "@babel/helper-member-expression-to-functions@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
@@ -248,16 +241,6 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
-  integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
-
 "@babel/helper-replace-supers@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
@@ -333,12 +316,12 @@
     "@babel/helper-create-class-features-plugin" "^7.5.5"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-decorators@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
-  integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
+"@babel/plugin-proposal-decorators@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz#6659d2572a17d70abd68123e89a12a43d90aa30c"
+  integrity sha512-ZSyYw9trQI50sES6YxREXKu+4b7MAg6Qx2cvyDDYjP2Hpzd3FleOUwC9cqn1+za8d0A2ZU8SHujxFao956efUg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
+    "@babel/helper-create-class-features-plugin" "^7.6.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
@@ -640,10 +623,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-runtime@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
-  integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
+"@babel/plugin-transform-runtime@^7.6.2":
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8"
+  integrity sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -696,7 +679,7 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.5.5", "@babel/preset-env@~7.6.2":
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.2", "@babel/preset-env@~7.6.2":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
   integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
@@ -767,7 +750,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
@@ -1193,29 +1176,29 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@nuxt/babel-preset-app@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.9.2.tgz#e8d2ac841db845ef88ca2687093a95a480106e5d"
-  integrity sha512-s4423c5Pvl3aCmD8KoDdit1XZuZig0sCwop5KV3kn0/KfEru+jFWbQ3pTssCV8XTR9Am2BV0UIQ0hoCMdnvdfw==
+"@nuxt/babel-preset-app@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.10.0.tgz#5f3cd3ef7dbd851d8120c28866f29ede7e64a43d"
+  integrity sha512-G+HY00F1e80ic2CwGMCA4FNAY1PcKMi/WshYOus8ObZxuHvlvsObKVilZq5l9P1xQqgcCoRyetEnhfMnpxqt7Q==
   dependencies:
-    "@babel/core" "^7.5.5"
+    "@babel/core" "^7.6.2"
     "@babel/plugin-proposal-class-properties" "^7.5.5"
-    "@babel/plugin-proposal-decorators" "^7.4.4"
-    "@babel/plugin-transform-runtime" "^7.5.5"
-    "@babel/preset-env" "^7.5.5"
-    "@babel/runtime" "^7.5.5"
+    "@babel/plugin-proposal-decorators" "^7.6.0"
+    "@babel/plugin-transform-runtime" "^7.6.2"
+    "@babel/preset-env" "^7.6.2"
+    "@babel/runtime" "^7.6.2"
     "@vue/babel-preset-jsx" "^1.1.0"
     core-js "^2.6.5"
 
-"@nuxt/builder@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.9.2.tgz#57c515efc446c02e4062ebdb6cd735ea456df4dd"
-  integrity sha512-egDjm2AnaKjeAlZ0yNAooP+Xd/fKIvhK66qNyd+ekvzutSkbSkKtB/udNxyHcBnjg8GOB4KayIXvBX0K1TS/vg==
+"@nuxt/builder@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.10.0.tgz#3f59fe06c1bde1af25c969ca85ebfee7201d1151"
+  integrity sha512-c8NgfILAvFRBwstUu8x9l8TZUUM0FiDB8gPewvYPsP2uEuy5HEglhGzj8+/NDU/lgvHh2a9jToDjTX1LpYYHuQ==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.9.2"
-    "@nuxt/vue-app" "2.9.2"
-    chokidar "^3.0.2"
+    "@nuxt/utils" "2.10.0"
+    "@nuxt/vue-app" "2.10.0"
+    chokidar "^3.2.1"
     consola "^2.10.1"
     fs-extra "^8.1.0"
     glob "^7.1.4"
@@ -1224,16 +1207,16 @@
     lodash "^4.17.15"
     pify "^4.0.1"
     semver "^6.3.0"
-    serialize-javascript "^1.8.0"
-    upath "^1.1.2"
+    serialize-javascript "^2.1.0"
+    upath "^1.2.0"
 
-"@nuxt/cli@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.9.2.tgz#d56540f95b58afa7c7073c166d6f624b78024fca"
-  integrity sha512-9Pxavn/w/K4uUItXPNmKyT1aBoGlJPqTdpr3nlXRX00JSU1OKd2fTNL3RlaN+xXtlYh2XoZo2roGHAFX1CyKrw==
+"@nuxt/cli@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.10.0.tgz#48c90a7c3d3be5d40b70daf8f2280f1865ccc2fe"
+  integrity sha512-nmARLjlBLWwWtWsgmyWTk4YGEkkUQvOqJS1YZlQy6CPU/itRdIDv9D/vbZZv2NkWegXQJOQ8UUv9iCue9g06bw==
   dependencies:
-    "@nuxt/config" "2.9.2"
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/config" "2.10.0"
+    "@nuxt/utils" "2.10.0"
     boxen "^4.1.0"
     chalk "^2.4.2"
     consola "^2.10.1"
@@ -1241,37 +1224,37 @@
     execa "^2.0.4"
     exit "^0.1.2"
     fs-extra "^8.1.0"
-    hable "^2.2.1"
+    hable "^2.3.2"
     minimist "^1.2.0"
     opener "1.5.1"
     pretty-bytes "^5.3.0"
     std-env "^2.2.1"
     wrap-ansi "^6.0.0"
 
-"@nuxt/config@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.9.2.tgz#8976da395cc9f9971f48890ecaff9991d011578a"
-  integrity sha512-FjBPZNE2vUh7UsJ4GdiEYcgr3umvAxSKU2xvbBQpBGk8mItPyt8k/1LmrRSvImkno4j1IBKp4VehSBZYEczJdQ==
+"@nuxt/config@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.10.0.tgz#72c1713d57b8e50b4f08c1abe6b816a64f7d2e28"
+  integrity sha512-avDv8sNBhffok7tJXE9bUQm7wcSGcN0ZQdM9N/PFNbHfROZ6wm8umsotQaQbg2XVJQZ2k2PNKCEN+hNKcFmrNw==
   dependencies:
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/utils" "2.10.0"
     consola "^2.10.1"
     std-env "^2.2.1"
 
-"@nuxt/core@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.9.2.tgz#1ab1d5c1928c37100a680241f23fe6ebe230d9f9"
-  integrity sha512-OtjLLutaMsYP6/EYXD96i/J79GSrjHlxfHbBaqHjIxnHdDnzZlsvA13EjULJ9mhumw3fvOPi12AEqqNpBHXqUg==
+"@nuxt/core@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.10.0.tgz#71479a2f87160309486be5de358fea97b98cf072"
+  integrity sha512-Frhyoqz+uGVOvTXA3S1mTguOZVqxJFCbcx+FksC49WCR7q5OdrD8Z6mQeUmUW9dBa2l+p7hj9LCTa6ECf1wwvw==
   dependencies:
-    "@nuxt/config" "2.9.2"
+    "@nuxt/config" "2.10.0"
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/server" "2.9.2"
-    "@nuxt/utils" "2.9.2"
-    "@nuxt/vue-renderer" "2.9.2"
+    "@nuxt/server" "2.10.0"
+    "@nuxt/utils" "2.10.0"
+    "@nuxt/vue-renderer" "2.10.0"
     consola "^2.10.1"
     debug "^4.1.1"
     esm "^3.2.25"
     fs-extra "^8.1.0"
-    hable "^2.2.1"
+    hable "^2.3.2"
     hash-sum "^2.0.0"
     std-env "^2.2.1"
 
@@ -1292,21 +1275,21 @@
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
-"@nuxt/generator@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.9.2.tgz#5fd8e1af5217b3c7049ef89af4a8568b3d34a437"
-  integrity sha512-54bp94eel5vAxUQPKP8YU3uxPmaqSb0EwXXY+712LS2kZ2HELR/YpuATOH2wS3IUfpc0x9Zu6O/nPkjYo+635Q==
+"@nuxt/generator@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.10.0.tgz#614ff34776f1796cbbd22c46dfcbbe7ad7e0ee60"
+  integrity sha512-5R6yuexDSSMXP5gGAnIZOJIBjfpmFXdaj8PsKkYjN3PNESVXTlJ8quBefV39QbCnyQgvNusOKppN3KmtpbDkdg==
   dependencies:
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/utils" "2.10.0"
     chalk "^2.4.2"
     consola "^2.10.1"
     fs-extra "^8.1.0"
     html-minifier "^4.0.0"
 
-"@nuxt/loading-screen@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@nuxt/loading-screen/-/loading-screen-1.0.1.tgz#fca2483c30545c5ab98f9547327d0e81cf4b9ebc"
-  integrity sha512-uvFYSHG1H8sN5F61/JWPy6aZGQKYXcpVkrwv10HaXsm+INXrC9zGin4+WtRl9LA+3MMIoPqiJ6NZSwD3LqzNRA==
+"@nuxt/loading-screen@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/loading-screen/-/loading-screen-1.2.0.tgz#9cfab1e5e421bbaedadb26f7f27a68bcde313c24"
+  integrity sha512-l7nXgwkuX2/lDxEDAyIe3013MS8Jhja29uDVka21gyEbRnL68XOkoV3ws4dkk6QfhT2bcPwtu2C8tYvAhhhUzA==
   dependencies:
     connect "^3.7.0"
     fs-extra "^8.1.0"
@@ -1322,13 +1305,13 @@
     consola "^2.10.1"
     node-fetch "^2.6.0"
 
-"@nuxt/server@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.9.2.tgz#ef6f45b57b2f873c48ddb3cb1c593f56052dc186"
-  integrity sha512-If9Yu1pCah3d9l1AmyZ6hyfJ4+3RTekAdB9lMyHskIFGR4DCoTx2cd8oJ0VOv9CgQz90j/1Wi/SdeHy22Hy9Fg==
+"@nuxt/server@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.10.0.tgz#354f9f7fec04c8544791331194aba60eb0631a32"
+  integrity sha512-K3317JyzvQe7lhVtveOb56k+L9NlFt1I2BgSg5GDt0lp21Rpf+qGUK53GQBXIpvWc9P5VT5hr8m+nxEdZZQYpA==
   dependencies:
-    "@nuxt/config" "2.9.2"
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/config" "2.10.0"
+    "@nuxt/utils" "2.10.0"
     "@nuxtjs/youch" "^4.2.3"
     chalk "^2.4.2"
     compression "^1.7.4"
@@ -1345,61 +1328,61 @@
     serve-static "^1.14.1"
     server-destroy "^1.0.1"
 
-"@nuxt/utils@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.9.2.tgz#b6ced2abe8ada3f8d5ec03dd1a5e8053c9b4a66c"
-  integrity sha512-qmXbRNNJtdT4cr1t66ayaUFx9rQ9aOiLPHM/J69/uw/TKiy/j3WgX1YHE6TRAfIpg0eb68nDzHGM40T3XJ+jsg==
+"@nuxt/utils@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.10.0.tgz#7e1e618312c4048238050d97bf7ac61d1ce71804"
+  integrity sha512-DcBcUOf9qhVnaR0RqE/Ft+IbTgCQCttn4DM3CBRJJCQ9RV8CpLG8mfFsNtgnPTYrgDrUet67YrL5JcM9Ok02aw==
   dependencies:
     consola "^2.10.1"
     fs-extra "^8.1.0"
     hash-sum "^2.0.0"
     proper-lockfile "^4.1.1"
     semver "^6.3.0"
-    serialize-javascript "^1.8.0"
+    serialize-javascript "^2.1.0"
     signal-exit "^3.0.2"
     ua-parser-js "^0.7.20"
 
-"@nuxt/vue-app@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.9.2.tgz#725b1f6c4ac955b990ce3db68f9ae19a8d578c5b"
-  integrity sha512-zLoCvA3+UVfdikfol7plPukP0GddU1LdgkV+1EDeVUm22PNgt/OdYN3z5kJIZEfZoLpfMbtF8NsBVWrehPuoFQ==
+"@nuxt/vue-app@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.10.0.tgz#fd5616d91c543ae0dfdf745167c481d8932381ec"
+  integrity sha512-63tnJCv5IReW9wJh63IHgw/F09hqkQ1ot+u8+umTsk45awYWE39VrwdNOkRdy2IHygIH2xxXIhtYkwZuX8xFhg==
   dependencies:
     node-fetch "^2.6.0"
     unfetch "^4.1.0"
     vue "^2.6.10"
     vue-client-only "^2.0.0"
-    vue-meta "^2.2.1"
+    vue-meta "^2.2.2"
     vue-no-ssr "^1.1.1"
     vue-router "~3.0.7"
     vue-template-compiler "^2.6.10"
     vuex "^3.1.1"
 
-"@nuxt/vue-renderer@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.9.2.tgz#5118ba5caa894d94b272ad4665f88837ab2359ef"
-  integrity sha512-bLUnYEj2PHs07K7EAH+a3Nhg9ZK4WRsbG9q5eYNF3CD0O10CzNOR6/8qqqbFYj8hFrP76EOf0P/5CAJcWvRtPg==
+"@nuxt/vue-renderer@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.10.0.tgz#1e467d6b146670311cfb23e7e6f3933d2c58a296"
+  integrity sha512-uTkBDZUUJWi87RnViyC6x252NwQ9w3GuZMuN0Mv0v42+8S+BQ1/0bN84X2d5imdZz3kAlhsLJQ69GKrI75dCAA==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/utils" "2.10.0"
     consola "^2.10.1"
     fs-extra "^8.1.0"
     lru-cache "^5.1.1"
     vue "^2.6.10"
-    vue-meta "^2.2.1"
+    vue-meta "^2.2.2"
     vue-server-renderer "^2.6.10"
 
-"@nuxt/webpack@2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.9.2.tgz#4db33ddcb6805d5fed06a67515e542ca54ffa75d"
-  integrity sha512-M+j3Ceo6BcBSz4eIXqMP+Owcp2f78Dco+KGHJuUuCxWRNJjVdJAo1RHa2sMVDezdQgiDJQzgChwORU2mjN6rEw==
+"@nuxt/webpack@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.10.0.tgz#c71f54994dbba52f24849f55eb275d87667f2da7"
+  integrity sha512-ah1G6nIP3PJaeS5oQXrAUyPwmeWos1ycgZXvADN2rkXP4I2hdpdRuFBVrl1NfNoCNq+Hw0hZeEL9vgN4SbbPXQ==
   dependencies:
-    "@babel/core" "^7.5.5"
-    "@nuxt/babel-preset-app" "2.9.2"
+    "@babel/core" "^7.6.2"
+    "@nuxt/babel-preset-app" "2.10.0"
     "@nuxt/friendly-errors-webpack-plugin" "^2.5.0"
-    "@nuxt/utils" "2.9.2"
+    "@nuxt/utils" "2.10.0"
     babel-loader "^8.0.6"
     cache-loader "^4.1.0"
-    caniuse-lite "^1.0.30000989"
+    caniuse-lite "^1.0.30000997"
     chalk "^2.4.2"
     consola "^2.10.1"
     css-loader "^3.2.0"
@@ -1414,22 +1397,23 @@
     memory-fs "^0.4.1"
     optimize-css-assets-webpack-plugin "^5.0.3"
     pify "^4.0.1"
-    postcss "^7.0.17"
+    postcss "^7.0.18"
     postcss-import "^12.0.1"
     postcss-import-resolver "^1.2.3"
     postcss-loader "^3.0.0"
     postcss-preset-env "^6.7.0"
     postcss-url "^8.0.0"
+    semver "^6.3.0"
     std-env "^2.2.1"
     style-resources-loader "^1.2.1"
-    terser-webpack-plugin "^1.4.1"
+    terser-webpack-plugin "^2.1.2"
     thread-loader "^2.1.3"
     time-fix-plugin "^2.0.6"
     url-loader "^2.1.0"
     vue-loader "^15.7.1"
-    webpack "^4.39.3"
-    webpack-bundle-analyzer "^3.4.1"
-    webpack-dev-middleware "^3.7.0"
+    webpack "^4.41.0"
+    webpack-bundle-analyzer "^3.5.2"
+    webpack-dev-middleware "^3.7.2"
     webpack-hot-middleware "^2.25.0"
     webpack-node-externals "^1.7.2"
     webpackbar "^4.0.0"
@@ -2879,6 +2863,14 @@ agent-base@^4.1.0, agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+aggregate-error@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79"
+  integrity sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^3.2.0"
+
 "airbnb-js-shims@^1 || ^2":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-2.2.0.tgz#46e1d9d9516f704ef736de76a3b6d484df9a96d8"
@@ -3042,10 +3034,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.2.tgz#ddb3a8495d44875423af7b919aace11e91732a41"
-  integrity sha512-rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ==
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -4428,7 +4420,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2:
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -4613,6 +4605,30 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
+cacache@^13.0.0:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
+  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
+  dependencies:
+    chownr "^1.1.2"
+    figgy-pudding "^3.5.1"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.2"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    minipass "^3.0.0"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    p-map "^3.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^2.7.1"
+    ssri "^7.0.0"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4743,11 +4759,16 @@ caniuse-lite@^1.0.30000955:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db"
   integrity sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ==
 
-caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984, caniuse-lite@^1.0.30000989:
+caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984:
   version "1.0.30000989"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
   integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
 
+caniuse-lite@^1.0.30000997:
+  version "1.0.30000998"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744"
+  integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -4878,26 +4899,31 @@ chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.5:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
-  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
+chokidar@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.1.tgz#4634772a1924512d990d4505957bf3a510611387"
+  integrity sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==
   dependencies:
-    anymatch "^3.0.1"
-    braces "^3.0.2"
-    glob-parent "^5.0.0"
-    is-binary-path "^2.1.0"
-    is-glob "^4.0.1"
-    normalize-path "^3.0.0"
-    readdirp "^3.1.1"
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.1.3"
   optionalDependencies:
-    fsevents "^2.0.6"
+    fsevents "~2.1.0"
 
 chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
 
+chownr@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+
 chrome-trace-event@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
@@ -7383,6 +7409,13 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.2.1"
 
+fs-minipass@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
+  integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==
+  dependencies:
+    minipass "^3.0.0"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -7406,10 +7439,10 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fsevents@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.6.tgz#87b19df0bfb4a1a51d7ddb51b01b5f3bedb40c33"
-  integrity sha512-vfmKZp3XPM36DNF0qhW+Cdxk7xm7gTEHY1clv1Xq1arwRQuKZgAhw+NZNWbJBtuaNxzNXwhfdPYRrvIbjfS33A==
+fsevents@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.0.tgz#ce1a5f9ac71c6d75278b0c5bd236d7dfece4cbaa"
+  integrity sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==
 
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
@@ -7557,10 +7590,10 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
-  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
+glob-parent@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
   dependencies:
     is-glob "^4.0.1"
 
@@ -7715,7 +7748,7 @@ graceful-fs@^4.1.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
   integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
 
-graceful-fs@^4.2.0:
+graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
@@ -7814,10 +7847,10 @@ gzip-size@^5.0.0:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
-hable@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/hable/-/hable-2.2.1.tgz#714ef141a7eda5bd8530d6e4e3b37c6807716290"
-  integrity sha512-CuGRGMNnCp8RJ70zeoTX37sX4ctoT8BpmkStI2TYQwBBtWzQQFXQ/jsBUCqd34grt3IJQ+hkUXAU84/IuErVLQ==
+hable@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/hable/-/hable-2.3.2.tgz#7867ffec0b67e63136937613d9a0bc646ac9d7fe"
+  integrity sha512-qJ9WoXl/15LNlG1KeAuBjCNGStUb+MCQ5biPxOmwRyESH8CSWwZB4xEnzCduuQ3I/mlgui28t8/oMAGT1Rpb2g==
 
 handlebars@^4.1.2:
   version "4.1.2"
@@ -8384,7 +8417,7 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-infer-owner@^1.0.3:
+infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
@@ -8566,7 +8599,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-binary-path@^2.1.0:
+is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
@@ -8727,7 +8760,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -10367,6 +10400,27 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
+  integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==
+  dependencies:
+    minipass "^3.0.0"
+
 minipass@^2.2.1, minipass@^2.3.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -10375,6 +10429,13 @@ minipass@^2.2.1, minipass@^2.3.4:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.0.1.tgz#b4fec73bd61e8a40f0b374ddd04260ade2c8ec20"
+  integrity sha512-2y5okJ4uBsjoD2vAbLKL9EUQPPkC0YMIp+2mZOXG3nBba++pdfJWRxx2Ewirc0pwAJYu4XtWg2EkVo1nRXuO/w==
+  dependencies:
+    yallist "^4.0.0"
+
 minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -10753,7 +10814,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -10853,18 +10914,18 @@ nuxt-env@~0.1.0:
   resolved "https://registry.yarnpkg.com/nuxt-env/-/nuxt-env-0.1.0.tgz#8ac50b9ff45391ad3044ea932cbd05f06a585f87"
   integrity sha512-7mTao3qG0zfN0hahk3O6SuDy0KEwYmNojammWQsMwhqMn3aUjX4nMYnWDa0pua+2/rwAY9oG53jQtLgJdG7f9w==
 
-nuxt@~2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.9.2.tgz#3c190fe79dcb00550029d065bb9505caffd02bbb"
-  integrity sha512-PQjHQfh567g9J+SdbiZPWUZ9FXKWDONE9kB6/H9O9reWcac+jwD/uwWzZrgt+W6AiphHmbfwyGGLwCLv5hrQBg==
+nuxt@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.10.0.tgz#854c21e87c8b237359253b9419f05149b6214b63"
+  integrity sha512-Hl5hbT6gbfNXinY74oFvYroa0d0rCKpJQgJaLDN57e8CZu9kCe/90Gr21BX1+npcguIicjup5EXZ4GwzlcXKDA==
   dependencies:
-    "@nuxt/builder" "2.9.2"
-    "@nuxt/cli" "2.9.2"
-    "@nuxt/core" "2.9.2"
-    "@nuxt/generator" "2.9.2"
-    "@nuxt/loading-screen" "^1.0.1"
+    "@nuxt/builder" "2.10.0"
+    "@nuxt/cli" "2.10.0"
+    "@nuxt/core" "2.10.0"
+    "@nuxt/generator" "2.10.0"
+    "@nuxt/loading-screen" "^1.2.0"
     "@nuxt/opencollective" "^0.3.0"
-    "@nuxt/webpack" "2.9.2"
+    "@nuxt/webpack" "2.10.0"
 
 nwsapi@^2.0.7:
   version "2.1.4"
@@ -11182,6 +11243,13 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-map@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -12190,6 +12258,15 @@ postcss@^7.0.17:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.18:
+  version "7.0.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
+  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -13006,10 +13083,10 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.2.tgz#fa85d2d14d4289920e4671dead96431add2ee78a"
-  integrity sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==
+readdirp@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.3.tgz#d6e011ed5b9240a92f08651eeb40f7942ceb6cc1"
+  integrity sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==
   dependencies:
     picomatch "^2.0.4"
 
@@ -13370,6 +13447,13 @@ rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -13530,6 +13614,14 @@ schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.2.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+schema-utils@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56"
+  integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==
+  dependencies:
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
 scriptjs@^2.5.9:
   version "2.5.9"
   resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.9.tgz#343915cd2ec2ed9bfdde2b9875cd28f59394b35f"
@@ -13607,11 +13699,6 @@ serialize-javascript@^1.3.0, serialize-javascript@^1.7.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
   integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
 
-serialize-javascript@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.8.0.tgz#9515fc687232e2321aea1ca7a529476eb34bb480"
-  integrity sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==
-
 serialize-javascript@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
@@ -14008,6 +14095,14 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
+ssri@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.0.1.tgz#b0cab7bbb11ac9ea07f003453e2011f8cbed9f34"
+  integrity sha512-FfndBvkXL9AHyGLNzU3r9AvYIBBZ7gm+m+kd0p8cT3/v4OliMAyipZAhLVEv1Zi/k4QFq9CstRGVd9pW/zcHFQ==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    minipass "^3.0.0"
+
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -14458,6 +14553,20 @@ terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
+terser-webpack-plugin@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz#2b9b8147a6f18918348200800cf9560c50f701bb"
+  integrity sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg==
+  dependencies:
+    cacache "^13.0.0"
+    find-cache-dir "^3.0.0"
+    jest-worker "^24.9.0"
+    schema-utils "^2.4.1"
+    serialize-javascript "^2.1.0"
+    source-map "^0.6.1"
+    terser "^4.3.4"
+    webpack-sources "^1.4.3"
+
 terser@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391"
@@ -14467,6 +14576,15 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.4.tgz#ad91bade95619e3434685d69efa621a5af5f877d"
+  integrity sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 test-exclude@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -15014,11 +15132,16 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.1.1, upath@^1.1.2:
+upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
+upath@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
 update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
@@ -15335,10 +15458,10 @@ vue-loader@^15.7.1, vue-loader@~15.7.0:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-meta@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.2.1.tgz#30c2ff8b806f67eb2079734883c586295761b086"
-  integrity sha512-S0setu909L+jQNI4wa/WUMMJQSHIOU13eQZVIIBT1sCEH7g91AWwNA347//5lbWoNvyr3EQPk/kPMuPnhEbL1w==
+vue-meta@^2.2.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.0.tgz#7f4af99b02c7a1811ad332110839f0c8ab1c4ea3"
+  integrity sha512-pLfbtVco5HXWQ6byjK+KdmGZJFaXcE441Dt1UmuQmT1lyX05QLRZo5laDYSHZdgGyHyiUsykZAKVBRXBCvDa6w==
   dependencies:
     deepmerge "^4.0.0"
 
@@ -15491,10 +15614,10 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-bundle-analyzer@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.4.1.tgz#430544c7ba1631baccf673475ca8300cb74a3c47"
-  integrity sha512-Bs8D/1zF+17lhqj2OYmzi7HEVYqEVxu7lCO9Ff8BwajenOU0vAwEoV8e4ICCPNZAcqR1PCR/7o2SkW+cnCmF0A==
+webpack-bundle-analyzer@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz#ac02834f4b31de8e27d71e6c7a612301ebddb79f"
+  integrity sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -15520,6 +15643,17 @@ webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
+webpack-dev-middleware@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
+  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
 webpack-external-import@^0.0.1-beta.19:
   version "0.0.1-beta.19"
   resolved "https://registry.yarnpkg.com/webpack-external-import/-/webpack-external-import-0.0.1-beta.19.tgz#505c2bf1bf43bf6be96e25ac1e586ab0b46aa87f"
@@ -15569,7 +15703,15 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.33.0, webpack@^4.38.0, webpack@^4.39.3:
+webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^4.33.0, webpack@^4.38.0:
   version "4.39.3"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.3.tgz#a02179d1032156b713b6ec2da7e0df9d037def50"
   integrity sha512-BXSI9M211JyCVc3JxHWDpze85CvjC842EvpRsVTc/d15YJGlox7GIDd38kJgWrb3ZluyvIjgenbLDMBQPDcxYQ==
@@ -15598,6 +15740,35 @@ webpack@^4.33.0, webpack@^4.38.0, webpack@^4.39.3:
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
+webpack@^4.41.0:
+  version "4.41.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b"
+  integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
 webpackbar@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-4.0.0.tgz#ee7a87f16077505b5720551af413c8ecd5b1f780"
@@ -15881,6 +16052,11 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"

From 3912b21ea2f24e2e25682060b7166d1511442e6e Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 00:55:14 +0200
Subject: [PATCH 036/212] refactor: use named slot for additional text

@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
---
 webapp/components/Comment/Comment.vue | 48 ++++++++++-----------------
 webapp/components/User/User.vue       |  4 +--
 webapp/pages/post/_id/_slug/index.vue | 38 ++++++++-------------
 3 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index 6fc076c7b..534c45e6b 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -12,33 +12,25 @@
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card :id="anchor">
       <ds-space margin-bottom="small" margin-top="small">
-        <ds-flex>
-          <ds-flex-item width="40%">
-            <hc-user :user="author" :date-time="comment.createdAt" />
-          </ds-flex-item>
-          <ds-flex-item>
-            <ds-text v-if="comment.createdAt !== comment.updatedAt" color="softer" class="italics">
-              {{ this.$t('comment.edited') }}
+        <hc-user :user="author" :date-time="comment.createdAt">
+          <template v-slot:dateTime>
+            <ds-text v-if="comment.createdAt !== comment.updatedAt">
+              ({{ $t('comment.edited') }})
             </ds-text>
-          </ds-flex-item>
-          <ds-flex-item>
-            <ds-space margin-top="base">
-              <client-only>
-                <content-menu
-                  v-show="!openEditCommentMenu"
-                  placement="bottom-end"
-                  resource-type="comment"
-                  :resource="comment"
-                  :modalsData="menuModalsData"
-                  class="float-right"
-                  :is-owner="isAuthor(author.id)"
-                  @showEditCommentMenu="editCommentMenu"
-                />
-              </client-only>
-            </ds-space>
-          </ds-flex-item>
-        </ds-flex>
-        <!-- Content Menu (can open Modals) -->
+          </template>
+        </hc-user>
+        <client-only>
+          <content-menu
+            v-show="!openEditCommentMenu"
+            placement="bottom-end"
+            resource-type="comment"
+            :resource="comment"
+            :modalsData="menuModalsData"
+            class="float-right"
+            :is-owner="isAuthor(author.id)"
+            @showEditCommentMenu="editCommentMenu"
+          />
+        </client-only>
       </ds-space>
       <div v-if="openEditCommentMenu">
         <hc-comment-form
@@ -212,8 +204,4 @@ span.show-more-or-less {
   margin: 0px 20px;
   cursor: pointer;
 }
-
-.ds-text.italics {
-  font-style: italic;
-}
 </style>
diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index eb7092bcc..3afef5c11 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -11,17 +11,17 @@
         <div @mouseover="openMenu(true)" @mouseleave="closeMenu(true)">
           <hc-avatar class="avatar" :user="user" />
           <div>
-            <ds-text align="left">
+            <ds-text>
               <b class="username">{{ userName | truncate(18) }}</b>
               <ds-text v-if="dateTime" size="small" color="soft">
                 <ds-icon name="clock" />
                 <client-only>
                   <hc-relative-date-time :date-time="dateTime" />
                 </client-only>
+                <slot name="dateTime"></slot>
               </ds-text>
             </ds-text>
           </div>
-          <!-- Time -->
           <ds-text align="left" size="small" color="soft">
             {{ userSlug }}
           </ds-text>
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0c45c0ca3..1357f9653 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -6,30 +6,20 @@
       :class="{ 'post-card': true, 'disabled-content': post.disabled }"
     >
       <ds-space margin-bottom="small" />
-      <ds-flex>
-        <ds-flex-item width="40%">
-          <hc-user :user="post.author" :date-time="post.createdAt" />
-        </ds-flex-item>
-        <ds-flex-item>
-          <ds-text v-if="post.createdAt !== post.updatedAt" color="softer" class="italics">
-            {{ this.$t('post.edited') }}
-          </ds-text>
-        </ds-flex-item>
-        <ds-flex-item>
-          <ds-space margin-top="base">
-            <client-only>
-              <content-menu
-                placement="bottom-end"
-                resource-type="contribution"
-                :resource="post"
-                :modalsData="menuModalsData"
-                :is-owner="isAuthor(post.author ? post.author.id : null)"
-              />
-            </client-only>
-          </ds-space>
-        </ds-flex-item>
-      </ds-flex>
-      <!-- Content Menu (can open Modals) -->
+      <hc-user :user="post.author" :date-time="post.createdAt">
+        <template v-slot:dateTime>
+          <ds-text v-if="post.createdAt !== post.updatedAt">({{ $t('post.edited') }})</ds-text>
+        </template>
+      </hc-user>
+      <client-only>
+        <content-menu
+          placement="bottom-end"
+          resource-type="contribution"
+          :resource="post"
+          :modalsData="menuModalsData"
+          :is-owner="isAuthor(post.author ? post.author.id : null)"
+        />
+      </client-only>
       <ds-space margin-bottom="small" />
       <ds-heading tag="h3" no-margin class="hyphenate-text">{{ post.title }}</ds-heading>
       <ds-space margin-bottom="small" />

From 99db1338c1522f389f5e5deec019cba839011179 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 01:05:39 +0200
Subject: [PATCH 037/212] docs: add storybook section for edit information

---
 webapp/components/User/User.story.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/webapp/components/User/User.story.js b/webapp/components/User/User.story.js
index e7a66de3f..931f40da6 100644
--- a/webapp/components/User/User.story.js
+++ b/webapp/components/User/User.story.js
@@ -56,7 +56,7 @@ const user = {
 storiesOf('User', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
-  .add('available user', () => ({
+  .add('available', () => ({
     components: { User },
     store: helpers.store,
     data: () => ({
@@ -64,7 +64,21 @@ storiesOf('User', module)
     }),
     template: '<user :user="user" :trunc="35" :date-time="new Date()" />',
   }))
-  .add('anonymous user', () => ({
+  .add('has edited something', () => ({
+    components: { User },
+    store: helpers.store,
+    data: () => ({
+      user,
+    }),
+    template: `
+    <user :user="user" :trunc="35" :date-time="new Date()">
+      <template v-slot:dateTime>
+        - HEY! I'm edited
+      </template>
+    </user>
+    `,
+  }))
+  .add('anonymous', () => ({
     components: { User },
     store: helpers.store,
     data: () => ({

From 78bf07649856b2be043c09dc920568b3aa2df7ed Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 01:39:18 +0200
Subject: [PATCH 038/212] test: add tests for #1809

---
 backend/src/jwt/decode.spec.js | 31 ++++++++++++++++++++++++++++++-
 backend/src/models/User.js     |  1 +
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js
index df6914f25..9ea858304 100644
--- a/backend/src/jwt/decode.spec.js
+++ b/backend/src/jwt/decode.spec.js
@@ -1,9 +1,10 @@
 import Factory from '../seed/factories/index'
-import { getDriver } from '../bootstrap/neo4j'
+import { getDriver, neode as getNeode } from '../bootstrap/neo4j'
 import decode from './decode'
 
 const factory = Factory()
 const driver = getDriver()
+const neode = getNeode()
 
 // here is the decoded JWT token:
 // {
@@ -85,6 +86,33 @@ describe('decode', () => {
         })
       })
 
+      it('sets `lastActiveAt`', async () => {
+        let user = await neode.first('User', { id: 'u3' })
+        await expect(user.toJson()).resolves.not.toHaveProperty('lastActiveAt')
+        await decode(driver, authorizationHeader)
+        user = await neode.first('User', { id: 'u3' })
+        await expect(user.toJson()).resolves.toMatchObject({
+          lastActiveAt: expect.any(String),
+        })
+      })
+
+      it('updates `lastActiveAt` for every authenticated request', async () => {
+        let user = await neode.first('User', { id: 'u3' })
+        await user.update({
+          updatedAt: new Date().toISOString(),
+          lastActiveAt: '2019-10-03T23:33:08.598Z',
+        })
+        await expect(user.toJson()).resolves.toMatchObject({
+          lastActiveAt: '2019-10-03T23:33:08.598Z',
+        })
+        await decode(driver, authorizationHeader)
+        user = await neode.first('User', { id: 'u3' })
+        await expect(user.toJson()).resolves.toMatchObject({
+          // should be a different time by now ;)
+          lastActiveAt: expect.not.stringContaining('2019-10-03T23:33'),
+        })
+      })
+
       describe('but user is deleted', () => {
         beforeEach(async () => {
           await user.update({ updatedAt: new Date().toISOString(), deleted: true })
@@ -92,6 +120,7 @@ describe('decode', () => {
 
         it('returns null', returnsNull)
       })
+
       describe('but user is disabled', () => {
         beforeEach(async () => {
           await user.update({ updatedAt: new Date().toISOString(), disabled: true })
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 4bab080ca..6448d7450 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -49,6 +49,7 @@ module.exports = {
     direction: 'in',
   },
   invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
+  lastActiveAt: { type: 'string', isoDate: true },
   createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
   updatedAt: {
     type: 'string',

From e7fbd169d9ede1a2641853ad58d734d852e325e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 4 Oct 2019 10:23:31 +0200
Subject: [PATCH 039/212] Get backend test to work with new properties

---
 backend/src/schema/resolvers/reports.js      | 28 +++++++++++---------
 backend/src/schema/resolvers/reports.spec.js |  9 +++++++
 backend/src/schema/types/schema.gql          |  5 ++--
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 79cae032b..d8698844f 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -2,19 +2,20 @@ import uuid from 'uuid/v4'
 
 export default {
   Mutation: {
-    report: async (parent, { id, description }, { driver, req, user }, resolveInfo) => {
+    report: async (_parent, { id, reasonCategory, description }, { driver, req, user }, _resolveInfo) => {
       const reportId = uuid()
       const session = driver.session()
-      const reportData = {
+      const reportProperties = {
         id: reportId,
         createdAt: new Date().toISOString(),
-        description: description,
+        reasonCategory,
+        description,
       }
 
       const reportQueryRes = await session.run(
         `
-        match (u:User {id:$submitterId}) -[:REPORTED]->(report)-[:REPORTED]-> (resource {id: $resourceId}) 
-        return  labels(resource)[0] as label
+          MATCH (u:User {id:$submitterId})-[:REPORTED]->(report)-[:REPORTED]->(resource {id: $resourceId}) 
+          RETURN labels(resource)[0] as label
         `,
         {
           resourceId: id,
@@ -30,20 +31,21 @@ export default {
       if (rep) {
         throw new Error(rep.label)
       }
+
       const res = await session.run(
         `
-        MATCH (submitter:User {id: $userId})
-        MATCH (resource {id: $resourceId})
-        WHERE resource:User OR resource:Comment OR resource:Post
-        MERGE (report:Report  {id: {reportData}.id })
-        MERGE (resource)<-[:REPORTED]-(report)
-        MERGE (report)<-[:REPORTED]-(submitter)
-        RETURN report, submitter, resource, labels(resource)[0] as type
+          MATCH (submitter:User {id: $userId})
+          MATCH (resource {id: $resourceId})
+          WHERE resource:User OR resource:Comment OR resource:Post
+          CREATE (report:Report  {reportProperties})
+          MERGE (resource)<-[:REPORTED]-(report)
+          MERGE (report)<-[:REPORTED]-(submitter)
+          RETURN report, submitter, resource, labels(resource)[0] as type
         `,
         {
           resourceId: id,
           userId: user.id,
-          reportData,
+          reportProperties,
         },
       )
 
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index cfebbed81..228234ba1 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -121,6 +121,15 @@ describe('report', () => {
           })
         })
 
+        it('returns a date', async () => {
+          returnedObject = '{ createdAt }'
+          await expect(action()).resolves.toEqual(expect.objectContaining({
+            report: {
+              createdAt: expect.any(String),
+            },
+          }))
+        })
+
         it('returns the reason category', async () => {
           variables = {
             ...variables,
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 0adb72d85..2bb3fdace 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -37,11 +37,12 @@ type Mutation {
 
 type Report {
   id: ID!
+  createdAt: String!
+  reasonCategory: String!
+  description: String!
   submitter: User @relation(name: "REPORTED", direction: "IN")
-  description: String
   type: String!
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
-  createdAt: String
   comment: Comment @relation(name: "REPORTED", direction: "OUT")
   post: Post @relation(name: "REPORTED", direction: "OUT")
   user: User @relation(name: "REPORTED", direction: "OUT")

From b4f47997b3f67b79a414d11c2102782dc81a7660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 4 Oct 2019 10:40:18 +0200
Subject: [PATCH 040/212] Centralized and refactored report mutations and
 queries

---
 webapp/components/Modal/ReportModal.vue           | 10 ++--------
 .../{ModerationListQuery.js => Moderation.js}     | 15 +++++++++++++--
 webapp/pages/moderation/index.vue                 |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename webapp/graphql/{ModerationListQuery.js => Moderation.js} (81%)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index a55c12f42..ff31d5e0e 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -68,8 +68,8 @@
 </template>
 
 <script>
-import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
+import { reportMutation } from '~/graphql/Moderation.js'
 
 export default {
   name: 'ReportModal',
@@ -173,13 +173,7 @@ export default {
       // await this.modalData.buttons.confirm.callback()
       this.$apollo
         .mutate({
-          mutation: gql`
-            mutation($id: ID!, $reasonCategory: String!, $description: String!) {
-              report(id: $id, reasonCategory: $reasonCategory, description: $description) {
-                id
-              }
-            }
-          `,
+          mutation: reportMutation(),
           variables: {
             id: this.id,
             reasonCategory: reasonCategory.value,
diff --git a/webapp/graphql/ModerationListQuery.js b/webapp/graphql/Moderation.js
similarity index 81%
rename from webapp/graphql/ModerationListQuery.js
rename to webapp/graphql/Moderation.js
index 221ec6177..b6dd69da1 100644
--- a/webapp/graphql/ModerationListQuery.js
+++ b/webapp/graphql/Moderation.js
@@ -1,13 +1,14 @@
 import gql from 'graphql-tag'
 
-export default app => {
+export const reportListQuery = () => {
   return gql`
     query {
       Report(first: 20, orderBy: createdAt_desc) {
         id
+        createdAt
+        reasonCategory
         description
         type
-        createdAt
         submitter {
           id
           slug
@@ -79,3 +80,13 @@ export default app => {
     }
   `
 }
+
+export const reportMutation = () => {
+  return gql`
+    mutation($id: ID!, $reasonCategory: String!, $description: String!) {
+      report(id: $id, reasonCategory: $reasonCategory, description: $description) {
+        id
+      }
+    }
+  `
+}
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 9988ebc7a..1f8bb65c9 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -110,7 +110,7 @@
 
 <script>
 import HcEmpty from '~/components/Empty.vue'
-import query from '~/graphql/ModerationListQuery.js'
+import { reportListQuery } from '~/graphql/Moderation.js'
 
 export default {
   components: {
@@ -134,7 +134,7 @@ export default {
   },
   apollo: {
     Report: {
-      query,
+      query: reportListQuery(),
       fetchPolicy: 'cache-and-network',
     },
   },

From 3b5e39c54dafc2e701eb3ce1e830737a9b4bcf82 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 11:42:55 +0200
Subject: [PATCH 041/212] Update orderBy, remove >=, more realistic seed data

---
 backend/src/seed/seed-db.js        | 210 ++++++++++++++++++++++++++++-
 webapp/pages/index.vue             |   2 +-
 webapp/pages/profile/_id/_slug.vue |   8 +-
 3 files changed, 214 insertions(+), 6 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index afdd6adef..d64aa998c 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -114,7 +114,7 @@ import { gql } from '../jest/helpers'
       }),
       factory.create('Badge', {
         id: 'indiegogo_en_wolf',
-        icon: '/img/badges/indiegogo_en_wolfactory.svg',
+        icon: '/img/badges/indiegogo_en_wolf.svg',
       }),
       factory.create('Badge', {
         id: 'indiegogo_en_bear',
@@ -694,6 +694,214 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
+    
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(4).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p15',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p4',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(21).keys()].map(() => {
+        return factory.create('Post', {
+          author: peterLustig,
+          image: faker.image.unsplash.buildings(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(3).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p4',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p14',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p0',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(11).keys()].map(() => {
+        return factory.create('Post', {
+          author: dewey,
+          image: faker.image.unsplash.food(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(7).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p6',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p9',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(16).keys()].map(() => {
+        return factory.create('Post', {
+          author: louie,
+          image: faker.image.unsplash.technology(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(4).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p1',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p10',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(45).keys()].map(() => {
+        return factory.create('Post', {
+          author: bobDerBaumeister,
+          image: faker.image.unsplash.people(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(3).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p12',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(7).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Post', {
+          author: huey,
+          image: faker.image.unsplash.nature(),
+        })
+      }),
+    )
+
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p0',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(9).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p15',
+        })
+      })
+    )
+
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     process.exit(0)
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d41e7d440..360a72303 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -151,7 +151,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 8879190f5..abcb1dcda 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -251,7 +251,7 @@
           </template>
         </masonry-grid>
         <div
-          v-if="hasMore"
+          v-if="hasMore && posts.length >= pageSize"
           v-infinite-scroll="showMoreContributions"
           :infinite-scroll-disabled="$apollo.loading"
           :infinite-scroll-distance="10"
@@ -375,17 +375,17 @@ export default {
     showMoreContributions() {
       const { Post: PostQuery } = this.$apollo.queries
       if (!PostQuery) return // seems this can be undefined on subpages
-
       this.offset += this.pageSize
+
       PostQuery.fetchMore({
         variables: {
           offset: this.offset,
           filter: this.filter,
           first: this.pageSize,
-          orderBy: this.sorting,
+          orderBy: 'createdAt_desc',
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {

From c9219f0be3da3e1821b765ed2d72d87df9f9b243 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 12:09:22 +0200
Subject: [PATCH 042/212] Fix lint

---
 backend/src/seed/seed-db.js | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index d64aa998c..1c57dd19b 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -694,14 +694,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(6).keys()].map(() => {
         return factory.create('Comment', {
           author: jennyRostock,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -710,7 +710,7 @@ import { gql } from '../jest/helpers'
           author: jennyRostock,
           postId: 'p15',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -719,7 +719,7 @@ import { gql } from '../jest/helpers'
           author: jennyRostock,
           postId: 'p4',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -730,14 +730,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(3).keys()].map(() => {
         return factory.create('Comment', {
           author: peterLustig,
           postId: 'p4',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -746,7 +746,7 @@ import { gql } from '../jest/helpers'
           author: peterLustig,
           postId: 'p14',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -755,7 +755,7 @@ import { gql } from '../jest/helpers'
           author: peterLustig,
           postId: 'p0',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -766,14 +766,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(7).keys()].map(() => {
         return factory.create('Comment', {
           author: dewey,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -782,7 +782,7 @@ import { gql } from '../jest/helpers'
           author: dewey,
           postId: 'p6',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -791,7 +791,7 @@ import { gql } from '../jest/helpers'
           author: dewey,
           postId: 'p9',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -802,14 +802,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(4).keys()].map(() => {
         return factory.create('Comment', {
           author: louie,
           postId: 'p1',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -818,7 +818,7 @@ import { gql } from '../jest/helpers'
           author: louie,
           postId: 'p10',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -827,7 +827,7 @@ import { gql } from '../jest/helpers'
           author: louie,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -838,14 +838,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(2).keys()].map(() => {
         return factory.create('Comment', {
           author: bobDerBaumeister,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -854,7 +854,7 @@ import { gql } from '../jest/helpers'
           author: bobDerBaumeister,
           postId: 'p12',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -863,7 +863,7 @@ import { gql } from '../jest/helpers'
           author: bobDerBaumeister,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -881,7 +881,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p0',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -890,7 +890,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -899,7 +899,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p15',
         })
-      })
+      }),
     )
 
     /* eslint-disable-next-line no-console */

From fd388fc1ba0b1b5cc709d50d33695fcd862c9f6a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 12:34:48 +0200
Subject: [PATCH 043/212] Fix tests for changed implementation

- we do not display a load more button when there are clearly no more
posts to load... if there are at least 6, the pageSize, we display it
because there might or might not be posts to load
---
 webapp/pages/profile/_id/_slug.spec.js | 35 +++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index 6470bb69a..f7eba10cc 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -139,7 +139,23 @@ describe('ProfileSlug', () => {
               wrapper.setData({ posts, hasMore: true })
             })
 
-            it('displays a "load more" button', () => {
+            it('does not display a "load more" button', () => {
+              expect(wrapper.find('.load-more').exists()).toBe(false)
+            })
+          })
+
+          describe('pagination returned at least as many posts as pageSize', () => {
+            beforeEach(() => {
+              const posts = [1, 2, 3, 4, 5, 6].map(id => {
+                return {
+                  ...aPost,
+                  id,
+                }
+              })
+              wrapper.setData({ posts })
+            })
+
+            it('displays "load more" button', () => {
               expect(wrapper.find('.load-more').exists()).toBe(true)
             })
 
@@ -157,23 +173,6 @@ describe('ProfileSlug', () => {
               })
             })
           })
-
-          describe('pagination returned as many posts as available', () => {
-            beforeEach(() => {
-              const posts = [1, 2, 3, 4, 5, 6].map(id => {
-                return {
-                  ...aPost,
-                  id,
-                }
-              })
-
-              wrapper.setData({ posts, hasMore: false })
-            })
-
-            it('displays no "load more" button', () => {
-              expect(wrapper.find('.load-more').exists()).toBe(false)
-            })
-          })
         })
       })
     })

From 8747bf4853346b6f3a97af4c5652bb20a656a46d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 15:11:40 +0200
Subject: [PATCH 044/212] Update to 0.1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.0...HEAD)

**Fixed bugs:**

- 🐛 \[Bug\] Update maintenance page email [\#1731](https://github.com/Human-Connection/Human-Connection/issues/1731)
- 🐛 \[Bug\] Editing comments is not reactive again [\#1718](https://github.com/Human-Connection/Human-Connection/issues/1718)
- 🐛 \[Bug\] Comments with mentions in the end not displayed [\#1665](https://github.com/Human-Connection/Human-Connection/issues/1665)
- 🐛 \[Bug\] Moderators and Admins can be blocked [\#1663](https://github.com/Human-Connection/Human-Connection/issues/1663)
- 🐛 \[Bug\] Links in Comments don't show up [\#1661](https://github.com/Human-Connection/Human-Connection/issues/1661)
- 🐛 \[Bug\] Delete the Sleep Icon [\#1659](https://github.com/Human-Connection/Human-Connection/issues/1659)
- 🐛 \[Bug\] Mail Layout German/English not working in Webmail [\#1656](https://github.com/Human-Connection/Human-Connection/issues/1656)
- 🐛 \[Bug\] Far to less Characters per Contribution \(2000\) [\#1639](https://github.com/Human-Connection/Human-Connection/issues/1639)
- 🐛 \[Bug\] Notifications do just update with page reload [\#1637](https://github.com/Human-Connection/Human-Connection/issues/1637)
- 🐛 \[Bug\] Admin statistics entries are missing [\#1633](https://github.com/Human-Connection/Human-Connection/issues/1633)
- 🐛 \[Bug\] Can no users used all hashtags be correct? [\#1632](https://github.com/Human-Connection/Human-Connection/issues/1632)
- 🐛 \[Bug\] Create account has no info about email, no localisation, no HC logo [\#1631](https://github.com/Human-Connection/Human-Connection/issues/1631)
- 🐛 \[Bug\] Embeds are displayed when creating comments but get removed [\#1547](https://github.com/Human-Connection/Human-Connection/issues/1547)
- 🐛 \[Bug\] One cypress test fails but it does not fail the build [\#1312](https://github.com/Human-Connection/Human-Connection/issues/1312)
- 🐛 \[Bug\] TypeError: Cannot read property 'offsetTop' of null [\#1273](https://github.com/Human-Connection/Human-Connection/issues/1273)

**Closed issues:**

- 🚀 \[Feature\] Extend Emoticons [\#1745](https://github.com/Human-Connection/Human-Connection/issues/1745)
- 🚀 \[Feature\] Show "Edited" on comments and Posts [\#1669](https://github.com/Human-Connection/Human-Connection/issues/1669)
- 🚀 \[Feature\] Change slug [\#1650](https://github.com/Human-Connection/Human-Connection/issues/1650)
- 🚀 \[Feature\] Make the slug more visible and usable [\#1486](https://github.com/Human-Connection/Human-Connection/issues/1486)
- 🚀 \[Feature\] Report with reason [\#1469](https://github.com/Human-Connection/Human-Connection/issues/1469)
- 🚀 \[Feature\] Update `lastActiveAt` on every JWT token check [\#1305](https://github.com/Human-Connection/Human-Connection/issues/1305)
- 🚀 \[Feature\] Make Invite an Registration E-Mails translatable and pretty [\#1186](https://github.com/Human-Connection/Human-Connection/issues/1186)
- 🚀 \[Feature\] @Username: Unique user identification if identical profile names exist [\#1069](https://github.com/Human-Connection/Human-Connection/issues/1069)
- 🚀 \[Feature\] UserSettings - YourData - Email [\#407](https://github.com/Human-Connection/Human-Connection/issues/407)

**Merged pull requests:**

- fixes\#1305 lastActiveAt [\#1809](https://github.com/Human-Connection/Human-Connection/pull/1809) ([iylim](https://github.com/iylim))
- Show that a Post/Comment has been edited [\#1807](https://github.com/Human-Connection/Human-Connection/pull/1807) ([mattwr18](https://github.com/mattwr18))
- fix invites count calculation for admin dashboard [\#1806](https://github.com/Human-Connection/Human-Connection/pull/1806) ([vbelolapotkov](https://github.com/vbelolapotkov))
- build\(deps\): bump nuxt from 2.9.2 to 2.10.0 in /webapp [\#1804](https://github.com/Human-Connection/Human-Connection/pull/1804) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /webapp [\#1803](https://github.com/Human-Connection/Human-Connection/pull/1803) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend [\#1802](https://github.com/Human-Connection/Human-Connection/pull/1802) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /backend [\#1801](https://github.com/Human-Connection/Human-Connection/pull/1801) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps-dev\): bump cross-env from 6.0.2 to 6.0.3 [\#1800](https://github.com/Human-Connection/Human-Connection/pull/1800) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Remove language toggle from email template [\#1798](https://github.com/Human-Connection/Human-Connection/pull/1798) ([alina-beck](https://github.com/alina-beck))
- Max aspect ratio of 1:1 for Post index page [\#1796](https://github.com/Human-Connection/Human-Connection/pull/1796) ([mattwr18](https://github.com/mattwr18))
- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /backend [\#1794](https://github.com/Human-Connection/Human-Connection/pull/1794) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps-dev\): bump cross-env from 6.0.0 to 6.0.2 [\#1793](https://github.com/Human-Connection/Human-Connection/pull/1793) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump metascraper-description from 5.7.5 to 5.7.6 in /backend [\#1792](https://github.com/Human-Connection/Human-Connection/pull/1792) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /webapp [\#1791](https://github.com/Human-Connection/Human-Connection/pull/1791) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- build\(deps\): bump @nuxtjs/apollo from 4.0.0-rc13.1 to 4.0.0-rc14 in /webapp [\#1790](https://github.com/Human-Connection/Human-Connection/pull/1790) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update Post query for blockedByUsers [\#1788](https://github.com/Human-Connection/Human-Connection/pull/1788) ([mattwr18](https://github.com/mattwr18))
- Update neo4j to Enterprise edition [\#1787](https://github.com/Human-Connection/Human-Connection/pull/1787) ([mattwr18](https://github.com/mattwr18))
- Update to 0.1.2 [\#1786](https://github.com/Human-Connection/Human-Connection/pull/1786) ([mattwr18](https://github.com/mattwr18))
- Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend [\#1783](https://github.com/Human-Connection/Human-Connection/pull/1783) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-url from 5.7.5 to 5.7.6 in /backend [\#1782](https://github.com/Human-Connection/Human-Connection/pull/1782) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump graphql-middleware from 3.0.5 to 4.0.1 in /backend [\#1781](https://github.com/Human-Connection/Human-Connection/pull/1781) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump eslint from 6.4.0 to 6.5.1 in /backend [\#1780](https://github.com/Human-Connection/Human-Connection/pull/1780) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-audio from 5.7.5 to 5.7.6 in /backend [\#1779](https://github.com/Human-Connection/Human-Connection/pull/1779) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-publisher from 5.7.4 to 5.7.6 in /backend [\#1778](https://github.com/Human-Connection/Human-Connection/pull/1778) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-youtube from 5.7.5 to 5.7.6 in /backend [\#1777](https://github.com/Human-Connection/Human-Connection/pull/1777) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /backend [\#1776](https://github.com/Human-Connection/Human-Connection/pull/1776) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-soundcloud from 5.7.4 to 5.7.6 in /backend [\#1775](https://github.com/Human-Connection/Human-Connection/pull/1775) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-author from 5.7.4 to 5.7.6 in /backend [\#1774](https://github.com/Human-Connection/Human-Connection/pull/1774) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Fix failing test [\#1772](https://github.com/Human-Connection/Human-Connection/pull/1772) ([aonomike](https://github.com/aonomike))
- Bump metascraper-date from 5.7.4 to 5.7.6 in /backend [\#1771](https://github.com/Human-Connection/Human-Connection/pull/1771) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp [\#1770](https://github.com/Human-Connection/Human-Connection/pull/1770) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump date-fns from 2.3.0 to 2.4.1 in /backend [\#1769](https://github.com/Human-Connection/Human-Connection/pull/1769) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump date-fns from 2.4.0 to 2.4.1 in /webapp [\#1768](https://github.com/Human-Connection/Human-Connection/pull/1768) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump graphql-middleware-sentry from 3.2.0 to 3.2.1 in /backend [\#1767](https://github.com/Human-Connection/Human-Connection/pull/1767) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-lang from 5.7.4 to 5.7.6 in /backend [\#1766](https://github.com/Human-Connection/Human-Connection/pull/1766) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump tiptap from 1.25.0 to 1.26.0 in /webapp [\#1765](https://github.com/Human-Connection/Human-Connection/pull/1765) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-video from 5.7.5 to 5.7.6 in /backend [\#1764](https://github.com/Human-Connection/Human-Connection/pull/1764) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump apollo-server from 2.9.3 to 2.9.4 in /backend [\#1762](https://github.com/Human-Connection/Human-Connection/pull/1762) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-image from 5.7.5 to 5.7.6 in /backend [\#1761](https://github.com/Human-Connection/Human-Connection/pull/1761) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp [\#1760](https://github.com/Human-Connection/Human-Connection/pull/1760) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-title from 5.7.5 to 5.7.6 in /backend [\#1759](https://github.com/Human-Connection/Human-Connection/pull/1759) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump nodemon from 1.19.2 to 1.19.3 in /backend [\#1758](https://github.com/Human-Connection/Human-Connection/pull/1758) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- fix email middleware transport config [\#1757](https://github.com/Human-Connection/Human-Connection/pull/1757) ([vbelolapotkov](https://github.com/vbelolapotkov))
- 1273 fix post page nav suggestions [\#1756](https://github.com/Human-Connection/Human-Connection/pull/1756) ([roschaefer](https://github.com/roschaefer))
- docs: moves storybook into webapp/README.md [\#1755](https://github.com/Human-Connection/Human-Connection/pull/1755) ([roschaefer](https://github.com/roschaefer))
- Bump date-fns from 2.2.1 to 2.4.0 in /webapp [\#1752](https://github.com/Human-Connection/Human-Connection/pull/1752) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- fix: Github's security vulnerability warning [\#1751](https://github.com/Human-Connection/Human-Connection/pull/1751) ([roschaefer](https://github.com/roschaefer))
- update neo4j docker-compose config [\#1750](https://github.com/Human-Connection/Human-Connection/pull/1750) ([vbelolapotkov](https://github.com/vbelolapotkov))
- 🍰 Try to fix VSCode format works against ESLint [\#1749](https://github.com/Human-Connection/Human-Connection/pull/1749) ([Tirokk](https://github.com/Tirokk))
- Bump neo4j from 3.5.9 to 3.5.11 in /neo4j [\#1739](https://github.com/Human-Connection/Human-Connection/pull/1739) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump graphql from 14.5.7 to 14.5.8 in /backend [\#1738](https://github.com/Human-Connection/Human-Connection/pull/1738) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-youtube from 5.7.4 to 5.7.5 in /backend [\#1737](https://github.com/Human-Connection/Human-Connection/pull/1737) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Update to 0.1.1 [\#1734](https://github.com/Human-Connection/Human-Connection/pull/1734) ([roschaefer](https://github.com/roschaefer))
- Update maintenance page email to support@... [\#1732](https://github.com/Human-Connection/Human-Connection/pull/1732) ([mattwr18](https://github.com/mattwr18))
- Bump @babel/register from 7.6.0 to 7.6.2 in /backend [\#1730](https://github.com/Human-Connection/Human-Connection/pull/1730) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump graphql from 14.5.7 to 14.5.8 in /webapp [\#1729](https://github.com/Human-Connection/Human-Connection/pull/1729) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/core from 7.6.0 to 7.6.2 in /backend [\#1728](https://github.com/Human-Connection/Human-Connection/pull/1728) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp [\#1727](https://github.com/Human-Connection/Human-Connection/pull/1727) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump apollo-server-express from 2.9.3 to 2.9.4 in /backend [\#1726](https://github.com/Human-Connection/Human-Connection/pull/1726) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/node from 7.6.1 to 7.6.2 in /backend [\#1725](https://github.com/Human-Connection/Human-Connection/pull/1725) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Fix bug UpdateComment, Fix styling on Comment [\#1719](https://github.com/Human-Connection/Human-Connection/pull/1719) ([mattwr18](https://github.com/mattwr18))
- Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend [\#1717](https://github.com/Human-Connection/Human-Connection/pull/1717) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-title from 5.7.4 to 5.7.5 in /backend [\#1715](https://github.com/Human-Connection/Human-Connection/pull/1715) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump date-fns from 2.2.1 to 2.3.0 in /backend [\#1714](https://github.com/Human-Connection/Human-Connection/pull/1714) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/cli from 7.6.0 to 7.6.2 in /backend [\#1713](https://github.com/Human-Connection/Human-Connection/pull/1713) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- \[WIP\]1706 refactor shout spec [\#1712](https://github.com/Human-Connection/Human-Connection/pull/1712) ([aonomike](https://github.com/aonomike))
- 407 change your email address [\#1711](https://github.com/Human-Connection/Human-Connection/pull/1711) ([roschaefer](https://github.com/roschaefer))
- Remove repetitive labels from emote button [\#1702](https://github.com/Human-Connection/Human-Connection/pull/1702) ([roschaefer](https://github.com/roschaefer))
- fix the bug with scrolling post comments into view [\#1701](https://github.com/Human-Connection/Human-Connection/pull/1701) ([vbelolapotkov](https://github.com/vbelolapotkov))
- Bump metascraper-description from 5.7.4 to 5.7.5 in /backend [\#1700](https://github.com/Human-Connection/Human-Connection/pull/1700) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-logo from 5.7.4 to 5.7.5 in /backend [\#1698](https://github.com/Human-Connection/Human-Connection/pull/1698) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-video from 5.7.4 to 5.7.5 in /backend [\#1697](https://github.com/Human-Connection/Human-Connection/pull/1697) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/core from 7.6.0 to 7.6.2 in /webapp [\#1696](https://github.com/Human-Connection/Human-Connection/pull/1696) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-image from 5.7.4 to 5.7.5 in /backend [\#1695](https://github.com/Human-Connection/Human-Connection/pull/1695) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp [\#1694](https://github.com/Human-Connection/Human-Connection/pull/1694) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-audio from 5.7.4 to 5.7.5 in /backend [\#1693](https://github.com/Human-Connection/Human-Connection/pull/1693) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump metascraper-url from 5.7.4 to 5.7.5 in /backend [\#1692](https://github.com/Human-Connection/Human-Connection/pull/1692) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bugfix create user page - missing submit buttons [\#1690](https://github.com/Human-Connection/Human-Connection/pull/1690) ([roschaefer](https://github.com/roschaefer))
- Remove sleep icon from comments list [\#1689](https://github.com/Human-Connection/Human-Connection/pull/1689) ([alina-beck](https://github.com/alina-beck))
- Configure docker to work with storybook [\#1688](https://github.com/Human-Connection/Human-Connection/pull/1688) ([mattwr18](https://github.com/mattwr18))
- Add Comment story, add spacing above user info [\#1685](https://github.com/Human-Connection/Human-Connection/pull/1685) ([mattwr18](https://github.com/mattwr18))
- Fix create account page has no logo, localisation [\#1681](https://github.com/Human-Connection/Human-Connection/pull/1681) ([roschaefer](https://github.com/roschaefer))
- Fix intermittent backend specs [\#1679](https://github.com/Human-Connection/Human-Connection/pull/1679) ([roschaefer](https://github.com/roschaefer))
- Improve comments output [\#1678](https://github.com/Human-Connection/Human-Connection/pull/1678) ([mattwr18](https://github.com/mattwr18))
- Fix intermittent failing test [\#1677](https://github.com/Human-Connection/Human-Connection/pull/1677) ([mattwr18](https://github.com/mattwr18))
- Bump graphql from 14.5.6 to 14.5.7 in /webapp [\#1676](https://github.com/Human-Connection/Human-Connection/pull/1676) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump graphql from 14.5.6 to 14.5.7 in /backend [\#1675](https://github.com/Human-Connection/Human-Connection/pull/1675) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp [\#1674](https://github.com/Human-Connection/Human-Connection/pull/1674) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend [\#1673](https://github.com/Human-Connection/Human-Connection/pull/1673) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump helmet from 3.21.0 to 3.21.1 in /backend [\#1672](https://github.com/Human-Connection/Human-Connection/pull/1672) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump cypress-file-upload from 3.3.3 to 3.3.4 [\#1671](https://github.com/Human-Connection/Human-Connection/pull/1671) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump codecov from 3.6.0 to 3.6.1 [\#1670](https://github.com/Human-Connection/Human-Connection/pull/1670) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Make Human Connection a Progressive Web App [\#1668](https://github.com/Human-Connection/Human-Connection/pull/1668) ([roschaefer](https://github.com/roschaefer))
- Remove contentExcerpt from comments [\#1667](https://github.com/Human-Connection/Human-Connection/pull/1667) ([mattwr18](https://github.com/mattwr18))
- Remove follow type enum [\#1660](https://github.com/Human-Connection/Human-Connection/pull/1660) ([vbelolapotkov](https://github.com/vbelolapotkov))
- 🍰 Notifications self update and refactoring [\#1658](https://github.com/Human-Connection/Human-Connection/pull/1658) ([Tirokk](https://github.com/Tirokk))
- Bump mustache from 3.0.3 to 3.1.0 in /backend [\#1655](https://github.com/Human-Connection/Human-Connection/pull/1655) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @hapi/joi from 16.1.1 to 16.1.2 in /backend [\#1654](https://github.com/Human-Connection/Human-Connection/pull/1654) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @nuxtjs/apollo from 4.0.0-rc13 to 4.0.0-rc13.1 in /webapp [\#1653](https://github.com/Human-Connection/Human-Connection/pull/1653) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump codecov from 3.5.0 to 3.6.0 [\#1652](https://github.com/Human-Connection/Human-Connection/pull/1652) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Change your own slug [\#1651](https://github.com/Human-Connection/Human-Connection/pull/1651) ([roschaefer](https://github.com/roschaefer))
- Fix bug where short comments scrub links [\#1649](https://github.com/Human-Connection/Human-Connection/pull/1649) ([mattwr18](https://github.com/mattwr18))
- Fix styling issue in comments list [\#1648](https://github.com/Human-Connection/Human-Connection/pull/1648) ([mattwr18](https://github.com/mattwr18))
- Provider list approval hard cut [\#1647](https://github.com/Human-Connection/Human-Connection/pull/1647) ([ogerly](https://github.com/ogerly))
- Point the changelog to Github [\#1646](https://github.com/Human-Connection/Human-Connection/pull/1646) ([roschaefer](https://github.com/roschaefer))
- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /webapp [\#1643](https://github.com/Human-Connection/Human-Connection/pull/1643) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /backend [\#1642](https://github.com/Human-Connection/Human-Connection/pull/1642) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Fix \#1639 - No limits for post length [\#1641](https://github.com/Human-Connection/Human-Connection/pull/1641) ([roschaefer](https://github.com/roschaefer))
- 1486 make slug more usable [\#1640](https://github.com/Human-Connection/Human-Connection/pull/1640) ([roschaefer](https://github.com/roschaefer))
- Update de.json [\#1636](https://github.com/Human-Connection/Human-Connection/pull/1636) ([datenbrei](https://github.com/datenbrei))
- Exclude broken maintenance-worker docker image [\#1635](https://github.com/Human-Connection/Human-Connection/pull/1635) ([roschaefer](https://github.com/roschaefer))
- Fix bug where about must not be empty string [\#1630](https://github.com/Human-Connection/Human-Connection/pull/1630) ([mattwr18](https://github.com/mattwr18))
- Bump @storybook/addon-a11y from 5.2.0 to 5.2.1 in /webapp [\#1627](https://github.com/Human-Connection/Human-Connection/pull/1627) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @storybook/addon-actions from 5.2.0 to 5.2.1 in /webapp [\#1625](https://github.com/Human-Connection/Human-Connection/pull/1625) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @storybook/vue from 5.2.0 to 5.2.1 in /webapp [\#1624](https://github.com/Human-Connection/Human-Connection/pull/1624) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump cross-env from 5.2.1 to 6.0.0 in /backend [\#1623](https://github.com/Human-Connection/Human-Connection/pull/1623) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump @hapi/joi from 16.0.1 to 16.1.1 in /backend [\#1622](https://github.com/Human-Connection/Human-Connection/pull/1622) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Bump cross-env from 5.2.1 to 6.0.0 [\#1621](https://github.com/Human-Connection/Human-Connection/pull/1621) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- 1612 refactor moderator spec [\#1620](https://github.com/Human-Connection/Human-Connection/pull/1620) ([aonomike](https://github.com/aonomike))
- Fix disappearing embeds on comments [\#1618](https://github.com/Human-Connection/Human-Connection/pull/1618) ([mattwr18](https://github.com/mattwr18))
- links\_to\_imprint\_and\_privacy\_policy\_changed\_to\_human-connection.org [\#1615](https://github.com/Human-Connection/Human-Connection/pull/1615) ([ogerly](https://github.com/ogerly))
- Bump metascraper-author from 5.6.6 to 5.7.4 in /backend [\#1610](https://github.com/Human-Connection/Human-Connection/pull/1610) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
- Configure emails [\#1599](https://github.com/Human-Connection/Human-Connection/pull/1599) ([alina-beck](https://github.com/alina-beck))
- Improve follow/ufollow mutation [\#1596](https://github.com/Human-Connection/Human-Connection/pull/1596) ([vbelolapotkov](https://github.com/vbelolapotkov))

\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 VERSION      |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c89b2d48..5bcffad4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,13 @@
 - 🐛 \[Bug\] Update maintenance page email [\#1731](https://github.com/Human-Connection/Human-Connection/issues/1731)
 - 🐛 \[Bug\] Editing comments is not reactive again [\#1718](https://github.com/Human-Connection/Human-Connection/issues/1718)
 - 🐛 \[Bug\] Comments with mentions in the end not displayed [\#1665](https://github.com/Human-Connection/Human-Connection/issues/1665)
+- 🐛 \[Bug\] Moderators and Admins can be blocked [\#1663](https://github.com/Human-Connection/Human-Connection/issues/1663)
+- 🐛 \[Bug\] Links in Comments don't show up [\#1661](https://github.com/Human-Connection/Human-Connection/issues/1661)
 - 🐛 \[Bug\] Delete the Sleep Icon [\#1659](https://github.com/Human-Connection/Human-Connection/issues/1659)
+- 🐛 \[Bug\] Mail Layout German/English not working in Webmail [\#1656](https://github.com/Human-Connection/Human-Connection/issues/1656)
 - 🐛 \[Bug\] Far to less Characters per Contribution \(2000\) [\#1639](https://github.com/Human-Connection/Human-Connection/issues/1639)
 - 🐛 \[Bug\] Notifications do just update with page reload [\#1637](https://github.com/Human-Connection/Human-Connection/issues/1637)
+- 🐛 \[Bug\] Admin statistics entries are missing [\#1633](https://github.com/Human-Connection/Human-Connection/issues/1633)
 - 🐛 \[Bug\] Can no users used all hashtags be correct? [\#1632](https://github.com/Human-Connection/Human-Connection/issues/1632)
 - 🐛 \[Bug\] Create account has no info about email, no localisation, no HC logo [\#1631](https://github.com/Human-Connection/Human-Connection/issues/1631)
 - 🐛 \[Bug\] Embeds are displayed when creating comments but get removed [\#1547](https://github.com/Human-Connection/Human-Connection/issues/1547)
@@ -21,14 +25,35 @@
 **Closed issues:**
 
 - 🚀 \[Feature\] Extend Emoticons [\#1745](https://github.com/Human-Connection/Human-Connection/issues/1745)
+- 🚀 \[Feature\] Show "Edited" on comments and Posts [\#1669](https://github.com/Human-Connection/Human-Connection/issues/1669)
 - 🚀 \[Feature\] Change slug [\#1650](https://github.com/Human-Connection/Human-Connection/issues/1650)
 - 🚀 \[Feature\] Make the slug more visible and usable [\#1486](https://github.com/Human-Connection/Human-Connection/issues/1486)
 - 🚀 \[Feature\] Report with reason [\#1469](https://github.com/Human-Connection/Human-Connection/issues/1469)
+- 🚀 \[Feature\] Update `lastActiveAt` on every JWT token check [\#1305](https://github.com/Human-Connection/Human-Connection/issues/1305)
 - 🚀 \[Feature\] Make Invite an Registration E-Mails translatable and pretty [\#1186](https://github.com/Human-Connection/Human-Connection/issues/1186)
 - 🚀 \[Feature\] @Username: Unique user identification if identical profile names exist [\#1069](https://github.com/Human-Connection/Human-Connection/issues/1069)
+- 🚀 \[Feature\] UserSettings - YourData - Email [\#407](https://github.com/Human-Connection/Human-Connection/issues/407)
 
 **Merged pull requests:**
 
+- fixes\#1305 lastActiveAt [\#1809](https://github.com/Human-Connection/Human-Connection/pull/1809) ([iylim](https://github.com/iylim))
+- Show that a Post/Comment has been edited [\#1807](https://github.com/Human-Connection/Human-Connection/pull/1807) ([mattwr18](https://github.com/mattwr18))
+- fix invites count calculation for admin dashboard [\#1806](https://github.com/Human-Connection/Human-Connection/pull/1806) ([vbelolapotkov](https://github.com/vbelolapotkov))
+- build\(deps\): bump nuxt from 2.9.2 to 2.10.0 in /webapp [\#1804](https://github.com/Human-Connection/Human-Connection/pull/1804) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /webapp [\#1803](https://github.com/Human-Connection/Human-Connection/pull/1803) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend [\#1802](https://github.com/Human-Connection/Human-Connection/pull/1802) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /backend [\#1801](https://github.com/Human-Connection/Human-Connection/pull/1801) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cross-env from 6.0.2 to 6.0.3 [\#1800](https://github.com/Human-Connection/Human-Connection/pull/1800) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Remove language toggle from email template [\#1798](https://github.com/Human-Connection/Human-Connection/pull/1798) ([alina-beck](https://github.com/alina-beck))
+- Max aspect ratio of 1:1 for Post index page [\#1796](https://github.com/Human-Connection/Human-Connection/pull/1796) ([mattwr18](https://github.com/mattwr18))
+- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /backend [\#1794](https://github.com/Human-Connection/Human-Connection/pull/1794) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cross-env from 6.0.0 to 6.0.2 [\#1793](https://github.com/Human-Connection/Human-Connection/pull/1793) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump metascraper-description from 5.7.5 to 5.7.6 in /backend [\#1792](https://github.com/Human-Connection/Human-Connection/pull/1792) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /webapp [\#1791](https://github.com/Human-Connection/Human-Connection/pull/1791) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump @nuxtjs/apollo from 4.0.0-rc13.1 to 4.0.0-rc14 in /webapp [\#1790](https://github.com/Human-Connection/Human-Connection/pull/1790) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update Post query for blockedByUsers [\#1788](https://github.com/Human-Connection/Human-Connection/pull/1788) ([mattwr18](https://github.com/mattwr18))
+- Update neo4j to Enterprise edition [\#1787](https://github.com/Human-Connection/Human-Connection/pull/1787) ([mattwr18](https://github.com/mattwr18))
+- Update to 0.1.2 [\#1786](https://github.com/Human-Connection/Human-Connection/pull/1786) ([mattwr18](https://github.com/mattwr18))
 - Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend [\#1783](https://github.com/Human-Connection/Human-Connection/pull/1783) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump metascraper-url from 5.7.5 to 5.7.6 in /backend [\#1782](https://github.com/Human-Connection/Human-Connection/pull/1782) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump graphql-middleware from 3.0.5 to 4.0.1 in /backend [\#1781](https://github.com/Human-Connection/Human-Connection/pull/1781) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
@@ -77,6 +102,7 @@
 - Bump date-fns from 2.2.1 to 2.3.0 in /backend [\#1714](https://github.com/Human-Connection/Human-Connection/pull/1714) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump @babel/cli from 7.6.0 to 7.6.2 in /backend [\#1713](https://github.com/Human-Connection/Human-Connection/pull/1713) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - \[WIP\]1706 refactor shout spec [\#1712](https://github.com/Human-Connection/Human-Connection/pull/1712) ([aonomike](https://github.com/aonomike))
+- 407 change your email address [\#1711](https://github.com/Human-Connection/Human-Connection/pull/1711) ([roschaefer](https://github.com/roschaefer))
 - Remove repetitive labels from emote button [\#1702](https://github.com/Human-Connection/Human-Connection/pull/1702) ([roschaefer](https://github.com/roschaefer))
 - fix the bug with scrolling post comments into view [\#1701](https://github.com/Human-Connection/Human-Connection/pull/1701) ([vbelolapotkov](https://github.com/vbelolapotkov))
 - Bump metascraper-description from 5.7.4 to 5.7.5 in /backend [\#1700](https://github.com/Human-Connection/Human-Connection/pull/1700) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
diff --git a/VERSION b/VERSION
index d917d3e26..b1e80bb24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.2
+0.1.3

From 935252a16e2133d9256c7a38e6bc5d63641c86a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 4 Oct 2019 15:21:07 +0200
Subject: [PATCH 045/212] Rename variables, parameters and properties

---
 backend/src/schema/resolvers/reports.js      |  8 ++--
 backend/src/schema/resolvers/reports.spec.js | 22 +++++-----
 backend/src/schema/types/schema.gql          |  4 +-
 backend/src/seed/seed-db.js                  | 16 ++++----
 cypress/integration/common/report.js         |  8 ++--
 webapp/components/Modal/ReportModal.vue      | 42 ++++++++++----------
 webapp/graphql/Moderation.js                 | 10 +++--
 webapp/locales/en.json                       |  2 +-
 8 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index d8698844f..42f9a416f 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -2,14 +2,14 @@ import uuid from 'uuid/v4'
 
 export default {
   Mutation: {
-    report: async (_parent, { id, reasonCategory, description }, { driver, req, user }, _resolveInfo) => {
+    report: async (_parent, { resourceId, reasonCategory, reasonDescription }, { driver, req, user }, _resolveInfo) => {
       const reportId = uuid()
       const session = driver.session()
       const reportProperties = {
         id: reportId,
         createdAt: new Date().toISOString(),
         reasonCategory,
-        description,
+        reasonDescription,
       }
 
       const reportQueryRes = await session.run(
@@ -18,7 +18,7 @@ export default {
           RETURN labels(resource)[0] as label
         `,
         {
-          resourceId: id,
+          resourceId,
           submitterId: user.id,
         },
       )
@@ -43,7 +43,7 @@ export default {
           RETURN report, submitter, resource, labels(resource)[0] as type
         `,
         {
-          resourceId: id,
+          resourceId,
           userId: user.id,
           reportProperties,
         },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 228234ba1..d96b894c5 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -18,9 +18,9 @@ describe('report', () => {
   beforeEach(async () => {
     returnedObject = '{ id }'
     variables = {
-      id: 'whatever',
+      resourceId: 'whatever',
       reasonCategory: 'reason-category-dummy',
-      description: 'Violates code of conduct !!!',
+      reasonDescription: 'Violates code of conduct !!!',
     }
     headers = {}
     user = await factory.create('User', {
@@ -49,8 +49,8 @@ describe('report', () => {
   const action = () => {
     // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
     reportMutation = `
-      mutation($id: ID!, $reasonCategory: String!, $description: String!) {
-        report( id: $id, reasonCategory: $reasonCategory, description: $description) ${returnedObject}
+      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+        report( resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) ${returnedObject}
       }
     `
     client = new GraphQLClient(host, {
@@ -86,7 +86,7 @@ describe('report', () => {
         beforeEach(async () => {
           variables = {
             ...variables,
-            id: 'u2',
+            resourceId: 'u2',
           }
         })
 
@@ -146,12 +146,12 @@ describe('report', () => {
         it('returns the reason description', async () => {
           variables = {
             ...variables,
-            description: 'My reason!',
+            reasonDescription: 'My reason!',
           }
-          returnedObject = '{ description }'
+          returnedObject = '{ reasonDescription }'
           await expect(action()).resolves.toEqual({
             report: {
-              description: 'My reason!',
+              reasonDescription: 'My reason!',
             },
           })
         })
@@ -167,7 +167,7 @@ describe('report', () => {
           })
           variables = {
             ...variables,
-            id: 'p23',
+            resourceId: 'p23',
           }
         })
 
@@ -221,7 +221,7 @@ describe('report', () => {
           })
           variables = {
             ...variables,
-            id: 'c34',
+            resourceId: 'c34',
           }
         })
 
@@ -256,7 +256,7 @@ describe('report', () => {
           })
           variables = {
             ...variables,
-            id: 't23',
+            resourceId: 't23',
           }
         })
 
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 2bb3fdace..cdf0d7f87 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -24,7 +24,7 @@ type Mutation {
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
-  report(id: ID!, reasonCategory: String!, description: String!): Report
+  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
   # Shout the given Type and ID
@@ -39,7 +39,7 @@ type Report {
   id: ID!
   createdAt: String!
   reasonCategory: String!
-  description: String!
+  reasonDescription: String!
   submitter: User @relation(name: "REPORTED", direction: "IN")
   type: String!
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 8c87a3214..bc85e2a7d 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -650,8 +650,8 @@ import { gql } from '../jest/helpers'
     authenticatedUser = null
 
     const reportMutation = gql`
-      mutation($id: ID!, $description: String!) {
-        report(description: $description, id: $id) {
+      mutation($resourceId: ID!, $reasonDescription: String!) {
+        report(reasonDescription: $reasonDescription, resourceId: $resourceId) {
           id
         }
       }
@@ -661,22 +661,22 @@ import { gql } from '../jest/helpers'
       mutate({
         mutation: reportMutation,
         variables: {
-          description: 'This comment is bigoted',
-          id: 'c1',
+          reasonDescription: 'This comment is bigoted',
+          resourceId: 'c1',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
-          description: 'This post is bigoted',
-          id: 'p1',
+          reasonDescription: 'This post is bigoted',
+          resourceId: 'p1',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
-          description: 'This user is harassing me with bigoted remarks',
-          id: 'u1',
+          reasonDescription: 'This user is harassing me with bigoted remarks',
+          resourceId: 'u1',
         },
       }),
     ])
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index c51c6b42e..83c96e6af 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -122,13 +122,13 @@ Given('somebody reported the following posts:', table => {
     cy.factory()
       .create('User', submitter)
       .authenticateAs(submitter)
-      .mutate(`mutation($id: ID!, $description: String!) {
-        report(description: $description, id: $id) {
+      .mutate(`mutation($resourceId: ID!, $reasonDescription: String!) {
+        report(reasonDescription: $reasonDescription, resourceId: $resourceId) {
           id
         }
       }`, {
-        id,
-        description: 'Offensive content'
+        resourceId,
+        reasonDescription: 'Offensive content'
       })
   })
 })
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index ff31d5e0e..415ec9db4 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -28,24 +28,24 @@
       :options="form.reasonCategoryOptions"
     />
     <!-- Wolle <ds-input
-        model="reasonAddText"
-        :label="$t('report.reason.addText.label')"
-        :placeholder="$t('report.reason.addText.placeholder')"
+        model="reasonDescription"
+        :label="$t('report.reason.description.label')"
+        :placeholder="$t('report.reason.description.placeholder')"
         type="textarea"
         rows="5"
-        class="reasonAddText"
+        class="reasonDescription"
       /> -->
     <ds-input
-      :value="form.reasonAddText"
-      :schema="formSchema.reasonAddText"
-      :label="$t('report.reason.addText.label')"
-      :placeholder="$t('report.reason.addText.placeholder')"
+      :value="form.reasonDescription"
+      :schema="formSchema.reasonDescription"
+      :label="$t('report.reason.description.label')"
+      :placeholder="$t('report.reason.description.placeholder')"
       type="textarea"
       rows="5"
-      class="reasonAddText"
+      class="reasonDescription"
     />
     <small class="smallTag">
-      {{ form.reasonAddText.length }}/{{ formSchema.reasonAddText.max }}
+      {{ form.reasonDescription.length }}/{{ formSchema.reasonDescription.max }}
     </small>
     <ds-space />
     <!-- Wolle </ds-form> -->
@@ -109,7 +109,7 @@ export default {
         reasonCategory: null,
         // Wolle reasonCategory: reasonCategoryOptions[0],
         reasonCategoryOptions,
-        reasonAddText: '',
+        reasonDescription: '',
       },
       formSchema: {
         reasonCategory: {
@@ -124,12 +124,12 @@ export default {
             callback()
           },
         },
-        reasonAddText: {
+        reasonDescription: {
           type: 'string',
           min: 0,
           max: 200,
           validator: (rule, value, callback, source, options) => {
-            this.form.reasonAddText = value
+            this.form.reasonDescription = value
             callback()
           },
         },
@@ -151,9 +151,9 @@ export default {
     //   console.log('this.form.reasonCategory: ', this.form.reasonCategory)
     //   this.failsValidations = false
     // },
-    // Wolle inputReasonAddText(reasonAddText) {
-    //   console.log('reasonAddText: ', reasonAddText)
-    //   this.form.reasonAddText = reasonAddText
+    // Wolle inputReasonAddText(reasonDescription) {
+    //   console.log('reasonDescription: ', reasonDescription)
+    //   this.form.reasonDescription = reasonDescription
     // },
     async cancel() {
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
@@ -164,9 +164,9 @@ export default {
       }, 1000)
     },
     async confirm() {
-      const { reasonCategory, reasonAddText } = this.form
+      const { reasonCategory, reasonDescription } = this.form
       // Wolle console.log('reasonCategory: ', reasonCategory.value)
-      // Wolle console.log('reasonAddText: ', reasonAddText)
+      // Wolle console.log('reasonDescription: ', reasonDescription)
 
       this.loading = true
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
@@ -175,9 +175,9 @@ export default {
         .mutate({
           mutation: reportMutation(),
           variables: {
-            id: this.id,
+            resourceId: this.id,
             reasonCategory: reasonCategory.value,
-            description: reasonAddText,
+            reasonDescription,
           },
         })
         .then(({ _data }) => {
@@ -214,7 +214,7 @@ export default {
 </script>
 
 <style lang="scss">
-.reasonAddText {
+.reasonDescription {
   margin-top: $space-x-small;
   margin-bottom: $space-xxx-small;
 }
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index b6dd69da1..d86205042 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -7,7 +7,7 @@ export const reportListQuery = () => {
         id
         createdAt
         reasonCategory
-        description
+        reasonDescription
         type
         submitter {
           id
@@ -83,8 +83,12 @@ export const reportListQuery = () => {
 
 export const reportMutation = () => {
   return gql`
-    mutation($id: ID!, $reasonCategory: String!, $description: String!) {
-      report(id: $id, reasonCategory: $reasonCategory, description: $description) {
+    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      report(
+        resourceId: $resourceId
+        reasonCategory: $reasonCategory
+        reasonDescription: $reasonDescription
+      ) {
         id
       }
     }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index ef623050f..0b4c317be 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -471,7 +471,7 @@
           "other": "Other"
         }
       },
-      "addText": {
+      "description": {
         "label": "Please explain why you like to report this?",
         "placeholder": "Additional information …"
       }

From 64b9ca7f432ec02acef71ef45d57c586e6645c8d Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Fri, 4 Oct 2019 16:55:53 +0300
Subject: [PATCH 046/212] Implement dislplay email for admins

---
 webapp/locales/de.json       |  1 +
 webapp/locales/en.json       |  1 +
 webapp/pages/admin/users.vue | 10 +++-------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 7b7bc3ec1..751674c22 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -259,6 +259,7 @@
         "columns": {
           "number": "Nr.",
           "name": "Name",
+          "email": "E-mail",
           "slug": "Slug",
           "role": "Rolle",
           "createdAt": "Erstellt am"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8204d4741..2b5a164a1 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -260,6 +260,7 @@
         "columns": {
           "number": "No.",
           "name": "Name",
+          "email": "E-mail",
           "slug": "Slug",
           "role": "Role",
           "createdAt": "Created at"
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 8797d6a22..d5590f474 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -34,14 +34,9 @@
           </nuxt-link>
         </template>
         <template slot="email" slot-scope="scope">
-          <nuxt-link
-            :to="{
-              name: 'profile-id-slug',
-              params: { id: scope.row.id, slug: scope.row.slug },
-            }"
-          >
+          <a :href="`mailto:${scope.row.email}`">
             <b>{{ scope.row.email }}</b>
-          </nuxt-link>
+          </a>
         </template>
         <template slot="slug" slot-scope="scope">
           <nuxt-link
@@ -102,6 +97,7 @@ export default {
       return {
         index: this.$t('admin.users.table.columns.number'),
         name: this.$t('admin.users.table.columns.name'),
+        email: this.$t('admin.users.table.columns.email'),
         slug: this.$t('admin.users.table.columns.slug'),
         createdAt: this.$t('admin.users.table.columns.createdAt'),
         contributionsCount: {

From bb73ff43e4f63f50d2165034118d435cf752126b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 4 Oct 2019 16:43:42 +0200
Subject: [PATCH 047/212] Sanitize reason description and test, fix report in
 'seed-db.js'

---
 backend/src/middleware/xssMiddleware.js      |  2 +-
 backend/src/schema/resolvers/reports.js      |  7 +++++-
 backend/src/schema/resolvers/reports.spec.js | 25 ++++++++++++++++----
 backend/src/seed/seed-db.js                  | 18 ++++++++++----
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/backend/src/middleware/xssMiddleware.js b/backend/src/middleware/xssMiddleware.js
index f98ab9d61..9b4e3e759 100644
--- a/backend/src/middleware/xssMiddleware.js
+++ b/backend/src/middleware/xssMiddleware.js
@@ -85,7 +85,7 @@ function clean(dirty) {
   return dirty
 }
 
-const fields = ['content', 'contentExcerpt']
+const fields = ['content', 'contentExcerpt', 'reasonDescription']
 
 export default {
   Mutation: async (resolve, root, args, context, info) => {
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 42f9a416f..4b86e57f4 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -2,7 +2,12 @@ import uuid from 'uuid/v4'
 
 export default {
   Mutation: {
-    report: async (_parent, { resourceId, reasonCategory, reasonDescription }, { driver, req, user }, _resolveInfo) => {
+    report: async (
+      _parent,
+      { resourceId, reasonCategory, reasonDescription },
+      { driver, _req, user },
+      _resolveInfo,
+    ) => {
       const reportId = uuid()
       const session = driver.session()
       const reportProperties = {
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index d96b894c5..ed459df17 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -123,11 +123,13 @@ describe('report', () => {
 
         it('returns a date', async () => {
           returnedObject = '{ createdAt }'
-          await expect(action()).resolves.toEqual(expect.objectContaining({
-            report: {
-              createdAt: expect.any(String),
-            },
-          }))
+          await expect(action()).resolves.toEqual(
+            expect.objectContaining({
+              report: {
+                createdAt: expect.any(String),
+              },
+            }),
+          )
         })
 
         it('returns the reason category', async () => {
@@ -155,6 +157,19 @@ describe('report', () => {
             },
           })
         })
+
+        it('sanitize the reason description', async () => {
+          variables = {
+            ...variables,
+            reasonDescription: 'My reason <sanitize></sanitize>!',
+          }
+          returnedObject = '{ reasonDescription }'
+          await expect(action()).resolves.toEqual({
+            report: {
+              reasonDescription: 'My reason !',
+            },
+          })
+        })
       })
 
       describe('reported resource is a post', () => {
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index bc85e2a7d..89180ac2e 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -649,9 +649,14 @@ import { gql } from '../jest/helpers'
     ])
     authenticatedUser = null
 
+    // There is no error logged or the 'try' fails if this mutation is wrong. Why?
     const reportMutation = gql`
-      mutation($resourceId: ID!, $reasonDescription: String!) {
-        report(reasonDescription: $reasonDescription, resourceId: $resourceId) {
+      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+        report(
+          resourceId: $resourceId
+          reasonCategory: $reasonCategory
+          reasonDescription: $reasonDescription
+        ) {
           id
         }
       }
@@ -661,22 +666,25 @@ import { gql } from '../jest/helpers'
       mutate({
         mutation: reportMutation,
         variables: {
-          reasonDescription: 'This comment is bigoted',
           resourceId: 'c1',
+          reasonCategory: 'other',
+          reasonDescription: 'This comment is bigoted',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
-          reasonDescription: 'This post is bigoted',
           resourceId: 'p1',
+          reasonCategory: 'discrimination-etc',
+          reasonDescription: 'This post is bigoted',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
-          reasonDescription: 'This user is harassing me with bigoted remarks',
           resourceId: 'u1',
+          reasonCategory: 'doxing',
+          reasonDescription: 'This user is harassing me with bigoted remarks',
         },
       }),
     ])

From 45a6016427fc34d9ad9aa024cbf4b1c50926ee83 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 5 Oct 2019 16:00:29 +0300
Subject: [PATCH 048/212] Allow admin to receive user email back

---
 backend/src/middleware/permissionsMiddleware.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index ce98090ad..e8816d2df 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -172,7 +172,7 @@ const permissions = shield(
       markAsRead: isAuthenticated,
     },
     User: {
-      email: isMyOwn,
+      email: or(isMyOwn, isAdmin),
     },
   },
   {

From 14c44877b75483ae43db038d830b8604e03164e4 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 5 Oct 2019 16:06:19 +0300
Subject: [PATCH 049/212] Refactor the unauthenticated path test

---
 .../middleware/permissionsMiddleware.spec.js  | 88 ++++++++++++-------
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index 6cf9dc302..096bb5819 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -1,22 +1,56 @@
-import { GraphQLClient } from 'graphql-request'
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '../server'
 import Factory from '../seed/factories'
-import { host, login } from '../jest/helpers'
+import { gql } from '../jest/helpers'
+import { getDriver, neode as getNeode } from '../bootstrap/neo4j'
 
 const factory = Factory()
+const instance = getNeode()
+const driver = getDriver()
+
+let query, authenticatedUser, owner, someoneElse, adminExtraordinaire, variables
+
+const userQuery = gql`
+  query($name: String) {
+    User(name: $name) {
+      email
+    }
+  }
+`
 
 describe('authorization', () => {
+  beforeAll(async()=>{
+    await factory.cleanDatabase()
+    const { server } = createServer({
+      context: () => ({
+        driver,
+        instance,
+        user: authenticatedUser,
+      }),
+    })
+    query = createTestClient(server).query
+  })
+
   describe('given two existing users', () => {
     beforeEach(async () => {
-      await factory.create('User', {
-        email: 'owner@example.org',
-        name: 'Owner',
-        password: 'iamtheowner',
-      })
-      await factory.create('User', {
-        email: 'someone@example.org',
-        name: 'Someone else',
-        password: 'else',
-      })
+      [owner, someoneElse, adminExtraordinaire] = await Promise.all([
+        factory.create('User', {
+          email: 'owner@example.org',
+          name: 'Owner',
+          password: 'iamtheowner',
+        }),
+      factory.create('User', {
+          email: 'someone@example.org',
+          name: 'Someone else',
+          password: 'else',
+        }),
+        factory.create('User', {
+          email: 'admin@example.org',
+          name: 'Admin extraordinaire',
+          password: 'admin',
+        }),
+      ])
+      variables = {}
     })
 
     afterEach(async () => {
@@ -24,30 +58,16 @@ describe('authorization', () => {
     })
 
     describe('access email address', () => {
-      let headers = {}
-      let loginCredentials = null
-      const action = async () => {
-        if (loginCredentials) {
-          headers = await login(loginCredentials)
-        }
-        const graphQLClient = new GraphQLClient(host, { headers })
-        return graphQLClient.request('{User(name: "Owner") { email } }')
-      }
-
       describe('not logged in', () => {
-        it('rejects', async () => {
-          await expect(action()).rejects.toThrow('Not Authorised!')
+        beforeEach(()=>{
+          authenticatedUser = null
         })
-
-        it("does not expose the owner's email address", async () => {
-          let response = {}
-          try {
-            await action()
-          } catch (error) {
-            response = error.response.data
-          } finally {
-            expect(response).toEqual({ User: [null] })
-          }
+        it("throws an error and does not expose the owner's email address", async () => {
+          const expected = await query({ query: userQuery, variables: { name: 'Owner' } })
+          await expect(query({ query: userQuery, variables: { name: 'Owner' } })).resolves.toMatchObject({ 
+            errors: [{ message: 'Not Authorised!'}],
+            data: { User: [null]}
+          })
         })
       })
 

From f8cf975d6c2bb4fc93c429eab1b7d23feccba117 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 5 Oct 2019 17:18:11 +0300
Subject: [PATCH 050/212] Test that admin can access the email of a user

- Refactor all tests on permissionsMiddleware
---
 .../middleware/permissionsMiddleware.spec.js  | 110 +++++++++++-------
 1 file changed, 71 insertions(+), 39 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index 096bb5819..da703fb11 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -8,7 +8,7 @@ const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
-let query, authenticatedUser, owner, someoneElse, adminExtraordinaire, variables
+let query, authenticatedUser, owner, anotherRegularUser, administrator, variables, moderator
 
 const userQuery = gql`
   query($name: String) {
@@ -19,7 +19,7 @@ const userQuery = gql`
 `
 
 describe('authorization', () => {
-  beforeAll(async()=>{
+  beforeAll(async () => {
     await factory.cleanDatabase()
     const { server } = createServer({
       context: () => ({
@@ -33,21 +33,28 @@ describe('authorization', () => {
 
   describe('given two existing users', () => {
     beforeEach(async () => {
-      [owner, someoneElse, adminExtraordinaire] = await Promise.all([
+      ;[owner, anotherRegularUser, administrator, moderator] = await Promise.all([
         factory.create('User', {
           email: 'owner@example.org',
           name: 'Owner',
           password: 'iamtheowner',
         }),
-      factory.create('User', {
-          email: 'someone@example.org',
-          name: 'Someone else',
+        factory.create('User', {
+          email: 'another.regular.user@example.org',
+          name: 'Another Regular User',
           password: 'else',
         }),
         factory.create('User', {
           email: 'admin@example.org',
-          name: 'Admin extraordinaire',
+          name: 'Admin',
           password: 'admin',
+          role: 'admin',
+        }),
+        factory.create('User', {
+          email: 'moderator@example.org',
+          name: 'Moderator',
+          password: 'moderator',
+          role: 'moderator',
         }),
       ])
       variables = {}
@@ -58,52 +65,77 @@ describe('authorization', () => {
     })
 
     describe('access email address', () => {
-      describe('not logged in', () => {
-        beforeEach(()=>{
+      describe('unauthenticated', () => {
+        beforeEach(() => {
           authenticatedUser = null
         })
         it("throws an error and does not expose the owner's email address", async () => {
-          const expected = await query({ query: userQuery, variables: { name: 'Owner' } })
-          await expect(query({ query: userQuery, variables: { name: 'Owner' } })).resolves.toMatchObject({ 
-            errors: [{ message: 'Not Authorised!'}],
-            data: { User: [null]}
+          await expect(
+            query({ query: userQuery, variables: { name: 'Owner' } }),
+          ).resolves.toMatchObject({
+            errors: [{ message: 'Not Authorised!' }],
+            data: { User: [null] },
           })
         })
       })
 
-      describe('as owner', () => {
-        beforeEach(() => {
-          loginCredentials = {
-            email: 'owner@example.org',
-            password: 'iamtheowner',
-          }
+      describe('authenticated', () => {
+        describe('as the owner', () => {
+          beforeEach(async () => {
+            authenticatedUser = await owner.toJson()
+          })
+
+          it("exposes the owner's email address", async () => {
+            variables = { name: 'Owner' }
+            await expect(query({ query: userQuery, variables })).resolves.toMatchObject({
+              data: { User: [{ email: 'owner@example.org' }] },
+              errors: undefined,
+            })
+          })
         })
 
-        it("exposes the owner's email address", async () => {
-          await expect(action()).resolves.toEqual({ User: [{ email: 'owner@example.org' }] })
-        })
-      })
+        describe('as another regular user', () => {
+          beforeEach(async () => {
+            authenticatedUser = await anotherRegularUser.toJson()
+          })
 
-      describe('authenticated as another user', () => {
-        beforeEach(async () => {
-          loginCredentials = {
-            email: 'someone@example.org',
-            password: 'else',
-          }
+          it("throws an error and does not expose the owner's email address", async () => {
+            await expect(
+              query({ query: userQuery, variables: { name: 'Owner' } }),
+            ).resolves.toMatchObject({
+              errors: [{ message: 'Not Authorised!' }],
+              data: { User: [null] },
+            })
+          })
         })
 
-        it('rejects', async () => {
-          await expect(action()).rejects.toThrow('Not Authorised!')
+        describe('as a moderator', () => {
+          beforeEach(async () => {
+            authenticatedUser = await moderator.toJson()
+          })
+
+          it("throws an error and does not expose the owner's email address", async () => {
+            await expect(
+              query({ query: userQuery, variables: { name: 'Owner' } }),
+            ).resolves.toMatchObject({
+              errors: [{ message: 'Not Authorised!' }],
+              data: { User: [null] },
+            })
+          })
         })
 
-        it("does not expose the owner's email address", async () => {
-          let response
-          try {
-            await action()
-          } catch (error) {
-            response = error.response.data
-          }
-          expect(response).toEqual({ User: [null] })
+        describe('administrator', () => {
+          beforeEach(async () => {
+            authenticatedUser = await administrator.toJson()
+          })
+
+          it("exposes the owner's email address", async () => {
+            variables = { name: 'Owner' }
+            await expect(query({ query: userQuery, variables })).resolves.toMatchObject({
+              data: { User: [{ email: 'owner@example.org' }] },
+              errors: undefined,
+            })
+          })
         })
       })
     })

From 0a16f6f2cd77e37522518196254f2f334373dd41 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:27:18 +0000
Subject: [PATCH 051/212] build(deps-dev): bump cypress-cucumber-preprocessor

Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.16.0...v1.16.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 62020c4e4..5427090dc 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "codecov": "^3.6.1",
     "cross-env": "^6.0.3",
     "cypress": "^3.4.1",
-    "cypress-cucumber-preprocessor": "^1.16.0",
+    "cypress-cucumber-preprocessor": "^1.16.1",
     "cypress-file-upload": "^3.3.4",
     "cypress-plugin-retries": "^1.3.0",
     "dotenv": "^8.1.0",
diff --git a/yarn.lock b/yarn.lock
index e5b36f7f3..8d561ef5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1877,10 +1877,10 @@ cucumber@^4.2.1:
     util-arity "^1.0.2"
     verror "^1.9.0"
 
-cypress-cucumber-preprocessor@^1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.16.0.tgz#c73b3b72ea95ba90cd1ed8fb2e586b1380440edd"
-  integrity sha512-U3V15iMEKkb7qIePEn22QyDcOjsT+/HRTS6cdKBB2BgtYBCnkWZJ1jfUhf3rFDMMoXFkExSNZG/i00ljF/DUkA==
+cypress-cucumber-preprocessor@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.16.1.tgz#2ac7e0e53396334c052aeed8b5e61e08616f73a2"
+  integrity sha512-m8Z5t9hSc10kv47qK0fV/JlCboCwQVxgTa+WhnCjOPB7YBnX/en4f0O8l27yaZbZyHan7JBoJvpfzINlaOKafg==
   dependencies:
     "@cypress/browserify-preprocessor" "^2.1.1"
     chai "^4.1.2"
@@ -1892,6 +1892,7 @@ cypress-cucumber-preprocessor@^1.16.0:
     debug "^3.0.1"
     gherkin "^5.1.0"
     glob "^7.1.2"
+    js-string-escape "^1.0.1"
     through "^2.3.8"
 
 cypress-file-upload@^3.3.4:
@@ -3024,6 +3025,11 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
   integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
 
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"

From 7cea3e2382a5c91df4b1883d9a23dc39f1b56c77 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:27:46 +0000
Subject: [PATCH 052/212] build(deps): bump @hapi/joi from 16.1.5 to 16.1.7 in
 /backend

Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.5 to 16.1.7.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.5...v16.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 44f51709f..6f181b52e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,7 +41,7 @@
     ]
   },
   "dependencies": {
-    "@hapi/joi": "^16.1.5",
+    "@hapi/joi": "^16.1.7",
     "@sentry/node": "^5.6.2",
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 990464fdb..08c3d28b4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -766,10 +766,10 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/joi@^16.1.5":
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.5.tgz#06bdfec1084f46bff6be8f6b4076d8314c81cea2"
-  integrity sha512-FnVe0t1YQbF0H4fhFM6qBL7lIP4wdVHdFFBkloxgCkpKKdaCB6Z2UaNI0UalaDRHbRM9BvfTfyUKJg7tGtBSXg==
+"@hapi/joi@^16.1.7":
+  version "16.1.7"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.7.tgz#360857223a87bb1f5f67691537964c1b4908ed93"
+  integrity sha512-anaIgnZhNooG3LJLrTFzgGALTiO97zRA1UkvQHm9KxxoSiIzCozB3RCNCpDnfhTJD72QlrHA8nwGmNgpFFCIeg==
   dependencies:
     "@hapi/address" "^2.1.2"
     "@hapi/formula" "^1.2.0"

From 88aa08ef0a2c6f89e358efce4bdff56cde019172 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:28:30 +0000
Subject: [PATCH 053/212] build(deps-dev): bump eslint-config-prettier in
 /backend

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 44f51709f..bb1e27771 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -118,7 +118,7 @@
     "chai": "~4.2.0",
     "cucumber": "~5.1.0",
     "eslint": "~6.5.1",
-    "eslint-config-prettier": "~6.3.0",
+    "eslint-config-prettier": "~6.4.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.18.2",
     "eslint-plugin-jest": "~22.17.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 990464fdb..e818968fe 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3205,10 +3205,10 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.3.0.tgz#e73b48e59dc49d950843f3eb96d519e2248286a3"
-  integrity sha512-EWaGjlDAZRzVFveh2Jsglcere2KK5CJBhkNSa1xs3KfMUGdRiT7lG089eqPdvlzWHpAqaekubOsOMu8W8Yk71A==
+eslint-config-prettier@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477"
+  integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==
   dependencies:
     get-stdin "^6.0.0"
 

From 6f7eccd7d5a39f712c07c42539b7fe1fd48ad845 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:28:41 +0000
Subject: [PATCH 054/212] build(deps-dev): bump eslint-config-prettier in
 /webapp

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index be343570e..f45c16671 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -109,7 +109,7 @@
     "core-js": "~2.6.9",
     "css-loader": "~3.2.0",
     "eslint": "~5.16.0",
-    "eslint-config-prettier": "~6.3.0",
+    "eslint-config-prettier": "~6.4.0",
     "eslint-config-standard": "~12.0.0",
     "eslint-loader": "~3.0.2",
     "eslint-plugin-import": "~2.18.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 6e0fc69b8..936491c0f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6533,10 +6533,10 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^6.0.0, eslint-config-prettier@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.3.0.tgz#e73b48e59dc49d950843f3eb96d519e2248286a3"
-  integrity sha512-EWaGjlDAZRzVFveh2Jsglcere2KK5CJBhkNSa1xs3KfMUGdRiT7lG089eqPdvlzWHpAqaekubOsOMu8W8Yk71A==
+eslint-config-prettier@^6.0.0, eslint-config-prettier@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477"
+  integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==
   dependencies:
     get-stdin "^6.0.0"
 

From a02133ce0a2a34a35b25d322c3efa84f3ee78d49 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:29:24 +0000
Subject: [PATCH 055/212] build(deps): bump tiptap from 1.26.0 to 1.26.3 in
 /webapp

Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.26.0 to 1.26.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.26.0...tiptap@1.26.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index be343570e..0299e56ab 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -76,7 +76,7 @@
     "stack-utils": "^1.0.2",
     "string-hash": "^1.1.3",
     "tippy.js": "^4.3.5",
-    "tiptap": "~1.26.0",
+    "tiptap": "~1.26.3",
     "tiptap-extensions": "~1.28.0",
     "trunc-html": "^1.1.2",
     "v-tooltip": "~2.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 6e0fc69b8..1980c8e4d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -12487,10 +12487,10 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1:
     prosemirror-state "^1.0.0"
     w3c-keyname "^1.1.8"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.2.tgz#829abd7fb496783ba088936d2d7aff228206829a"
-  integrity sha512-mopozod/qNTB6utEyY8q4w1nCLDakpr39d8smzHno/wuAivCzBU8HkC9YOx1MBdTcTU6sXiIEh08hQfkC3damw==
+prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.2, prosemirror-model@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.3.tgz#d843b9338ebb1c22db85681452cf5724f785906e"
+  integrity sha512-Es71i2qXdkJNyIFyH7QoKDnKCTVC4LaQgiAaQV5Zd5XCKHg09m9NIJCEgePrF2yN/1tB/C5NYDY/4QsPvEM59A==
   dependencies:
     orderedmap "^1.0.0"
 
@@ -14671,19 +14671,19 @@ tippy.js@^4.3.5:
   dependencies:
     popper.js "^1.14.7"
 
-tiptap-commands@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.0.tgz#603b1c710c6950950eb1a7fc5279008f36bc2962"
-  integrity sha512-LWAVHOxsFR4yUJuruEwJ2QMwe0e9S4kHQ4HVIPEIofhuXKW4vmjvvX9Lzgi4cHy5cXC/TBAU2D43BNy7vdH1Kg==
+tiptap-commands@^1.12.0, tiptap-commands@^1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.2.tgz#5d478604f03ab5bc5b05e3f94f8c75cec175c8c3"
+  integrity sha512-wE19avtU0N/pNQlwDhfsJH1M3QT0Bc3oukfoB7K+K0H7xAXyfukbVPoZGjItWoyawtPk11A80OIBQCrO63fO4Q==
   dependencies:
     prosemirror-commands "^1.0.8"
     prosemirror-inputrules "^1.0.4"
-    prosemirror-model "^1.7.2"
+    prosemirror-model "^1.7.3"
     prosemirror-schema-list "^1.0.3"
     prosemirror-state "^1.2.4"
     prosemirror-tables "^0.9.5"
     prosemirror-utils "^0.9.6"
-    tiptap-utils "^1.8.0"
+    tiptap-utils "^1.8.1"
 
 tiptap-extensions@~1.28.0:
   version "1.28.0"
@@ -14702,31 +14702,31 @@ tiptap-extensions@~1.28.0:
     tiptap "^1.26.0"
     tiptap-commands "^1.12.0"
 
-tiptap-utils@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.0.tgz#cb03a263a1b1672bf4cccccb2078506fa91bd112"
-  integrity sha512-0k7zuhwrNpEAnoiH8kjAE9IUnqV8FNX1bv9W7we+jhQZPUuxODcpMX1oUkrN9i1seFVfPcxgQa+SmIy63kRKig==
+tiptap-utils@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.1.tgz#52eb90524f1ec95e66ddc84a20d892aaac879630"
+  integrity sha512-FcceXo+yVZni54aB/R3nTpdtcHmFM6QwW6PZg1aHH2u2fhkeV/MB7sXBkx3wIrvOtw8WPT2Kjpou2to27CCtbA==
   dependencies:
-    prosemirror-model "^1.7.2"
+    prosemirror-model "^1.7.3"
     prosemirror-state "^1.2.4"
     prosemirror-tables "^0.9.5"
     prosemirror-utils "^0.9.6"
 
-tiptap@^1.26.0, tiptap@~1.26.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.0.tgz#edaa07b4b9b6836d433d0b8017d26d37cc0cc3c9"
-  integrity sha512-lKJnZ4jL3luu3C5Y5aZIEj2spAfNPSwc5HPB+n9HhpSaWAfGM9XTOLm6I0EIbkLHiCnYNjItlLP6p1g+KPdtSw==
+tiptap@^1.26.0, tiptap@~1.26.3:
+  version "1.26.3"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.3.tgz#a08e1db4f1dce17a14309532e65a3949b0ceed91"
+  integrity sha512-EcTEM8GLuMa1jNxGg5cWR7NqyiFwtRat6im8A5EvL6iiLiOhIaqgkQnZJ5qUxWNgQTfjgCO5IWA85yoRSJWNMQ==
   dependencies:
     prosemirror-commands "^1.0.8"
     prosemirror-dropcursor "^1.1.2"
     prosemirror-gapcursor "^1.0.4"
     prosemirror-inputrules "^1.0.4"
     prosemirror-keymap "^1.0.1"
-    prosemirror-model "^1.7.2"
+    prosemirror-model "^1.7.3"
     prosemirror-state "^1.2.4"
     prosemirror-view "^1.11.4"
-    tiptap-commands "^1.12.0"
-    tiptap-utils "^1.8.0"
+    tiptap-commands "^1.12.2"
+    tiptap-utils "^1.8.1"
 
 title-case@^2.1.0:
   version "2.1.1"

From 1d5f4f2868dbcae43d98831e596f546e267b0888 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:30:07 +0000
Subject: [PATCH 056/212] build(deps): bump node from 12.10.0-alpine to
 12.11.0-alpine in /webapp

Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/Dockerfile             | 2 +-
 webapp/Dockerfile.maintenance | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 87793de92..1f793b2eb 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.10.0-alpine as base
+FROM node:12.11.0-alpine as base
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index 116016480..5c44e9ab9 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,4 +1,4 @@
-FROM node:12.10.0-alpine as build
+FROM node:12.11.0-alpine as build
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000

From e934148f7dabea8e32dc5c2a3079617532c50e46 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 04:30:25 +0000
Subject: [PATCH 057/212] build(deps): bump apollo-server from 2.9.4 to 2.9.5
 in /backend

Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.4...apollo-server@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 44f51709f..8a5bf301f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,7 +47,7 @@
     "apollo-client": "~2.6.4",
     "apollo-link-context": "~1.0.19",
     "apollo-link-http": "~1.5.16",
-    "apollo-server": "~2.9.4",
+    "apollo-server": "~2.9.5",
     "apollo-server-express": "^2.9.4",
     "babel-plugin-transform-runtime": "^6.23.0",
     "bcryptjs": "~2.4.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 990464fdb..7227204d0 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1668,10 +1668,10 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.4.tgz#0404455884951804d23ea64e45514c73afd34e5e"
-  integrity sha512-6mzipnn9woJxgo/JQFWTlY13svS7HCr0ZsN035eRmKOsXzROfB9ugXcTuc6MP94ICM7TlB/DtJOP+bLX53mijw==
+apollo-server-core@^2.9.4, apollo-server-core@^2.9.5:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737"
+  integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.0"
     "@apollographql/graphql-playground-html" "1.6.24"
@@ -1708,10 +1708,10 @@ apollo-server-errors@^2.3.3:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
   integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
-apollo-server-express@^2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.4.tgz#ae7ca0b70a644ba9fa5e3ac395d1e2d9a4b23522"
-  integrity sha512-diX9n81E0tIJ0Sy2bHvDGPM9QsFBsZ76Nx/dszinY00ViyWG0yIAYEYWeRbsoKTeNDWWTvlMrh/3Eu2oaCIEhQ==
+apollo-server-express@^2.9.4, apollo-server-express@^2.9.5:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.5.tgz#383e0a5cb80cf1172b0bc1e565797edd629d750a"
+  integrity sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
@@ -1719,7 +1719,7 @@ apollo-server-express@^2.9.4:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.1"
     accepts "^1.3.5"
-    apollo-server-core "^2.9.4"
+    apollo-server-core "^2.9.5"
     apollo-server-types "^0.2.4"
     body-parser "^1.18.3"
     cors "^2.8.4"
@@ -1753,13 +1753,13 @@ apollo-server-types@^0.2.4:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-server@~2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.4.tgz#564a0d0ec6dbefc86dbabe15bd23a83e48f58314"
-  integrity sha512-huAgQizkmzUkREixsSJHNM4ZnJ08plkwK70dm36mX9j+yYbc0h9J5b5o4E2Fb9U5PMR8kEVto1dz2rOJ0XPApA==
+apollo-server@~2.9.5:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.5.tgz#4f616337d04f2f0886d4bbe46b047a32a649b1fd"
+  integrity sha512-hbWZAZ3g186NG9U9bVmMpPcbUJ+/f/CSL+/tJsK6iQPp5L3hcVYoe+/qDw3zpfDMA5R2Jq/yHZtF2LcI5ylVnQ==
   dependencies:
-    apollo-server-core "^2.9.4"
-    apollo-server-express "^2.9.4"
+    apollo-server-core "^2.9.5"
+    apollo-server-express "^2.9.5"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"

From 3644400174bcda06198c6a182ae722f145ec3e10 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 07:20:51 +0000
Subject: [PATCH 058/212] build(deps-dev): bump cucumber from 5.1.0 to 6.0.1 in
 /backend

Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 5.1.0 to 6.0.1.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v5.1.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |   2 +-
 backend/yarn.lock    | 135 ++++++++++++++++++++++---------------------
 2 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 44f51709f..facd50401 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -116,7 +116,7 @@
     "babel-eslint": "~10.0.3",
     "babel-jest": "~24.9.0",
     "chai": "~4.2.0",
-    "cucumber": "~5.1.0",
+    "cucumber": "~6.0.1",
     "eslint": "~6.5.1",
     "eslint-config-prettier": "~6.3.0",
     "eslint-config-standard": "~14.1.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 990464fdb..cd418da20 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -605,14 +605,6 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/polyfill@^7.2.3":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.6.0.tgz#6d89203f8b6cd323e8d946e47774ea35dc0619cc"
-  integrity sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
-
 "@babel/preset-env@~7.6.2":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
@@ -1880,12 +1872,12 @@ assert@^1.4.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assertion-error-formatter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/assertion-error-formatter/-/assertion-error-formatter-2.0.1.tgz#6bbdffaec8e2fa9e2b0eb158bfe353132d7c0a9b"
-  integrity sha512-cjC3jUCh9spkroKue5PDSKH5RFQ/KNuZJhk3GwHYmB/8qqETxLOmMdLH+ohi/VukNzxDlMvIe7zScvLoOdhb6Q==
+assertion-error-formatter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error-formatter/-/assertion-error-formatter-3.0.0.tgz#be9c8825dee6a8a6c72183d915912d9b57d5d265"
+  integrity sha512-6YyAVLrEze0kQ7CmJfUgrLHb+Y7XghmL2Ie7ijVa2Y9ynP3LV+VDiwFk62Dn0qtqbmY0BT0ss6p1xxpiF2PYbQ==
   dependencies:
-    diff "^3.0.0"
+    diff "^4.0.1"
     pad-right "^0.2.2"
     repeat-string "^1.6.1"
 
@@ -2487,11 +2479,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
+commander@^2.8.1, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
+  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2710,49 +2707,47 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-cucumber-expressions@^6.0.0:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-6.6.2.tgz#d89640eccc72a78380b6c210eae36a64e7462b81"
-  integrity sha512-WcFSVBiWNLJbIcAAC3t/ACU46vaOKfe1UIF5H3qveoq+Y4XQm9j3YwHurQNufRKBBg8nCnpU7Ttsx7egjS3hwA==
+cucumber-expressions@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-7.0.2.tgz#aa4f959c68e72e0893613406e18cb3afe2fd4d82"
+  integrity sha512-U7xNcsDOA26rhbW/RlhrMexMyYDsu9Fea+RcEGrRB23heZjmy9rOHQcHAVvzSd+drlKC7XaSS6rlGL977j8ClQ==
   dependencies:
     becke-ch--regex--s0-0-v1--base--pl--lib "^1.2.0"
 
-cucumber-tag-expressions@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz#7f5c7b70009bc2b666591bfe64854578bedee85a"
-  integrity sha1-f1x7cACbwrZmWRv+ZIVFeL7e6Fo=
+cucumber-tag-expressions@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.2.tgz#aac27aae3690818ec15235bd056282dad8a2d2b8"
+  integrity sha512-DohmT4X641KX/sb96bdb7J2kXNcQBPrYmf3Oc5kiHCLfzFMWx/o2kB4JvjvQPZnYuA9lRt6pqtArM5gvUn4uzw==
 
-cucumber@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-5.1.0.tgz#7b166812c255bec7eac4b0df7007a40d089c895d"
-  integrity sha512-zrl2VYTBRgvxucwV2GKAvLqcfA1Naeax8plPvWgPEzl3SCJiuPPv3WxBHIRHtPYcEdbHDR6oqLpZP4bJ8UIdmA==
+cucumber@~6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.1.tgz#e1f003df9849e1861195783e92fe3463c360ca63"
+  integrity sha512-a/OmPfz00gNH8urg90e8tzFq2R5J8xZZUlXXpQk5xERSeQBZK7QeBKZArvQP476i9GarvFXY2eyIfKhGdCNrcw==
   dependencies:
-    "@babel/polyfill" "^7.2.3"
-    assertion-error-formatter "^2.0.1"
+    assertion-error-formatter "^3.0.0"
     bluebird "^3.4.1"
     cli-table3 "^0.5.1"
     colors "^1.1.2"
-    commander "^2.9.0"
-    cross-spawn "^6.0.5"
-    cucumber-expressions "^6.0.0"
-    cucumber-tag-expressions "^1.1.1"
+    commander "^3.0.1"
+    cucumber-expressions "^7.0.0"
+    cucumber-tag-expressions "^2.0.2"
     duration "^0.2.1"
-    escape-string-regexp "^1.0.5"
-    figures "2.0.0"
-    gherkin "^5.0.0"
+    escape-string-regexp "^2.0.0"
+    figures "^3.0.0"
+    gherkin "5.0.0"
     glob "^7.1.3"
-    indent-string "^3.1.0"
+    indent-string "^4.0.0"
     is-generator "^1.0.2"
-    is-stream "^1.1.0"
+    is-stream "^2.0.0"
     knuth-shuffle-seeded "^1.0.6"
-    lodash "^4.17.10"
+    lodash "^4.17.14"
     mz "^2.4.0"
     progress "^2.0.0"
     resolve "^1.3.3"
-    serialize-error "^3.0.0"
+    serialize-error "^4.1.0"
     stack-chain "^2.0.0"
     stacktrace-js "^2.0.0"
-    string-argv "0.1.1"
+    string-argv "^0.3.0"
     title-case "^2.1.1"
     util-arity "^1.0.2"
     verror "^1.9.0"
@@ -2937,10 +2932,10 @@ diff-sequences@^24.9.0:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
   integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
-diff@^3.0.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
 
 dns-prefetch-control@0.2.0:
   version "0.2.0"
@@ -3193,6 +3188,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escodegen@^1.9.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
@@ -3627,13 +3627,6 @@ feature-policy@0.3.0:
   resolved "https://registry.yarnpkg.com/feature-policy/-/feature-policy-0.3.0.tgz#7430e8e54a40da01156ca30aaec1a381ce536069"
   integrity sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==
 
-figures@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 figures@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"
@@ -3892,10 +3885,10 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gherkin@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gherkin/-/gherkin-5.1.0.tgz#684bbb03add24eaf7bdf544f58033eb28fb3c6d5"
-  integrity sha1-aEu7A63STq9731RPWAM+so+zxtU=
+gherkin@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/gherkin/-/gherkin-5.0.0.tgz#96def41198ec3908258b511af74f655a2764d2a1"
+  integrity sha1-lt70EZjsOQgli1Ea909lWidk0qE=
 
 glob-parent@^3.1.0:
   version "3.1.0"
@@ -4411,11 +4404,16 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^3.1.0, indent-string@^3.2.0:
+indent-string@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
   integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -4771,6 +4769,11 @@ is-stream@^1.0.0, is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -5590,7 +5593,7 @@ lodash.unescape@4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15:
+lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -7437,10 +7440,12 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-error@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-3.0.0.tgz#80100282b09be33c611536f50033481cb9cc87cf"
-  integrity sha512-+y3nkkG/go1Vdw+2f/+XUXM1DXX1XcxTl99FfiD/OEPUNw4uo0i6FKABfTAN5ZcgGtjTRZcEbxcE/jtXbEY19A==
+serialize-error@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-4.1.0.tgz#63e1e33ede20bcd89d9f0528ea4c15fbf0f2b78a"
+  integrity sha512-5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw==
+  dependencies:
+    type-fest "^0.3.0"
 
 serve-static@1.14.1:
   version "1.14.1"
@@ -7730,10 +7735,10 @@ streamsearch@0.1.2:
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
   integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
 
-string-argv@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.1.tgz#66bd5ae3823708eaa1916fa5412703150d4ddfaf"
-  integrity sha512-El1Va5ehZ0XTj3Ekw4WFidXvTmt9SrC0+eigdojgtJMVtPkF0qbBe9fyNSl9eQf+kUHnTSQxdQYzuHfZy8V+DQ==
+string-argv@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
 string-length@^2.0.0:
   version "2.0.0"

From 73e278f897fa7f7d0a514314ce72cc9150fee0df Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 07:27:10 +0000
Subject: [PATCH 059/212] build(deps): bump node from 12.10.0-alpine to
 12.11.0-alpine in /backend

Bumps node from 12.10.0-alpine to 12.11.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index dc2e6da87..556b6c48e 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.10.0-alpine as base
+FROM node:12.11.0-alpine as base
 LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 4000

From 555159e17180275bfaac3d351ee7bc2ccf83ee7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 7 Oct 2019 09:31:24 +0200
Subject: [PATCH 060/212] Refactor moderation page

---
 webapp/locales/de.json            |  6 ++--
 webapp/locales/en.json            |  6 ++--
 webapp/pages/moderation/index.vue | 55 ++++++++++++++++++++-----------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b6ee3f320..33994dd04 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -395,8 +395,10 @@
     "reports": {
       "empty": "Glückwunsch, es gibt nichts zu moderieren.",
       "name": "Meldungen",
-      "submitter": "gemeldet von",
-      "disabledBy": "deaktiviert von"
+      "reasonCategory": "Kategorie",
+      "reasonDescription": "Beschreibung",
+      "submitter": "Gemeldet von",
+      "disabledBy": "Deaktiviert von"
     }
   },
   "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 661c9c90a..74afad9dc 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -396,8 +396,10 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "submitter": "reported by",
-      "disabledBy": "disabled by"
+      "reasonCategory": "Category",
+      "reasonDescription": "Description",
+      "submitter": "Reported by",
+      "disabledBy": "Disabled by"
     }
   },
   "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1f8bb65c9..1f05c93ab 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -2,7 +2,28 @@
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
     <ds-table v-if="Report && Report.length" :data="Report" :fields="fields" condensed>
-      <template slot="name" slot-scope="scope">
+      <!-- Icon -->
+      <template slot="type" slot-scope="scope">
+        <ds-text color="soft">
+          <ds-icon
+            v-if="scope.row.type === 'Post'"
+            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
+            name="bookmark"
+          />
+          <ds-icon
+            v-else-if="scope.row.type === 'Comment'"
+            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
+            name="comments"
+          />
+          <ds-icon
+            v-else-if="scope.row.type === 'User'"
+            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+            name="user"
+          />
+        </ds-text>
+      </template>
+      <!-- reported user or content -->
+      <template slot="reportedUserContent" slot-scope="scope">
         <div v-if="scope.row.type === 'Post'">
           <nuxt-link
             :to="{
@@ -42,25 +63,15 @@
           </nuxt-link>
         </div>
       </template>
-      <template slot="type" slot-scope="scope">
-        <ds-text color="soft">
-          <ds-icon
-            v-if="scope.row.type === 'Post'"
-            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
-            name="bookmark"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'Comment'"
-            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
-            name="comments"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'User'"
-            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
-            name="user"
-          />
-        </ds-text>
+      <!-- reasonCategory -->
+      <template slot="reasonCategory" slot-scope="scope">
+        {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
       </template>
+      <!-- reasonCategory -->
+      <template slot="reasonDescription" slot-scope="scope">
+        {{ scope.row.reasonDescription }}
+      </template>
+      <!-- submitter -->
       <template slot="submitter" slot-scope="scope">
         <nuxt-link
           :to="{
@@ -71,6 +82,7 @@
           {{ scope.row.submitter.name }}
         </nuxt-link>
       </template>
+      <!-- disabledBy -->
       <template slot="disabledBy" slot-scope="scope">
         <nuxt-link
           v-if="scope.row.type === 'Post' && scope.row.post.disabledBy"
@@ -102,6 +114,7 @@
         >
           <b>{{ scope.row.user.disabledBy.name | truncate(50) }}</b>
         </nuxt-link>
+        <b v-else>—</b>
       </template>
     </ds-table>
     <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
@@ -125,7 +138,9 @@ export default {
     fields() {
       return {
         type: ' ',
-        name: ' ',
+        reportedUserContent: ' ',
+        reasonCategory: this.$t('moderation.reports.reasonCategory'),
+        reasonDescription: this.$t('moderation.reports.reasonDescription'),
         submitter: this.$t('moderation.reports.submitter'),
         disabledBy: this.$t('moderation.reports.disabledBy'),
         // actions: ' '

From 574fbcf8b136473b18a5e7272b24ec26440ca2e2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Oct 2019 10:32:11 +0200
Subject: [PATCH 061/212] tests ok, lint ok

---
 webapp/components/Editor/nodes/Embed.js      | 2 +-
 webapp/components/Editor/nodes/Embed.spec.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index f508589ba..88dd078b2 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -161,7 +161,7 @@ export default class Embed extends Node {
         },
         removeEmbed() {
           // TODO: replace the whole Embed with a proper Link node
-          console.log('I want to be a Link!')
+          // console.log('I want to be a Link!')
           this.removeEmbeds = true
         },
         async updateEmbedSettings(allowEmbedIframes) {
diff --git a/webapp/components/Editor/nodes/Embed.spec.js b/webapp/components/Editor/nodes/Embed.spec.js
index e38bda061..8307a9393 100644
--- a/webapp/components/Editor/nodes/Embed.spec.js
+++ b/webapp/components/Editor/nodes/Embed.spec.js
@@ -14,11 +14,11 @@ describe('Embed.vue', () => {
     }
   })
 
-  it('renders anchor', () => {
+  it('renders ds-container', () => {
     propsData = {
       node: { attrs: { href: someUrl } },
     }
-    expect(Wrapper({ propsData }).is('a')).toBe(true)
+    expect(Wrapper({ propsData }).is('ds-container')).toBe(true)
   })
 
   describe('given a href', () => {
@@ -49,8 +49,8 @@ describe('Embed.vue', () => {
         propsData.node = { attrs: { href: 'https://www.youtube.com/watch?v=qkdXAtO40Fo' } }
         const wrapper = Wrapper({ propsData })
         await wrapper.html()
-        expect(wrapper.find('div iframe').attributes('src')).toEqual(
-          'https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed',
+        expect(wrapper.find('ds-container img').attributes('src')).toEqual(
+          'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
         )
       })
     })

From 1ecfee09db1f70966f5cdaa6d62f4df8622a1328 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 7 Oct 2019 10:29:42 +0200
Subject: [PATCH 062/212] hide embed remove button when viewing post

---
 webapp/components/Editor/Editor.vue     |  6 ++++++
 webapp/components/Editor/nodes/Embed.js | 19 +++++++++++--------
 webapp/components/Editor/nodes/Link.js  |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 6ab4a0db6..fa37c64dc 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -343,6 +343,12 @@ li > p {
   }
 }
 
+.ProseMirror[contenteditable='false'] {
+  .embed-close-button {
+    display: none;
+  }
+}
+
 .embed-container {
   position: relative;
   padding: 0;
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 88dd078b2..9f2c9573f 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -4,8 +4,13 @@ import { compileToFunctions } from 'vue-template-compiler'
 import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
-const template = ` 
-  <a v-if="removeEmbeds" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>  
+const template = `
+  <a
+    v-if="showLinkOnly"
+    :href="dataEmbedUrl"
+    rel="noopener noreferrer nofollow"
+    target="_blank"
+  >{{dataEmbedUrl}}</a>
   <ds-container v-else width="small" class="embed-container">
     <section class="embed-content">
       <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
@@ -16,7 +21,7 @@ const template = `
       <h4 v-if="embedTitle">{{embedTitle}}</h4>
       <p v-if="embedDescription">{{embedDescription}}</p>
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
-    </section>   
+    </section>
     <aside v-if="showOverlay" class="embed-overlay">
       <h3>Achte auf deine Daten!</h3>
       <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
@@ -30,7 +35,7 @@ const template = `
       </label>
     </aside>
     <ds-button icon="close" ghost size="small" class="embed-close-button" @click.prevent="removeEmbed()" />
-  </ds-container> 
+  </ds-container>
 `
 
 const compiledTemplate = compileToFunctions(template)
@@ -93,7 +98,7 @@ export default class Embed extends Node {
         checkedAlwaysAllowEmbeds: false,
         showEmbed: false,
         showOverlay: false,
-        removeEmbeds: false,
+        showLinkOnly: false,
       }),
       async created() {
         if (this.options) {
@@ -160,9 +165,7 @@ export default class Embed extends Node {
           }
         },
         removeEmbed() {
-          // TODO: replace the whole Embed with a proper Link node
-          // console.log('I want to be a Link!')
-          this.removeEmbeds = true
+          this.showLinkOnly = true
         },
         async updateEmbedSettings(allowEmbedIframes) {
           try {
diff --git a/webapp/components/Editor/nodes/Link.js b/webapp/components/Editor/nodes/Link.js
index 6c015c030..4856566d6 100644
--- a/webapp/components/Editor/nodes/Link.js
+++ b/webapp/components/Editor/nodes/Link.js
@@ -27,6 +27,7 @@ export default class Link extends TipTapLink {
         {
           ...node.attrs,
           rel: 'noopener noreferrer nofollow',
+          target: '_blank',
         },
         0,
       ],

From 2f9954228e268b4ea9a7adfe1c589118d29b58b7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Oct 2019 10:51:05 +0200
Subject: [PATCH 063/212] vor merge

---
 webapp/components/Editor/nodes/Embed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 88dd078b2..27d07e59c 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -5,8 +5,8 @@ import { mapGetters, mapMutations } from 'vuex'
 import { allowEmbedIframesMutation } from '~/graphql/User.js'
 
 const template = ` 
-  <a v-if="removeEmbeds" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>  
-  <ds-container v-else width="small" class="embed-container">
+  <a v-show="removeEmbeds" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>  
+  <ds-container v-if="!removeEmbeds" width="small" class="embed-container">
     <section class="embed-content">
       <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
       <template v-else>

From 74322fc3762de1a6abce0248de692c04c922a4ae Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 08:57:08 +0000
Subject: [PATCH 064/212] build(deps-dev): bump apollo-server-testing in
 /backend

Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.4 to 2.9.5.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.4...apollo-server-testing@2.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index a74b06e19..e7b088594 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -111,7 +111,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.6.2",
     "@babel/register": "~7.6.2",
-    "apollo-server-testing": "~2.9.4",
+    "apollo-server-testing": "~2.9.5",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.3",
     "babel-jest": "~24.9.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 096bd4fac..9cae9f374 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1668,7 +1668,7 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.4, apollo-server-core@^2.9.5:
+apollo-server-core@^2.9.5:
   version "2.9.5"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737"
   integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==
@@ -1737,12 +1737,12 @@ apollo-server-plugin-base@^0.6.4:
   dependencies:
     apollo-server-types "^0.2.4"
 
-apollo-server-testing@~2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.4.tgz#421783573bdc5cef70dfe574b5193db38a33b5fb"
-  integrity sha512-qvnA9cXRKqizfYPHBli4LeSKYXwFVsQkGF3eHgofN/RbTqnEBqW7I5L14qDYAjGZg9/Z4alJf69hFE8KPHbT0Q==
+apollo-server-testing@~2.9.5:
+  version "2.9.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.5.tgz#ff5bbe3fefdf4d639bb138277d3dfc846b309438"
+  integrity sha512-IoElvnJ0Zex6i1QZj9v0szbDvCM6LF1gSZlQswRuIeTwvvquzixFVGMpLZKItojmjrCSxsT7DHJxeUFugZJUWA==
   dependencies:
-    apollo-server-core "^2.9.4"
+    apollo-server-core "^2.9.5"
 
 apollo-server-types@^0.2.4:
   version "0.2.4"

From 02281044f0876072caec4348641549fddd2e16e8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2019 08:57:55 +0000
Subject: [PATCH 065/212] build(deps): bump tiptap-extensions from 1.28.0 to
 1.28.3 in /webapp

Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.0 to 1.28.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.0...tiptap-extensions@1.28.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a19be8e0d..398d53faf 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -77,7 +77,7 @@
     "string-hash": "^1.1.3",
     "tippy.js": "^4.3.5",
     "tiptap": "~1.26.3",
-    "tiptap-extensions": "~1.28.0",
+    "tiptap-extensions": "~1.28.3",
     "trunc-html": "^1.1.2",
     "v-tooltip": "~2.0.2",
     "vue-count-to": "~1.0.13",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5bb87c600..f3929791b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -12487,7 +12487,7 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1:
     prosemirror-state "^1.0.0"
     w3c-keyname "^1.1.8"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.2, prosemirror-model@^1.7.3:
+prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.3.tgz#d843b9338ebb1c22db85681452cf5724f785906e"
   integrity sha512-Es71i2qXdkJNyIFyH7QoKDnKCTVC4LaQgiAaQV5Zd5XCKHg09m9NIJCEgePrF2yN/1tB/C5NYDY/4QsPvEM59A==
@@ -12521,10 +12521,10 @@ prosemirror-tables@^0.9.5:
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.0.0"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.4.tgz#30b35f02dd7761dd8139e5eb7612831fd031036a"
-  integrity sha512-1Y3XuaFJtwusYDvojcCxi3VZvNIntPVoh/dpeVaIM5Vf1V+M6xiIWcDgktUWWRovMxEhdibnpt5eyFmYJJhHtQ==
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.5.tgz#e50113d8004854eca1fa0711806bca53b1f1fad9"
+  integrity sha512-hJyRcwykLrAAj/ziNbVK1P/ensiszWJ2fNwNiDM8ZWYiMPwM4cAd2jptj/znxJfIvaj0S0psWL1+VhKwPNJDSQ==
   dependencies:
     prosemirror-model "^1.0.0"
 
@@ -14671,7 +14671,7 @@ tippy.js@^4.3.5:
   dependencies:
     popper.js "^1.14.7"
 
-tiptap-commands@^1.12.0, tiptap-commands@^1.12.2:
+tiptap-commands@^1.12.2:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.2.tgz#5d478604f03ab5bc5b05e3f94f8c75cec175c8c3"
   integrity sha512-wE19avtU0N/pNQlwDhfsJH1M3QT0Bc3oukfoB7K+K0H7xAXyfukbVPoZGjItWoyawtPk11A80OIBQCrO63fO4Q==
@@ -14685,22 +14685,22 @@ tiptap-commands@^1.12.0, tiptap-commands@^1.12.2:
     prosemirror-utils "^0.9.6"
     tiptap-utils "^1.8.1"
 
-tiptap-extensions@~1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.0.tgz#4704945e7a4fe33a77de11847f7ca3058008895e"
-  integrity sha512-yGKXGUnOrLhnXpnhTrL4tDJv+CSgyqVu0//M80uiY097btYnf/K0t7i0StRCY3Xg5mX5YFL9Q01f9Ppyi2jgtQ==
+tiptap-extensions@~1.28.3:
+  version "1.28.3"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.3.tgz#6278ed247c35c97cec41395671433408977cd9ef"
+  integrity sha512-iTUY5HQ+gYCHlyGMqcfKqO7JAvCqDEuvO4vEUrVxx0RgoYQfEf+Y17Kw8AJlVR6bB/Y/bEmMIuzVPjsgWNWdbw==
   dependencies:
     lowlight "^1.12.1"
     prosemirror-collab "^1.1.2"
     prosemirror-history "^1.0.4"
-    prosemirror-model "^1.7.2"
+    prosemirror-model "^1.7.3"
     prosemirror-state "^1.2.4"
     prosemirror-tables "^0.9.5"
-    prosemirror-transform "^1.1.4"
+    prosemirror-transform "^1.1.5"
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.11.4"
-    tiptap "^1.26.0"
-    tiptap-commands "^1.12.0"
+    tiptap "^1.26.3"
+    tiptap-commands "^1.12.2"
 
 tiptap-utils@^1.8.1:
   version "1.8.1"
@@ -14712,7 +14712,7 @@ tiptap-utils@^1.8.1:
     prosemirror-tables "^0.9.5"
     prosemirror-utils "^0.9.6"
 
-tiptap@^1.26.0, tiptap@~1.26.3:
+tiptap@^1.26.3, tiptap@~1.26.3:
   version "1.26.3"
   resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.3.tgz#a08e1db4f1dce17a14309532e65a3949b0ceed91"
   integrity sha512-EcTEM8GLuMa1jNxGg5cWR7NqyiFwtRat6im8A5EvL6iiLiOhIaqgkQnZJ5qUxWNgQTfjgCO5IWA85yoRSJWNMQ==

From 9350994ccab40a2a7f2947dbb29118ac6b31dc7f Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 7 Oct 2019 11:12:48 +0200
Subject: [PATCH 066/212] use translations for data privacy warning

---
 webapp/components/Editor/nodes/Embed.js | 10 +++++-----
 webapp/locales/de.json                  | 10 ++++++++--
 webapp/locales/en.json                  | 10 ++++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 9f2c9573f..63ae6bfae 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -23,15 +23,15 @@ const template = `
       <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
     </section>
     <aside v-if="showOverlay" class="embed-overlay">
-      <h3>Achte auf deine Daten!</h3>
-      <ds-text>Deine Daten sind noch nicht weitergegeben. Wenn Du die das jetzt ansiehst dann werden auch Daten mit dem Anbieter ({{embedPublisher}}) ausgetauscht!</ds-text>
+      <h3>{{ $t('editor.embed.data_privacy_warning') }}</h3>
+      <ds-text>{{ $t('editor.embed.data_privacy_info') }} {{embedPublisher}}</ds-text>
       <div class="embed-buttons">
-      <ds-button primary @click.prevent="allowEmbed()">jetzt ansehen</ds-button>
-      <ds-button ghost @click.prevent="closeOverlay()">Abbrechen</ds-button>
+      <ds-button primary @click.prevent="allowEmbed()">{{ $t('editor.embed.play_now') }}</ds-button>
+      <ds-button ghost @click.prevent="closeOverlay()">{{ $t('actions.cancel') }}</ds-button>
       </div>
       <label class="embed-checkbox">
         <input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />
-        <span>Inhalte von Drittanbietern immer zulassen</span>
+        <span>{{ $t('editor.embed.always_allow') }}</span>
       </label>
     </aside>
     <ds-button icon="close" ghost size="small" class="embed-close-button" @click.prevent="removeEmbed()" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f935fc005..27241a82d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -108,6 +108,12 @@
       "noHashtagsFound": "Keine Hashtags gefunden",
       "addHashtag": "Neuer Hashtag",
       "addLetter": "Tippe einen Buchstaben"
+    },
+    "embed": {
+      "data_privacy_warning": "Achte auf deine Daten!",
+      "data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn du dieses Video jetzt abspielst, registriert der folgende Anbieter wahrscheinlich deine Nutzerdaten:",
+      "play_now": "Jetzt ansehen",
+      "always_allow": "Inhalte von Drittanbietern immer anzeigen (diese Einstellung kannst du jederzeit ändern)"
     }
   },
   "profile": {
@@ -347,7 +353,7 @@
       "button-totrue": "dauerhaft zulassen",
       "third-party-false": "Es wird <b style='color:red'>kein</b> Service von Drittanbietern automatisch eingebunden.",
       "third-party-true": "Das einbinden der Services von Drittanbietern ist <b style='color:red'>dauerhaft zugelassen</b> und gespeichert für komende Sitzungen."
-    }
+    },
     "edited": "bearbeitet"
   },
   "comment": {
@@ -634,4 +640,4 @@
     "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎",
     "closing": "Herzlichst <br><br> Euer Human Connection Team"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 79f885491..676eeedd3 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -109,6 +109,12 @@
       "noHashtagsFound": "No hashtags found",
       "addHashtag": "New hashtag",
       "addLetter": "Type a letter"
+    },
+    "embed": {
+      "data_privacy_warning": "Data Privacy Warning!",
+      "data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to watch this video the following provider will likely collect user data:",
+      "play_now": "Watch now",
+      "always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)"
     }
   },
   "profile": {
@@ -348,7 +354,7 @@
       "button-totrue": "allow permanently",
       "third-party-false": "It automatically integrates <b style='color:red'>no </b> third-party providers' service.",
       "third-party-true": "The inclusion of third-party services is <b style='color:red'>permanently allowed</b> and stored for future sessions."
-    }
+    },
     "edited": "edited"
   },
   "comment": {
@@ -635,4 +641,4 @@
     "have-fun": "Now have fun with the alpha version of Human Connection! For the first universal peace. ♥︎",
     "closing": "Thank you very much <br> <br> your Human Connection Team"
   }
-}
\ No newline at end of file
+}

From ab8e30df305d3627b66a6cdbb46399b3226b422e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 7 Oct 2019 11:13:42 +0200
Subject: [PATCH 067/212] Translations

---
 webapp/locales/de.json | 21 +++++++++++++++++++++
 webapp/locales/en.json | 18 +++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 33994dd04..5034e1c4c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -62,6 +62,7 @@
     "success": "Du bist eingeloggt!"
   },
   "password-reset": {
+    "title": "Dein Passwort zurücksetzen",
     "form": {
       "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
       "submit": "Email anfordern",
@@ -458,6 +459,26 @@
       "type": "Kommentar",
       "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" melden möchtest?",
       "error": "Du hast den Kommentar bereits gemeldet!"
+    },
+    "reason": {
+      "category": {
+        "label": "Wähle eine Kategorie:",
+        "placeholder": "Kategorie …",
+        "options": {
+          "discrimination-etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
+          "pornographic-content-links": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
+          "glorific-trivia-of-cruel-inhuman-acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
+          "doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
+          "intentional-intimidation-stalking-persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
+          "advert-products-services-commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
+          "criminal-behavior-violation-german-law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
+          "other": "Anderes …"
+        }
+      },
+      "description": {
+        "label": "Bitte erkläre: Warum möchtest du dies melden?",
+        "placeholder": "Zusätzliche Information …"
+      }
     }
   },
   "followButton": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 74afad9dc..1b2edb86f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -465,18 +465,18 @@
         "label": "Select a category:",
         "placeholder": "Category …",
         "options": {
-          "discrimination-etc": "Discriminatory posts, comments, utterances or insults",
-          "pornographic-content-links": "Posting or linking of clearly pornographic material",
-          "glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence",
-          "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\")",
-          "intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution",
-          "advert-products-services-commercial": "Advertising products and services with commercial intent",
-          "criminal-behavior-violation-german-law": "Criminal behavior or violation of German law",
-          "other": "Other"
+          "discrimination-etc": "Discriminatory posts, comments, utterances or insults.",
+          "pornographic-content-links": "Posting or linking of clearly pornographic material.",
+          "glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
+          "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
+          "intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution.",
+          "advert-products-services-commercial": "Advertising products and services with commercial intent.",
+          "criminal-behavior-violation-german-law": "Criminal behavior or violation of German law.",
+          "other": "Other …"
         }
       },
       "description": {
-        "label": "Please explain why you like to report this?",
+        "label": "Please explain: Why you like to report this?",
         "placeholder": "Additional information …"
       }
     }

From b0151e4b2e7003b11738de02219bf8cd111ee2d3 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 7 Oct 2019 12:09:46 +0200
Subject: [PATCH 068/212] fix typo in email template

---
 backend/src/middleware/email/templates/emailVerification.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html
index 5b5564ebf..939ceccdb 100644
--- a/backend/src/middleware/email/templates/emailVerification.html
+++ b/backend/src/middleware/email/templates/emailVerification.html
@@ -57,7 +57,7 @@
           <td
             style="padding: 20px; padding-bottom: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
             <p style="margin: 0;">Falls Du deine E-Mail Adresse doch nicht ändern möchtest, kannst du diese Nachricht
-              einfach ignorieren. Mlde Dich gerne <a href="{{{ supportUrl }}}" style="color: #17b53e;">bei
+              einfach ignorieren. Melde Dich gerne <a href="{{{ supportUrl }}}" style="color: #17b53e;">bei
                 unserem Support Team</a>, wenn du noch Fragen hast!</p>
           </td>
         </tr>

From 18cfa0b8c8938b2babe30ec755b5ea61e0f7b6e6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 7 Oct 2019 13:01:21 +0200
Subject: [PATCH 069/212] tests 2 ok

---
 webapp/components/Editor/defaultExtensions.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Editor/defaultExtensions.spec.js b/webapp/components/Editor/defaultExtensions.spec.js
index 5bf8126b0..78924db55 100644
--- a/webapp/components/Editor/defaultExtensions.spec.js
+++ b/webapp/components/Editor/defaultExtensions.spec.js
@@ -35,7 +35,7 @@ describe('defaultExtensions', () => {
     it('renders mentioning as link', () => {
       const editor = createEditor()
       const expected =
-        '<p>This is a post content mentioning <a href="/profile/f0628376-e692-4167-bdb4-d521de5a014f" rel="noopener noreferrer nofollow">@alicia-luettgen</a>.</p>'
+        '<p>This is a post content mentioning <a href="/profile/f0628376-e692-4167-bdb4-d521de5a014f" rel="noopener noreferrer nofollow" target="_blank">@alicia-luettgen</a>.</p>'
       expect(editor.getHTML()).toEqual(expected)
     })
   })
@@ -49,7 +49,7 @@ describe('defaultExtensions', () => {
     it('renders hashtag as link', () => {
       const editor = createEditor()
       const expected =
-        '<p>This is a post content with a hashtag <a href="/search/hashtag/metoo" rel="noopener noreferrer nofollow">#metoo</a>.</p>'
+        '<p>This is a post content with a hashtag <a href="/search/hashtag/metoo" rel="noopener noreferrer nofollow" target="_blank">#metoo</a>.</p>'
       expect(editor.getHTML()).toEqual(expected)
     })
   })

From da1df277991015bd7c48a1fc551244b4288a75f3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 7 Oct 2019 19:15:39 +0200
Subject: [PATCH 070/212] Extract logic to EmbedComponent to separate concerns

- Co-authored-by: senderfm <dev@sender.fm>
---
 webapp/components/Editor/nodes/Embed.js      | 117 +-------------
 webapp/components/Editor/nodes/Embed.spec.js |  32 ++--
 webapp/components/Embed/EmbedComponent.vue   | 153 +++++++++++++++++++
 3 files changed, 176 insertions(+), 126 deletions(-)
 create mode 100644 webapp/components/Embed/EmbedComponent.vue

diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 63ae6bfae..0d7a82a18 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -1,42 +1,11 @@
 import { Node } from 'tiptap'
 import pasteRule from '../commands/pasteRule'
 import { compileToFunctions } from 'vue-template-compiler'
-import { mapGetters, mapMutations } from 'vuex'
-import { allowEmbedIframesMutation } from '~/graphql/User.js'
+import Vue from 'vue'
+import EmbedComponent from '~/components/Embed/EmbedComponent'
 
-const template = `
-  <a
-    v-if="showLinkOnly"
-    :href="dataEmbedUrl"
-    rel="noopener noreferrer nofollow"
-    target="_blank"
-  >{{dataEmbedUrl}}</a>
-  <ds-container v-else width="small" class="embed-container">
-    <section class="embed-content">
-      <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
-      <template v-else>
-        <img v-if="embedHtml && embedImage" :src="embedImage" class="embed-preview-image embed-preview-image--clickable" @click.prevent="openOverlay()" />
-        <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" />
-      </template>
-      <h4 v-if="embedTitle">{{embedTitle}}</h4>
-      <p v-if="embedDescription">{{embedDescription}}</p>
-      <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">{{dataEmbedUrl}}</a>
-    </section>
-    <aside v-if="showOverlay" class="embed-overlay">
-      <h3>{{ $t('editor.embed.data_privacy_warning') }}</h3>
-      <ds-text>{{ $t('editor.embed.data_privacy_info') }} {{embedPublisher}}</ds-text>
-      <div class="embed-buttons">
-      <ds-button primary @click.prevent="allowEmbed()">{{ $t('editor.embed.play_now') }}</ds-button>
-      <ds-button ghost @click.prevent="closeOverlay()">{{ $t('actions.cancel') }}</ds-button>
-      </div>
-      <label class="embed-checkbox">
-        <input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />
-        <span>{{ $t('editor.embed.always_allow') }}</span>
-      </label>
-    </aside>
-    <ds-button icon="close" ghost size="small" class="embed-close-button" @click.prevent="removeEmbed()" />
-  </ds-container>
-`
+Vue.component(EmbedComponent)
+const template = `<component :dataEmbedUrl="dataEmbedUrl" :embedData="embedData" :is="componentType" />`
 
 const compiledTemplate = compileToFunctions(template)
 
@@ -95,45 +64,15 @@ export default class Embed extends Node {
       props: ['node', 'updateAttrs', 'options'],
       data: () => ({
         embedData: {},
-        checkedAlwaysAllowEmbeds: false,
-        showEmbed: false,
-        showOverlay: false,
-        showLinkOnly: false,
       }),
       async created() {
         if (this.options) {
           this.embedData = await this.options.onEmbed({ url: this.dataEmbedUrl })
-          this.showEmbed = this.currentUser.allowEmbedIframes
-          this.checkedAlwaysAllowEmbeds = this.currentUser.allowEmbedIframes
         }
       },
       computed: {
-        ...mapGetters({
-          currentUser: 'auth/user',
-        }),
-        embedHtml() {
-          const { html = '' } = this.embedData
-          return html
-        },
-        embedImage() {
-          const { image = '' } = this.embedData
-          return image
-        },
-        embedPublisher() {
-          const { publisher = '' } = this.embedData
-          return publisher
-        },
-        embedTitle() {
-          const { title = '' } = this.embedData
-          return title
-        },
-        embedAuthor() {
-          const { author = '' } = this.embedData
-          return author
-        },
-        embedDescription() {
-          const { description = '' } = this.embedData
-          return description
+        componentType() {
+          return EmbedComponent
         },
         dataEmbedUrl: {
           get() {
@@ -146,50 +85,6 @@ export default class Embed extends Node {
           },
         },
       },
-      methods: {
-        ...mapMutations({
-          setCurrentUser: 'auth/SET_USER',
-        }),
-        openOverlay() {
-          this.showOverlay = true
-        },
-        closeOverlay() {
-          this.showOverlay = false
-        },
-        allowEmbed() {
-          this.showEmbed = true
-          this.closeOverlay()
-
-          if (this.checkedAlwaysAllowEmbeds !== this.currentUser.allowEmbedIframes) {
-            this.updateEmbedSettings(this.checkedAlwaysAllowEmbeds)
-          }
-        },
-        removeEmbed() {
-          this.showLinkOnly = true
-        },
-        async updateEmbedSettings(allowEmbedIframes) {
-          try {
-            await this.$apollo.mutate({
-              mutation: allowEmbedIframesMutation(),
-              variables: {
-                id: this.currentUser.id,
-                allowEmbedIframes,
-              },
-              update: (store, { data: { UpdateUser } }) => {
-                const { allowEmbedIframes } = UpdateUser
-                this.setCurrentUser({
-                  ...this.currentUser,
-                  allowEmbedIframes,
-                })
-              },
-            })
-            this.$toast.success(this.$t('contribution.success'))
-            this.showEmbed = this.currentUser.allowEmbedIframes
-          } catch (err) {
-            this.$toast.error(err.message)
-          }
-        },
-      },
       render(createElement) {
         return compiledTemplate.render.call(this, createElement)
       },
diff --git a/webapp/components/Editor/nodes/Embed.spec.js b/webapp/components/Editor/nodes/Embed.spec.js
index 8307a9393..a2ae2e7e5 100644
--- a/webapp/components/Editor/nodes/Embed.spec.js
+++ b/webapp/components/Editor/nodes/Embed.spec.js
@@ -1,31 +1,35 @@
-import { shallowMount } from '@vue/test-utils'
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
 import Embed from './Embed'
 
-let Wrapper
-let propsData
+let Wrapper, propsData, component
 const someUrl = 'https://www.youtube.com/watch?v=qkdXAtO40Fo'
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
 
 describe('Embed.vue', () => {
   beforeEach(() => {
     propsData = {}
-    const component = new Embed()
-    Wrapper = ({ mocks, propsData }) => {
+    component = new Embed()
+    // computed = {
+    //   currentUser: () => {
+    //     return { id: 'im a user', allowEmbedIframes: false }
+    //   },
+    // }
+    Wrapper = ({ propsData }) => {
       return shallowMount(component.view, { propsData })
     }
   })
 
-  it('renders ds-container', () => {
-    propsData = {
-      node: { attrs: { href: someUrl } },
-    }
-    expect(Wrapper({ propsData }).is('ds-container')).toBe(true)
-  })
-
   describe('given a href', () => {
     describe('onEmbed returned embed data', () => {
       beforeEach(() => {
         propsData.options = {
           onEmbed: () => ({
+            __typename: 'Embed',
             type: 'video',
             title: 'Baby Loves Cat',
             author: 'Merkley Family',
@@ -49,9 +53,7 @@ describe('Embed.vue', () => {
         propsData.node = { attrs: { href: 'https://www.youtube.com/watch?v=qkdXAtO40Fo' } }
         const wrapper = Wrapper({ propsData })
         await wrapper.html()
-        expect(wrapper.find('ds-container img').attributes('src')).toEqual(
-          'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
-        )
+        expect(wrapper.contains('embed-component-stub')).toBe(true)
       })
     })
 
diff --git a/webapp/components/Embed/EmbedComponent.vue b/webapp/components/Embed/EmbedComponent.vue
new file mode 100644
index 000000000..d7707d9bb
--- /dev/null
+++ b/webapp/components/Embed/EmbedComponent.vue
@@ -0,0 +1,153 @@
+<template>
+  <a v-if="showLinkOnly" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">
+    {{ dataEmbedUrl }}
+  </a>
+  <ds-container v-else width="small" class="embed-container">
+    <section class="embed-content">
+      <div v-if="showEmbed" v-html="embedHtml" class="embed-html" />
+      <template v-else>
+        <img
+          v-if="embedHtml && embedImage"
+          :src="embedImage"
+          class="embed-preview-image embed-preview-image--clickable"
+          @click.prevent="openOverlay()"
+        />
+        <img v-else-if="embedImage" :src="embedImage" class="embed-preview-image" />
+      </template>
+      <h4 v-if="embedTitle">{{ embedTitle }}</h4>
+      <p v-if="embedDescription">{{ embedDescription }}</p>
+      <a class="embed" :href="dataEmbedUrl" rel="noopener noreferrer nofollow" target="_blank">
+        {{ dataEmbedUrl }}
+      </a>
+    </section>
+    <aside v-if="showOverlay" class="embed-overlay">
+      <h3>{{ $t('editor.embed.data_privacy_warning') }}</h3>
+      <ds-text>{{ $t('editor.embed.data_privacy_info') }} {{ embedPublisher }}</ds-text>
+      <div class="embed-buttons">
+        <ds-button primary @click.prevent="allowEmbed()">
+          {{ $t('editor.embed.play_now') }}
+        </ds-button>
+        <ds-button ghost @click.prevent="closeOverlay()">{{ $t('actions.cancel') }}</ds-button>
+      </div>
+      <label class="embed-checkbox">
+        <input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />
+        <span>{{ $t('editor.embed.always_allow') }}</span>
+      </label>
+    </aside>
+    <ds-button
+      icon="close"
+      ghost
+      size="small"
+      class="embed-close-button"
+      @click.prevent="removeEmbed()"
+    />
+  </ds-container>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+import { allowEmbedIframesMutation } from '~/graphql/User.js'
+
+export default {
+  name: 'embed-component',
+  props: {
+    dataEmbedUrl: {
+      type: String,
+      default: '',
+    },
+    embedData: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      checkedAlwaysAllowEmbeds: false,
+      showEmbed: false,
+      showOverlay: false,
+      showLinkOnly: false,
+    }
+  },
+  created() {
+    if (this.embedData.options) {
+      this.showEmbed = this.currentUser.allowEmbedIframes
+      this.checkedAlwaysAllowEmbeds = this.currentUser.allowEmbedIframes
+    }
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'auth/user',
+    }),
+    embedHtml() {
+      const { html = '' } = this.embedData
+      return html
+    },
+    embedImage() {
+      const { image = '' } = this.embedData
+      return image
+    },
+    embedPublisher() {
+      const { publisher = '' } = this.embedData
+      return publisher
+    },
+    embedTitle() {
+      const { title = '' } = this.embedData
+      return title
+    },
+    embedAuthor() {
+      const { author = '' } = this.embedData
+      return author
+    },
+    embedDescription() {
+      const { description = '' } = this.embedData
+      return description
+    },
+  },
+  methods: {
+    ...mapMutations({
+      setCurrentUser: 'auth/SET_USER',
+    }),
+    openOverlay() {
+      this.showOverlay = true
+    },
+    closeOverlay() {
+      this.showOverlay = false
+    },
+    allowEmbed() {
+      this.showEmbed = true
+      this.closeOverlay()
+
+      if (this.checkedAlwaysAllowEmbeds !== this.currentUser.allowEmbedIframes) {
+        this.updateEmbedSettings(this.checkedAlwaysAllowEmbeds)
+      }
+    },
+    removeEmbed() {
+      this.showLinkOnly = true
+    },
+    async updateEmbedSettings(allowEmbedIframes) {
+      try {
+        await this.$apollo.mutate({
+          mutation: allowEmbedIframesMutation(),
+          variables: {
+            id: this.currentUser.id,
+            allowEmbedIframes,
+          },
+          update: (store, { data: { UpdateUser } }) => {
+            const { allowEmbedIframes } = UpdateUser
+            this.setCurrentUser({
+              ...this.currentUser,
+              allowEmbedIframes,
+            })
+          },
+        })
+        this.$toast.success(this.$t('contribution.success'))
+        this.showEmbed = this.currentUser.allowEmbedIframes
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
+    },
+  },
+}
+</script>

From 37dff79494f2e3a1f99dc84f768aa626c84259f2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2019 05:01:55 +0000
Subject: [PATCH 071/212] build(deps-dev): bump cucumber from 6.0.1 to 6.0.2 in
 /backend

Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 1a24c3567..69b67c8df 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -116,7 +116,7 @@
     "babel-eslint": "~10.0.3",
     "babel-jest": "~24.9.0",
     "chai": "~4.2.0",
-    "cucumber": "~6.0.1",
+    "cucumber": "~6.0.2",
     "eslint": "~6.5.1",
     "eslint-config-prettier": "~6.4.0",
     "eslint-config-standard": "~14.1.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5be862f29..967e55235 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2065,7 +2065,7 @@ bcryptjs@~2.4.3:
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
 
-becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0:
+becke-ch--regex--s0-0-v1--base--pl--lib@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz#429ceebbfa5f7e936e78d73fbdc7da7162b20e20"
   integrity sha1-Qpzuu/pffpNueNc/vcfacWKyDiA=
@@ -2707,29 +2707,30 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-cucumber-expressions@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-7.0.2.tgz#aa4f959c68e72e0893613406e18cb3afe2fd4d82"
-  integrity sha512-U7xNcsDOA26rhbW/RlhrMexMyYDsu9Fea+RcEGrRB23heZjmy9rOHQcHAVvzSd+drlKC7XaSS6rlGL977j8ClQ==
+cucumber-expressions@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-8.0.1.tgz#47eb87dcb626e90a4672986da1130f3c470b9e3d"
+  integrity sha512-g+A+tUEafNofe6ErwvOkqaMvDj9NuOr0GouGotpw4r5yK2d4144o9/6sQpXBr2YXbRy5ItmER/2bzAyDAzhPyQ==
   dependencies:
-    becke-ch--regex--s0-0-v1--base--pl--lib "^1.2.0"
+    becke-ch--regex--s0-0-v1--base--pl--lib "^1.4.0"
+    xregexp "^4.2.4"
 
 cucumber-tag-expressions@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.2.tgz#aac27aae3690818ec15235bd056282dad8a2d2b8"
   integrity sha512-DohmT4X641KX/sb96bdb7J2kXNcQBPrYmf3Oc5kiHCLfzFMWx/o2kB4JvjvQPZnYuA9lRt6pqtArM5gvUn4uzw==
 
-cucumber@~6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.1.tgz#e1f003df9849e1861195783e92fe3463c360ca63"
-  integrity sha512-a/OmPfz00gNH8urg90e8tzFq2R5J8xZZUlXXpQk5xERSeQBZK7QeBKZArvQP476i9GarvFXY2eyIfKhGdCNrcw==
+cucumber@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.2.tgz#3c4fbf1f76e60ddee79ab58f137a62c897a4d7f0"
+  integrity sha512-yEwPYGvgS2KG6ODdUXQwWcxjyr/l31dmpGJsZSkJIXNLNNmieKVefTpf8zLj6+0V2TCPwkmUZt4+OIXv97duEw==
   dependencies:
     assertion-error-formatter "^3.0.0"
     bluebird "^3.4.1"
     cli-table3 "^0.5.1"
     colors "^1.1.2"
     commander "^3.0.1"
-    cucumber-expressions "^7.0.0"
+    cucumber-expressions "^8.0.1"
     cucumber-tag-expressions "^2.0.2"
     duration "^0.2.1"
     escape-string-regexp "^2.0.0"

From 85b233cd87cbcb3f3d45edc1e80fc277155dffe3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2019 05:02:24 +0000
Subject: [PATCH 072/212] build(deps-dev): bump @storybook/vue from 5.2.1 to
 5.2.3 in /webapp

Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.1 to 5.2.3.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.3/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 431 ++++++++++++++++++++++----------------------
 2 files changed, 220 insertions(+), 213 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a19be8e0d..55c5c60d6 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -95,7 +95,7 @@
     "@babel/preset-env": "~7.6.2",
     "@storybook/addon-a11y": "^5.2.1",
     "@storybook/addon-actions": "^5.2.1",
-    "@storybook/vue": "~5.2.1",
+    "@storybook/vue": "~5.2.3",
     "@vue/cli-shared-utils": "~3.11.0",
     "@vue/eslint-config-prettier": "~5.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.29",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5bb87c600..1dfee9d06 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -750,7 +750,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
@@ -803,17 +803,7 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@emotion/cache@^10.0.14":
-  version "10.0.14"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.14.tgz#56093cff025c04b0330bdd92afe8335ed326dd18"
-  integrity sha512-HNGEwWnPlNyy/WPXBXzbjzkzeZFV657Z99/xq2xs5yinJHbMfi3ioCvBJ6Y8Zc8DQzO9F5jDmVXJB41Ytx3QMw==
-  dependencies:
-    "@emotion/sheet" "0.9.3"
-    "@emotion/stylis" "0.8.4"
-    "@emotion/utils" "0.11.2"
-    "@emotion/weak-memoize" "0.2.3"
-
-"@emotion/cache@^10.0.17", "@emotion/cache@^10.0.9":
+"@emotion/cache@^10.0.17":
   version "10.0.17"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.17.tgz#3491a035f62f276620d586677bfc3d4fad0b8472"
   integrity sha512-442/miwbuwIDfSzfMqZNxuzxSEbskcz/bZ86QBYzEjFrr/oq9w+y5kJY1BHbGhDtr91GO232PZ5NN9XYMwr/Qg==
@@ -835,19 +825,7 @@
     "@emotion/sheet" "0.9.3"
     "@emotion/utils" "0.11.2"
 
-"@emotion/core@^10.0.9":
-  version "10.0.14"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.14.tgz#cac5c334b278d5b7688cfff39e460a5b50abb71c"
-  integrity sha512-G9FbyxLm3lSnPfLDcag8fcOQBKui/ueXmWOhV+LuEQg9HrqExuWnWaO6gm6S5rNe+AMcqLXVljf8pYgAdFLNSg==
-  dependencies:
-    "@babel/runtime" "^7.4.3"
-    "@emotion/cache" "^10.0.14"
-    "@emotion/css" "^10.0.14"
-    "@emotion/serialize" "^0.11.8"
-    "@emotion/sheet" "0.9.3"
-    "@emotion/utils" "0.11.2"
-
-"@emotion/css@^10.0.14", "@emotion/css@^10.0.9":
+"@emotion/css@^10.0.14":
   version "10.0.14"
   resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz#95dacabdd0e22845d1a1b0b5968d9afa34011139"
   integrity sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==
@@ -992,11 +970,6 @@
   dependencies:
     vue "^2.6.10"
 
-"@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
-  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
-
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -1845,7 +1818,7 @@
     redux "^4.0.1"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@5.2.1", "@storybook/addon-actions@^5.2.1":
+"@storybook/addon-actions@^5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.1.tgz#2096e7f938b289be48af6f0adfd620997e7a420c"
   integrity sha512-tu4LGeRGAq+sLlsRPE1PzGyYU9JyM3HMLXnOCh5dvRSS8wnoDw1zQ55LPOXH6aoJGdsrvktiw+uTVf4OyN7ryg==
@@ -1865,29 +1838,6 @@
     react-inspector "^3.0.2"
     uuid "^3.3.2"
 
-"@storybook/addon-knobs@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.2.1.tgz#6bc2f7e254ccce09d6f5136e9cce63cd808c9853"
-  integrity sha512-JCSqrGYyVVBNkudhvla7qc9m0/Mn1UMaMzIxH5kewEE1KWZcCkdXD5hDASN39pkn3mX1yyqveP8jiyIL9vVBLg==
-  dependencies:
-    "@storybook/addons" "5.2.1"
-    "@storybook/api" "5.2.1"
-    "@storybook/client-api" "5.2.1"
-    "@storybook/components" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/theming" "5.2.1"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    escape-html "^1.0.3"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.11"
-    prop-types "^15.7.2"
-    qs "^6.6.0"
-    react-color "^2.17.0"
-    react-lifecycles-compat "^3.0.4"
-    react-select "^3.0.0"
-
 "@storybook/addons@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.1.tgz#6e52aa1fa2737e170fb675eb1fcceebd0a915a0b"
@@ -1901,6 +1851,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.3.tgz#02e35fad3ed4101625896e43e0a1e20215f6be38"
+  integrity sha512-LTkUJB8ZDc4++yt9acNHNjlnGWCyNtP+NVYPDvg7zFOaMip21Pj4T0pg9UwYxdqrFBWz9tVz7DJeXroS3egXxg==
+  dependencies:
+    "@storybook/api" "5.2.3"
+    "@storybook/channels" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.1.tgz#b9cd6639019e044a8ade6fb358cade79c0e3b5d3"
@@ -1924,6 +1887,29 @@
     telejson "^2.2.2"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247"
+  integrity sha512-2csxa/d64rXy4Dwoc7YjbPeNUJRgcI/wJUo30CLujk2stEFzDnKeMPR1mlHMCIFDW+KDxJ28bW59VPxwrqJFjw==
+  dependencies:
+    "@storybook/channels" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/router" "5.2.3"
+    "@storybook/theming" "5.2.3"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.0.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.1.tgz#85541f926d61eedbe2a687bb394d37fc06252751"
@@ -1935,6 +1921,17 @@
     global "^4.3.2"
     telejson "^2.2.2"
 
+"@storybook/channel-postmessage@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a"
+  integrity sha512-ixlpr6aAYoRM72cKwEWU/W0rWzOn3mYqb/eUdIaz3Da5BtFGKm3yEFguII0l1my82uhMm5/d3UNfoh0rO3pUyg==
+  dependencies:
+    "@storybook/channels" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.0.2"
+
 "@storybook/channels@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.1.tgz#e5e35f6d9fb1b1fba4f18b171f31d5f6540f3bef"
@@ -1942,6 +1939,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0"
+  integrity sha512-13Mlb+XbE0mHXiLLHdg0w9byhRy/bE605U7U96PGQp2cwX4lf+4jpViO2mDCsndAFRc0+2hexXPTkwgzvZzq0A==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.1.tgz#bdd335187279a4ab45e20d6d5e9131e5f7098acf"
@@ -1963,6 +1967,27 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872"
+  integrity sha512-anXxcf2z+KQAk94xxdbeG1N6nTEWXj087XHQ22L3pOoX9TRzfG71UjL0/S7vj4EFUiXVHj8d6YUFwLb5LwpUIw==
+  dependencies:
+    "@storybook/addons" "5.2.3"
+    "@storybook/channel-postmessage" "5.2.3"
+    "@storybook/channels" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/router" "5.2.3"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.1.tgz#5c1f122b65386f04a6ad648808dfa89f2d852d7a"
@@ -1970,6 +1995,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88"
+  integrity sha512-Z1irXW4jiFs7rClgqJqYOgg5op51ynV6dVuoIqxkSC0MrOG5s/VbX7T+ojGPXKyQWD4XYGw66Hnw9jouSfXL9g==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.1.tgz#a4519c5d435c2c25c481e2b64a768e1e568a223f"
@@ -1994,6 +2026,30 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
+"@storybook/components@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf"
+  integrity sha512-EiWKa3xONP2BPxrssiRdvKELhF2tO14HVL131CCFY+Zg/ylExzWWWVSBun7vYcKhkI52K5lmvC1vFSsB6Gmlhw==
+  dependencies:
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/theming" "5.2.3"
+    "@types/react-syntax-highlighter" "10.1.0"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^1.18.3"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^8.0.1"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+
 "@storybook/core-events@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.1.tgz#bc28d704938d26dd544d0362d38ef08e8cfed916"
@@ -2001,25 +2057,32 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.1.tgz#3aa17c6fa9b02704723501d32884453869e3c06c"
-  integrity sha512-mGGvN3GWeLxZ9lYZ4IuD1IoJD+cn6XXm2Arzw+k6KEtJJDFrC5SjESTDGLVFienX5s2tgH4FjYb9Ps9sKfhHlg==
+"@storybook/core-events@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00"
+  integrity sha512-sZEv93yE1o+/UJdhtqQ6vo2EauZ90FjN/L8F7CR7iqDEZzqo9g77Idg9LSgcN3TAeXcGAWVSrPb1vkK7H96L2g==
+  dependencies:
+    core-js "^3.0.1"
+
+"@storybook/core@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.3.tgz#e06cda6510b7778db1273696fc5b56f7ba33c025"
+  integrity sha512-sktjYY8pH4kQGFRKjXwtwwShdG3ajjHkrnw8oh3R383MRPom7i9owx5yHHMuQedLCXIwAg84s2DzO01I2URTcg==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.3.3"
     "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.2.1"
-    "@storybook/channel-postmessage" "5.2.1"
-    "@storybook/client-api" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/node-logger" "5.2.1"
-    "@storybook/router" "5.2.1"
-    "@storybook/theming" "5.2.1"
-    "@storybook/ui" "5.2.1"
+    "@storybook/addons" "5.2.3"
+    "@storybook/channel-postmessage" "5.2.3"
+    "@storybook/client-api" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/node-logger" "5.2.3"
+    "@storybook/router" "5.2.3"
+    "@storybook/theming" "5.2.3"
+    "@storybook/ui" "5.2.3"
     airbnb-js-shims "^1 || ^2"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.4.9"
@@ -2075,10 +2138,10 @@
     webpack-dev-middleware "^3.7.0"
     webpack-hot-middleware "^2.25.0"
 
-"@storybook/node-logger@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.1.tgz#00d8c0dc9dfd482e7d1d244a59c46726c6b761d9"
-  integrity sha512-rz+snXZyKwTegKEf15w4uaFWIKpgaWzTw+Ar8mxa+mX7C2DP65TOc+JGYZ7lsXdred+0WP0DhnmhGu2cX8z3lA==
+"@storybook/node-logger@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.3.tgz#cb746dbe0d1e56d905bf5601d16bb3a054123792"
+  integrity sha512-5p+5ltLdr7cZTSCG+vdIMDLHq5AAaL/CQ/bygjl+Rw/RSpvBO5Rg8hryszFyhogToHJbn2JinUbypLA+P6tcuQ==
   dependencies:
     chalk "^2.4.2"
     core-js "^3.0.1"
@@ -2099,6 +2162,19 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.3.tgz#d10284325820275ab7971621333988b5021dd3c9"
+  integrity sha512-sOu6y2GySaY82SdXfF3yOn0IJTKMqd2BDOSGEno7PWWtSenHFQWY+z99C9k0dLBTkjRes5tPcgm0OJ7RdQVRDQ==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+
 "@storybook/theming@5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.1.tgz#913e383632e4702035a107c2cc5e5cb27231b389"
@@ -2117,21 +2193,37 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/ui@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.1.tgz#ceba1657a232efd10f839027f8ae274e370c89f6"
-  integrity sha512-h6Yf1ro/nZcz4nQAU+eSVPxVmpqv7uT7RMb3Vz+VLTY59IEA/sWcoIgA4MIxwf14nVcWOqSmVBJzNKWwc+NGJw==
+"@storybook/theming@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a"
+  integrity sha512-3/0bo8CaoaHDYZaexydpYcwP6WW8BKRqSQBGXJY9y0TLhwY2Who5nPX9XdOLyu9d7lN//PRZlt8JnZynuncxoQ==
   dependencies:
-    "@storybook/addon-actions" "5.2.1"
-    "@storybook/addon-knobs" "5.2.1"
-    "@storybook/addons" "5.2.1"
-    "@storybook/api" "5.2.1"
-    "@storybook/channels" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/components" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/router" "5.2.1"
-    "@storybook/theming" "5.2.1"
+    "@emotion/core" "^10.0.14"
+    "@emotion/styled" "^10.0.14"
+    "@storybook/client-logger" "5.2.3"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.14"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+
+"@storybook/ui@5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.3.tgz#35e3a1147977da923c820db90fb95c95caf47126"
+  integrity sha512-SNyo5oxupb105N4Rz8O5/iJMs/THrmdvP+vsN7CpOTxebM01rHyvk51cNUwHKG1QwlZmpXL8GbtWlbvqL2d/gQ==
+  dependencies:
+    "@storybook/addons" "5.2.3"
+    "@storybook/api" "5.2.3"
+    "@storybook/channels" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/components" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/router" "5.2.3"
+    "@storybook/theming" "5.2.3"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2147,7 +2239,7 @@
     qs "^6.6.0"
     react "^16.8.3"
     react-dom "^16.8.3"
-    react-draggable "^3.3.2"
+    react-draggable "^4.0.3"
     react-helmet-async "^1.0.2"
     react-hotkeys "2.0.0-pre4"
     react-sizeme "^2.6.7"
@@ -2155,16 +2247,17 @@
     resolve-from "^5.0.0"
     semver "^6.0.0"
     store2 "^2.7.1"
-    telejson "^2.2.2"
+    telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.1.tgz#497e1be115b0d39b05a570c001c75d8a6e330a8f"
-  integrity sha512-0r8c7MsPix6hM7EOn0It1VS296OTFg5kzDqaOHLb/NHkPVuTackTdEkrZ8+tMAytDQ3NMU0wgj0uV4Bg8eKSWA==
+"@storybook/vue@~5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.3.tgz#66ec9830e878ffc700aa55a489e3582c91245955"
+  integrity sha512-HK5vkiiVEHc9N+zjv5dKIP1HlDIzUfGWtAo8TCywnyPskeZXfAjjjuZb5kttdwKjULGuwmpLtzjGcaYRJ/ytkQ==
   dependencies:
-    "@storybook/addons" "5.2.1"
-    "@storybook/core" "5.2.1"
+    "@storybook/addons" "5.2.3"
+    "@storybook/core" "5.2.3"
+    "@types/webpack-env" "^1.13.9"
     common-tags "^1.8.0"
     core-js "^3.0.1"
     global "^4.3.2"
@@ -2318,6 +2411,11 @@
   resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.0.tgz#56c95c69b51e7168b0d6727005d1fb2a00aaef94"
   integrity sha512-8CBLG8RmxSvoY07FE6M/QpvJ7J5KzeKqF8eWN7Dq6Ks+lBTQae8Roc2G81lUu2Kw5Ju1gymOuvgyUsussbjAaA==
 
+"@types/is-function@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/is-function/-/is-function-1.0.0.tgz#1b0b819b1636c7baf0d6785d030d12edf70c3e83"
+  integrity sha512-iTs9HReBu7evG77Q4EC8hZnqRt57irBDkK9nvmHroiOIVwYMQc4IvYvdRgwKfYepunIY7Oh/dBuuld+Gj9uo6w==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -2458,6 +2556,11 @@
   resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
+"@types/webpack-env@^1.13.9":
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.0.tgz#8edfc5f8e6eae20eeed3ca0d02974ed4ee5e4efc"
+  integrity sha512-Fv+0gYJzE/czLoRKq+gnXWr4yBpPM3tO3C8pDLFwqVKlMICQUq5OsxwwFZYDaVr7+L6mgNDp16iOcJHEz3J5RQ==
+
 "@types/ws@^6.0.0":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.1.tgz#ca7a3f3756aa12f62a0a62145ed14c6db25d5a28"
@@ -6169,13 +6272,6 @@ dom-event-types@^1.0.0:
   resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.0.0.tgz#5830a0a29e1bf837fe50a70cd80a597232813cae"
   integrity sha512-2G2Vwi2zXTHBGqXHsJ4+ak/iP0N8Ar+G8a7LiD2oup5o4sQWytwqqrZu/O6hIMV0KMID2PL69OhpshLO0n7UJQ==
 
-dom-helpers@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
 dom-serializer@0, dom-serializer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
@@ -6511,7 +6607,7 @@ es6-shim@^0.35.5:
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
   integrity sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg==
 
-escape-html@^1.0.3, escape-html@~1.0.3:
+escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -7637,7 +7733,7 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global@^4.3.2:
+global@^4.3.2, global@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -10008,7 +10104,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.x, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -10183,11 +10279,6 @@ markdown-to-jsx@^6.9.1, markdown-to-jsx@^6.9.3:
     prop-types "^15.6.2"
     unquote "^1.1.0"
 
-material-colors@^1.2.1:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
-  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -10207,11 +10298,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memoize-one@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
-  integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
-
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -12402,7 +12488,7 @@ prompts@^2.0.1:
     kleur "^3.0.2"
     sisteransi "^1.0.0"
 
-prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.7.2, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -12698,13 +12784,6 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
   integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
-raf@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
 ramda@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
@@ -12765,18 +12844,6 @@ react-clientside-effect@^1.2.0:
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-color@^2.17.0:
-  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.17.3.tgz#b8556d744f95193468c7061d2aa19180118d4a48"
-  integrity sha512-1dtO8LqAVotPIChlmo6kLtFS1FP89ll8/OiA8EcFRDR+ntcK+0ukJgByuIQHRtzvigf26dV5HklnxDIvhON9VQ==
-  dependencies:
-    "@icons/material" "^0.2.4"
-    lodash "^4.17.11"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
-
 react-dev-utils@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.1.tgz#5c03d85a0b2537d0c46af7165c24a7dfb274bef2"
@@ -12818,10 +12885,10 @@ react-dom@^16.8.3:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
-react-draggable@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.3.2.tgz#966ef1d90f2387af3c2d8bd3516f601ea42ca359"
-  integrity sha512-oaz8a6enjbPtx5qb0oDWxtDNuybOylvto1QLydsXgKmwT7e3GXC2eMVDwEMIUYJIFqVG72XpOv673UuuAq6LhA==
+react-draggable@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.0.3.tgz#6b9f76f66431c47b9070e9b805bbc520df8ca481"
+  integrity sha512-4vD6zms+9QGeZ2RQXzlUBw8PBYUXy+dzYX5r22idjp9YwQKIIvD/EojL0rbjS1GK4C3P0rAJnmKa8gDQYWUDyA==
   dependencies:
     classnames "^2.2.5"
     prop-types "^15.6.0"
@@ -12864,13 +12931,6 @@ react-hotkeys@2.0.0-pre4:
   dependencies:
     prop-types "^15.6.1"
 
-react-input-autosize@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
-  integrity sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==
-  dependencies:
-    prop-types "^15.5.8"
-
 react-inspector@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-3.0.2.tgz#c530a06101f562475537e47df428e1d7aff16ed8"
@@ -12922,22 +12982,6 @@ react-redux@^7.0.2:
     prop-types "^15.7.2"
     react-is "^16.8.6"
 
-react-select@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.4.tgz#16bde37c24fd4f6444914d4681e78f15ffbc86d3"
-  integrity sha512-fbVISKa/lSUlLsltuatfUiKcWCNvdLXxFFyrzVQCBUsjxJZH/m7UMPdw/ywmRixAmwXAP++MdbNNZypOsiDEfA==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@emotion/cache" "^10.0.9"
-    "@emotion/core" "^10.0.9"
-    "@emotion/css" "^10.0.9"
-    classnames "^2.2.5"
-    memoize-one "^5.0.0"
-    prop-types "^15.6.0"
-    raf "^3.4.0"
-    react-input-autosize "^2.2.1"
-    react-transition-group "^2.2.1"
-
 react-sizeme@^2.5.2, react-sizeme@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.7.tgz#231339ce8821ac2c26424c791e0027f89dae3e90"
@@ -12967,16 +13011,6 @@ react-textarea-autosize@^7.1.0:
     "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
 
-react-transition-group@^2.2.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
-  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
-  dependencies:
-    dom-helpers "^3.4.0"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
-
 react@^16.8.3:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
@@ -12987,13 +13021,6 @@ react@^16.8.3:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -14526,6 +14553,20 @@ telejson@^2.2.2:
     lodash "^4.17.11"
     memoizerific "^1.11.3"
 
+telejson@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-3.0.3.tgz#442af55f78d791d3744c9e7a696be6cdf789a4b5"
+  integrity sha512-gUOh6wox1zJjbGMg+e26NquZcp/F18EbIaqVvjiGqikRqVB4fYEAM8Nyin8smgwX30XhaRBOg+kCj4vInmvwAg==
+  dependencies:
+    "@types/is-function" "^1.0.0"
+    global "^4.4.0"
+    is-function "^1.0.1"
+    is-regex "^1.0.4"
+    is-symbol "^1.0.2"
+    isobject "^4.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -14659,11 +14700,6 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tinycolor2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
-  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
 tippy.js@^4.3.5:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54"
@@ -15711,36 +15747,7 @@ webpack-sources@^1.4.3:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.33.0, webpack@^4.38.0:
-  version "4.39.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.3.tgz#a02179d1032156b713b6ec2da7e0df9d037def50"
-  integrity sha512-BXSI9M211JyCVc3JxHWDpze85CvjC842EvpRsVTc/d15YJGlox7GIDd38kJgWrb3ZluyvIjgenbLDMBQPDcxYQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.1"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
-    watchpack "^1.6.0"
-    webpack-sources "^1.4.1"
-
-webpack@^4.41.0:
+webpack@^4.33.0, webpack@^4.38.0, webpack@^4.41.0:
   version "4.41.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b"
   integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==

From 390e073acdd8d98c8b6572be97229712ecf52449 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2019 05:03:33 +0000
Subject: [PATCH 073/212] build(deps): bump node from 12.11.0-alpine to
 12.11.1-alpine in /webapp

Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/Dockerfile             | 2 +-
 webapp/Dockerfile.maintenance | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 1f793b2eb..1a27e6d94 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.11.0-alpine as base
+FROM node:12.11.1-alpine as base
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index 5c44e9ab9..e32048252 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,4 +1,4 @@
-FROM node:12.11.0-alpine as build
+FROM node:12.11.1-alpine as build
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000

From 0d08f95ca82e131a9a58bfeded051e664d8fb9ce Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2019 05:31:11 +0000
Subject: [PATCH 074/212] build(deps): bump styleguide from `808b3c5` to
 `d46fc15`

Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `d46fc15`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/808b3c5a9523505cb80b20b50348d29ba9932845...d46fc1570c6bcea328ae4cc3a4892745edea7319)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 styleguide | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styleguide b/styleguide
index 808b3c5a9..d46fc1570 160000
--- a/styleguide
+++ b/styleguide
@@ -1 +1 @@
-Subproject commit 808b3c5a9523505cb80b20b50348d29ba9932845
+Subproject commit d46fc1570c6bcea328ae4cc3a4892745edea7319

From 7cc139e879ac7ea912e82ea7eff14f7b67eddb4a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Oct 2019 13:20:07 +0200
Subject: [PATCH 075/212] add test embeds and links

---
 webapp/components/Editor/nodes/Embed.spec.js  |   5 -
 .../components/Embed/EmbedComponent.spec.js   | 151 ++++++++++++++++++
 webapp/components/Embed/EmbedComponent.vue    |   2 +-
 3 files changed, 152 insertions(+), 6 deletions(-)
 create mode 100644 webapp/components/Embed/EmbedComponent.spec.js

diff --git a/webapp/components/Editor/nodes/Embed.spec.js b/webapp/components/Editor/nodes/Embed.spec.js
index a2ae2e7e5..639f99338 100644
--- a/webapp/components/Editor/nodes/Embed.spec.js
+++ b/webapp/components/Editor/nodes/Embed.spec.js
@@ -14,11 +14,6 @@ describe('Embed.vue', () => {
   beforeEach(() => {
     propsData = {}
     component = new Embed()
-    // computed = {
-    //   currentUser: () => {
-    //     return { id: 'im a user', allowEmbedIframes: false }
-    //   },
-    // }
     Wrapper = ({ propsData }) => {
       return shallowMount(component.view, { propsData })
     }
diff --git a/webapp/components/Embed/EmbedComponent.spec.js b/webapp/components/Embed/EmbedComponent.spec.js
new file mode 100644
index 000000000..46a9df1b0
--- /dev/null
+++ b/webapp/components/Embed/EmbedComponent.spec.js
@@ -0,0 +1,151 @@
+import { mount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+import EmbedComponent from './EmbedComponent'
+
+let Wrapper, wrapper, propsData, getters, mocks
+const someUrl = 'https://www.youtube.com/watch?v=qkdXAtO40Fo'
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+
+describe('EmbedComponent.vue', () => {
+  beforeEach(() => {
+    mocks = {
+      $t: a => a,
+    }
+    propsData = {}
+    getters = {
+      'auth/user': () => {
+        return { id: 'u5', allowEmbedIframes: false }
+      },
+    }
+    Wrapper = ({ propsData }) => {
+      const store = new Vuex.Store({
+        getters,
+      })
+      return mount(EmbedComponent, { propsData, localVue, store, mocks })
+    }
+  })
+
+  describe('given a href only for a link ', () => {
+    beforeEach(() => {
+      propsData.embedData = {
+        __typename: 'Embed',
+        type: 'link',
+        title: '👻 ✉️ Bruno... le ciel sur répondeur ! 🔮 🧠 - Clément FREZE',
+        author: null,
+        publisher: 'PeerTube.social',
+        date: null,
+        description:
+          'Salut tout le monde ! Aujourd’hui, une vidéo sur le scepticisme, nous allons parler médiumnité avec le cas de Bruno CHARVET : « Bruno, un nouveau message ». Merci de rester respectueux dans les commentaires : SOURCES : Les sources des vi...',
+        url: 'https://peertube.social/videos/watch/f3cb1945-a8f7-481f-a465-946c6f884e50',
+        image: 'https://peertube.social/static/thumbnails/f3cb1945-a8f7-481f-a465-946c6f884e50.jpg',
+        audio: null,
+        video: null,
+        lang: 'fr',
+        sources: ['resource', 'oembed'],
+        html: null,
+      }
+      wrapper = Wrapper({ propsData })
+    })
+
+    it.only('show the title', () => {
+      expect(wrapper.find('h4').text()).toBe(
+        '👻 ✉️ Bruno... le ciel sur répondeur ! 🔮 🧠 - Clément FREZE',
+      )
+    })
+
+    it.only('show the desciption', () => {
+      expect(wrapper.find('.embed-content p').text()).toBe(
+        'Salut tout le monde ! Aujourd’hui, une vidéo sur le scepticisme, nous allons parler médiumnité avec le cas de Bruno CHARVET : « Bruno, un nouveau message ». Merci de rester respectueux dans les commentaires : SOURCES : Les sources des vi...',
+      )
+    })
+
+    it.only('show preview Images for link', () => {
+      expect(wrapper.find('.embed-preview-image--clickable')).toEqual({
+        selector: '.embed-preview-image--clickable',
+      })
+    })
+  })
+
+  describe('given a href wite embed html', () => {
+    describe('onEmbed returned title and description', () => {
+      beforeEach(() => {
+        propsData.embedData = {
+          __typename: 'Embed',
+          title: 'Baby Loves Cat',
+          description:
+            'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
+        }
+        wrapper = Wrapper({ propsData })
+      })
+
+      it.only('show the title', () => {
+        expect(wrapper.find('h4').text()).toBe('Baby Loves Cat')
+      })
+
+      it.only('show the desciption', () => {
+        expect(wrapper.find('.embed-content p').text()).toBe(
+          'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
+        )
+      })
+    })
+
+    describe('onEmbed returned embed data with html', () => {
+      beforeEach(() => {
+        propsData.embedData = {
+          __typename: 'Embed',
+          type: 'video',
+          title: 'Baby Loves Cat',
+          author: 'Merkley Family',
+          publisher: 'YouTube',
+          date: '2015-08-16T00:00:00.000Z',
+          description:
+            'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
+          url: someUrl,
+          image: 'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
+          audio: null,
+          video: null,
+          lang: 'de',
+          sources: ['resource', 'oembed'],
+          html:
+            '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+        }
+        wrapper = Wrapper({ propsData })
+      })
+
+      it('shows a simple link when a user closes the embed preview', () => {
+        wrapper.find('.embed-close-button').trigger('click')
+        expect(wrapper.vm.showLinkOnly).toBe(true)
+      })
+
+      it.only('opens the data privacy overlay when a user clicks on the preview image', () => {
+        wrapper.find('.embed-preview-image--clickable').trigger('click')
+        expect(wrapper.vm.showOverlay).toBe(true)
+      })
+
+      it.only('click show iframe and change NOT setting permanetly', () => {
+        wrapper.setData({ showOverlay: true })
+        wrapper.find('.ds-button-primary').trigger('click')
+        expect(wrapper.vm.showEmbed).toBe(true)
+        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
+      })
+
+      it.only('click show iframe and change setting permanetly', () => {
+        wrapper.setData({ showOverlay: true })
+        wrapper.find('input[type=checkbox]').trigger('click')
+        wrapper.find('.ds-button-primary').trigger('click')
+        expect(wrapper.vm.showEmbed).toBe(true)
+        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
+      })
+
+      it.only('show only iframe if allowEmbedIframes true', () => {
+        wrapper.setData({ allowEmbedIframes: true })
+        expect(wrapper.find('.embed-html')).toEqual({ selector: '.embed-html' })
+        expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})
+      })
+    })
+  })
+})
diff --git a/webapp/components/Embed/EmbedComponent.vue b/webapp/components/Embed/EmbedComponent.vue
index d7707d9bb..5dc8ad00c 100644
--- a/webapp/components/Embed/EmbedComponent.vue
+++ b/webapp/components/Embed/EmbedComponent.vue
@@ -71,7 +71,7 @@ export default {
     }
   },
   created() {
-    if (this.embedData.options) {
+    if (this.currentUser.allowEmbedIframes) {
       this.showEmbed = this.currentUser.allowEmbedIframes
       this.checkedAlwaysAllowEmbeds = this.currentUser.allowEmbedIframes
     }

From 0424992358d6cde034909a8c43160587a6da572f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Oct 2019 16:35:49 +0200
Subject: [PATCH 076/212] change specs

---
 .../components/Embed/EmbedComponent.spec.js   | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Embed/EmbedComponent.spec.js b/webapp/components/Embed/EmbedComponent.spec.js
index 46a9df1b0..09546bf15 100644
--- a/webapp/components/Embed/EmbedComponent.spec.js
+++ b/webapp/components/Embed/EmbedComponent.spec.js
@@ -51,26 +51,26 @@ describe('EmbedComponent.vue', () => {
       wrapper = Wrapper({ propsData })
     })
 
-    it.only('show the title', () => {
+    it('shows the title', () => {
       expect(wrapper.find('h4').text()).toBe(
         '👻 ✉️ Bruno... le ciel sur répondeur ! 🔮 🧠 - Clément FREZE',
       )
     })
 
-    it.only('show the desciption', () => {
+    it('shows the description', () => {
       expect(wrapper.find('.embed-content p').text()).toBe(
         'Salut tout le monde ! Aujourd’hui, une vidéo sur le scepticisme, nous allons parler médiumnité avec le cas de Bruno CHARVET : « Bruno, un nouveau message ». Merci de rester respectueux dans les commentaires : SOURCES : Les sources des vi...',
       )
     })
 
-    it.only('show preview Images for link', () => {
+    it('shows preview Images for link', () => {
       expect(wrapper.find('.embed-preview-image--clickable')).toEqual({
         selector: '.embed-preview-image--clickable',
       })
     })
   })
 
-  describe('given a href wite embed html', () => {
+  describe('given a href with embed html', () => {
     describe('onEmbed returned title and description', () => {
       beforeEach(() => {
         propsData.embedData = {
@@ -82,11 +82,11 @@ describe('EmbedComponent.vue', () => {
         wrapper = Wrapper({ propsData })
       })
 
-      it.only('show the title', () => {
+      it('show the title', () => {
         expect(wrapper.find('h4').text()).toBe('Baby Loves Cat')
       })
 
-      it.only('show the desciption', () => {
+      it('show the desciption', () => {
         expect(wrapper.find('.embed-content p').text()).toBe(
           'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
         )
@@ -121,19 +121,19 @@ describe('EmbedComponent.vue', () => {
         expect(wrapper.vm.showLinkOnly).toBe(true)
       })
 
-      it.only('opens the data privacy overlay when a user clicks on the preview image', () => {
+      it('opens the data privacy overlay when a user clicks on the preview image', () => {
         wrapper.find('.embed-preview-image--clickable').trigger('click')
         expect(wrapper.vm.showOverlay).toBe(true)
       })
 
-      it.only('click show iframe and change NOT setting permanetly', () => {
+      it("click show iframe, but don't select to change setting permanetly", () => {
         wrapper.setData({ showOverlay: true })
         wrapper.find('.ds-button-primary').trigger('click')
         expect(wrapper.vm.showEmbed).toBe(true)
         expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
       })
 
-      it.only('click show iframe and change setting permanetly', () => {
+      it('click show iframe and change setting permanetly', () => {
         wrapper.setData({ showOverlay: true })
         wrapper.find('input[type=checkbox]').trigger('click')
         wrapper.find('.ds-button-primary').trigger('click')
@@ -141,7 +141,14 @@ describe('EmbedComponent.vue', () => {
         expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
       })
 
-      it.only('show only iframe if allowEmbedIframes true', () => {
+      it('click do not show iframe', () => {
+        wrapper.setData({ showOverlay: true })
+        wrapper.find('.ds-button-ghost').trigger('click')
+        expect(wrapper.vm.showOverlay).toBe(false)
+        expect(wrapper.vm.showEmbed).toBe(false)
+      })
+
+      it('show only iframe if allowEmbedIframes true', () => {
         wrapper.setData({ allowEmbedIframes: true })
         expect(wrapper.find('.embed-html')).toEqual({ selector: '.embed-html' })
         expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})

From e2da57287b01feae82497ea260fa2d5c40acb0a6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Oct 2019 18:56:45 +0200
Subject: [PATCH 077/212] change providers.json

---
 backend/src/schema/resolvers/embeds/findProvider.js | 3 ++-
 webapp/components/Embed/EmbedComponent.spec.js      | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index c7d910918..4742935b7 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -3,9 +3,10 @@ import path from 'path'
 import minimatch from 'minimatch'
 
 let oEmbedProvidersFile = fs.readFileSync(
-  path.join(__dirname, '../../../../public/providers.json'),
+  path.join(__dirname, './providers.json'),
   'utf8',
 )
+
 // some providers allow a format parameter
 // we need JSON
 oEmbedProvidersFile = oEmbedProvidersFile.replace(/\{format\}/g, 'json')
diff --git a/webapp/components/Embed/EmbedComponent.spec.js b/webapp/components/Embed/EmbedComponent.spec.js
index 09546bf15..b4fbe6a60 100644
--- a/webapp/components/Embed/EmbedComponent.spec.js
+++ b/webapp/components/Embed/EmbedComponent.spec.js
@@ -68,6 +68,8 @@ describe('EmbedComponent.vue', () => {
         selector: '.embed-preview-image--clickable',
       })
     })
+
+           
   })
 
   describe('given a href with embed html', () => {
@@ -91,7 +93,6 @@ describe('EmbedComponent.vue', () => {
           'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
         )
       })
-    })
 
     describe('onEmbed returned embed data with html', () => {
       beforeEach(() => {
@@ -141,7 +142,7 @@ describe('EmbedComponent.vue', () => {
         expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
       })
 
-      it('click do not show iframe', () => {
+      it('click cancel do not show iframe', () => {
         wrapper.setData({ showOverlay: true })
         wrapper.find('.ds-button-ghost').trigger('click')
         expect(wrapper.vm.showOverlay).toBe(false)
@@ -154,5 +155,6 @@ describe('EmbedComponent.vue', () => {
         expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})
       })
     })
+    })
   })
-})
+})
\ No newline at end of file

From 3c04e1a32851cfefbb9f7add213b6a28f662e982 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Oct 2019 19:00:14 +0200
Subject: [PATCH 078/212] code blockuser in settings add

---
 webapp/pages/settings.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue
index cfd258bad..a7604ea5f 100644
--- a/webapp/pages/settings.vue
+++ b/webapp/pages/settings.vue
@@ -35,6 +35,10 @@ export default {
           name: this.$t('settings.social-media.name'),
           path: `/settings/my-social-media`,
         },
+        {
+          name: this.$t('settings.blocked-users.name'),
+          path: `/settings/blocked-users`,
+        },
         {
           name: this.$t('post.allowEmbeds.name'),
           path: `/settings/allow-embeds`,

From b8037b6e1f4098f4c02f7385b8c10c03cf53ec2d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 8 Oct 2019 20:29:41 +0200
Subject: [PATCH 079/212] fix lint

---
 .../schema/resolvers/embeds/findProvider.js   |   5 +-
 .../components/Embed/EmbedComponent.spec.js   | 112 +++++++++---------
 2 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index 4742935b7..a4240895f 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -2,10 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import minimatch from 'minimatch'
 
-let oEmbedProvidersFile = fs.readFileSync(
-  path.join(__dirname, './providers.json'),
-  'utf8',
-)
+let oEmbedProvidersFile = fs.readFileSync(path.join(__dirname, './providers.json'), 'utf8')
 
 // some providers allow a format parameter
 // we need JSON
diff --git a/webapp/components/Embed/EmbedComponent.spec.js b/webapp/components/Embed/EmbedComponent.spec.js
index b4fbe6a60..0f7c6f4e1 100644
--- a/webapp/components/Embed/EmbedComponent.spec.js
+++ b/webapp/components/Embed/EmbedComponent.spec.js
@@ -68,8 +68,6 @@ describe('EmbedComponent.vue', () => {
         selector: '.embed-preview-image--clickable',
       })
     })
-
-           
   })
 
   describe('given a href with embed html', () => {
@@ -94,67 +92,67 @@ describe('EmbedComponent.vue', () => {
         )
       })
 
-    describe('onEmbed returned embed data with html', () => {
-      beforeEach(() => {
-        propsData.embedData = {
-          __typename: 'Embed',
-          type: 'video',
-          title: 'Baby Loves Cat',
-          author: 'Merkley Family',
-          publisher: 'YouTube',
-          date: '2015-08-16T00:00:00.000Z',
-          description:
-            'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
-          url: someUrl,
-          image: 'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
-          audio: null,
-          video: null,
-          lang: 'de',
-          sources: ['resource', 'oembed'],
-          html:
-            '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
-        }
-        wrapper = Wrapper({ propsData })
-      })
+      describe('onEmbed returned embed data with html', () => {
+        beforeEach(() => {
+          propsData.embedData = {
+            __typename: 'Embed',
+            type: 'video',
+            title: 'Baby Loves Cat',
+            author: 'Merkley Family',
+            publisher: 'YouTube',
+            date: '2015-08-16T00:00:00.000Z',
+            description:
+              'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
+            url: someUrl,
+            image: 'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
+            audio: null,
+            video: null,
+            lang: 'de',
+            sources: ['resource', 'oembed'],
+            html:
+              '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+          }
+          wrapper = Wrapper({ propsData })
+        })
 
-      it('shows a simple link when a user closes the embed preview', () => {
-        wrapper.find('.embed-close-button').trigger('click')
-        expect(wrapper.vm.showLinkOnly).toBe(true)
-      })
+        it('shows a simple link when a user closes the embed preview', () => {
+          wrapper.find('.embed-close-button').trigger('click')
+          expect(wrapper.vm.showLinkOnly).toBe(true)
+        })
 
-      it('opens the data privacy overlay when a user clicks on the preview image', () => {
-        wrapper.find('.embed-preview-image--clickable').trigger('click')
-        expect(wrapper.vm.showOverlay).toBe(true)
-      })
+        it('opens the data privacy overlay when a user clicks on the preview image', () => {
+          wrapper.find('.embed-preview-image--clickable').trigger('click')
+          expect(wrapper.vm.showOverlay).toBe(true)
+        })
 
-      it("click show iframe, but don't select to change setting permanetly", () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('.ds-button-primary').trigger('click')
-        expect(wrapper.vm.showEmbed).toBe(true)
-        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
-      })
+        it("click show iframe, but don't select to change setting permanetly", () => {
+          wrapper.setData({ showOverlay: true })
+          wrapper.find('.ds-button-primary').trigger('click')
+          expect(wrapper.vm.showEmbed).toBe(true)
+          expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
+        })
 
-      it('click show iframe and change setting permanetly', () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('input[type=checkbox]').trigger('click')
-        wrapper.find('.ds-button-primary').trigger('click')
-        expect(wrapper.vm.showEmbed).toBe(true)
-        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
-      })
+        it('click show iframe and change setting permanetly', () => {
+          wrapper.setData({ showOverlay: true })
+          wrapper.find('input[type=checkbox]').trigger('click')
+          wrapper.find('.ds-button-primary').trigger('click')
+          expect(wrapper.vm.showEmbed).toBe(true)
+          expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
+        })
 
-      it('click cancel do not show iframe', () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('.ds-button-ghost').trigger('click')
-        expect(wrapper.vm.showOverlay).toBe(false)
-        expect(wrapper.vm.showEmbed).toBe(false)
-      })
+        it('click cancel do not show iframe', () => {
+          wrapper.setData({ showOverlay: true })
+          wrapper.find('.ds-button-ghost').trigger('click')
+          expect(wrapper.vm.showOverlay).toBe(false)
+          expect(wrapper.vm.showEmbed).toBe(false)
+        })
 
-      it('show only iframe if allowEmbedIframes true', () => {
-        wrapper.setData({ allowEmbedIframes: true })
-        expect(wrapper.find('.embed-html')).toEqual({ selector: '.embed-html' })
-        expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})
+        it('show only iframe if allowEmbedIframes true', () => {
+          wrapper.setData({ allowEmbedIframes: true })
+          expect(wrapper.find('.embed-html')).toEqual({ selector: '.embed-html' })
+          expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})
+        })
       })
     })
-    })
   })
-})
\ No newline at end of file
+})

From bced6983ea1f51736e989eab6a41166723a6a6ca Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 8 Oct 2019 20:47:13 +0200
Subject: [PATCH 080/212] Fix lint, update tests

- to remove vue warnings
- favor one expectation per it block
---
 .../schema/resolvers/embeds/findProvider.js   |   5 +-
 .../components/Embed/EmbedComponent.spec.js   | 184 +++++++++++-------
 webapp/components/Embed/EmbedComponent.vue    |   1 +
 3 files changed, 117 insertions(+), 73 deletions(-)

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index 4742935b7..a4240895f 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -2,10 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import minimatch from 'minimatch'
 
-let oEmbedProvidersFile = fs.readFileSync(
-  path.join(__dirname, './providers.json'),
-  'utf8',
-)
+let oEmbedProvidersFile = fs.readFileSync(path.join(__dirname, './providers.json'), 'utf8')
 
 // some providers allow a format parameter
 // we need JSON
diff --git a/webapp/components/Embed/EmbedComponent.spec.js b/webapp/components/Embed/EmbedComponent.spec.js
index b4fbe6a60..5ad8dd324 100644
--- a/webapp/components/Embed/EmbedComponent.spec.js
+++ b/webapp/components/Embed/EmbedComponent.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
 import EmbedComponent from './EmbedComponent'
 
-let Wrapper, wrapper, propsData, getters, mocks
+let wrapper, propsData, getters, mocks
 const someUrl = 'https://www.youtube.com/watch?v=qkdXAtO40Fo'
 const localVue = createLocalVue()
 
@@ -11,9 +11,25 @@ localVue.use(Vuex)
 localVue.use(Styleguide)
 
 describe('EmbedComponent.vue', () => {
+  const Wrapper = () => {
+    const store = new Vuex.Store({
+      getters,
+    })
+    return mount(EmbedComponent, { propsData, localVue, store, mocks })
+  }
+
   beforeEach(() => {
     mocks = {
       $t: a => a,
+      $apollo: {
+        mutate: jest
+          .fn()
+          .mockResolvedValueOnce({ data: { UpdateUser: { allowEmbedIframes: true } } }),
+      },
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
     }
     propsData = {}
     getters = {
@@ -21,12 +37,6 @@ describe('EmbedComponent.vue', () => {
         return { id: 'u5', allowEmbedIframes: false }
       },
     }
-    Wrapper = ({ propsData }) => {
-      const store = new Vuex.Store({
-        getters,
-      })
-      return mount(EmbedComponent, { propsData, localVue, store, mocks })
-    }
   })
 
   describe('given a href only for a link ', () => {
@@ -48,7 +58,7 @@ describe('EmbedComponent.vue', () => {
         sources: ['resource', 'oembed'],
         html: null,
       }
-      wrapper = Wrapper({ propsData })
+      wrapper = Wrapper()
     })
 
     it('shows the title', () => {
@@ -64,12 +74,8 @@ describe('EmbedComponent.vue', () => {
     })
 
     it('shows preview Images for link', () => {
-      expect(wrapper.find('.embed-preview-image--clickable')).toEqual({
-        selector: '.embed-preview-image--clickable',
-      })
+      expect(wrapper.find('.embed-preview-image').exists()).toBe(true)
     })
-
-           
   })
 
   describe('given a href with embed html', () => {
@@ -81,7 +87,7 @@ describe('EmbedComponent.vue', () => {
           description:
             'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
         }
-        wrapper = Wrapper({ propsData })
+        wrapper = Wrapper()
       })
 
       it('show the title', () => {
@@ -94,67 +100,107 @@ describe('EmbedComponent.vue', () => {
         )
       })
 
-    describe('onEmbed returned embed data with html', () => {
-      beforeEach(() => {
-        propsData.embedData = {
-          __typename: 'Embed',
-          type: 'video',
-          title: 'Baby Loves Cat',
-          author: 'Merkley Family',
-          publisher: 'YouTube',
-          date: '2015-08-16T00:00:00.000Z',
-          description:
-            'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
-          url: someUrl,
-          image: 'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
-          audio: null,
-          video: null,
-          lang: 'de',
-          sources: ['resource', 'oembed'],
-          html:
-            '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
-        }
-        wrapper = Wrapper({ propsData })
-      })
+      describe('onEmbed returned embed data with html', () => {
+        beforeEach(() => {
+          propsData.embedData = {
+            __typename: 'Embed',
+            type: 'video',
+            title: 'Baby Loves Cat',
+            author: 'Merkley Family',
+            publisher: 'YouTube',
+            date: '2015-08-16T00:00:00.000Z',
+            description:
+              'She’s incapable of controlling her limbs when her kitty is around. The obsession grows every day. Ps. That’s a sleep sack she’s in. Not a starfish outfit. Al...',
+            url: someUrl,
+            image: 'https://i.ytimg.com/vi/qkdXAtO40Fo/maxresdefault.jpg',
+            audio: null,
+            video: null,
+            lang: 'de',
+            sources: ['resource', 'oembed'],
+            html:
+              '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>',
+          }
+          wrapper = Wrapper()
+        })
 
-      it('shows a simple link when a user closes the embed preview', () => {
-        wrapper.find('.embed-close-button').trigger('click')
-        expect(wrapper.vm.showLinkOnly).toBe(true)
-      })
+        it('shows a simple link when a user closes the embed preview', () => {
+          wrapper.find('.embed-close-button').trigger('click')
+          expect(wrapper.vm.showLinkOnly).toBe(true)
+        })
 
-      it('opens the data privacy overlay when a user clicks on the preview image', () => {
-        wrapper.find('.embed-preview-image--clickable').trigger('click')
-        expect(wrapper.vm.showOverlay).toBe(true)
-      })
+        it('opens the data privacy overlay when a user clicks on the preview image', () => {
+          wrapper.find('.embed-preview-image--clickable').trigger('click')
+          expect(wrapper.vm.showOverlay).toBe(true)
+        })
 
-      it("click show iframe, but don't select to change setting permanetly", () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('.ds-button-primary').trigger('click')
-        expect(wrapper.vm.showEmbed).toBe(true)
-        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
-      })
+        describe('shows iframe', () => {
+          beforeEach(() => {
+            wrapper.setData({ showOverlay: true })
+          })
 
-      it('click show iframe and change setting permanetly', () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('input[type=checkbox]').trigger('click')
-        wrapper.find('.ds-button-primary').trigger('click')
-        expect(wrapper.vm.showEmbed).toBe(true)
-        expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
-      })
+          it('when user agress', () => {
+            wrapper.find('.ds-button-primary').trigger('click')
+            expect(wrapper.vm.showEmbed).toBe(true)
+          })
 
-      it('click cancel do not show iframe', () => {
-        wrapper.setData({ showOverlay: true })
-        wrapper.find('.ds-button-ghost').trigger('click')
-        expect(wrapper.vm.showOverlay).toBe(false)
-        expect(wrapper.vm.showEmbed).toBe(false)
-      })
+          it('does not show iframe when user clicks to cancel', () => {
+            wrapper.find('.ds-button-ghost').trigger('click')
+            expect(wrapper.vm.showEmbed).toBe(false)
+          })
 
-      it('show only iframe if allowEmbedIframes true', () => {
-        wrapper.setData({ allowEmbedIframes: true })
-        expect(wrapper.find('.embed-html')).toEqual({ selector: '.embed-html' })
-        expect(wrapper.find('.embed-preview-image--clickable')).toEqual({})
+          describe("doesn't set permanently", () => {
+            beforeEach(() => {
+              wrapper.find('.ds-button-primary').trigger('click')
+            })
+
+            it("if user doesn't give consent", () => {
+              expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(false)
+            })
+
+            it("doesn't update the user's profile", () => {
+              expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+            })
+          })
+
+          describe('sets permanently', () => {
+            beforeEach(() => {
+              wrapper.find('input[type=checkbox]').trigger('click')
+              wrapper.find('.ds-button-primary').trigger('click')
+            })
+
+            it('changes setting permanetly when user requests', () => {
+              expect(wrapper.vm.checkedAlwaysAllowEmbeds).toBe(true)
+            })
+
+            it("updates the user's profile", () => {
+              expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+            })
+          })
+        })
+
+        describe('immediately shows', () => {
+          beforeEach(() => {
+            getters = {
+              'auth/user': () => {
+                return { id: 'u5', allowEmbedIframes: true }
+              },
+            }
+            wrapper = Wrapper()
+          })
+
+          it('sets showEmbed to true', () => {
+            expect(wrapper.vm.showEmbed).toBe(true)
+          })
+
+          it('the iframe returned from oEmbed', () => {
+            expect(wrapper.find('iframe').html()).toEqual(propsData.embedData.html)
+          })
+
+          it('does not display image to click', () => {
+            expect(wrapper.find('.embed-preview-image--clickable').exists()).toBe(false)
+          })
+        })
       })
     })
-    })
   })
-})
\ No newline at end of file
+})
diff --git a/webapp/components/Embed/EmbedComponent.vue b/webapp/components/Embed/EmbedComponent.vue
index 5dc8ad00c..7831c1de1 100644
--- a/webapp/components/Embed/EmbedComponent.vue
+++ b/webapp/components/Embed/EmbedComponent.vue
@@ -145,6 +145,7 @@ export default {
         this.$toast.success(this.$t('contribution.success'))
         this.showEmbed = this.currentUser.allowEmbedIframes
       } catch (err) {
+        console.log(err)
         this.$toast.error(err.message)
       }
     },

From 211bae63622625ce2121bf4dded4e04961bba43c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 8 Oct 2019 22:42:41 +0200
Subject: [PATCH 081/212] Fix lint

---
 webapp/components/Embed/EmbedComponent.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/Embed/EmbedComponent.vue b/webapp/components/Embed/EmbedComponent.vue
index 7831c1de1..5dc8ad00c 100644
--- a/webapp/components/Embed/EmbedComponent.vue
+++ b/webapp/components/Embed/EmbedComponent.vue
@@ -145,7 +145,6 @@ export default {
         this.$toast.success(this.$t('contribution.success'))
         this.showEmbed = this.currentUser.allowEmbedIframes
       } catch (err) {
-        console.log(err)
         this.$toast.error(err.message)
       }
     },

From ef1b401d0747a85429fc90362c28eec53e4df492 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 04:52:42 +0000
Subject: [PATCH 082/212] build(deps-dev): bump @babel/node from 7.6.2 to 7.6.3
 in /backend

Bumps [@babel/node](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 1a24c3567..fc7f6b13c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -107,7 +107,7 @@
   "devDependencies": {
     "@babel/cli": "~7.6.2",
     "@babel/core": "~7.6.2",
-    "@babel/node": "~7.6.2",
+    "@babel/node": "~7.6.3",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.6.2",
     "@babel/register": "~7.6.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5be862f29..5da5e9f14 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -241,10 +241,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/node@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.6.2.tgz#a94479f95ee2008342f4847346c8bb8ff2770f44"
-  integrity sha512-59UxvVtRpVpL5i0KTcw41FqLNPT/Jc9k/48Rq00wfN49lAIQeRKGwZ6xX1FWlCfcIGP+5l4rfZajORvmYkhfGg==
+"@babel/node@~7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.6.3.tgz#f175ab6718dde55431cbd4d9dee95f65c38be527"
+  integrity sha512-+nHje5AcE9TPlB/TRGYyOSQyTfhfU/WXniG6SkVf+V5+ibAjEqkH79lYdiEcytBTH4KeSf25IriySXs6TjaLjg==
   dependencies:
     "@babel/register" "^7.6.2"
     commander "^2.8.1"

From 588ca434646c6374c8889ba05e71755fd09044a1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Oct 2019 09:09:44 +0200
Subject: [PATCH 083/212] Title character increased from 64 to 100

---
 webapp/components/ContributionForm/ContributionForm.spec.js | 2 +-
 webapp/components/ContributionForm/ContributionForm.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index eaba26360..836fe3fd3 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -32,7 +32,7 @@ describe('ContributionForm.vue', () => {
   const postTitle = 'this is a title for a post'
   const postTitleTooShort = 'xx'
   let postTitleTooLong = ''
-  for (let i = 0; i < 65; i++) {
+  for (let i = 0; i < 101; i++) {
     postTitleTooLong += 'x'
   }
   const postContent = 'this is a post'
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index c783298f4..73fa0afd9 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -104,7 +104,7 @@ export default {
         categoryIds: [],
       },
       formSchema: {
-        title: { required: true, min: 3, max: 64 },
+        title: { required: true, min: 3, max: 100 },
         content: [{ required: true }],
       },
       id: null,

From 297df951d33805aeae066416484712d22aed42b4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 08:31:11 +0000
Subject: [PATCH 084/212] build(deps-dev): bump @babel/preset-env from 7.6.2 to
 7.6.3 in /backend

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 69b67c8df..998fbc6a9 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -109,7 +109,7 @@
     "@babel/core": "~7.6.2",
     "@babel/node": "~7.6.2",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
-    "@babel/preset-env": "~7.6.2",
+    "@babel/preset-env": "~7.6.3",
     "@babel/register": "~7.6.2",
     "apollo-server-testing": "~2.9.5",
     "babel-core": "~7.0.0-0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 967e55235..7423b7124 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -382,10 +382,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79"
-  integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==
+"@babel/plugin-transform-block-scoping@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
+  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
@@ -507,10 +507,10 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b"
-  integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
+  integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==
   dependencies:
     regexpu-core "^4.6.0"
 
@@ -605,10 +605,10 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/preset-env@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
-  integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
+"@babel/preset-env@~7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
+  integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -626,7 +626,7 @@
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
     "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-block-scoping" "^7.6.3"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.6.0"
@@ -641,7 +641,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.6.0"
     "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
@@ -654,7 +654,7 @@
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
     "@babel/plugin-transform-unicode-regex" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -711,10 +711,10 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
-  integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
+  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"

From 89eb6e72c45a5744f72872658722e112310165a5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 08:31:38 +0000
Subject: [PATCH 085/212] build(deps-dev): bump @storybook/addon-actions in
 /webapp

Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.1 to 5.2.3.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.3/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 52 +++++++++------------------------------------
 2 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index f5fbf4f1c..de2556535 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -94,7 +94,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.2",
     "@storybook/addon-a11y": "^5.2.1",
-    "@storybook/addon-actions": "^5.2.1",
+    "@storybook/addon-actions": "^5.2.3",
     "@storybook/vue": "~5.2.3",
     "@vue/cli-shared-utils": "~3.11.0",
     "@vue/eslint-config-prettier": "~5.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 59b42b2c7..ec08173f0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1818,17 +1818,17 @@
     redux "^4.0.1"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.1.tgz#2096e7f938b289be48af6f0adfd620997e7a420c"
-  integrity sha512-tu4LGeRGAq+sLlsRPE1PzGyYU9JyM3HMLXnOCh5dvRSS8wnoDw1zQ55LPOXH6aoJGdsrvktiw+uTVf4OyN7ryg==
+"@storybook/addon-actions@^5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.3.tgz#40675f1258428074eebd363e5f9468adeec79046"
+  integrity sha512-7/Ax5QX2HHuIYS/TwgysEtJhvsfNekc0ofzVQRSlowU+Io5u/wMaD+/FEn43Cx8MXzWxPs+x/KNZ5cWRXx2vjg==
   dependencies:
-    "@storybook/addons" "5.2.1"
-    "@storybook/api" "5.2.1"
-    "@storybook/client-api" "5.2.1"
-    "@storybook/components" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/theming" "5.2.1"
+    "@storybook/addons" "5.2.3"
+    "@storybook/api" "5.2.3"
+    "@storybook/client-api" "5.2.3"
+    "@storybook/components" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/theming" "5.2.3"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -1910,17 +1910,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.1.tgz#85541f926d61eedbe2a687bb394d37fc06252751"
-  integrity sha512-gmnn9qU1iLCpfF6bZuEM3QQOZsAviWeIpiezjrd/qkxatgr3qtbXd4EoZpcVuQw314etarWtNxVpcX6PXcASjQ==
-  dependencies:
-    "@storybook/channels" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^2.2.2"
-
 "@storybook/channel-postmessage@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a"
@@ -1946,27 +1935,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.1.tgz#bdd335187279a4ab45e20d6d5e9131e5f7098acf"
-  integrity sha512-VxexqxrbORCGqwx2j0/91Eu1A/vq+rSVIesWwzIowmoLfBwRwDdskO20Yn9U7iMSpux4RvHGF6y1Q1ZtnXm9aA==
-  dependencies:
-    "@storybook/addons" "5.2.1"
-    "@storybook/channel-postmessage" "5.2.1"
-    "@storybook/channels" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/router" "5.2.1"
-    common-tags "^1.8.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872"

From 4cd054834c6f2822d93c41fbe30f366a58adf37b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 08:31:51 +0000
Subject: [PATCH 086/212] build(deps-dev): bump @babel/cli from 7.6.2 to 7.6.3
 in /backend

Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index c36ace0b9..3fac0b9c8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -105,7 +105,7 @@
     "xregexp": "^4.2.4"
   },
   "devDependencies": {
-    "@babel/cli": "~7.6.2",
+    "@babel/cli": "~7.6.3",
     "@babel/core": "~7.6.2",
     "@babel/node": "~7.6.3",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index c46bf575f..2c08252ec 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -14,10 +14,10 @@
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
-"@babel/cli@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.2.tgz#4ce8b5b4b2e4b4c1b7bd841cec62085e2dfc4465"
-  integrity sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ==
+"@babel/cli@~7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.3.tgz#1b0c62098c8a5e01e4a4a59a52cba9682e7e0906"
+  integrity sha512-kWKOEeuylpa781yCeA5//eEx1u3WtLZqbi2VWXLKmb3QDPb5T2f7Yk311MK7bvvjR70dluAeiu4VXXsG1WwJsw==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
@@ -27,7 +27,7 @@
     mkdirp "^0.5.1"
     output-file-sync "^2.0.0"
     slash "^2.0.0"
-    source-map "^0.5.0"
+    source-map "^0.6.1"
   optionalDependencies:
     chokidar "^2.1.8"
 

From 37bf09dc6e3aa628544c39b8f51d2ee5a4066b59 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 08:33:36 +0000
Subject: [PATCH 087/212] build(deps): bump node from 12.11.0-alpine to
 12.11.1-alpine in /backend

Bumps node from 12.11.0-alpine to 12.11.1-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 556b6c48e..0d040a753 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.11.0-alpine as base
+FROM node:12.11.1-alpine as base
 LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 4000

From 603cae56ebc6b78f2f40a13cb74f445ed52e38c6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 13:44:21 +0000
Subject: [PATCH 088/212] build(deps-dev): bump @babel/core from 7.6.2 to 7.6.3
 in /webapp

Bumps [@babel/core](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 63 ++++++++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index f5fbf4f1c..bc54adbd6 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -90,7 +90,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.6.2",
+    "@babel/core": "~7.6.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.2",
     "@storybook/addon-a11y": "^5.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 59b42b2c7..1cd07639e 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -56,25 +56,25 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
-  integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
+"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.3.tgz#44de824e89eaa089bb12da7337bc9bdff2ab68f9"
+  integrity sha512-QfQ5jTBgXLzJuo7Mo8bZK/ePywmgNRgk/UQykiKwEtZPiFIn8ZqE6jB+AnD1hbB1S2xQyL4//it5vuAUOVAMTw==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.3"
     "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.2"
+    "@babel/parser" "^7.6.3"
     "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/traverse" "^7.6.3"
+    "@babel/types" "^7.6.3"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
-    source-map "^0.5.0"
+    source-map "^0.6.1"
 
 "@babel/generator@7.5.5":
   version "7.5.5"
@@ -87,15 +87,15 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
-  integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
+"@babel/generator@^7.4.0", "@babel/generator@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.3.tgz#71d5375264f93ec7bac7d9f35a67067733f5578e"
+  integrity sha512-hLhYbAb3pHwxjlijC4AQ7mqZdcoujiNaW7izCT04CIowHK8psN0IN8QjDv0iyFtycF5FowUOTwDloIheI25aMw==
   dependencies:
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     jsesc "^2.5.1"
     lodash "^4.17.13"
-    source-map "^0.5.0"
+    source-map "^0.6.1"
 
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
@@ -294,10 +294,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
-  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.3.tgz#9eff8b9c3eeae16a74d8d4ff30da2bd0d6f0487e"
+  integrity sha512-sUZdXlva1dt2Vw2RqbMkmfoImubO0D0gaCrNngV6Hi0DA4x3o4mlrq0tbfY0dZEUIccH8I6wQ4qgEtwcpOR6Qg==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -766,22 +766,22 @@
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
-  integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
+  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.3"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/parser" "^7.6.3"
+    "@babel/types" "^7.6.3"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@7.6.1", "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
+"@babel/types@7.6.1":
   version "7.6.1"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
   integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
@@ -790,6 +790,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
+  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"

From 00627254702b5f86e3f6ab453108e2e44f648bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 9 Oct 2019 15:49:11 +0200
Subject: [PATCH 089/212] Fix the frontend tests and design issues with and in
 the report modal

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: alina-beck <4ndroid4va@gmail.com>
---
 webapp/components/Modal/ReportModal.spec.js |  7 +++--
 webapp/components/Modal/ReportModal.vue     | 29 ++++++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/webapp/components/Modal/ReportModal.spec.js b/webapp/components/Modal/ReportModal.spec.js
index bcbb85931..d6350f595 100644
--- a/webapp/components/Modal/ReportModal.spec.js
+++ b/webapp/components/Modal/ReportModal.spec.js
@@ -20,7 +20,7 @@ describe('ReportModal.vue', () => {
       id: 'c43',
     }
     mocks = {
-      $t: jest.fn(),
+      $t: jest.fn(a => a),
       $filters: {
         truncate: a => a,
       },
@@ -29,7 +29,9 @@ describe('ReportModal.vue', () => {
         error: () => {},
       },
       $apollo: {
-        mutate: jest.fn().mockResolvedValue(),
+        mutate: jest.fn().mockResolvedValue({
+          data: {},
+        }),
       },
     }
   })
@@ -154,6 +156,7 @@ describe('ReportModal.vue', () => {
 
       describe('click confirm button', () => {
         beforeEach(() => {
+          wrapper.find('.ds-radio-option-label').trigger('click')
           wrapper.find('button.confirm').trigger('click')
         })
 
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 415ec9db4..0222a1fdf 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -1,10 +1,5 @@
 <template>
-  <ds-modal
-    :title="title"
-    :is-open="isOpen"
-    :width="{ base: '100%', sm: '200px', md: '200px', lg: '200px' }"
-    @cancel="cancel"
-  >
+  <ds-modal :title="title" :is-open="isOpen" @cancel="cancel">
     <transition name="ds-transition-fade">
       <ds-flex v-if="success" class="hc-modal-success" centered>
         <sweetalert-icon icon="success" />
@@ -26,6 +21,7 @@
       :schema="formSchema.reasonCategory"
       :label="$t('report.reason.category.label')"
       :options="form.reasonCategoryOptions"
+      labelProp="label"
     />
     <!-- Wolle <ds-input
         model="reasonDescription"
@@ -33,16 +29,16 @@
         :placeholder="$t('report.reason.description.placeholder')"
         type="textarea"
         rows="5"
-        class="reasonDescription"
+        class="reason-description"
       /> -->
     <ds-input
+      class="reason-description"
       :value="form.reasonDescription"
       :schema="formSchema.reasonDescription"
       :label="$t('report.reason.description.label')"
       :placeholder="$t('report.reason.description.placeholder')"
       type="textarea"
       rows="5"
-      class="reasonDescription"
     />
     <small class="smallTag">
       {{ form.reasonDescription.length }}/{{ formSchema.reasonDescription.max }}
@@ -214,15 +210,24 @@ export default {
 </script>
 
 <style lang="scss">
-.reasonDescription {
-  margin-top: $space-x-small;
-  margin-bottom: $space-xxx-small;
+.ds-modal {
+  max-width: 600px !important;
+}
+.ds-radio-option:not(.ds-button) {
+  width: 100% !important;
+}
+.ds-radio-option-label {
+  margin: 5px 20px 5px 5px !important;
+  width: 100% !important;
+}
+.reason-description {
+  margin-top: $space-x-small !important;
+  margin-bottom: $space-xx-small !important;
 }
 .smallTag {
   width: 100%;
   position: relative;
   left: 90%;
-  margin-top: $space-xxx-small;
 }
 .hc-modal-success {
   pointer-events: none;

From 4f3f192e12ade297cbc9eb4763f8e291c672ceb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 9 Oct 2019 15:53:35 +0200
Subject: [PATCH 090/212] Remove out commented code

---
 webapp/components/Modal/ReportModal.vue | 31 -------------------------
 1 file changed, 31 deletions(-)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 0222a1fdf..25c7636e8 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -9,13 +9,6 @@
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
 
-    <!-- Wolle <ds-form ref="reportForm" v-model="form" :schema="formSchema"> -->
-    <!-- Wolle <ds-radio
-        model="reasonCategory"
-        :label="$t('report.reason.category.label')"
-        :options="form.reasonCategoryOptions"
-        :placeholder="$t('report.reason.category.placeholder')"
-      /> -->
     <ds-radio
       :value="form.reasonCategory"
       :schema="formSchema.reasonCategory"
@@ -23,14 +16,6 @@
       :options="form.reasonCategoryOptions"
       labelProp="label"
     />
-    <!-- Wolle <ds-input
-        model="reasonDescription"
-        :label="$t('report.reason.description.label')"
-        :placeholder="$t('report.reason.description.placeholder')"
-        type="textarea"
-        rows="5"
-        class="reason-description"
-      /> -->
     <ds-input
       class="reason-description"
       :value="form.reasonDescription"
@@ -44,7 +29,6 @@
       {{ form.reasonDescription.length }}/{{ formSchema.reasonDescription.max }}
     </small>
     <ds-space />
-    <!-- Wolle </ds-form> -->
 
     <template slot="footer">
       <ds-button class="cancel" icon="close" @click="cancel">{{ $t('report.cancel') }}</ds-button>
@@ -103,7 +87,6 @@ export default {
       failsValidations: true,
       form: {
         reasonCategory: null,
-        // Wolle reasonCategory: reasonCategoryOptions[0],
         reasonCategoryOptions,
         reasonDescription: '',
       },
@@ -112,11 +95,8 @@ export default {
           type: 'enum',
           required: true,
           validator: (rule, value, callback, source, options) => {
-            // Wolle console.log('value: ', value)
             this.form.reasonCategory = value
-            // Wolle console.log('this.form.reasonCategory: ', this.form.reasonCategory)
             this.failsValidations = !this.form.reasonCategory
-            // Wolle console.log('this.failsValidations: ', this.failsValidations)
             callback()
           },
         },
@@ -142,15 +122,6 @@ export default {
     },
   },
   methods: {
-    // Wolle toggleReasonCategory(reasonCategory) {
-    //   console.log('reasonCategory: ', reasonCategory)
-    //   console.log('this.form.reasonCategory: ', this.form.reasonCategory)
-    //   this.failsValidations = false
-    // },
-    // Wolle inputReasonAddText(reasonDescription) {
-    //   console.log('reasonDescription: ', reasonDescription)
-    //   this.form.reasonDescription = reasonDescription
-    // },
     async cancel() {
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
       // await this.modalData.buttons.cancel.callback()
@@ -161,8 +132,6 @@ export default {
     },
     async confirm() {
       const { reasonCategory, reasonDescription } = this.form
-      // Wolle console.log('reasonCategory: ', reasonCategory.value)
-      // Wolle console.log('reasonDescription: ', reasonDescription)
 
       this.loading = true
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!

From dbbece43b5b800752cc885d7076c662b4235bcf2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Oct 2019 16:52:48 +0200
Subject: [PATCH 091/212] List of providers is always visible, button color
 changed, info text adapted

---
 webapp/locales/de.json                 |  3 ++-
 webapp/locales/en.json                 |  3 ++-
 webapp/pages/settings/allow-embeds.vue | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c763ea504..b7965062b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -345,7 +345,8 @@
     },
     "allowEmbeds": {
       "name": "Drittanbieter",
-      "description": "In unseren Beiträgen können / werden aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text eingebunden werden.",
+      "info-description": "Wenn du zustimmst werden in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
+      "description": "Du hast zugestimmt das in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
       "statustext": "Momentan ist das automatische einbinden:",
       "statuschange": "Einstellung ändern",
       "false": "Abgestellt",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 58f56f142..162f1a0f0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -346,7 +346,8 @@
     },
     "allowEmbeds": {
       "name": "Third party providers",
-      "description": "In our contributions can / will be included from the following list of providers foreign code from other providers (third parties) in the form of embedded videos, images or text.",
+      "info-description": "If you agree, the posts from the following list of providers will automatically include third-party code from other providers (third parties) in the form of embedded videos, images, or text.",
+      "description": "You have agreed that in the contributions from the following list of providers, foreign code from other providers (third parties) in the form of embedded videos, images or text automatically are embedded.",
       "statustext": "At the moment this is automatic embedding:",
       "statuschange": "Change setting",
       "false": "Turned off",
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/allow-embeds.vue
index db6e7552e..c76a50422 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/allow-embeds.vue
@@ -12,12 +12,12 @@
       <ds-container width="large">
         <ds-flex>
           <ds-flex-item>
-            <ds-button @click="toFalse" primary :disabled="!disabled">
+            <ds-button @click="toFalse" :disabled="!disabled">
               {{ $t('post.allowEmbeds.button-tofalse') }}
             </ds-button>
           </ds-flex-item>
           <ds-flex-item>
-            <ds-button @click="toTrue" danger :disabled="disabled">
+            <ds-button @click="toTrue" secondary :disabled="disabled">
               {{ $t('post.allowEmbeds.button-totrue') }}
             </ds-button>
           </ds-flex-item>
@@ -27,8 +27,11 @@
     <ds-space />
     <ds-space />
 
-    <div v-show="disabled">
-      <p>{{ $t('post.allowEmbeds.description') }}</p>
+    <div>
+      <p v-if="disabled">
+        <b>{{ $t('post.allowEmbeds.description') }}</b>
+      </p>
+      <p v-else>{{ $t('post.allowEmbeds.info-description') }}</p>
       <ds-container>
         <ds-placeholder>
           <ul>

From bc4cf2ee600769bd97c7b196acf829d1f95aa7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 9 Oct 2019 17:11:16 +0200
Subject: [PATCH 092/212] Fix Cypress tests

---
 cypress/integration/common/report.js             | 16 +++++++++++-----
 .../integration/moderation/ReportContent.feature |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 83c96e6af..96664335a 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -107,6 +107,11 @@ Then(`I can't see the moderation menu item`, () => {
 When(/^I confirm the reporting dialog .*:$/, message => {
   cy.contains(message) // wait for element to become visible
   cy.get('.ds-modal').within(() => {
+    cy.get('.ds-radio-option-label')
+      .first()
+      .click({
+        force: true
+      })
     cy.get('button')
       .contains('Report')
       .click()
@@ -114,21 +119,22 @@ When(/^I confirm the reporting dialog .*:$/, message => {
 })
 
 Given('somebody reported the following posts:', table => {
-  table.hashes().forEach(({ id }) => {
+  table.hashes().forEach(({ resourceId, reasonCategory, reasonDescription }) => {
     const submitter = {
-      email: `submitter${id}@example.org`,  
+      email: `submitter${resourceId}@example.org`,
       password: '1234'
     }
     cy.factory()
       .create('User', submitter)
       .authenticateAs(submitter)
-      .mutate(`mutation($resourceId: ID!, $reasonDescription: String!) {
-        report(reasonDescription: $reasonDescription, resourceId: $resourceId) {
+      .mutate(`mutation(resourceId: ID!, reasonCategory: String!, reasonDescription: String!) {
+        report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           id
         }
       }`, {
         resourceId,
-        reasonDescription: 'Offensive content'
+        reasonCategory,
+        reasonDescription
       })
   })
 })
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 0f8eec0e3..1d334325e 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -50,8 +50,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported content
     Given somebody reported the following posts:
-      | id |
-      | p1 |
+      | resourceId | reasonCategory     | reasonDescription |
+      | p1         | discrimination-etc | Offensive content |
     And I am logged in with a "moderator" role
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
@@ -60,8 +60,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported posts of a user who's blocked a moderator
     Given somebody reported the following posts:
-      | id |
-      | p2 |
+      | resourceId | reasonCategory | reasonDescription |
+      | p2         | other          | Offensive content |
     And my user account has the role "moderator"
     And there is an annoying user who has blocked me
     And I am logged in

From 9b31927ba1dfe13a3aeaebd2ae5546f7af1d5537 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 15:17:28 +0000
Subject: [PATCH 093/212] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.1 to 5.2.3.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.3/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 145 +++-----------------------------------------
 2 files changed, 11 insertions(+), 136 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index d77a8688c..ee14a4ef0 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -93,7 +93,7 @@
     "@babel/core": "~7.6.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.2",
-    "@storybook/addon-a11y": "^5.2.1",
+    "@storybook/addon-a11y": "^5.2.3",
     "@storybook/addon-actions": "^5.2.3",
     "@storybook/vue": "~5.2.3",
     "@vue/cli-shared-utils": "~3.11.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index e16a59e29..65bd0b6d5 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1804,17 +1804,17 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@storybook/addon-a11y@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.1.tgz#4ab013ea7910189cdbfc2dbfecdd6c2dab5f04d8"
-  integrity sha512-DrS+FR8efOKVYjN1wtm0b1M9+FrPQeBAMSsStiQvgzJ67ixg56wjGd4Euen9xbIWfbKK5cs3HVnj22iwuePBow==
+"@storybook/addon-a11y@^5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.3.tgz#bcfb50b92b2a17c36e4cbb0b42a0c586e40aa68e"
+  integrity sha512-1N8hes5J3qyhCahHyFUXwiKif3JH892dzGalxc46jtvC0oCMM0r6lu+lj9J6THc15Oc8Icy9KJZuw4R0wRJl0Q==
   dependencies:
-    "@storybook/addons" "5.2.1"
-    "@storybook/api" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/components" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/theming" "5.2.1"
+    "@storybook/addons" "5.2.3"
+    "@storybook/api" "5.2.3"
+    "@storybook/client-logger" "5.2.3"
+    "@storybook/components" "5.2.3"
+    "@storybook/core-events" "5.2.3"
+    "@storybook/theming" "5.2.3"
     axe-core "^3.3.2"
     common-tags "^1.8.0"
     core-js "^3.0.1"
@@ -1847,19 +1847,6 @@
     react-inspector "^3.0.2"
     uuid "^3.3.2"
 
-"@storybook/addons@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.1.tgz#6e52aa1fa2737e170fb675eb1fcceebd0a915a0b"
-  integrity sha512-kdx97tTKsMf/lBlT40uLYsHMF1J71mn2j41RNaCXmWw/PrKCDmiNfinemN2wtbwRSvGqb3q/BAqjKLvUtWynGg==
-  dependencies:
-    "@storybook/api" "5.2.1"
-    "@storybook/channels" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.3.tgz#02e35fad3ed4101625896e43e0a1e20215f6be38"
@@ -1873,29 +1860,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.1.tgz#b9cd6639019e044a8ade6fb358cade79c0e3b5d3"
-  integrity sha512-EXN6sqkGHRuNq0W6BZXOlxe2I2dmN0yUdQLiUOpzH2I3mXnVHpad/0v76dRc9fZbC4LaYUSxR8lBTr0rqIb4mA==
-  dependencies:
-    "@storybook/channels" "5.2.1"
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/core-events" "5.2.1"
-    "@storybook/router" "5.2.1"
-    "@storybook/theming" "5.2.1"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^2.2.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247"
@@ -1930,13 +1894,6 @@
     global "^4.3.2"
     telejson "^3.0.2"
 
-"@storybook/channels@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.1.tgz#e5e35f6d9fb1b1fba4f18b171f31d5f6540f3bef"
-  integrity sha512-AsF/Hwx91SDOgiOGOBSWS8EJAgqVm939n2nkfdLSJQQmX5EdPRAc3EIE3f13tyQub2yNx0OR4UzQDWgjwfVsEQ==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0"
@@ -1965,13 +1922,6 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.1.tgz#5c1f122b65386f04a6ad648808dfa89f2d852d7a"
-  integrity sha512-wzxSE9t3DaLCdd/gnGFnjevmYRZ92F3TEwhUP/QDXM9cZkNsRKHkjE61qjiO5aQPaZQG6Ea9ayWEQEMgZXDucg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88"
@@ -1979,30 +1929,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/components@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.1.tgz#a4519c5d435c2c25c481e2b64a768e1e568a223f"
-  integrity sha512-cik5J/mTm1b1TOI17qM+2Mikk3rjb3SbBD4WlNz3Zvn+Hw0ukgbx6kQwVBgujhMlDtsHreidyEgIg4TM13S0Tg==
-  dependencies:
-    "@storybook/client-logger" "5.2.1"
-    "@storybook/theming" "5.2.1"
-    "@types/react-syntax-highlighter" "10.1.0"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^1.18.3"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^8.0.1"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-
 "@storybook/components@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf"
@@ -2027,13 +1953,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/core-events@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.1.tgz#bc28d704938d26dd544d0362d38ef08e8cfed916"
-  integrity sha512-AIYV/I+baQ0KxvEM7QAKqUedLn2os0XU9HTdtfZJTC3U9wjmR2ah2ScD6T0n7PBz3MderkvZG6dNjs9h8gRquQ==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00"
@@ -2126,19 +2045,6 @@
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/router@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.1.tgz#9c49df79343d3be10c7f984858fb5c9ae3eb7491"
-  integrity sha512-Mlk275cyPoKtnP4DwQ5D8gTfnaRPL6kDZOSn0wbTMa6pQOfYKgJsa7tjzeAtZuZ/j8hKI4gAfT/auMgH6g+94A==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-
 "@storybook/router@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.3.tgz#d10284325820275ab7971621333988b5021dd3c9"
@@ -2152,24 +2058,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/theming@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.1.tgz#913e383632e4702035a107c2cc5e5cb27231b389"
-  integrity sha512-lbAfcyI7Tx8swduIPmlu/jdWzqTBN/v82IEQbZbPR4LS5OHRPmhXPNgFGrcH4kFAiD0GoezSsdum1x0ZZpsQUQ==
-  dependencies:
-    "@emotion/core" "^10.0.14"
-    "@emotion/styled" "^10.0.14"
-    "@storybook/client-logger" "5.2.1"
-    common-tags "^1.8.0"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.14"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-
 "@storybook/theming@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a"
@@ -14517,19 +14405,6 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-telejson@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-2.2.2.tgz#d61d721d21849a6e4070d547aab302a9bd22c720"
-  integrity sha512-YyNwnKY0ilabOwYgC/J754En1xOe5PBIUIw+C9e0+5HjVVcnQE5/gdu2yET2pmSbp5bxIDqYNjvndj2PUkIiYA==
-  dependencies:
-    global "^4.3.2"
-    is-function "^1.0.1"
-    is-regex "^1.0.4"
-    is-symbol "^1.0.2"
-    isobject "^3.0.1"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-
 telejson@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/telejson/-/telejson-3.0.3.tgz#442af55f78d791d3744c9e7a696be6cdf789a4b5"

From 0b549a9deafd8569d3fa4e75ae4abbad7dcbc3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 9 Oct 2019 18:05:54 +0200
Subject: [PATCH 094/212] Try to fix Cypress test for reports Latin1 error

Error in Cypress: `InvalidCharacterError: Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range.`
---
 cypress/integration/common/report.js                 | 4 ++--
 cypress/integration/moderation/ReportContent.feature | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 96664335a..7688b51c3 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -119,9 +119,9 @@ When(/^I confirm the reporting dialog .*:$/, message => {
 })
 
 Given('somebody reported the following posts:', table => {
-  table.hashes().forEach(({ resourceId, reasonCategory, reasonDescription }) => {
+  table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {
     const submitter = {
-      email: `submitter${resourceId}@example.org`,
+      email: submitterEmail,
       password: '1234'
     }
     cy.factory()
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 1d334325e..5701841cf 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -50,8 +50,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported content
     Given somebody reported the following posts:
-      | resourceId | reasonCategory     | reasonDescription |
-      | p1         | discrimination-etc | Offensive content |
+      | submitterEmail           | resourceId | reasonCategory     | reasonDescription |
+      | p1.submitter@example.org | p1         | discrimination-etc | Offensive content |
     And I am logged in with a "moderator" role
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
@@ -60,8 +60,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported posts of a user who's blocked a moderator
     Given somebody reported the following posts:
-      | resourceId | reasonCategory | reasonDescription |
-      | p2         | other          | Offensive content |
+      | submitterEmail           | resourceId | reasonCategory | reasonDescription |
+      | p2.submitter@example.org | p2         | other          | Offensive content |
     And my user account has the role "moderator"
     And there is an annoying user who has blocked me
     And I am logged in

From 846b5683f1a41ddbff238ff1709ed30cb727456d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2019 20:04:33 +0000
Subject: [PATCH 095/212] build(deps-dev): bump @babel/preset-env from 7.6.2 to
 7.6.3 in /webapp

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.2 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index ee14a4ef0..17fd9403e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -92,7 +92,7 @@
   "devDependencies": {
     "@babel/core": "~7.6.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "~7.6.2",
+    "@babel/preset-env": "~7.6.3",
     "@storybook/addon-a11y": "^5.2.3",
     "@storybook/addon-actions": "^5.2.3",
     "@storybook/vue": "~5.2.3",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 65bd0b6d5..b6dca2ca6 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -438,10 +438,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79"
-  integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==
+"@babel/plugin-transform-block-scoping@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
+  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
@@ -563,10 +563,10 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b"
-  integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
+  integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==
   dependencies:
     regexpu-core "^4.6.0"
 
@@ -679,10 +679,10 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.2", "@babel/preset-env@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
-  integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.2", "@babel/preset-env@~7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
+  integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -700,7 +700,7 @@
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
     "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-block-scoping" "^7.6.3"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.6.0"
@@ -715,7 +715,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.6.0"
     "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
@@ -728,7 +728,7 @@
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
     "@babel/plugin-transform-unicode-regex" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"

From 2e13b6911c2990e12802b599ff72d4f72a400ba6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 05:08:06 +0000
Subject: [PATCH 096/212] build(deps): bump nodemailer from 6.3.0 to 6.3.1 in
 /backend

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.3.0...v6.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3ddfa8d23..3a0cf6be8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -93,7 +93,7 @@
     "neo4j-graphql-js": "^2.7.2",
     "neode": "^0.3.3",
     "node-fetch": "~2.6.0",
-    "nodemailer": "^6.3.0",
+    "nodemailer": "^6.3.1",
     "nodemailer-html-to-text": "^3.1.0",
     "npm-run-all": "~4.1.5",
     "request": "~2.88.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index ea3a38991..5adc174ce 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6182,10 +6182,10 @@ nodemailer-html-to-text@^3.1.0:
   dependencies:
     html-to-text "^5.1.1"
 
-nodemailer@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.0.tgz#a89b0c62d3937bdcdeecbf55687bd7911b627e12"
-  integrity sha512-TEHBNBPHv7Ie/0o3HXnb7xrPSSQmH1dXwQKRaMKDBGt/ZN54lvDVujP6hKkO/vjkIYL9rK8kHSG11+G42Nhxuw==
+nodemailer@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.1.tgz#2784beebac6b9f014c424c54dbdcc5c4d1221346"
+  integrity sha512-j0BsSyaMlyadEDEypK/F+xlne2K5m6wzPYMXS/yxKI0s7jmT1kBx6GEKRVbZmyYfKOsjkeC/TiMVDJBI/w5gMQ==
 
 nodemon@~1.19.3:
   version "1.19.3"

From 8f64071931e950498c0b769206b859b579b1f270 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2019 05:16:10 +0000
Subject: [PATCH 097/212] build(deps-dev): bump cypress-cucumber-preprocessor

Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.16.1 to 1.16.2.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.16.1...v1.16.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5427090dc..18a46e56d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "codecov": "^3.6.1",
     "cross-env": "^6.0.3",
     "cypress": "^3.4.1",
-    "cypress-cucumber-preprocessor": "^1.16.1",
+    "cypress-cucumber-preprocessor": "^1.16.2",
     "cypress-file-upload": "^3.3.4",
     "cypress-plugin-retries": "^1.3.0",
     "dotenv": "^8.1.0",
diff --git a/yarn.lock b/yarn.lock
index 8d561ef5e..231e6100e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1877,10 +1877,10 @@ cucumber@^4.2.1:
     util-arity "^1.0.2"
     verror "^1.9.0"
 
-cypress-cucumber-preprocessor@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.16.1.tgz#2ac7e0e53396334c052aeed8b5e61e08616f73a2"
-  integrity sha512-m8Z5t9hSc10kv47qK0fV/JlCboCwQVxgTa+WhnCjOPB7YBnX/en4f0O8l27yaZbZyHan7JBoJvpfzINlaOKafg==
+cypress-cucumber-preprocessor@^1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.16.2.tgz#79e0ce7e7afa781f752711f7284a3bf48aa99ab8"
+  integrity sha512-jDJuQnnzrOrO+4PRt+VKFkHxHO7DplJACXOMUHLLWcL7vjlRUkIG4+QWnOkn/Py3yOhv9Rmuug8Iil5+FV8wEw==
   dependencies:
     "@cypress/browserify-preprocessor" "^2.1.1"
     chai "^4.1.2"

From b41f340ad6b7f7d3b26a81de0ce78fa85ba7b597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 10 Oct 2019 08:15:17 +0200
Subject: [PATCH 098/212] Fix Cypher test by correcting syntax of GraphQL
 report mutation

---
 backend/src/schema/resolvers/reports.spec.js | 2 +-
 cypress/integration/common/report.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index ed459df17..4b0aa7ba4 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -50,7 +50,7 @@ describe('report', () => {
     // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
     reportMutation = `
       mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
-        report( resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) ${returnedObject}
+        report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) ${returnedObject}
       }
     `
     client = new GraphQLClient(host, {
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 7688b51c3..907c3d5eb 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -127,7 +127,7 @@ Given('somebody reported the following posts:', table => {
     cy.factory()
       .create('User', submitter)
       .authenticateAs(submitter)
-      .mutate(`mutation(resourceId: ID!, reasonCategory: String!, reasonDescription: String!) {
+      .mutate(`mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
         report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           id
         }

From 7990879fc81fcaa147bf697d683cf6dca9c39b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 10 Oct 2019 08:21:36 +0200
Subject: [PATCH 099/212] Correct translation

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 19340ab2e..37c73f515 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -473,7 +473,7 @@
           "intentional-intimidation-stalking-persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
           "advert-products-services-commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
           "criminal-behavior-violation-german-law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
-          "other": "Anderes …"
+          "other": "Andere …"
         }
       },
       "description": {

From b556a601ce21bd2c10484a27a772bc63fd584124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 10 Oct 2019 09:06:28 +0200
Subject: [PATCH 100/212] Followed Matts suggestion with the push

---
 webapp/components/Modal/ReportModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 25c7636e8..56e49f87f 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -73,11 +73,11 @@ export default {
       'other',
     ]
     let reasonCategoryOptions = []
-    valuesReasonCategoryOptions.forEach((reasonCategory, index) => {
-      reasonCategoryOptions[index] = {
+    valuesReasonCategoryOptions.forEach(reasonCategory => {
+      reasonCategoryOptions.push({
         label: this.$t('report.reason.category.options.' + reasonCategory),
         value: reasonCategory,
-      }
+      })
     })
 
     return {

From a07010f50ce537d2ef5a30b2f9ce13c2b0a30ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 10 Oct 2019 15:38:20 +0200
Subject: [PATCH 101/212] First step of implementing direct report relation

---
 backend/src/schema/index.js                  |  2 +-
 backend/src/schema/resolvers/reports.js      | 21 ++++++------
 backend/src/schema/resolvers/reports.spec.js |  2 +-
 backend/src/schema/types/schema.gql          | 35 ++++++++++++--------
 backend/src/schema/types/type/REPORTED.gql   | 30 +++++++++++++++++
 backend/src/seed/seed-db.js                  |  2 +-
 cypress/integration/common/report.js         |  2 +-
 webapp/graphql/Moderation.js                 |  7 ++--
 8 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 backend/src/schema/types/type/REPORTED.gql

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 4d1b9574e..e3c835447 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -35,7 +35,7 @@ export default applyScalars(
             'Notfication',
             'Post',
             'Comment',
-            'Report',
+            'REPORTED',
             'Statistics',
             'LoggedInUser',
             'Location',
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 4b86e57f4..2cf1187e0 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -8,10 +8,10 @@ export default {
       { driver, _req, user },
       _resolveInfo,
     ) => {
-      const reportId = uuid()
+      // Wolle const reportId = uuid()
       const session = driver.session()
       const reportProperties = {
-        id: reportId,
+        // Wolle id: reportId,
         createdAt: new Date().toISOString(),
         reasonCategory,
         reasonDescription,
@@ -19,7 +19,7 @@ export default {
 
       const reportQueryRes = await session.run(
         `
-          MATCH (u:User {id:$submitterId})-[:REPORTED]->(report)-[:REPORTED]->(resource {id: $resourceId}) 
+          MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
           RETURN labels(resource)[0] as label
         `,
         {
@@ -39,22 +39,22 @@ export default {
 
       const res = await session.run(
         `
-          MATCH (submitter:User {id: $userId})
+          MATCH (submitter:User {id: $submitterId})
           MATCH (resource {id: $resourceId})
           WHERE resource:User OR resource:Comment OR resource:Post
-          CREATE (report:Report  {reportProperties})
-          MERGE (resource)<-[:REPORTED]-(report)
-          MERGE (report)<-[:REPORTED]-(submitter)
+          CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
           RETURN report, submitter, resource, labels(resource)[0] as type
         `,
         {
           resourceId,
-          userId: user.id,
-          reportProperties,
+          submitterId: user.id,
+          createdAt: reportProperties.createdAt,
+          reasonCategory: reportProperties.reasonCategory,
+          reasonDescription: reportProperties.reasonDescription,
         },
       )
 
-      session.close()
+     session.close()
 
       const [dbResponse] = res.records.map(r => {
         return {
@@ -65,6 +65,7 @@ export default {
         }
       })
       if (!dbResponse) return null
+
       const { report, submitter, resource, type } = dbResponse
 
       const response = {
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 4b0aa7ba4..cf89dab7a 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -16,7 +16,7 @@ describe('report', () => {
   const categoryIds = ['cat9']
 
   beforeEach(async () => {
-    returnedObject = '{ id }'
+    returnedObject = '{ createdAt }'
     variables = {
       resourceId: 'whatever',
       reasonCategory: 'reason-category-dummy',
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index cdf0d7f87..e4986ad73 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -24,7 +24,6 @@ type Mutation {
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
-  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
   # Shout the given Type and ID
@@ -35,18 +34,28 @@ type Mutation {
   unfollowUser(id: ID!): User
 }
 
-type Report {
-  id: ID!
-  createdAt: String!
-  reasonCategory: String!
-  reasonDescription: String!
-  submitter: User @relation(name: "REPORTED", direction: "IN")
-  type: String!
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
-  comment: Comment @relation(name: "REPORTED", direction: "OUT")
-  post: Post @relation(name: "REPORTED", direction: "OUT")
-  user: User @relation(name: "REPORTED", direction: "OUT")
-}
+# Wolle
+# type Report {
+  # not necessary
+  # id: ID!
+  # done
+  # createdAt: String!
+  # done
+  # reasonCategory: String!
+  # done
+  # reasonDescription: String!
+  # done
+  # submitter: User @relation(name: "REPORTED", direction: "IN")
+  # done
+  # type: String!
+  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
+  # seems unused
+  # comment: Comment @relation(name: "REPORTED", direction: "OUT")
+  # seems unused
+  # post: Post @relation(name: "REPORTED", direction: "OUT")
+  # seems unused
+  # user: User @relation(name: "REPORTED", direction: "OUT")
+# }
 
 enum Deletable {
   Post
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
new file mode 100644
index 000000000..881184bb5
--- /dev/null
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -0,0 +1,30 @@
+type REPORTED {
+  createdAt: String
+  reasonCategory: String
+  reasonDescription: String
+  submitter: User
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
+  resource: ReportReource
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
+  resourceId: ID
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
+  type: String
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
+  user: User
+  post: Post
+  comment: Comment
+}
+
+union ReportReource = User | Post | Comment
+
+enum ReportOrdering {
+  createdAt_desc
+}
+
+type Query {
+  Report(orderBy: ReportOrdering): [REPORTED]
+}
+
+type Mutation {
+  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): REPORTED
+}
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 89180ac2e..aae955752 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -657,7 +657,7 @@ import { gql } from '../jest/helpers'
           reasonCategory: $reasonCategory
           reasonDescription: $reasonDescription
         ) {
-          id
+          type
         }
       }
     `
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 907c3d5eb..ab9a90e36 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -129,7 +129,7 @@ Given('somebody reported the following posts:', table => {
       .authenticateAs(submitter)
       .mutate(`mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
         report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
-          id
+          type
         }
       }`, {
         resourceId,
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index d86205042..981b8146e 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,14 +1,15 @@
 import gql from 'graphql-tag'
 
 export const reportListQuery = () => {
+  // no limit vor the moment like before: "Report(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
-      Report(first: 20, orderBy: createdAt_desc) {
-        id
+      Report(orderBy: createdAt_desc) {
         createdAt
         reasonCategory
         reasonDescription
         type
+        resourceId
         submitter {
           id
           slug
@@ -89,7 +90,7 @@ export const reportMutation = () => {
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
       ) {
-        id
+        type
       }
     }
   `

From 771337a654b536f2f039f619b30c8c7ca1cccf56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Thu, 10 Oct 2019 16:39:23 +0200
Subject: [PATCH 102/212] Add Hall of Fame to README

Because we are so cool! :wink:

See: https://github.com/sourcerer-io/hall-of-fame
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b2f42c8b9..b5064cd0d 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ Join our friendly open-source community on [Discord](https://discordapp.com/invi
 Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard:
 Check out the [contribution guideline](./CONTRIBUTING.md), too!
 
+[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/0)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/0)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/1)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/1)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/2)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/2)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/3)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/3)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/4)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/4)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/5)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/5)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/6)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/6)[![](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/images/7)](https://sourcerer.io/fame/roschaefer/Human-Connection/Human-Connection/links/7)
+
 
 ## Attributions
 

From c3b2b4fcac7c93d2272a481bb5c16a42350d6415 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 18:27:56 +0200
Subject: [PATCH 103/212] Structure translations based on file locations

---
 webapp/locales/de.json                        | 26 ++++++++---------
 webapp/locales/en.json                        | 26 ++++++++---------
 webapp/pages/settings.vue                     |  4 +--
 .../settings/{allow-embeds.vue => embeds.vue} | 28 +++++++++----------
 4 files changed, 42 insertions(+), 42 deletions(-)
 rename webapp/pages/settings/{allow-embeds.vue => embeds.vue} (74%)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b7965062b..cb1b60db1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -226,6 +226,19 @@
       "success": "Konto erfolgreich gelöscht!",
       "pleaseConfirm": "<b class='is-danger'>Zerstörerische Aktion!</b> Gib <b>{confirm}</b> ein, um zu bestätigen."
     },
+    "embeds": {
+      "name": "Drittanbieter",
+      "info-description": "Wenn du zustimmst werden in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
+      "description": "Du hast zugestimmt das in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
+      "statustext": "Momentan ist das automatische einbinden:",
+      "statuschange": "Einstellung ändern",
+      "false": "Abgestellt",
+      "true": "Zugelassen",
+      "button-tofalse": "Abstellen",
+      "button-totrue": "dauerhaft zulassen",
+      "third-party-false": "Es wird <b style='color:red'>kein</b> Service von Drittanbietern automatisch eingebunden.",
+      "third-party-true": "Das einbinden der Services von Drittanbietern ist <b style='color:red'>dauerhaft zugelassen</b> und gespeichert für komende Sitzungen."
+    },
     "organizations": {
       "name": "Meine Organisationen"
     },
@@ -343,19 +356,6 @@
       "submitted": "Kommentar Gesendet",
       "updated": "Änderungen gespeichert"
     },
-    "allowEmbeds": {
-      "name": "Drittanbieter",
-      "info-description": "Wenn du zustimmst werden in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
-      "description": "Du hast zugestimmt das in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
-      "statustext": "Momentan ist das automatische einbinden:",
-      "statuschange": "Einstellung ändern",
-      "false": "Abgestellt",
-      "true": "Zugelassen",
-      "button-tofalse": "Abstellen",
-      "button-totrue": "dauerhaft zulassen",
-      "third-party-false": "Es wird <b style='color:red'>kein</b> Service von Drittanbietern automatisch eingebunden.",
-      "third-party-true": "Das einbinden der Services von Drittanbietern ist <b style='color:red'>dauerhaft zugelassen</b> und gespeichert für komende Sitzungen."
-    },
     "edited": "bearbeitet"
   },
   "comment": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 162f1a0f0..af416c2c9 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -227,6 +227,19 @@
       "success": "Account successfully deleted!",
       "pleaseConfirm": "<b class='is-danger'>Destructive action!</b> Type <b>{confirm}</b> to confirm"
     },
+    "embeds": {
+      "name": "Third party providers",
+      "info-description": "If you agree, the posts from the following list of providers will automatically include third-party code from other providers (third parties) in the form of embedded videos, images, or text.",
+      "description": "You have agreed that in the contributions from the following list of providers, foreign code from other providers (third parties) in the form of embedded videos, images or text automatically are embedded.",
+      "statustext": "At the moment this is automatic embedding:",
+      "statuschange": "Change setting",
+      "false": "Turned off",
+      "true": "Admitted",
+      "button-tofalse": "turn-off",
+      "button-totrue": "allow permanently",
+      "third-party-false": "It automatically integrates <b style='color:red'>no </b> third-party providers' service.",
+      "third-party-true": "The inclusion of third-party services is <b style='color:red'>permanently allowed</b> and stored for future sessions."
+    },
     "organizations": {
       "name": "My Organizations"
     },
@@ -344,19 +357,6 @@
       "submitted": "Comment Submitted",
       "updated": "Changes Saved"
     },
-    "allowEmbeds": {
-      "name": "Third party providers",
-      "info-description": "If you agree, the posts from the following list of providers will automatically include third-party code from other providers (third parties) in the form of embedded videos, images, or text.",
-      "description": "You have agreed that in the contributions from the following list of providers, foreign code from other providers (third parties) in the form of embedded videos, images or text automatically are embedded.",
-      "statustext": "At the moment this is automatic embedding:",
-      "statuschange": "Change setting",
-      "false": "Turned off",
-      "true": "Admitted",
-      "button-tofalse": "turn-off",
-      "button-totrue": "allow permanently",
-      "third-party-false": "It automatically integrates <b style='color:red'>no </b> third-party providers' service.",
-      "third-party-true": "The inclusion of third-party services is <b style='color:red'>permanently allowed</b> and stored for future sessions."
-    },
     "edited": "edited"
   },
   "comment": {
diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue
index a7604ea5f..2d8ba7237 100644
--- a/webapp/pages/settings.vue
+++ b/webapp/pages/settings.vue
@@ -40,8 +40,8 @@ export default {
           path: `/settings/blocked-users`,
         },
         {
-          name: this.$t('post.allowEmbeds.name'),
-          path: `/settings/allow-embeds`,
+          name: this.$t('settings.embeds.name'),
+          path: `/settings/embeds`,
         },
         {
           name: this.$t('settings.deleteUserAccount.name'),
diff --git a/webapp/pages/settings/allow-embeds.vue b/webapp/pages/settings/embeds.vue
similarity index 74%
rename from webapp/pages/settings/allow-embeds.vue
rename to webapp/pages/settings/embeds.vue
index c76a50422..f9e1abfdb 100644
--- a/webapp/pages/settings/allow-embeds.vue
+++ b/webapp/pages/settings/embeds.vue
@@ -1,6 +1,6 @@
 <template>
-  <ds-card :header="$t('post.allowEmbeds.name')">
-    <p>{{ $t('post.allowEmbeds.statustext') }}</p>
+  <ds-card :header="$t('settings.embeds.name')">
+    <p>{{ $t('settings.embeds.statustext') }}</p>
     <ds-container width="large">
       <h3 v-html="allowEmbeds_h3" />
       <div v-html="allowEmbeds_desc" />
@@ -8,17 +8,17 @@
     <div>
       <ds-space />
       <ds-space />
-      <p>{{ $t('post.allowEmbeds.statuschange') }}</p>
+      <p>{{ $t('settings.embeds.statuschange') }}</p>
       <ds-container width="large">
         <ds-flex>
           <ds-flex-item>
             <ds-button @click="toFalse" :disabled="!disabled">
-              {{ $t('post.allowEmbeds.button-tofalse') }}
+              {{ $t('settings.embeds.button-tofalse') }}
             </ds-button>
           </ds-flex-item>
           <ds-flex-item>
             <ds-button @click="toTrue" secondary :disabled="disabled">
-              {{ $t('post.allowEmbeds.button-totrue') }}
+              {{ $t('settings.embeds.button-totrue') }}
             </ds-button>
           </ds-flex-item>
         </ds-flex>
@@ -29,9 +29,9 @@
 
     <div>
       <p v-if="disabled">
-        <b>{{ $t('post.allowEmbeds.description') }}</b>
+        <b>{{ $t('settings.embeds.description') }}</b>
       </p>
-      <p v-else>{{ $t('post.allowEmbeds.info-description') }}</p>
+      <p v-else>{{ $t('settings.embeds.info-description') }}</p>
       <ds-container>
         <ds-placeholder>
           <ul>
@@ -54,7 +54,7 @@ import { allowEmbedIframesMutation } from '~/graphql/User.js'
 export default {
   head() {
     return {
-      title: this.$t('post.allowEmbeds.name'),
+      title: this.$t('settings.embeds.name'),
     }
   },
   computed: {
@@ -64,8 +64,8 @@ export default {
   },
   data() {
     return {
-      allowEmbeds_h3: this.$t('post.allowEmbeds.false'),
-      allowEmbeds_desc: this.$t('post.allowEmbeds.third-party-false'),
+      allowEmbeds_h3: this.$t('settings.embeds.false'),
+      allowEmbeds_desc: this.$t('settings.embeds.third-party-false'),
       disabled: null,
       providers: [],
     }
@@ -81,13 +81,13 @@ export default {
       setCurrentUser: 'auth/SET_USER',
     }),
     toFalse() {
-      this.allowEmbeds_h3 = this.$t('post.allowEmbeds.false')
-      this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-false')
+      this.allowEmbeds_h3 = this.$t('settings.embeds.false')
+      this.allowEmbeds_desc = this.$t('settings.embeds.third-party-false')
       this.submit()
     },
     toTrue() {
-      this.allowEmbeds_h3 = this.$t('post.allowEmbeds.true')
-      this.allowEmbeds_desc = this.$t('post.allowEmbeds.third-party-true')
+      this.allowEmbeds_h3 = this.$t('settings.embeds.true')
+      this.allowEmbeds_desc = this.$t('settings.embeds.third-party-true')
       this.submit()
     },
     async submit() {

From 465a46c8d4479f986778ee80063756e70dd8f87c Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 19:29:35 +0200
Subject: [PATCH 104/212] refactor: reduce code on settings/embeds

---
 webapp/locales/de.json           | 23 ++++++-----
 webapp/locales/en.json           | 23 ++++++-----
 webapp/pages/settings/embeds.vue | 68 ++++++++++++--------------------
 3 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cb1b60db1..304c8cb74 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -228,16 +228,19 @@
     },
     "embeds": {
       "name": "Drittanbieter",
-      "info-description": "Wenn du zustimmst werden in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
-      "description": "Du hast zugestimmt das in den Beiträgen aus der folgenden Liste an Providern Fremdcode von anderen Anbietern (Drittanbietern) in Form von eingebundenen Videos, Bilder oder Text automatisch eingebunden werden.",
-      "statustext": "Momentan ist das automatische einbinden:",
-      "statuschange": "Einstellung ändern",
-      "false": "Abgestellt",
-      "true": "Zugelassen",
-      "button-tofalse": "Abstellen",
-      "button-totrue": "dauerhaft zulassen",
-      "third-party-false": "Es wird <b style='color:red'>kein</b> Service von Drittanbietern automatisch eingebunden.",
-      "third-party-true": "Das einbinden der Services von Drittanbietern ist <b style='color:red'>dauerhaft zugelassen</b> und gespeichert für komende Sitzungen."
+      "info-description": "Hier ist die Liste an Drittanbietern, deren Inhalte als Fremdcode z.B. in Form von eingebetteten Videos angezeigt werden kann:",
+      "status": {
+        "description": "Als Grundeinstellung für dich wird eingebetter Fremdcode von Drittanbietern",
+        "disabled": {
+          "false": "zunächst nicht angezeigt",
+          "true": "sofort angezeigt"
+        },
+        "change": {
+          "question": "Soll eingebetter Fremdcode von Dritten für dich immer angezeigt werden?",
+          "allow": "Na klar",
+          "deny": "Lieber nicht"
+        }
+      }
     },
     "organizations": {
       "name": "Meine Organisationen"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index af416c2c9..7259e1757 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -229,16 +229,19 @@
     },
     "embeds": {
       "name": "Third party providers",
-      "info-description": "If you agree, the posts from the following list of providers will automatically include third-party code from other providers (third parties) in the form of embedded videos, images, or text.",
-      "description": "You have agreed that in the contributions from the following list of providers, foreign code from other providers (third parties) in the form of embedded videos, images or text automatically are embedded.",
-      "statustext": "At the moment this is automatic embedding:",
-      "statuschange": "Change setting",
-      "false": "Turned off",
-      "true": "Admitted",
-      "button-tofalse": "turn-off",
-      "button-totrue": "allow permanently",
-      "third-party-false": "It automatically integrates <b style='color:red'>no </b> third-party providers' service.",
-      "third-party-true": "The inclusion of third-party services is <b style='color:red'>permanently allowed</b> and stored for future sessions."
+      "info-description": "Here is the list of third-party providers whose content can be displayed as third-party code, e.g. in the form of embedded videos.",
+      "status": {
+        "description": "As a default for you, embedded code of third-party providers is",
+        "disabled": {
+          "false": "initially not displayed",
+          "true": "displayed immediately"
+        },
+        "change": {
+          "question": "Should embedded source code from third parties always be displayed to you?",
+          "allow": "Sure",
+          "deny": "No thanks"
+        }
+      }
     },
     "organizations": {
       "name": "My Organizations"
diff --git a/webapp/pages/settings/embeds.vue b/webapp/pages/settings/embeds.vue
index f9e1abfdb..5ba1af556 100644
--- a/webapp/pages/settings/embeds.vue
+++ b/webapp/pages/settings/embeds.vue
@@ -1,48 +1,31 @@
 <template>
   <ds-card :header="$t('settings.embeds.name')">
-    <p>{{ $t('settings.embeds.statustext') }}</p>
-    <ds-container width="large">
-      <h3 v-html="allowEmbeds_h3" />
-      <div v-html="allowEmbeds_desc" />
-    </ds-container>
-    <div>
-      <ds-space />
-      <ds-space />
-      <p>{{ $t('settings.embeds.statuschange') }}</p>
-      <ds-container width="large">
-        <ds-flex>
-          <ds-flex-item>
-            <ds-button @click="toFalse" :disabled="!disabled">
-              {{ $t('settings.embeds.button-tofalse') }}
-            </ds-button>
-          </ds-flex-item>
-          <ds-flex-item>
-            <ds-button @click="toTrue" secondary :disabled="disabled">
-              {{ $t('settings.embeds.button-totrue') }}
-            </ds-button>
-          </ds-flex-item>
-        </ds-flex>
-      </ds-container>
-    </div>
-    <ds-space />
-    <ds-space />
+    <ds-section>
+      <ds-text>
+        {{ $t('settings.embeds.status.description') }}
+        <ds-text bold>
+          {{ $t(`settings.embeds.status.disabled.${disabled}`) }}
+        </ds-text>
+        .
+      </ds-text>
+      <ds-text>
+        {{ $t('settings.embeds.status.change.question') }}
+      </ds-text>
+      <ds-button @click="toFalse" :primary="!disabled" :disabled="!disabled">
+        {{ $t('settings.embeds.status.change.deny') }}
+      </ds-button>
+      <ds-button @click="toTrue" :primary="disabled" :disabled="disabled">
+        {{ $t('settings.embeds.status.change.allow') }}
+      </ds-button>
 
-    <div>
-      <p v-if="disabled">
-        <b>{{ $t('settings.embeds.description') }}</b>
-      </p>
-      <p v-else>{{ $t('settings.embeds.info-description') }}</p>
-      <ds-container>
-        <ds-placeholder>
-          <ul>
-            <li v-for="provider in providers" :key="provider.provider_name">
-              {{ provider.provider_name }},
-              <small>{{ provider.provider_url }}</small>
-            </li>
-          </ul>
-        </ds-placeholder>
-      </ds-container>
-    </div>
+      <p>{{ $t('settings.embeds.info-description') }}</p>
+      <ul>
+        <li v-for="provider in providers" :key="provider.provider_name">
+          {{ provider.provider_name }},
+          <small>{{ provider.provider_url }}</small>
+        </li>
+      </ul>
+    </ds-section>
   </ds-card>
 </template>
 
@@ -106,7 +89,6 @@ export default {
             })
           },
         })
-        this.$toast.success(this.$t('site.thanks') + ' ' + this.allowEmbeds_h3)
         this.disabled = !this.disabled
       } catch (err) {
         this.$toast.error(err.message)

From ba27d2189d155cf019f885bf3577f8b597327f97 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 19:37:57 +0200
Subject: [PATCH 105/212] Remove obsolete code

---
 webapp/pages/settings/embeds.vue | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/webapp/pages/settings/embeds.vue b/webapp/pages/settings/embeds.vue
index 5ba1af556..7b85295c0 100644
--- a/webapp/pages/settings/embeds.vue
+++ b/webapp/pages/settings/embeds.vue
@@ -11,10 +11,10 @@
       <ds-text>
         {{ $t('settings.embeds.status.change.question') }}
       </ds-text>
-      <ds-button @click="toFalse" :primary="!disabled" :disabled="!disabled">
+      <ds-button @click="submit" :primary="!disabled" :disabled="!disabled">
         {{ $t('settings.embeds.status.change.deny') }}
       </ds-button>
-      <ds-button @click="toTrue" :primary="disabled" :disabled="disabled">
+      <ds-button @click="submit" :primary="disabled" :disabled="disabled">
         {{ $t('settings.embeds.status.change.allow') }}
       </ds-button>
 
@@ -47,8 +47,6 @@ export default {
   },
   data() {
     return {
-      allowEmbeds_h3: this.$t('settings.embeds.false'),
-      allowEmbeds_desc: this.$t('settings.embeds.third-party-false'),
       disabled: null,
       providers: [],
     }
@@ -63,16 +61,6 @@ export default {
     ...mapMutations({
       setCurrentUser: 'auth/SET_USER',
     }),
-    toFalse() {
-      this.allowEmbeds_h3 = this.$t('settings.embeds.false')
-      this.allowEmbeds_desc = this.$t('settings.embeds.third-party-false')
-      this.submit()
-    },
-    toTrue() {
-      this.allowEmbeds_h3 = this.$t('settings.embeds.true')
-      this.allowEmbeds_desc = this.$t('settings.embeds.third-party-true')
-      this.submit()
-    },
     async submit() {
       try {
         await this.$apollo.mutate({

From 71e94d88c6fde65641c4b60b6f142ad9026faf4c Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 22:13:46 +0200
Subject: [PATCH 106/212] feat: add page component for public registration

---
 webapp/components/PasswordReset/Request.vue |  21 ++--
 webapp/components/Registration/Signup.vue   | 106 ++++++++++----------
 webapp/locales/de.json                      |   2 +
 webapp/locales/en.json                      |   2 +
 webapp/nuxt.config.js                       |   5 +-
 webapp/pages/admin/invite.vue               |   4 +-
 webapp/pages/login.vue                      |  18 ++--
 webapp/pages/registration/enter-nonce.vue   |   7 ++
 webapp/pages/registration/signup.vue        |  42 ++++++++
 9 files changed, 129 insertions(+), 78 deletions(-)
 create mode 100644 webapp/pages/registration/enter-nonce.vue
 create mode 100644 webapp/pages/registration/signup.vue

diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index aa7e67fcf..052be2f6c 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -10,9 +10,6 @@
         </ds-space>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-        <ds-space margin="small">
-          <ds-text size="small" align="left">{{ $t('login.copy') }}</ds-text>
-        </ds-space>
         <ds-form
           v-if="!submitted"
           @input="handleInput"
@@ -21,14 +18,16 @@
           :schema="formSchema"
           @submit="handleSubmit"
         >
-          <ds-input
-            :placeholder="$t('login.email')"
-            type="email"
-            id="email"
-            model="email"
-            name="email"
-            icon="envelope"
-          />
+          <ds-space margin="small">
+            <ds-input
+              :placeholder="$t('login.email')"
+              type="email"
+              id="email"
+              model="email"
+              name="email"
+              icon="envelope"
+            />
+          </ds-space>
           <ds-space margin-botton="large">
             <ds-text align="left">{{ $t('password-reset.form.description') }}</ds-text>
           </ds-space>
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index 36a43f180..2924183da 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -1,59 +1,57 @@
 <template>
-  <ds-card class="signup">
-    <ds-space margin="large">
-      <ds-form
-        v-if="!success && !error"
-        @input="handleInput"
-        @input-valid="handleInputValid"
-        v-model="formData"
-        :schema="formSchema"
-        @submit="handleSubmit"
+  <ds-space margin="large">
+    <ds-form
+      v-if="!success && !error"
+      @input="handleInput"
+      @input-valid="handleInputValid"
+      v-model="formData"
+      :schema="formSchema"
+      @submit="handleSubmit"
+    >
+      <h1>{{ invitation ? $t('profile.invites.title') : $t('registration.signup.title') }}</h1>
+      <ds-space v-if="token" margin-botton="large">
+        <ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" />
+      </ds-space>
+      <ds-space margin-botton="large">
+        <ds-text>
+          {{
+            invitation
+              ? $t('profile.invites.description')
+              : $t('registration.signup.form.description')
+          }}
+        </ds-text>
+      </ds-space>
+      <ds-input
+        :placeholder="invitation ? $t('profile.invites.emailPlaceholder') : $t('login.email')"
+        type="email"
+        id="email"
+        model="email"
+        name="email"
+        icon="envelope"
+      />
+      <ds-button
+        :disabled="disabled"
+        :loading="$apollo.loading"
+        primary
+        fullwidth
+        name="submit"
+        type="submit"
+        icon="envelope"
       >
-        <h1>{{ invitation ? $t('profile.invites.title') : $t('registration.signup.title') }}</h1>
-        <ds-space v-if="token" margin-botton="large">
-          <ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" />
-        </ds-space>
-        <ds-space margin-botton="large">
-          <ds-text>
-            {{
-              invitation
-                ? $t('profile.invites.description')
-                : $t('registration.signup.form.description')
-            }}
-          </ds-text>
-        </ds-space>
-        <ds-input
-          :placeholder="invitation ? $t('profile.invites.emailPlaceholder') : $t('login.email')"
-          type="email"
-          id="email"
-          model="email"
-          name="email"
-          icon="envelope"
-        />
-        <ds-button
-          :disabled="disabled"
-          :loading="$apollo.loading"
-          primary
-          fullwidth
-          name="submit"
-          type="submit"
-          icon="envelope"
-        >
-          {{ $t('registration.signup.form.submit') }}
-        </ds-button>
-      </ds-form>
-      <div v-else>
-        <template v-if="!error">
-          <sweetalert-icon icon="info" />
-          <ds-text align="center" v-html="submitMessage" />
-        </template>
-        <template v-else>
-          <sweetalert-icon icon="error" />
-          <ds-text align="center">{{ error.message }}</ds-text>
-        </template>
-      </div>
-    </ds-space>
-  </ds-card>
+        {{ $t('registration.signup.form.submit') }}
+      </ds-button>
+    </ds-form>
+    <div v-else>
+      <template v-if="!error">
+        <sweetalert-icon icon="info" />
+        <ds-text align="center" v-html="submitMessage" />
+      </template>
+      <template v-else>
+        <sweetalert-icon icon="error" />
+        <ds-text align="center">{{ error.message }}</ds-text>
+      </template>
+    </div>
+  </ds-space>
 </template>
 
 <script>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b7965062b..09c723545 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -55,6 +55,8 @@
     "email": "Deine E-Mail",
     "password": "Dein Passwort",
     "forgotPassword": "Passwort vergessen?",
+    "no-account": "Du hast noch keinen Benutzerkonto?",
+    "register": "Benutzerkonto erstellen",
     "moreInfo": "Was ist Human Connection?",
     "moreInfoURL": "https://human-connection.org",
     "moreInfoHint": "zur Präsentationsseite",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 162f1a0f0..42c41fe00 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -55,6 +55,8 @@
     "email": "Your Email",
     "password": "Your Password",
     "forgotPassword": "Forgot Password?",
+    "no-account": "Don't have an account?",
+    "register": "Sign up",
     "moreInfo": "What is Human Connection?",
     "moreInfoURL": "https://human-connection.org/en/",
     "moreInfoHint": "to the presentation page",
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 84602f7eb..f79e5982c 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -38,9 +38,8 @@ export default {
       'password-reset-request',
       'password-reset-verify-nonce',
       'password-reset-change-password',
-      // 'registration-signup', TODO: implement to open public registration
-      // 'registration-signup-by-invitation-code',
-      // 'registration-verify-nonce',
+      'registration-signup',
+      'registration-enter-nonce',
       'registration-create-user-account',
       'pages-slug',
       'terms-and-conditions',
diff --git a/webapp/pages/admin/invite.vue b/webapp/pages/admin/invite.vue
index 3f9b4d831..b45f8101c 100644
--- a/webapp/pages/admin/invite.vue
+++ b/webapp/pages/admin/invite.vue
@@ -5,7 +5,9 @@
       <ds-heading size="h3">{{ $t('admin.invites.title') }}</ds-heading>
       <ds-text>{{ $t('admin.invites.description') }}</ds-text>
     </ds-space>
-    <signup :invitation="true" />
+    <ds-card class="signup">
+      <signup :invitation="true" />
+    </ds-card>
   </ds-section>
 </template>
 
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 46168f1ab..971754870 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -22,6 +22,11 @@
             </ds-space>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+            <ds-space margin="small">
+              <a :href="$t('login.moreInfoURL')" :title="$t('login.moreInfoHint')" target="_blank">
+                {{ $t('login.moreInfo') }}
+              </a>
+            </ds-space>
             <ds-space margin="small">
               <ds-text size="small">{{ $t('login.copy') }}</ds-text>
             </ds-space>
@@ -43,7 +48,7 @@
                 name="password"
                 type="password"
               />
-              <ds-space class="password-reset-link" margin-bottom="large">
+              <ds-space margin-bottom="large">
                 <nuxt-link to="/password-reset/request">{{ $t('login.forgotPassword') }}</nuxt-link>
               </ds-space>
               <ds-button
@@ -56,14 +61,9 @@
               >
                 {{ $t('login.login') }}
               </ds-button>
-              <ds-space margin="x-small">
-                <a
-                  :href="$t('login.moreInfoURL')"
-                  :title="$t('login.moreInfoHint')"
-                  target="_blank"
-                >
-                  {{ $t('login.moreInfo') }}
-                </a>
+              <ds-space margin-top="large" margin-bottom="x-small">
+                {{ $t('login.no-account') }}
+                <nuxt-link to="/registration/signup">{{ $t('login.register') }}</nuxt-link>
               </ds-space>
             </form>
           </ds-flex-item>
diff --git a/webapp/pages/registration/enter-nonce.vue b/webapp/pages/registration/enter-nonce.vue
new file mode 100644
index 000000000..7efa86627
--- /dev/null
+++ b/webapp/pages/registration/enter-nonce.vue
@@ -0,0 +1,7 @@
+<template>
+  <h1>Enter nonce</h1>
+</template>
+
+<script>
+export default {}
+</script>
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
new file mode 100644
index 000000000..943109d59
--- /dev/null
+++ b/webapp/pages/registration/signup.vue
@@ -0,0 +1,42 @@
+<template>
+  <ds-container width="medium">
+    <ds-card>
+      <ds-flex gutter="small">
+        <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+          <client-only>
+            <locale-switch class="login-locale-switch" offset="5" />
+          </client-only>
+          <ds-space margin-top="small" margin-bottom="xxx-small" centered>
+            <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
+          </ds-space>
+        </ds-flex-item>
+        <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+          <signup :invitation="false" />
+        </ds-flex-item>
+      </ds-flex>
+    </ds-card>
+  </ds-container>
+</template>
+
+<script>
+import Signup from '~/components/Registration/Signup'
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+
+export default {
+  layout: 'no-header',
+  components: {
+    Signup,
+    LocaleSwitch,
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.signup-image {
+  width: 90%;
+  max-width: 200px;
+}
+.login-card {
+  position: relative;
+}
+</style>

From 7a276db42fd1017ba69863cce3adcbe9cc5f2f10 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 22:47:36 +0200
Subject: [PATCH 107/212] fix: remove obsolete css, add link to login page

---
 webapp/components/PasswordReset/Request.vue | 9 ++-------
 webapp/locales/de.json                      | 3 ++-
 webapp/locales/en.json                      | 3 ++-
 webapp/pages/registration/signup.vue        | 3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index 052be2f6c..cda886d8e 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -3,7 +3,7 @@
     <ds-flex gutter="small">
       <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
         <client-only>
-          <locale-switch class="login-locale-switch" offset="5" />
+          <locale-switch offset="5" />
         </client-only>
         <ds-space margin-top="small" margin-bottom="xxx-small" centered>
           <img class="login-image" alt="Human Connection" src="/img/sign-up/humanconnection.svg" />
@@ -123,7 +123,7 @@ export default {
   },
 }
 </script>
-<style>
+<style scoped>
 .login-image {
   width: 90%;
   max-width: 200px;
@@ -131,9 +131,4 @@ export default {
 .password-reset {
   position: relative;
 }
-.login-locale-switch {
-  position: absolute;
-  top: 1em;
-  left: 1em;
-}
 </style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 09c723545..0d317402b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -82,7 +82,8 @@
         },
         "submit": "Konto erstellen",
         "success": "Eine Mail mit einem Bestätigungslink für die Registrierung wurde an <b>{email}</b> geschickt"
-      }
+      },
+      "back-to-login": "Zurück zur Anmeldung"
     },
     "create-user-account": {
       "title": "Benutzerkonto anlegen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 42c41fe00..8ba1edad5 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -83,7 +83,8 @@
         },
         "submit": "Create an account",
         "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>"
-      }
+      },
+      "back-to-login": "Back to login page"
     },
     "create-user-account": {
       "title": "Create user account",
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index 943109d59..5fb9d3a4e 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -4,7 +4,7 @@
       <ds-flex gutter="small">
         <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
           <client-only>
-            <locale-switch class="login-locale-switch" offset="5" />
+            <locale-switch offset="5" />
           </client-only>
           <ds-space margin-top="small" margin-bottom="xxx-small" centered>
             <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
@@ -12,6 +12,7 @@
         </ds-flex-item>
         <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
           <signup :invitation="false" />
+          <nuxt-link to="/login">{{ $t('registration.signup.back-to-login') }}</nuxt-link>
         </ds-flex-item>
       </ds-flex>
     </ds-card>

From bb5d581906b5e6e723966c3dc687c7f309356841 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 4 Oct 2019 23:05:36 +0200
Subject: [PATCH 108/212] refactor: restructure translations and components

---
 .../EnterNonce.spec.js}                       |  16 +--
 webapp/components/EnterNonce/EnterNonce.vue   |  65 +++++++++++
 .../PasswordReset/ChangePassword.spec.js      |   4 +-
 .../PasswordReset/ChangePassword.vue          | 104 +++++++++--------
 .../components/PasswordReset/Request.spec.js  |   9 +-
 webapp/components/PasswordReset/Request.vue   | 110 +++++++-----------
 .../components/PasswordReset/VerifyNonce.vue  |  67 -----------
 webapp/components/Registration/Signup.spec.js |   2 +-
 webapp/components/Registration/Signup.vue     |   8 +-
 webapp/locales/de.json                        |  89 +++++++-------
 webapp/locales/en.json                        |  91 ++++++++-------
 webapp/locales/pl.json                        |  50 ++++----
 webapp/nuxt.config.js                         |   2 +-
 webapp/pages/password-reset.vue               |  28 +++--
 .../pages/password-reset/change-password.vue  |   6 +-
 .../{verify-nonce.vue => enter-nonce.vue}     |   8 +-
 webapp/pages/password-reset/request.vue       |   8 +-
 webapp/pages/registration/signup.vue          |   2 +-
 18 files changed, 344 insertions(+), 325 deletions(-)
 rename webapp/components/{PasswordReset/VerifyNonce.spec.js => EnterNonce/EnterNonce.spec.js} (67%)
 create mode 100644 webapp/components/EnterNonce/EnterNonce.vue
 delete mode 100644 webapp/components/PasswordReset/VerifyNonce.vue
 rename webapp/pages/password-reset/{verify-nonce.vue => enter-nonce.vue} (58%)

diff --git a/webapp/components/PasswordReset/VerifyNonce.spec.js b/webapp/components/EnterNonce/EnterNonce.spec.js
similarity index 67%
rename from webapp/components/PasswordReset/VerifyNonce.spec.js
rename to webapp/components/EnterNonce/EnterNonce.spec.js
index ebe552f0d..67f1f9073 100644
--- a/webapp/components/PasswordReset/VerifyNonce.spec.js
+++ b/webapp/components/EnterNonce/EnterNonce.spec.js
@@ -1,12 +1,12 @@
 import { mount, createLocalVue } from '@vue/test-utils'
-import VerifyNonce from './VerifyNonce.vue'
+import EnterNonce from './EnterNonce.vue'
 import Styleguide from '@human-connection/styleguide'
 
 const localVue = createLocalVue()
 
 localVue.use(Styleguide)
 
-describe('VerifyNonce ', () => {
+describe('EnterNonce ', () => {
   let wrapper
   let Wrapper
   let mocks
@@ -25,28 +25,28 @@ describe('VerifyNonce ', () => {
     beforeEach(jest.useFakeTimers)
 
     Wrapper = () => {
-      return mount(VerifyNonce, {
+      return mount(EnterNonce, {
         mocks,
         localVue,
         propsData,
       })
     }
 
-    it('renders a verify nonce form', () => {
+    it('renders an enter nonce form', () => {
       wrapper = Wrapper()
-      expect(wrapper.find('.verify-nonce').exists()).toBe(true)
+      expect(wrapper.find('form').exists()).toBe(true)
     })
 
-    describe('after verification nonce given', () => {
+    describe('after nonce entered', () => {
       beforeEach(() => {
         wrapper = Wrapper()
         wrapper.find('input#nonce').setValue('123456')
         wrapper.find('form').trigger('submit')
       })
 
-      it('emits `verification`', () => {
+      it('emits `nonceEntered`', () => {
         const expected = [[{ nonce: '123456', email: 'mail@example.org' }]]
-        expect(wrapper.emitted('verification')).toEqual(expected)
+        expect(wrapper.emitted('nonceEntered')).toEqual(expected)
       })
     })
   })
diff --git a/webapp/components/EnterNonce/EnterNonce.vue b/webapp/components/EnterNonce/EnterNonce.vue
new file mode 100644
index 000000000..a70c137cb
--- /dev/null
+++ b/webapp/components/EnterNonce/EnterNonce.vue
@@ -0,0 +1,65 @@
+<template>
+  <ds-space margin="large">
+    <ds-form
+      v-model="formData"
+      :schema="formSchema"
+      @submit="handleSubmitVerify"
+      @input="handleInput"
+      @input-valid="handleInputValid"
+    >
+      <ds-input
+        :placeholder="$t('components.enter-nonce.form.nonce')"
+        model="nonce"
+        name="nonce"
+        id="nonce"
+        icon="question-circle"
+      />
+      <ds-space margin-botton="large">
+        <ds-text>
+          {{ $t('components.enter-nonce.form.description') }}
+        </ds-text>
+      </ds-space>
+      <ds-button :disabled="disabled" primary fullwidth name="submit" type="submit">
+        {{ $t('components.enter-nonce.form.next') }}
+      </ds-button>
+    </ds-form>
+  </ds-space>
+</template>
+
+<script>
+export default {
+  props: {
+    email: { type: String, required: true },
+  },
+  data() {
+    return {
+      formData: {
+        nonce: '',
+      },
+      formSchema: {
+        nonce: {
+          type: 'string',
+          min: 6,
+          max: 6,
+          required: true,
+          message: this.$t('components.enter-nonce.form.validations.length'),
+        },
+      },
+      disabled: true,
+    }
+  },
+  methods: {
+    async handleInput() {
+      this.disabled = true
+    },
+    async handleInputValid() {
+      this.disabled = false
+    },
+    handleSubmitVerify() {
+      const { nonce } = this.formData
+      const email = this.email
+      this.$emit('nonceEntered', { email, nonce })
+    },
+  },
+}
+</script>
diff --git a/webapp/components/PasswordReset/ChangePassword.spec.js b/webapp/components/PasswordReset/ChangePassword.spec.js
index e93d5d00d..b5d85dea7 100644
--- a/webapp/components/PasswordReset/ChangePassword.spec.js
+++ b/webapp/components/PasswordReset/ChangePassword.spec.js
@@ -39,7 +39,7 @@ describe('ChangePassword ', () => {
       })
     }
 
-    describe('given email and verification nonce', () => {
+    describe('given email and nonce', () => {
       beforeEach(() => {
         propsData.email = 'mail@example.org'
         propsData.nonce = '123456'
@@ -66,7 +66,7 @@ describe('ChangePassword ', () => {
 
         describe('password reset successful', () => {
           it('displays success message', () => {
-            const expected = 'verify-nonce.form.change-password.success'
+            const expected = 'components.password-reset.change-password.success'
             expect(mocks.$t).toHaveBeenCalledWith(expected)
           })
 
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index 3de4f048a..a98026b2e 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -1,54 +1,58 @@
 <template>
-  <ds-card class="verify-nonce">
-    <ds-space margin="large">
-      <ds-form
-        v-if="!changePasswordResult"
-        v-model="formData"
-        :schema="formSchema"
-        @submit="handleSubmitPassword"
-        class="change-password"
-      >
-        <template slot-scope="{ errors }">
-          <ds-input
-            id="password"
-            model="password"
-            type="password"
-            autocomplete="off"
-            :label="$t('settings.security.change-password.label-new-password')"
-          />
-          <ds-input
-            id="passwordConfirmation"
-            model="passwordConfirmation"
-            type="password"
-            autocomplete="off"
-            :label="$t('settings.security.change-password.label-new-password-confirm')"
-          />
-          <password-strength :password="formData.password" />
-          <ds-space margin-top="base">
-            <ds-button :loading="$apollo.loading" :disabled="errors" primary>
-              {{ $t('settings.security.change-password.button') }}
-            </ds-button>
-          </ds-space>
-        </template>
-      </ds-form>
-      <ds-text v-else>
-        <template v-if="changePasswordResult === 'success'">
-          <sweetalert-icon icon="success" />
-          <ds-text>
-            {{ $t(`verify-nonce.form.change-password.success`) }}
-          </ds-text>
-        </template>
-        <template v-else>
-          <sweetalert-icon icon="error" />
-          <ds-text align="left">
-            {{ $t(`verify-nonce.form.change-password.error`) }}
-            {{ $t('verify-nonce.form.change-password.help') }}
-          </ds-text>
-          <a href="mailto:support@human-connection.org">support@human-connection.org</a>
-        </template>
-      </ds-text>
-    </ds-space>
-  </ds-card>
+  <ds-space margin-top="base" margin-bottom="xxx-small">
+    <ds-form
+      v-if="!changePasswordResult"
+      v-model="formData"
+      :schema="formSchema"
+      @submit="handleSubmitPassword"
+      class="change-password"
+    >
+      <template slot-scope="{ errors }">
+        <ds-input
+          id="password"
+          model="password"
+          type="password"
+          autocomplete="off"
+          :label="$t('settings.security.change-password.label-new-password')"
+        />
+        <ds-input
+          id="passwordConfirmation"
+          model="passwordConfirmation"
+          type="password"
+          autocomplete="off"
+          :label="$t('settings.security.change-password.label-new-password-confirm')"
+        />
+        <password-strength :password="formData.password" />
+        <ds-space margin-top="base" margin-bottom="xxx-small">
+          <ds-button :loading="$apollo.loading" :disabled="errors" primary>
+            {{ $t('settings.security.change-password.button') }}
+          </ds-button>
+        </ds-space>
+      </template>
+    </ds-form>
+    <ds-text v-else>
+      <template v-if="changePasswordResult === 'success'">
+        <sweetalert-icon icon="success" />
+        <ds-text>
+          {{ $t('components.password-reset.change-password.success') }}
+        </ds-text>
+      </template>
+      <template v-else>
+        <sweetalert-icon icon="error" />
+        <ds-text>
+          <p>
+            {{ $t(`components.password-reset.change-password.error`) }}
+          </p>
+          <p>
+            {{ $t('components.password-reset.change-password.help') }}
+            <br />
+            <a href="mailto:support@human-connection.org">support@human-connection.org</a>
+          </p>
+        </ds-text>
+      </template>
+      <slot></slot>
+    </ds-text>
+  </ds-space>
 </template>
 
 <script>
diff --git a/webapp/components/PasswordReset/Request.spec.js b/webapp/components/PasswordReset/Request.spec.js
index 63e51cf76..594d6628d 100644
--- a/webapp/components/PasswordReset/Request.spec.js
+++ b/webapp/components/PasswordReset/Request.spec.js
@@ -18,7 +18,7 @@ describe('Request', () => {
         success: jest.fn(),
         error: jest.fn(),
       },
-      $t: jest.fn(),
+      $t: jest.fn(t => t),
       $apollo: {
         loading: false,
         mutate: jest.fn().mockResolvedValue({ data: { reqestPasswordReset: true } }),
@@ -45,7 +45,7 @@ describe('Request', () => {
 
     it('renders a password reset form', () => {
       wrapper = Wrapper()
-      expect(wrapper.find('.password-reset').exists()).toBe(true)
+      expect(wrapper.find('form').exists()).toBe(true)
     })
 
     describe('submit', () => {
@@ -69,7 +69,10 @@ describe('Request', () => {
       })
 
       it('displays a message that a password email was requested', () => {
-        const expected = ['password-reset.form.submitted', { email: 'mail@example.org' }]
+        const expected = [
+          'components.password-reset.request.form.submitted',
+          { email: 'mail@example.org' },
+        ]
         expect(mocks.$t).toHaveBeenCalledWith(...expected)
       })
 
diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index cda886d8e..c7dd759dd 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -1,76 +1,55 @@
 <template>
-  <ds-card class="password-reset">
-    <ds-flex gutter="small">
-      <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-        <client-only>
-          <locale-switch offset="5" />
-        </client-only>
-        <ds-space margin-top="small" margin-bottom="xxx-small" centered>
-          <img class="login-image" alt="Human Connection" src="/img/sign-up/humanconnection.svg" />
-        </ds-space>
-      </ds-flex-item>
-      <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-        <ds-form
-          v-if="!submitted"
-          @input="handleInput"
-          @input-valid="handleInputValid"
-          v-model="formData"
-          :schema="formSchema"
-          @submit="handleSubmit"
-        >
-          <ds-space margin="small">
-            <ds-input
-              :placeholder="$t('login.email')"
-              type="email"
-              id="email"
-              model="email"
-              name="email"
-              icon="envelope"
-            />
-          </ds-space>
-          <ds-space margin-botton="large">
-            <ds-text align="left">{{ $t('password-reset.form.description') }}</ds-text>
-          </ds-space>
-          <ds-button
-            :disabled="disabled"
-            :loading="$apollo.loading"
-            primary
-            fullwidth
-            name="submit"
-            type="submit"
-            icon="envelope"
-          >
-            {{ $t('password-reset.form.submit') }}
-          </ds-button>
-        </ds-form>
-        <div v-else>
-          <transition name="ds-transition-fade">
-            <ds-flex centered>
-              <sweetalert-icon icon="info" />
-            </ds-flex>
-          </transition>
-          <ds-text v-html="submitMessage" align="left" />
-        </div>
-        <ds-space margin-bottom="small" />
-        <div>
-          <nuxt-link to="/login">{{ $t('site.login') }}</nuxt-link>
-        </div>
-      </ds-flex-item>
-    </ds-flex>
-
-    <ds-space margin="x-small"></ds-space>
-  </ds-card>
+  <ds-form
+    v-if="!submitted"
+    @input="handleInput"
+    @input-valid="handleInputValid"
+    v-model="formData"
+    :schema="formSchema"
+    @submit="handleSubmit"
+  >
+    <ds-space margin="small">
+      <ds-input
+        :placeholder="$t('login.email')"
+        type="email"
+        id="email"
+        model="email"
+        name="email"
+        icon="envelope"
+      />
+    </ds-space>
+    <ds-space margin-botton="large">
+      <ds-text align="left">{{ $t('components.password-reset.request.form.description') }}</ds-text>
+    </ds-space>
+    <ds-button
+      :disabled="disabled"
+      :loading="$apollo.loading"
+      primary
+      fullwidth
+      name="submit"
+      type="submit"
+      icon="envelope"
+    >
+      {{ $t('components.password-reset.request.form.submit') }}
+    </ds-button>
+    <slot></slot>
+  </ds-form>
+  <div v-else>
+    <transition name="ds-transition-fade">
+      <ds-flex centered>
+        <sweetalert-icon icon="info" />
+      </ds-flex>
+    </transition>
+    <ds-text v-html="submitMessage" align="left" />
+  </div>
 </template>
 
 <script>
 import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
-import LocaleSwitch from '../LocaleSwitch/LocaleSwitch'
 
 export default {
   components: {
     SweetalertIcon,
-    LocaleSwitch,
   },
   data() {
     return {
@@ -91,7 +70,7 @@ export default {
   computed: {
     submitMessage() {
       const { email } = this.formData
-      return this.$t('password-reset.form.submitted', { email })
+      return this.$t('components.password-reset.request.form.submitted', { email })
     },
   },
   methods: {
@@ -128,7 +107,4 @@ export default {
   width: 90%;
   max-width: 200px;
 }
-.password-reset {
-  position: relative;
-}
 </style>
diff --git a/webapp/components/PasswordReset/VerifyNonce.vue b/webapp/components/PasswordReset/VerifyNonce.vue
deleted file mode 100644
index 94ae13564..000000000
--- a/webapp/components/PasswordReset/VerifyNonce.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <ds-card class="verify-nonce">
-    <ds-space margin="large">
-      <ds-form
-        v-model="formData"
-        :schema="formSchema"
-        @submit="handleSubmitVerify"
-        @input="handleInput"
-        @input-valid="handleInputValid"
-      >
-        <ds-input
-          :placeholder="$t('verify-nonce.form.nonce')"
-          model="nonce"
-          name="nonce"
-          id="nonce"
-          icon="question-circle"
-        />
-        <ds-space margin-botton="large">
-          <ds-text>
-            {{ $t('verify-nonce.form.description') }}
-          </ds-text>
-        </ds-space>
-        <ds-button :disabled="disabled" primary fullwidth name="submit" type="submit">
-          {{ $t('verify-nonce.form.next') }}
-        </ds-button>
-      </ds-form>
-    </ds-space>
-  </ds-card>
-</template>
-
-<script>
-export default {
-  props: {
-    email: { type: String, required: true },
-  },
-  data() {
-    return {
-      formData: {
-        nonce: '',
-      },
-      formSchema: {
-        nonce: {
-          type: 'string',
-          min: 6,
-          max: 6,
-          required: true,
-          message: this.$t('common.validations.verification-nonce'),
-        },
-      },
-      disabled: true,
-    }
-  },
-  methods: {
-    async handleInput() {
-      this.disabled = true
-    },
-    async handleInputValid() {
-      this.disabled = false
-    },
-    handleSubmitVerify() {
-      const { nonce } = this.formData
-      const email = this.email
-      this.$emit('verification', { email, nonce })
-    },
-  },
-}
-</script>
diff --git a/webapp/components/Registration/Signup.spec.js b/webapp/components/Registration/Signup.spec.js
index ed78d47a2..48b70a15f 100644
--- a/webapp/components/Registration/Signup.spec.js
+++ b/webapp/components/Registration/Signup.spec.js
@@ -42,7 +42,7 @@ describe('Signup', () => {
     describe('without invitation code', () => {
       it('renders signup form', () => {
         wrapper = Wrapper()
-        expect(wrapper.find('.signup').exists()).toBe(true)
+        expect(wrapper.find('form').exists()).toBe(true)
       })
 
       describe('submit', () => {
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index 2924183da..bba984e0e 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -8,7 +8,9 @@
       :schema="formSchema"
       @submit="handleSubmit"
     >
-      <h1>{{ invitation ? $t('profile.invites.title') : $t('registration.signup.title') }}</h1>
+      <h1>
+        {{ invitation ? $t('profile.invites.title') : $t('components.registration.signup.title') }}
+      </h1>
       <ds-space v-if="token" margin-botton="large">
         <ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" />
       </ds-space>
@@ -17,7 +19,7 @@
           {{
             invitation
               ? $t('profile.invites.description')
-              : $t('registration.signup.form.description')
+              : $t('components.registration.signup.form.description')
           }}
         </ds-text>
       </ds-space>
@@ -38,7 +40,7 @@
         type="submit"
         icon="envelope"
       >
-        {{ $t('registration.signup.form.submit') }}
+        {{ $t('components.registration.signup.form.submit') }}
       </ds-button>
     </ds-form>
     <div v-else>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 0d317402b..fc8cd8a69 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -1,4 +1,49 @@
 {
+  "components": {
+    "password-reset": {
+      "request": {
+        "form": {
+          "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
+          "submit": "Email anfordern",
+          "submitted": "Eine E-Mail mit weiteren Instruktionen wurde verschickt an <b>{email}</b>"
+        }
+      },
+      "change-password": {
+        "success": "Änderung des Passworts war erfolgreich!",
+        "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
+        "help": "Falls Probleme auftreten, schreib uns gerne eine Mail an:"
+      }
+    },
+    "enter-nonce": {
+      "form": {
+        "nonce": "Code eingeben",
+        "description": "Öffne dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
+        "next": "Weiter",
+        "validations": {
+          "length": "muss genau 6 Buchstaben lang sein"
+        }
+      }
+    },
+    "registration": {
+      "signup": {
+        "title": "Mach mit bei Human Connection!",
+        "form": {
+          "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
+          "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
+          "errors": {
+            "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
+            "invalid-invitation-token": "Es sieht so aus, als ob der Einladungscode schon eingelöst wurde. Jeder Code kann nur einmalig benutzt werden."
+          },
+          "submit": "Konto erstellen",
+          "success": "Eine Mail mit einem Bestätigungslink für die Registrierung wurde an <b>{email}</b> geschickt"
+        }
+      },
+      "create-user-account": {
+        "title": "Benutzerkonto anlegen",
+        "success": "Dein Benutzerkonto wurde erstellt!"
+      }
+    }
+  },
   "maintenance": {
     "title": "Human Connection befindet sich in der Wartung",
     "explanation": "Zurzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuch es später erneut.",
@@ -42,7 +87,7 @@
     "bank": "Bankverbindung",
     "germany": "Deutschland",
     "code-of-conduct": "Verhaltenscodex",
-    "login": "Zurück zum Anmeldung"
+    "back-to-login": "Zurück zur Anmeldung"
   },
   "sorting": {
     "newest": "Neueste",
@@ -63,45 +108,6 @@
     "hello": "Hallo",
     "success": "Du bist eingeloggt!"
   },
-  "password-reset": {
-    "form": {
-      "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
-      "submit": "Email anfordern",
-      "submitted": "Eine E-Mail mit weiteren Instruktionen wurde verschickt an <b>{email}</b>"
-    }
-  },
-  "registration": {
-    "signup": {
-      "title": "Mach mit bei Human Connection!",
-      "form": {
-        "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
-        "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
-        "errors": {
-          "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
-          "invalid-invitation-token": "Es sieht so aus, als ob der Einladungscode schon eingelöst wurde. Jeder Code kann nur einmalig benutzt werden."
-        },
-        "submit": "Konto erstellen",
-        "success": "Eine Mail mit einem Bestätigungslink für die Registrierung wurde an <b>{email}</b> geschickt"
-      },
-      "back-to-login": "Zurück zur Anmeldung"
-    },
-    "create-user-account": {
-      "title": "Benutzerkonto anlegen",
-      "success": "Dein Benutzerkonto wurde erstellt!"
-    }
-  },
-  "verify-nonce": {
-    "form": {
-      "nonce": "Code eingeben",
-      "description": "Öffne dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
-      "next": "Weiter",
-      "change-password": {
-        "success": "Änderung des Passworts war erfolgreich!",
-        "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
-        "help": "Falls Probleme auftreten, schreib uns gerne eine Mail an:"
-      }
-    }
-  },
   "editor": {
     "placeholder": "Schreib etwas Inspirierendes …",
     "mention": {
@@ -400,8 +406,7 @@
     "reportContent": "Melden",
     "validations": {
       "email": "muss eine gültige E-Mail Adresse sein",
-      "url": "muss eine gültige URL sein",
-      "verification-nonce": "muss genau 6 Buchstaben lang sein"
+      "url": "muss eine gültige URL sein"
     }
   },
   "actions": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8ba1edad5..bcbff1861 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -1,4 +1,50 @@
 {
+  "components": {
+    "password-reset": {
+      "request": {
+        "title": "Reset your password",
+        "form": {
+          "description": "A password reset email will be sent to the given email address.",
+          "submit": "Request email",
+          "submitted": "An email with further instructions has been sent to <b>{email}</b>"
+        }
+      },
+      "change-password": {
+        "success": "Changing your password was successful!",
+        "error": "Changing your password failed. Maybe the security code was not correct?",
+        "help": "In case of problems, feel free to ask for help by sending us a mail to:"
+      }
+    },
+    "enter-nonce": {
+      "form": {
+        "nonce": "Enter your code",
+        "description": "Open your inbox and enter the code that we've sent to you.",
+        "next": "Continue",
+        "validations": {
+          "length": "must be 6 characters long"
+        }
+      }
+    },
+    "registration": {
+      "signup": {
+        "title": "Join Human Connection!",
+        "form": {
+          "description": "To get started, enter your email address:",
+          "invitation-code": "Your invitation code is: <b>{code}</b>",
+          "errors": {
+            "email-exists": "There is already a user account with this email address!",
+            "invalid-invitation-token": "It looks like as if the invitation has been used already. Invitation links can only be used once."
+          },
+          "submit": "Create an account",
+          "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>"
+        }
+      },
+      "create-user-account": {
+        "title": "Create user account",
+        "success": "Your account has been created!"
+      }
+    }
+  },
   "maintenance": {
     "title": "Human Connection is under maintenance",
     "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
@@ -42,7 +88,7 @@
     "bank": "bank account",
     "germany": "Germany",
     "code-of-conduct": "Code of Conduct",
-    "login": "Back to login"
+    "back-to-login": "Back to login page"
   },
   "sorting": {
     "newest": "Newest",
@@ -63,46 +109,6 @@
     "hello": "Hello",
     "success": "You are logged in!"
   },
-  "password-reset": {
-    "title": "Reset your password",
-    "form": {
-      "description": "A password reset email will be sent to the given email address.",
-      "submit": "Request email",
-      "submitted": "An email with further instructions has been sent to <b>{email}</b>"
-    }
-  },
-  "registration": {
-    "signup": {
-      "title": "Join Human Connection!",
-      "form": {
-        "description": "To get started, enter your email address:",
-        "invitation-code": "Your invitation code is: <b>{code}</b>",
-        "errors": {
-          "email-exists": "There is already a user account with this email address!",
-          "invalid-invitation-token": "It looks like as if the invitation has been used already. Invitation links can only be used once."
-        },
-        "submit": "Create an account",
-        "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>"
-      },
-      "back-to-login": "Back to login page"
-    },
-    "create-user-account": {
-      "title": "Create user account",
-      "success": "Your account has been created!"
-    }
-  },
-  "verify-nonce": {
-    "form": {
-      "nonce": "Enter your code",
-      "description": "Open your inbox and enter the code that we've sent to you.",
-      "next": "Continue",
-      "change-password": {
-        "success": "Changing your password was successful!",
-        "error": "Changing your password failed. Maybe the security code was not correct?",
-        "help": "In case of problems, feel free to ask for help by sending us a mail to:"
-      }
-    }
-  },
   "editor": {
     "placeholder": "Leave your inspirational thoughts …",
     "mention": {
@@ -401,8 +407,7 @@
     "reportContent": "Report",
     "validations": {
       "email": "must be a valid email address",
-      "url": "must be a valid URL",
-      "verification-nonce": "must be 6 characters long"
+      "url": "must be a valid URL"
     }
   },
   "actions": {
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index f6880e157..305487717 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -1,4 +1,31 @@
 {
+  "components": {
+    "password-reset": {
+      "request": {
+        "title": "Zresetuj hasło",
+        "form": {
+          "description": "Na podany adres e-mail zostanie wysłany email z resetem hasła.",
+          "submit": "Poproś o wiadomość e-mail",
+          "submitted": "Na adres <b>{email}</b> została wysłana wiadomość z dalszymi instrukcjami."
+        }
+      },
+      "change-password": {
+        "success": "Zmiana hasła zakończyła się sukcesem!",
+        "error": "Zmiana hasła nie powiodła się. Może kod bezpieczeństwa nie był poprawny?",
+        "help": "W przypadku problemów, zachęcamy do zwrócenia się o pomoc, wysyłając do nas wiadomość e-mail:"
+      }
+    },
+    "enter-nonce": {
+      "form": {
+        "nonce": "Wprowadź swój kod",
+        "description": "Otwórz swoją skrzynkę odbiorczą i wpisz kod, który do Ciebie wysłaliśmy.",
+        "next": "Kontynuuj",
+        "validations": {
+          "length": "musi mieć długość 6 znaków."
+        }
+      }
+    }
+  },
   "filter-menu": {
     "title": "Twoja bańka filtrująca"
   },
@@ -29,26 +56,6 @@
     "moreInfoHint": "idź po więcej szczegółów",
     "hello": "Cześć"
   },
-  "password-reset": {
-    "title": "Zresetuj hasło",
-    "form": {
-      "description": "Na podany adres e-mail zostanie wysłany email z resetem hasła.",
-      "submit": "Poproś o wiadomość e-mail",
-      "submitted": "Na adres <b>{email}</b> została wysłana wiadomość z dalszymi instrukcjami."
-    }
-  },
-  "verify-nonce": {
-    "form": {
-      "nonce": "Wprowadź swój kod",
-      "description": "Otwórz swoją skrzynkę odbiorczą i wpisz kod, który do Ciebie wysłaliśmy.",
-      "next": "Kontynuuj",
-      "change-password": {
-        "success": "Zmiana hasła zakończyła się sukcesem!",
-        "error": "Zmiana hasła nie powiodła się. Może kod bezpieczeństwa nie był poprawny?",
-        "help": "W przypadku problemów, zachęcamy do zwrócenia się o pomoc, wysyłając do nas wiadomość e-mail:"
-      }
-    }
-  },
   "editor": {
     "placeholder": "Napisz coś inspirującego..."
   },
@@ -236,8 +243,7 @@
     "loading": "załadunek",
     "reportContent": "Sprawozdanie",
     "validations": {
-      "email": "musi być ważny adres e-mail.",
-      "verification-nonce": "musi mieć długość 6 znaków."
+      "email": "musi być ważny adres e-mail."
     }
   },
   "actions": {
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index f79e5982c..808c5982a 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -36,7 +36,7 @@ export default {
       'login',
       'logout',
       'password-reset-request',
-      'password-reset-verify-nonce',
+      'password-reset-enter-nonce',
       'password-reset-change-password',
       'registration-signup',
       'registration-enter-nonce',
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index e8f6ab4d6..df5ae39f9 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -1,17 +1,22 @@
 <template>
-  <ds-container width="medium">
-    <ds-flex>
-      <ds-flex-item :width="{ base: '100%' }" centered>
-        <ds-space style="text-align: center;" margin-top="small" margin-bottom="xxx-small" centered>
-          <nuxt-child />
-        </ds-space>
-      </ds-flex-item>
-    </ds-flex>
+  <ds-container width="small">
+    <ds-card>
+      <client-only>
+        <locale-switch offset="5" />
+      </client-only>
+      <nuxt-child />
+      <ds-space margin="x-small"></ds-space>
+    </ds-card>
   </ds-container>
 </template>
 
 <script>
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+
 export default {
+  components: {
+    LocaleSwitch,
+  },
   layout: 'no-header',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
@@ -20,3 +25,10 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+img {
+  padding-left: 50px;
+  padding-right: 50px;
+  max-width: 200px;
+}
+</style>
diff --git a/webapp/pages/password-reset/change-password.vue b/webapp/pages/password-reset/change-password.vue
index 7ab124782..3efdd001b 100644
--- a/webapp/pages/password-reset/change-password.vue
+++ b/webapp/pages/password-reset/change-password.vue
@@ -3,7 +3,11 @@
     :email="email"
     :nonce="nonce"
     @passwordResetResponse="handlePasswordResetResponse"
-  />
+  >
+    <ds-space centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </change-password>
 </template>
 
 <script>
diff --git a/webapp/pages/password-reset/verify-nonce.vue b/webapp/pages/password-reset/enter-nonce.vue
similarity index 58%
rename from webapp/pages/password-reset/verify-nonce.vue
rename to webapp/pages/password-reset/enter-nonce.vue
index 728eadf4c..ea76a0e54 100644
--- a/webapp/pages/password-reset/verify-nonce.vue
+++ b/webapp/pages/password-reset/enter-nonce.vue
@@ -1,20 +1,20 @@
 <template>
-  <verify-nonce :email="email" @verification="handleVerification" />
+  <enter-nonce :email="email" @nonceEntered="nonceEntered" />
 </template>
 
 <script>
-import VerifyNonce from '~/components/PasswordReset/VerifyNonce'
+import EnterNonce from '~/components/EnterNonce/EnterNonce.vue'
 
 export default {
   components: {
-    VerifyNonce,
+    EnterNonce,
   },
   data() {
     const { email = '' } = this.$route.query
     return { email }
   },
   methods: {
-    handleVerification({ email, nonce }) {
+    nonceEntered({ email, nonce }) {
       this.$router.push({ path: 'change-password', query: { email, nonce } })
     },
   },
diff --git a/webapp/pages/password-reset/request.vue b/webapp/pages/password-reset/request.vue
index aa1b1ef05..29f8fde9d 100644
--- a/webapp/pages/password-reset/request.vue
+++ b/webapp/pages/password-reset/request.vue
@@ -1,5 +1,9 @@
 <template>
-  <request @handleSubmitted="handlePasswordResetRequested" />
+  <request @handleSubmitted="handlePasswordResetRequested">
+    <ds-space margin-bottom="xxx-small" margin-top="large" centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </request>
 </template>
 
 <script>
@@ -11,7 +15,7 @@ export default {
   },
   methods: {
     handlePasswordResetRequested({ email }) {
-      this.$router.push({ path: 'verify-nonce', query: { email } })
+      this.$router.push({ path: 'enter-nonce', query: { email } })
     },
   },
 }
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index 5fb9d3a4e..bfd12a045 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -12,7 +12,7 @@
         </ds-flex-item>
         <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
           <signup :invitation="false" />
-          <nuxt-link to="/login">{{ $t('registration.signup.back-to-login') }}</nuxt-link>
+          <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
         </ds-flex-item>
       </ds-flex>
     </ds-card>

From 1dc4bc1411754667018c3dc6dffeac6a8e044b6f Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 7 Oct 2019 13:06:11 +0200
Subject: [PATCH 109/212] feat: add slot to EnterNonce for back to home link

---
 webapp/components/EnterNonce/EnterNonce.vue | 1 +
 webapp/pages/password-reset/enter-nonce.vue | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/components/EnterNonce/EnterNonce.vue b/webapp/components/EnterNonce/EnterNonce.vue
index a70c137cb..cd7633f50 100644
--- a/webapp/components/EnterNonce/EnterNonce.vue
+++ b/webapp/components/EnterNonce/EnterNonce.vue
@@ -23,6 +23,7 @@
         {{ $t('components.enter-nonce.form.next') }}
       </ds-button>
     </ds-form>
+    <slot></slot>
   </ds-space>
 </template>
 
diff --git a/webapp/pages/password-reset/enter-nonce.vue b/webapp/pages/password-reset/enter-nonce.vue
index ea76a0e54..ac7ef442a 100644
--- a/webapp/pages/password-reset/enter-nonce.vue
+++ b/webapp/pages/password-reset/enter-nonce.vue
@@ -1,5 +1,9 @@
 <template>
-  <enter-nonce :email="email" @nonceEntered="nonceEntered" />
+  <enter-nonce :email="email" @nonceEntered="nonceEntered">
+    <ds-space margin-bottom="xxx-small" margin-top="large" centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </enter-nonce>
 </template>
 
 <script>

From 4c7cc0a9cf04deaad18df5e8244a50899f1f1ffc Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 7 Oct 2019 22:36:44 +0200
Subject: [PATCH 110/212] refactor: DRY template in pages, fix signup flow

---
 .../Registration/CreateUserAccount.vue        | 166 ++++++++----------
 webapp/components/Registration/Signup.spec.js |  15 +-
 webapp/components/Registration/Signup.vue     |  33 ++--
 webapp/pages/registration.vue                 |  22 ++-
 webapp/pages/registration/enter-nonce.vue     |  22 ++-
 webapp/pages/registration/signup.vue          |  30 ++--
 6 files changed, 151 insertions(+), 137 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index b5711873c..66b63239f 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -1,98 +1,78 @@
 <template>
-  <ds-container width="small">
-    <ds-card v-if="success" class="success">
-      <ds-space>
-        <sweetalert-icon icon="success" />
-        <ds-text align="center" bold color="success">
-          {{ $t('registration.create-user-account.success') }}
-        </ds-text>
-      </ds-space>
-    </ds-card>
-    <ds-card v-else class="create-account-card">
-      <client-only>
-        <locale-switch />
-      </client-only>
-      <ds-space centered>
-        <img
-          class="create-account-image"
-          alt="Create an account for Human Connection"
-          src="/img/sign-up/nicetomeetyou.svg"
+  <ds-space v-if="success">
+    <sweetalert-icon icon="success" />
+    <ds-text align="center" bold color="success">
+      {{ $t('registration.create-user-account.success') }}
+    </ds-text>
+  </ds-space>
+  <div v-else class="create-account-card">
+    <ds-space margin-top="large">
+      <ds-heading size="h3">
+        {{ $t('components.registration.create-user-account.title') }}
+      </ds-heading>
+    </ds-space>
+
+    <ds-form class="create-user-account" v-model="formData" :schema="formSchema" @submit="submit">
+      <template v-slot="{ errors }">
+        <ds-input
+          id="name"
+          model="name"
+          icon="user"
+          :label="$t('settings.data.labelName')"
+          :placeholder="$t('settings.data.namePlaceholder')"
         />
-      </ds-space>
-      <ds-space>
-        <ds-heading size="h3">
-          {{ $t('registration.create-user-account.title') }}
-        </ds-heading>
-      </ds-space>
+        <ds-input
+          id="about"
+          model="about"
+          type="textarea"
+          rows="3"
+          :label="$t('settings.data.labelBio')"
+          :placeholder="$t('settings.data.labelBio')"
+        />
+        <ds-input
+          id="password"
+          model="password"
+          type="password"
+          autocomplete="off"
+          :label="$t('settings.security.change-password.label-new-password')"
+        />
+        <ds-input
+          id="passwordConfirmation"
+          model="passwordConfirmation"
+          type="password"
+          autocomplete="off"
+          :label="$t('settings.security.change-password.label-new-password-confirm')"
+        />
+        <password-strength :password="formData.password" />
 
-      <ds-form class="create-user-account" v-model="formData" :schema="formSchema" @submit="submit">
-        <template v-slot="{ errors }">
-          <ds-flex gutter="base">
-            <ds-flex-item width="100%">
-              <ds-input
-                id="name"
-                model="name"
-                icon="user"
-                :label="$t('settings.data.labelName')"
-                :placeholder="$t('settings.data.namePlaceholder')"
-              />
-              <ds-input
-                id="about"
-                model="about"
-                type="textarea"
-                rows="3"
-                :label="$t('settings.data.labelBio')"
-                :placeholder="$t('settings.data.labelBio')"
-              />
-              <ds-input
-                id="password"
-                model="password"
-                type="password"
-                autocomplete="off"
-                :label="$t('settings.security.change-password.label-new-password')"
-              />
-              <ds-input
-                id="passwordConfirmation"
-                model="passwordConfirmation"
-                type="password"
-                autocomplete="off"
-                :label="$t('settings.security.change-password.label-new-password-confirm')"
-              />
-              <password-strength :password="formData.password" />
-
-              <ds-text>
-                <input
-                  id="checkbox"
-                  type="checkbox"
-                  v-model="termsAndConditionsConfirmed"
-                  :checked="termsAndConditionsConfirmed"
-                />
-                <label
-                  for="checkbox"
-                  v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
-                ></label>
-              </ds-text>
-            </ds-flex-item>
-            <ds-flex-item width="100%">
-              <ds-space class="backendErrors" v-if="backendErrors">
-                <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
-              </ds-space>
-              <ds-button
-                style="float: right;"
-                icon="check"
-                type="submit"
-                :loading="$apollo.loading"
-                :disabled="errors || !termsAndConditionsConfirmed"
-                primary
-              >
-                {{ $t('actions.save') }}
-              </ds-button>
-            </ds-flex-item>
-          </ds-flex>
-        </template>
-      </ds-form>
-    </ds-card>
-  </ds-container>
+        <ds-text>
+          <input
+            id="checkbox"
+            type="checkbox"
+            v-model="termsAndConditionsConfirmed"
+            :checked="termsAndConditionsConfirmed"
+          />
+          <label
+            for="checkbox"
+            v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
+          ></label>
+        </ds-text>
+        <ds-space class="backendErrors" v-if="backendErrors">
+          <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
+        </ds-space>
+        <ds-button
+          style="float: right;"
+          icon="check"
+          type="submit"
+          :loading="$apollo.loading"
+          :disabled="errors || !termsAndConditionsConfirmed"
+          primary
+        >
+          {{ $t('actions.save') }}
+        </ds-button>
+      </template>
+    </ds-form>
+  </div>
 </template>
 
 <script>
@@ -101,13 +81,11 @@ import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { SignupVerificationMutation } from '~/graphql/Registration.js'
-import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
   components: {
     PasswordStrength,
     SweetalertIcon,
-    LocaleSwitch,
   },
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
diff --git a/webapp/components/Registration/Signup.spec.js b/webapp/components/Registration/Signup.spec.js
index 48b70a15f..b6b83a82e 100644
--- a/webapp/components/Registration/Signup.spec.js
+++ b/webapp/components/Registration/Signup.spec.js
@@ -69,15 +69,18 @@ describe('Signup', () => {
         })
 
         it('displays a message that a mail for email verification was sent', () => {
-          const expected = ['registration.signup.form.success', { email: 'mail@example.org' }]
+          const expected = [
+            'components.registration.signup.form.success',
+            { email: 'mail@example.org' },
+          ]
           expect(mocks.$t).toHaveBeenCalledWith(...expected)
         })
 
         describe('after animation', () => {
           beforeEach(jest.runAllTimers)
 
-          it('emits `handleSubmitted`', () => {
-            expect(wrapper.emitted('handleSubmitted')).toEqual([[{ email: 'mail@example.org' }]])
+          it('emits `submit`', () => {
+            expect(wrapper.emitted('submit')).toEqual([[{ email: 'mail@example.org' }]])
           })
         })
       })
@@ -121,7 +124,9 @@ describe('Signup', () => {
 
           it('explains the error', async () => {
             await action()
-            expect(mocks.$t).toHaveBeenCalledWith('registration.signup.form.errors.email-exists')
+            expect(mocks.$t).toHaveBeenCalledWith(
+              'components.registration.signup.form.errors.email-exists',
+            )
           })
         })
 
@@ -137,7 +142,7 @@ describe('Signup', () => {
           it('explains the error', async () => {
             await action()
             expect(mocks.$t).toHaveBeenCalledWith(
-              'registration.signup.form.errors.invalid-invitation-token',
+              'components.registration.signup.form.errors.invalid-invitation-token',
             )
           })
         })
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index bba984e0e..ce35c1fc8 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -1,7 +1,6 @@
 <template>
-  <ds-space margin="large">
+  <ds-space v-if="!success && !error" margin="large">
     <ds-form
-      v-if="!success && !error"
       @input="handleInput"
       @input-valid="handleInputValid"
       v-model="formData"
@@ -42,18 +41,19 @@
       >
         {{ $t('components.registration.signup.form.submit') }}
       </ds-button>
+      <slot></slot>
     </ds-form>
-    <div v-else>
-      <template v-if="!error">
-        <sweetalert-icon icon="info" />
-        <ds-text align="center" v-html="submitMessage" />
-      </template>
-      <template v-else>
-        <sweetalert-icon icon="error" />
-        <ds-text align="center">{{ error.message }}</ds-text>
-      </template>
-    </div>
   </ds-space>
+  <div v-else margin="large">
+    <template v-if="!error">
+      <sweetalert-icon icon="info" />
+      <ds-text align="center" v-html="submitMessage" />
+    </template>
+    <template v-else>
+      <sweetalert-icon icon="error" />
+      <ds-text align="center">{{ error.message }}</ds-text>
+    </template>
+  </div>
 </template>
 
 <script>
@@ -103,7 +103,7 @@ export default {
   computed: {
     submitMessage() {
       const { email } = this.formData
-      return this.$t('registration.signup.form.success', { email })
+      return this.$t('components.registration.signup.form.success', { email })
     },
   },
   methods: {
@@ -123,7 +123,7 @@ export default {
         this.success = true
 
         setTimeout(() => {
-          this.$emit('handleSubmitted', { email })
+          this.$emit('submit', { email })
         }, 3000)
       } catch (err) {
         const { message } = err
@@ -133,7 +133,10 @@ export default {
         }
         for (const [pattern, key] of Object.entries(mapping)) {
           if (message.includes(pattern))
-            this.error = { key, message: this.$t(`registration.signup.form.errors.${key}`) }
+            this.error = {
+              key,
+              message: this.$t(`components.registration.signup.form.errors.${key}`),
+            }
         }
         if (!this.error) {
           this.$toast.error(message)
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index 7c7f03975..695570d26 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -1,9 +1,29 @@
 <template>
-  <nuxt-child />
+  <ds-container width="medium">
+    <ds-card>
+      <ds-flex gutter="small">
+        <ds-flex-item :width="{ base: '100%', sm: '50%' }">
+          <client-only>
+            <locale-switch offset="5" />
+          </client-only>
+          <ds-space margin-top="small" margin-bottom="xxx-small">
+            <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
+          </ds-space>
+        </ds-flex-item>
+        <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+          <nuxt-child />
+        </ds-flex-item>
+      </ds-flex>
+    </ds-card>
+  </ds-container>
 </template>
 
 <script>
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 export default {
+  components: {
+    LocaleSwitch,
+  },
   layout: 'no-header',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
diff --git a/webapp/pages/registration/enter-nonce.vue b/webapp/pages/registration/enter-nonce.vue
index 7efa86627..022435b6e 100644
--- a/webapp/pages/registration/enter-nonce.vue
+++ b/webapp/pages/registration/enter-nonce.vue
@@ -1,7 +1,25 @@
 <template>
-  <h1>Enter nonce</h1>
+  <enter-nonce :email="email" @nonceEntered="nonceEntered">
+    <ds-space margin-bottom="xxx-small" margin-top="large" centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </enter-nonce>
 </template>
 
 <script>
-export default {}
+import EnterNonce from '~/components/EnterNonce/EnterNonce.vue'
+export default {
+  components: {
+    EnterNonce,
+  },
+  data() {
+    const { email = '' } = this.$route.query
+    return { email }
+  },
+  methods: {
+    nonceEntered({ email, nonce }) {
+      this.$router.push({ path: 'create-user-account', query: { email, nonce } })
+    },
+  },
+}
 </script>
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index bfd12a045..6ba7164ca 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -1,33 +1,23 @@
 <template>
-  <ds-container width="medium">
-    <ds-card>
-      <ds-flex gutter="small">
-        <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-          <client-only>
-            <locale-switch offset="5" />
-          </client-only>
-          <ds-space margin-top="small" margin-bottom="xxx-small" centered>
-            <img class="signup-image" alt="Human Connection" src="/img/sign-up/nicetomeetyou.svg" />
-          </ds-space>
-        </ds-flex-item>
-        <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-          <signup :invitation="false" />
-          <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
-        </ds-flex-item>
-      </ds-flex>
-    </ds-card>
-  </ds-container>
+  <signup :invitation="false" @submit="handleSubmitted">
+    <ds-space centered margin-top="large">
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </signup>
 </template>
 
 <script>
 import Signup from '~/components/Registration/Signup'
-import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
   layout: 'no-header',
   components: {
     Signup,
-    LocaleSwitch,
+  },
+  methods: {
+    handleSubmitted({ email }) {
+      this.$router.push({ path: 'enter-nonce', query: { email } })
+    },
   },
 }
 </script>

From b1e01cb65a91e34da4922814ba1c98707eeeeca7 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 7 Oct 2019 23:25:49 +0200
Subject: [PATCH 111/212] refactor: better errors, introduce email constants

---
 .../Registration/CreateUserAccount.vue        | 31 +++++++++++++------
 webapp/constants/emails.js                    |  4 +++
 webapp/locales/de.json                        |  4 ++-
 webapp/locales/en.json                        |  4 ++-
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 webapp/constants/emails.js

diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 66b63239f..3b2ec3399 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -1,10 +1,23 @@
 <template>
-  <ds-space v-if="success">
+  <div v-if="response === 'success'">
     <sweetalert-icon icon="success" />
     <ds-text align="center" bold color="success">
-      {{ $t('registration.create-user-account.success') }}
+      {{ $t('components.registration.create-user-account.success') }}
     </ds-text>
-  </ds-space>
+  </div>
+  <div v-else-if="response === 'error'">
+    <sweetalert-icon icon="error" />
+    <ds-text align="center" bold color="danger">
+      {{ $t('components.registration.create-user-account.error') }}
+    </ds-text>
+    <ds-text align="center">
+      {{ $t('components.registration.create-user-account.help') }}
+      <a :href="supportEmail.href">{{ supportEmail.label }}</a>
+    </ds-text>
+    <ds-space centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </div>
   <div v-else class="create-account-card">
     <ds-space margin-top="large">
       <ds-heading size="h3">
@@ -57,9 +70,6 @@
             v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
           ></label>
         </ds-text>
-        <ds-space class="backendErrors" v-if="backendErrors">
-          <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
-        </ds-space>
         <ds-button
           style="float: right;"
           icon="check"
@@ -79,6 +89,7 @@
 import PasswordStrength from '../Password/Strength'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
+import { SUPPORT_EMAIL } from '~/constants/emails.js'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { SignupVerificationMutation } from '~/graphql/Registration.js'
 
@@ -90,6 +101,7 @@ export default {
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
+      supportEmail: SUPPORT_EMAIL,
       formData: {
         name: '',
         about: '',
@@ -108,8 +120,7 @@ export default {
         ...passwordForm.formSchema,
       },
       disabled: true,
-      success: null,
-      backendErrors: null,
+      response: null,
       // TODO: Our styleguide does not support checkmarks.
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
@@ -130,7 +141,7 @@ export default {
           mutation: SignupVerificationMutation,
           variables: { name, password, about, email, nonce, termsAndConditionsAgreedVersion },
         })
-        this.success = true
+        this.response = 'success'
         setTimeout(() => {
           this.$emit('userCreated', {
             email,
@@ -138,7 +149,7 @@ export default {
           })
         }, 3000)
       } catch (err) {
-        this.backendErrors = err
+        this.response = 'error'
       }
     },
   },
diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js
new file mode 100644
index 000000000..14c53ee57
--- /dev/null
+++ b/webapp/constants/emails.js
@@ -0,0 +1,4 @@
+export const SUPPORT_EMAIL = {
+  href: 'mailto:support@human-connection.org',
+  label: 'support@human-connection.org',
+}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fc8cd8a69..ae783e618 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -40,7 +40,9 @@
       },
       "create-user-account": {
         "title": "Benutzerkonto anlegen",
-        "success": "Dein Benutzerkonto wurde erstellt!"
+        "success": "Dein Benutzerkonto wurde erstellt!",
+        "error": "Es konnte kein Benutzerkonto erstellt werden!",
+        "help": "Vielleicht war der Bestätigungscode falsch oder abgelaufen? Wenn das Problem weiterhin besteht, schick uns gerne eine E-Mail an:"
       }
     }
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index bcbff1861..5e68ec50b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -41,7 +41,9 @@
       },
       "create-user-account": {
         "title": "Create user account",
-        "success": "Your account has been created!"
+        "success": "Your account has been created!",
+        "error": "No user account could be created!",
+        "help": " Maybe the confirmation was invalid? In case of problems, feel free to ask for help by sending us a mail to:"
       }
     }
   },

From 9ac1e333d6b811dd323280a78a6ee688deab81ad Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 8 Oct 2019 00:51:40 +0200
Subject: [PATCH 112/212] feat: implement public registration checks

---
 backend/.env.template                           |  1 +
 backend/src/config/index.js                     | 14 ++++++++++++--
 backend/src/middleware/permissionsMiddleware.js |  4 +++-
 webapp/.env.template                            |  1 +
 webapp/locales/de.json                          |  1 +
 webapp/locales/en.json                          |  1 +
 webapp/nuxt.config.js                           |  6 +++++-
 webapp/pages/registration/signup.vue            | 13 ++++++++++++-
 8 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/backend/.env.template b/backend/.env.template
index 6697f09c4..5ecc5a5c4 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -17,3 +17,4 @@ PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78"
 
 SENTRY_DSN_BACKEND=
 COMMIT=
+PUBLIC_REGISTRATION=false
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 3709b5cc3..00361ba63 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -21,7 +21,12 @@ const {
   GRAPHQL_URI = 'http://localhost:4000',
 } = process.env
 
-export const requiredConfigs = { MAPBOX_TOKEN, JWT_SECRET, PRIVATE_KEY_PASSPHRASE }
+export const requiredConfigs = {
+  MAPBOX_TOKEN,
+  JWT_SECRET,
+  PRIVATE_KEY_PASSPHRASE,
+}
+
 export const smtpConfigs = {
   SMTP_HOST,
   SMTP_PORT,
@@ -30,7 +35,12 @@ export const smtpConfigs = {
   SMTP_PASSWORD,
 }
 export const neo4jConfigs = { NEO4J_URI, NEO4J_USERNAME, NEO4J_PASSWORD }
-export const serverConfigs = { GRAPHQL_PORT, CLIENT_URI, GRAPHQL_URI }
+export const serverConfigs = {
+  GRAPHQL_PORT,
+  CLIENT_URI,
+  GRAPHQL_URI,
+  PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true',
+}
 
 export const developmentConfigs = {
   DEBUG: process.env.NODE_ENV !== 'production' && process.env.DEBUG,
diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 8343443c9..df87f743e 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -111,6 +111,8 @@ const noEmailFilter = rule({
   return !('email' in args)
 })
 
+const publicRegistration = rule()(() => !!CONFIG.PUBLIC_REGISTRATION)
+
 // Permissions
 const permissions = shield(
   {
@@ -137,7 +139,7 @@ const permissions = shield(
       '*': deny,
       login: allow,
       SignupByInvitation: allow,
-      Signup: isAdmin,
+      Signup: or(publicRegistration, isAdmin),
       SignupVerification: allow,
       CreateInvitationCode: and(isAuthenticated, or(not(invitationLimitReached), isAdmin)),
       UpdateUser: onlyYourself,
diff --git a/webapp/.env.template b/webapp/.env.template
index bebdeaaaf..fdabcf003 100644
--- a/webapp/.env.template
+++ b/webapp/.env.template
@@ -1,3 +1,4 @@
 MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ"
 SENTRY_DSN_WEBAPP=
 COMMIT=
+PUBLIC_REGISTRATION=false
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ae783e618..452855f77 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -26,6 +26,7 @@
     },
     "registration": {
       "signup": {
+        "unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich.",
         "title": "Mach mit bei Human Connection!",
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 5e68ec50b..b89d9740d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -27,6 +27,7 @@
     },
     "registration": {
       "signup": {
+        "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server.",
         "title": "Join Human Connection!",
         "form": {
           "description": "To get started, enter your email address:",
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 808c5982a..312e19325 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -1,6 +1,10 @@
 import path from 'path'
+import dotenv from 'dotenv'
+
+dotenv.config() // we want to synchronize @nuxt-dotenv and nuxt-env
+
 const pkg = require('./package')
-export const envWhitelist = ['NODE_ENV', 'MAPBOX_TOKEN']
+export const envWhitelist = ['NODE_ENV', 'MAPBOX_TOKEN', 'PUBLIC_REGISTRATION']
 const dev = process.env.NODE_ENV !== 'production'
 
 const styleguidePath = '../styleguide'
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index 6ba7164ca..c78dcc9af 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -1,19 +1,30 @@
 <template>
-  <signup :invitation="false" @submit="handleSubmitted">
+  <signup v-if="publicRegistration" :invitation="false" @submit="handleSubmitted">
     <ds-space centered margin-top="large">
       <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
     </ds-space>
   </signup>
+  <ds-space v-else centered>
+    <hc-empty icon="events" :message="$t('components.registration.signup.unavailable')" />
+    <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+  </ds-space>
 </template>
 
 <script>
 import Signup from '~/components/Registration/Signup'
+import HcEmpty from '~/components/Empty.vue'
 
 export default {
   layout: 'no-header',
   components: {
+    HcEmpty,
     Signup,
   },
+  asyncData({ app }) {
+    return {
+      publicRegistration: app.$env.PUBLIC_REGISTRATION,
+    }
+  },
   methods: {
     handleSubmitted({ email }) {
       this.$router.push({ path: 'enter-nonce', query: { email } })

From a2c9ed520d0b396b39968ad686b964e3e9056c7e Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 8 Oct 2019 01:30:48 +0200
Subject: [PATCH 113/212] fix: frontend tests

---
 webapp/components/Registration/CreateUserAccount.spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js
index 6551211c0..848be00e8 100644
--- a/webapp/components/Registration/CreateUserAccount.spec.js
+++ b/webapp/components/Registration/CreateUserAccount.spec.js
@@ -8,6 +8,7 @@ const localVue = createLocalVue()
 localVue.use(Styleguide)
 config.stubs['sweetalert-icon'] = '<span><slot /></span>'
 config.stubs['client-only'] = '<span><slot /></span>'
+config.stubs['nuxt-link'] = '<span><slot /></span>'
 
 describe('CreateUserAccount', () => {
   let wrapper, Wrapper, mocks, propsData, stubs
@@ -102,7 +103,7 @@ describe('CreateUserAccount', () => {
 
           it('displays success', async () => {
             await action()
-            expect(mocks.$t).toHaveBeenCalledWith('registration.create-user-account.success')
+            expect(mocks.$t).toHaveBeenCalledWith('components.registration.create-user-account.success')
           })
 
           describe('after timeout', () => {
@@ -130,7 +131,7 @@ describe('CreateUserAccount', () => {
 
           it('displays form errors', async () => {
             await action()
-            expect(wrapper.find('.backendErrors').text()).toContain('Invalid nonce')
+            expect(mocks.$t).toHaveBeenCalledWith('components.registration.create-user-account.error')
           })
         })
       })

From bc4acf939ff69e277735ea360770f49fbd286289 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 9 Oct 2019 10:31:26 +0200
Subject: [PATCH 114/212] Fix lint

---
 webapp/components/Registration/CreateUserAccount.spec.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js
index 848be00e8..67a14b3c5 100644
--- a/webapp/components/Registration/CreateUserAccount.spec.js
+++ b/webapp/components/Registration/CreateUserAccount.spec.js
@@ -103,7 +103,9 @@ describe('CreateUserAccount', () => {
 
           it('displays success', async () => {
             await action()
-            expect(mocks.$t).toHaveBeenCalledWith('components.registration.create-user-account.success')
+            expect(mocks.$t).toHaveBeenCalledWith(
+              'components.registration.create-user-account.success',
+            )
           })
 
           describe('after timeout', () => {
@@ -131,7 +133,9 @@ describe('CreateUserAccount', () => {
 
           it('displays form errors', async () => {
             await action()
-            expect(mocks.$t).toHaveBeenCalledWith('components.registration.create-user-account.error')
+            expect(mocks.$t).toHaveBeenCalledWith(
+              'components.registration.create-user-account.error',
+            )
           })
         })
       })

From 8305921f006c38fbe2f174b21644117380981e78 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 11:58:19 +0200
Subject: [PATCH 115/212] Fine tune layout and spacing

---
 webapp/components/EnterNonce/EnterNonce.vue    |  2 +-
 .../PasswordReset/ChangePassword.vue           |  4 ++--
 webapp/pages/password-reset.vue                | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/webapp/components/EnterNonce/EnterNonce.vue b/webapp/components/EnterNonce/EnterNonce.vue
index cd7633f50..d936544ad 100644
--- a/webapp/components/EnterNonce/EnterNonce.vue
+++ b/webapp/components/EnterNonce/EnterNonce.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-space margin="large">
+  <ds-space margin-top="large" margin-bottom="xxx-small">
     <ds-form
       v-model="formData"
       :schema="formSchema"
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index a98026b2e..8f6a4a0ec 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -30,7 +30,7 @@
         </ds-space>
       </template>
     </ds-form>
-    <ds-text v-else>
+    <ds-space v-else>
       <template v-if="changePasswordResult === 'success'">
         <sweetalert-icon icon="success" />
         <ds-text>
@@ -51,7 +51,7 @@
         </ds-text>
       </template>
       <slot></slot>
-    </ds-text>
+    </ds-space>
   </ds-space>
 </template>
 
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index df5ae39f9..a4d0f1e56 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -1,11 +1,19 @@
 <template>
   <ds-container width="small">
     <ds-card>
-      <client-only>
-        <locale-switch offset="5" />
-      </client-only>
-      <nuxt-child />
-      <ds-space margin="x-small"></ds-space>
+      <ds-flex gutter="small">
+        <ds-flex-item :width="{ base: '100%', sm: '40%' }">
+          <client-only>
+            <locale-switch offset="5" />
+          </client-only>
+          <ds-space margin-top="small" margin-bottom="xxx-small" centered>
+            <img alt="Human Connection" src="/icon.png" />
+          </ds-space>
+        </ds-flex-item>
+        <ds-flex-item :width="{ base: '100%', sm: '60%' }" centered>
+          <nuxt-child />
+        </ds-flex-item>
+      </ds-flex>
     </ds-card>
   </ds-container>
 </template>

From c8c0414564178fe995f182914af90f62b81d9ff9 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 13:48:52 +0200
Subject: [PATCH 116/212] fix: send nonce along with signup mail

---
 backend/src/middleware/email/templateBuilder.js    | 2 +-
 backend/src/middleware/email/templates/signup.html | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js
index 4b7bcc7cd..b4b7b78ca 100644
--- a/backend/src/middleware/email/templateBuilder.js
+++ b/backend/src/middleware/email/templateBuilder.js
@@ -18,7 +18,7 @@ export const signupTemplate = ({ email, nonce }) => {
     subject,
     html: mustache.render(
       templates.layout,
-      { actionUrl, supportUrl, subject },
+      { actionUrl, nonce, supportUrl, subject },
       { content: templates.signup },
     ),
   }
diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html
index 79894b584..ad60d9323 100644
--- a/backend/src/middleware/email/templates/signup.html
+++ b/backend/src/middleware/email/templates/signup.html
@@ -60,7 +60,9 @@
       <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
         <tr>
           <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
-            <p style="margin: 0;">Falls Du Dich nicht selbst bei <a href="https://human-connection.org"
+            <p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
+            <p style="margin: 0;">Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.</p>
+            <p style="margin: 0; margin-top: 10px;">Falls Du Dich nicht selbst bei <a href="https://human-connection.org"
                 style="color: #17b53e;">Human Connection</a> angemeldet hast, schau doch mal vorbei!
               Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.</p>
             <p style="margin: 0; margin-top: 10px;">PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese
@@ -169,7 +171,9 @@
       <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
         <tr>
           <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
-            <p style="margin: 0;">If you didn't sign up for <a href="https://human-connection.org"
+            <p style="margin: 0;">If the above button doesn't work, you can also copy the following code into your browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
+            <p style="margin: 0;">However, this only works if you have registered through our website.</p>
+            <p style="margin: 0; margin-top: 10px;">If you didn't sign up for <a href="https://human-connection.org"
                 style="color: #17b53e;">Human Connection</a> we recommend you to check it out!
               It's a social network from people for people who want to connect and change the world together.</p>
             <p style="margin: 0; margin-top: 10px;">PS: If you ignore this e-mail we will not create an account

From adec248b18cdf2fca77f1b067445eeea26d60891 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 13:56:28 +0200
Subject: [PATCH 117/212] fix: compare env var with value to avoid type err

---
 webapp/pages/registration/signup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index c78dcc9af..bff658fa6 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -22,7 +22,7 @@ export default {
   },
   asyncData({ app }) {
     return {
-      publicRegistration: app.$env.PUBLIC_REGISTRATION,
+      publicRegistration: app.$env.PUBLIC_REGISTRATION === 'true',
     }
   },
   methods: {

From 01252b3584ab95756e57fca4e7c2966e5cc7fd3f Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 14:04:00 +0200
Subject: [PATCH 118/212] refactor: follow @mattwr18 code review

https://github.com/Human-Connection/Human-Connection/pull/1814#pullrequestreview-299434476
---
 webapp/components/PasswordReset/ChangePassword.vue   |  8 ++++++--
 webapp/components/PasswordReset/Request.vue          |  6 ------
 webapp/components/Registration/CreateUserAccount.vue |  8 ++++++--
 webapp/components/Registration/Signup.vue            |  8 ++++++--
 webapp/pages/registration/signup.vue                 | 10 ----------
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index 8f6a4a0ec..e45612171 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -32,13 +32,17 @@
     </ds-form>
     <ds-space v-else>
       <template v-if="changePasswordResult === 'success'">
-        <sweetalert-icon icon="success" />
+        <transition name="ds-transition-fade">
+          <sweetalert-icon icon="success" />
+        </transition>
         <ds-text>
           {{ $t('components.password-reset.change-password.success') }}
         </ds-text>
       </template>
       <template v-else>
-        <sweetalert-icon icon="error" />
+        <transition name="ds-transition-fade">
+          <sweetalert-icon icon="error" />
+        </transition>
         <ds-text>
           <p>
             {{ $t(`components.password-reset.change-password.error`) }}
diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index c7dd759dd..bcececcca 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -102,9 +102,3 @@ export default {
   },
 }
 </script>
-<style scoped>
-.login-image {
-  width: 90%;
-  max-width: 200px;
-}
-</style>
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 3b2ec3399..be01e0bb0 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -1,12 +1,16 @@
 <template>
   <div v-if="response === 'success'">
-    <sweetalert-icon icon="success" />
+    <transition name="ds-transition-fade">
+      <sweetalert-icon icon="success" />
+    </transition>
     <ds-text align="center" bold color="success">
       {{ $t('components.registration.create-user-account.success') }}
     </ds-text>
   </div>
   <div v-else-if="response === 'error'">
-    <sweetalert-icon icon="error" />
+    <transition name="ds-transition-fade">
+      <sweetalert-icon icon="error" />
+    </transition>
     <ds-text align="center" bold color="danger">
       {{ $t('components.registration.create-user-account.error') }}
     </ds-text>
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index ce35c1fc8..00309b1c6 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -46,11 +46,15 @@
   </ds-space>
   <div v-else margin="large">
     <template v-if="!error">
-      <sweetalert-icon icon="info" />
+      <transition name="ds-transition-fade">
+        <sweetalert-icon icon="info" />
+      </transition>
       <ds-text align="center" v-html="submitMessage" />
     </template>
     <template v-else>
-      <sweetalert-icon icon="error" />
+      <transition name="ds-transition-fade">
+        <sweetalert-icon icon="error" />
+      </transition>
       <ds-text align="center">{{ error.message }}</ds-text>
     </template>
   </div>
diff --git a/webapp/pages/registration/signup.vue b/webapp/pages/registration/signup.vue
index bff658fa6..721cb6268 100644
--- a/webapp/pages/registration/signup.vue
+++ b/webapp/pages/registration/signup.vue
@@ -32,13 +32,3 @@ export default {
   },
 }
 </script>
-
-<style lang="scss" scoped>
-.signup-image {
-  width: 90%;
-  max-width: 200px;
-}
-.login-card {
-  position: relative;
-}
-</style>

From afe189435a27fa1cc48fc9d83d4fcf5d3b60c9e7 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 10 Oct 2019 14:34:32 +0200
Subject: [PATCH 119/212] Allow public registration by default on docker env

My thought here is that a mailserver is started in
`docker-compose.override.yml` so you can see the emails being sent.
---
 docker-compose.override.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index ba9b32c18..df7d6ac92 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -15,6 +15,7 @@ services:
       - ./webapp:/nitro-web
     environment:
       - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
+      - PUBLIC_REGISTRATION=true
     command: yarn run dev
   backend:
     build:
@@ -28,6 +29,7 @@ services:
       - SMTP_PORT=25
       - SMTP_IGNORE_TLS=true
       - "DEBUG=${DEBUG}"
+      - PUBLIC_REGISTRATION=true
   maintenance:
     image: humanconnection/maintenance:latest
     build:

From 0e6e8f4e018dabd369180d3b2749c4d000b284ff Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 11 Oct 2019 00:58:26 +0200
Subject: [PATCH 120/212] fix: security vulnerability with yarn resolutions

---
 package.json |  3 +++
 yarn.lock    | 20 +++++---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 18a46e56d..6b51d9cca 100644
--- a/package.json
+++ b/package.json
@@ -33,5 +33,8 @@
     "neode": "^0.3.3",
     "npm-run-all": "^4.1.5",
     "slug": "^1.1.0"
+  },
+  "resolutions": {
+    "set-value": "^2.0.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 231e6100e..bd9d62653 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2947,7 +2947,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -4248,20 +4248,10 @@ set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^0.4.3, set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"

From c1a696577bf361dca85044a29b2f282f851294ef Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 11 Oct 2019 02:40:21 +0200
Subject: [PATCH 121/212] fix: search for email case-insensitively

---
 webapp/pages/admin/users.spec.js | 6 ++++++
 webapp/pages/admin/users.vue     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/pages/admin/users.spec.js b/webapp/pages/admin/users.spec.js
index e6b84cad9..f477aab1d 100644
--- a/webapp/pages/admin/users.spec.js
+++ b/webapp/pages/admin/users.spec.js
@@ -49,6 +49,12 @@ describe('Users', () => {
           expect(wrapper.vm.email).toEqual('email@example.org')
           expect(wrapper.vm.filter).toBe(null)
         })
+
+        it('email address is case-insensitive', async () => {
+          const wrapper = await searchAction(Wrapper(), { query: 'eMaiL@example.org' })
+          expect(wrapper.vm.email).toEqual('email@example.org')
+          expect(wrapper.vm.filter).toBe(null)
+        })
       })
 
       describe('query is just text', () => {
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index d5590f474..f46ef23df 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -170,7 +170,7 @@ export default {
       this.offset = 0
       const { query } = formData
       if (isemail.validate(query)) {
-        this.email = query
+        this.email = query.toLowerCase()
         this.filter = null
       } else {
         this.email = null

From c4adb5d5fe0b9af70f7f96554935af695b189d6f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 04:49:43 +0000
Subject: [PATCH 122/212] build(deps-dev): bump @babel/core from 7.6.2 to 7.6.4
 in /backend

Bumps [@babel/core](https://github.com/babel/babel) from 7.6.2 to 7.6.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.2...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 48 ++++++++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3a0cf6be8..d185688dd 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -106,7 +106,7 @@
   },
   "devDependencies": {
     "@babel/cli": "~7.6.3",
-    "@babel/core": "~7.6.2",
+    "@babel/core": "~7.6.4",
     "@babel/node": "~7.6.3",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.6.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5adc174ce..553e8cdca 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -38,18 +38,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@~7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
-  integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
+"@babel/core@^7.1.0", "@babel/core@~7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
+  integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.4"
     "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.2"
+    "@babel/parser" "^7.6.4"
     "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/traverse" "^7.6.3"
+    "@babel/types" "^7.6.3"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -58,12 +58,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
-  integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
+"@babel/generator@^7.4.0", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
+  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
   dependencies:
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -254,10 +254,10 @@
     regenerator-runtime "^0.13.3"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
-  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
+  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -696,17 +696,17 @@
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
-  integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
+  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.3"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/parser" "^7.6.3"
+    "@babel/types" "^7.6.3"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"

From b8112b021a9f2968d00775a006822c6d6f2e16c8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 04:50:18 +0000
Subject: [PATCH 123/212] build(deps): bump apollo-server-express from 2.9.5 to
 2.9.6 in /backend

Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-express@2.9.5...apollo-server-express@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |   2 +-
 backend/yarn.lock    | 118 +++++++++++++++++++++----------------------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3a0cf6be8..c270082b7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -48,7 +48,7 @@
     "apollo-link-context": "~1.0.19",
     "apollo-link-http": "~1.5.16",
     "apollo-server": "~2.9.5",
-    "apollo-server-express": "^2.9.4",
+    "apollo-server-express": "^2.9.6",
     "babel-plugin-transform-runtime": "^6.23.0",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5adc174ce..43e062c75 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1523,13 +1523,13 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-apollo-cache-control@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz#a3650d5e4173953e2a3af995bea62147f1ffe4d7"
-  integrity sha512-IZ1d3AXZtkZhLYo0kWqTbZ6nqLFaeUvLdMESs+9orMadBZ7mvzcAfBwrhKyCWPGeAAZ/jKv8FtYHybpchHgFAg==
+apollo-cache-control@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.5.tgz#d4b34691f6ca1cefac9d82b99a94a0815a85a5a8"
+  integrity sha512-2yQ1vKgJQ54SGkoQS/ZLZrDX3La6cluAYYdruFYJMJtL4zQrSdeOCy11CQliCMYEd6eKNyE70Rpln51QswW2Og==
   dependencies:
     apollo-server-env "^2.4.3"
-    graphql-extensions "^0.10.3"
+    graphql-extensions "^0.10.4"
 
 apollo-cache-inmemory@~1.6.3:
   version "1.6.3"
@@ -1572,27 +1572,27 @@ apollo-datasource@^0.6.3:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-engine-reporting-protobuf@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.0.tgz#e34c192d86493b33a73181fd6be75721559111ec"
-  integrity sha512-cXHZSienkis8v4RhqB3YG3DkaksqLpcxApRLTpRMs7IXNozgV7CUPYGFyFBEra1ZFgUyHXx4G9MpelV+n2cCfA==
+apollo-engine-reporting-protobuf@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.1.tgz#c0a35bcf28487f87dcbc452b03277f575192f5d2"
+  integrity sha512-d7vFFZ2oUrvGaN0Hpet8joe2ZG0X0lIGilN+SwgVP38dJnOuadjsaYMyrD9JudGQJg0bJA5wVQfYzcCVy0slrw==
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@^1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz#83af6689c4ab82d1c62c3f5dde7651975508114f"
-  integrity sha512-acfb7oFnru/8YQdY4x6+7WJbZfzdVETI8Cl+9ImgUrvUnE8P+f2SsGTKXTC1RuUvve4c56PAvaPgE+z8X1a1Mw==
+apollo-engine-reporting@^1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.7.tgz#6ca69ebdc1c17200969e2e4e07a0be64d748c27e"
+  integrity sha512-qsKDz9VkoctFhojM3Nj3nvRBO98t8TS2uTgtiIjUGs3Hln2poKMP6fIQ37Nm2Q2B3JJst76HQtpPwXmRJd1ZUg==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.4.0"
-    apollo-graphql "^0.3.3"
+    apollo-engine-reporting-protobuf "^0.4.1"
+    apollo-graphql "^0.3.4"
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
-    apollo-server-types "^0.2.4"
+    apollo-server-types "^0.2.5"
     async-retry "^1.2.1"
-    graphql-extensions "^0.10.3"
+    graphql-extensions "^0.10.4"
 
-apollo-env@0.5.1:
+apollo-env@0.5.1, apollo-env@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3"
   integrity sha512-fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw==
@@ -1609,12 +1609,12 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
-apollo-graphql@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
-  integrity sha512-t3CO/xIDVsCG2qOvx2MEbuu4b/6LzQjcBBwiVnxclmmFyAxYCIe7rpPlnLHSq7HyOMlCWDMozjoeWfdqYSaLqQ==
+apollo-graphql@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.4.tgz#c1f68591a4775945441d049eff9323542ab0401f"
+  integrity sha512-w+Az1qxePH4oQ8jvbhQBl5iEVvqcqynmU++x/M7MM5xqN1C7m1kyIzpN17gybXlTJXY4Oxej2WNURC2/hwpfYw==
   dependencies:
-    apollo-env "0.5.1"
+    apollo-env "^0.5.1"
     lodash.sortby "^4.7.0"
 
 apollo-link-context@~1.0.19:
@@ -1660,26 +1660,26 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.5.tgz#b2d9188d7acce5fe92a5460d276794988ffa6737"
-  integrity sha512-SlM/vhjhWb0ayXV3d4gnpq9gh2BsQj+UPfQXfq2X2KG9EH5I1JUH6EtlsctgMCZozirOZmEmUzlqZWSSUOUPgQ==
+apollo-server-core@^2.9.5, apollo-server-core@^2.9.6:
+  version "2.9.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.6.tgz#b6dc087200633f47ca4f08244d3e606b4d616320"
+  integrity sha512-2tHAWQxP7HrETI/BZvg2fem6YlahF9HUp4Y6SSL95WP3uNMOJBlN12yM1y+O2u5K5e4jwdPNaLjoL2A/26XrLw==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.0"
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/graphql-upload" "^8.0.0"
     "@types/ws" "^6.0.0"
-    apollo-cache-control "^0.8.4"
+    apollo-cache-control "^0.8.5"
     apollo-datasource "^0.6.3"
-    apollo-engine-reporting "^1.4.6"
+    apollo-engine-reporting "^1.4.7"
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
     apollo-server-errors "^2.3.3"
-    apollo-server-plugin-base "^0.6.4"
-    apollo-server-types "^0.2.4"
-    apollo-tracing "^0.8.4"
+    apollo-server-plugin-base "^0.6.5"
+    apollo-server-types "^0.2.5"
+    apollo-tracing "^0.8.5"
     fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "^0.10.3"
+    graphql-extensions "^0.10.4"
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
     graphql-upload "^8.0.2"
@@ -1700,10 +1700,10 @@ apollo-server-errors@^2.3.3:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
   integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
-apollo-server-express@^2.9.4, apollo-server-express@^2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.5.tgz#383e0a5cb80cf1172b0bc1e565797edd629d750a"
-  integrity sha512-6gonP7g5u2Kr+9cvKE+NuGPe+As7wRbz2yWoyLOym/TdXBmTRU4AKW2Qs+wpNanurzm2xbTa7sEfzrHGmembrQ==
+apollo-server-express@^2.9.5, apollo-server-express@^2.9.6:
+  version "2.9.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.6.tgz#eec2ec43b829b059278e14994d06bd23e43266f9"
+  integrity sha512-j80azBeXvLvyZsbqCnus7GH+w8vk+2IOnYzROZu/f0D2roDZtsu1XZkn+aplDJZXMcEXtqB6t4qNpyvV4zY0XQ==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
@@ -1711,8 +1711,8 @@ apollo-server-express@^2.9.4, apollo-server-express@^2.9.5:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.1"
     accepts "^1.3.5"
-    apollo-server-core "^2.9.5"
-    apollo-server-types "^0.2.4"
+    apollo-server-core "^2.9.6"
+    apollo-server-types "^0.2.5"
     body-parser "^1.18.3"
     cors "^2.8.4"
     express "^4.17.1"
@@ -1722,12 +1722,12 @@ apollo-server-express@^2.9.4, apollo-server-express@^2.9.5:
     subscriptions-transport-ws "^0.9.16"
     type-is "^1.6.16"
 
-apollo-server-plugin-base@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.4.tgz#63ea4fd0bbb6c4510bc8d0d2ad0a0684c8d0da8c"
-  integrity sha512-4rY+cBAIpQomGWYBtk8hHkLQWHrh5hgIBPQqmhXh00YFdcY+Ob1/cU2/2iqTcIzhtcaezsc8OZ63au6ahSBQqg==
+apollo-server-plugin-base@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.5.tgz#eebe27734c51bf6a45b6a9ec8738750b132ffde7"
+  integrity sha512-z2ve7HEPWmZI3EzL0iiY9qyt1i0hitT+afN5PzssCw594LB6DfUQWsI14UW+W+gcw8hvl8VQUpXByfUntAx5vw==
   dependencies:
-    apollo-server-types "^0.2.4"
+    apollo-server-types "^0.2.5"
 
 apollo-server-testing@~2.9.5:
   version "2.9.5"
@@ -1736,12 +1736,12 @@ apollo-server-testing@~2.9.5:
   dependencies:
     apollo-server-core "^2.9.5"
 
-apollo-server-types@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.4.tgz#28864900ffc7f9711a859297c143a833fdb6aa43"
-  integrity sha512-G4FvBVgGQcTW6ZBS2+hvcDQkSfdOIKV+cHADduXA275v+5zl42g+bCaGd/hCCKTDRjmQvObLiMxH/BJ6pDMQgA==
+apollo-server-types@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.5.tgz#2d63924706ffc1a59480cbbc93e9fe86655a57a5"
+  integrity sha512-6iJQsPh59FWu4K7ABrVmpnQVgeK8Ockx8BcawBh+saFYWTlVczwcLyGSZPeV1tPSKwFwKZutyEslrYSafcarXQ==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.4.0"
+    apollo-engine-reporting-protobuf "^0.4.1"
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
@@ -1756,13 +1756,13 @@ apollo-server@~2.9.5:
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
 
-apollo-tracing@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.4.tgz#0117820c3f0ad3aa6daf7bf13ddbb923cbefa6de"
-  integrity sha512-DjbFW0IvHicSlTVG+vK+1WINfBMRCdPPHJSW/j65JMir9Oe56WGeqL8qz8hptdUUmLYEb+azvcyyGsJsiR3zpQ==
+apollo-tracing@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.5.tgz#f07c4584d95bcf750e44bfe9845e073b03774941"
+  integrity sha512-lZn10/GRBZUlMxVYLghLMFsGcLN0jTYDd98qZfBtxw+wEWUx+PKkZdljDT+XNoOm/kDvEutFGmi5tSLhArIzWQ==
   dependencies:
     apollo-server-env "^2.4.3"
-    graphql-extensions "^0.10.3"
+    graphql-extensions "^0.10.4"
 
 apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2:
   version "1.3.2"
@@ -3988,14 +3988,14 @@ graphql-custom-directives@~0.2.14:
     moment "^2.22.2"
     numeral "^2.0.6"
 
-graphql-extensions@^0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.3.tgz#9e37f3bd26309c40b03a0be0e63e02b3f99d52ea"
-  integrity sha512-kwU0gUe+Qdfr8iZYT91qrPSwQNgPhB/ClF1m1LEPdxlptk5FhFmjpxAcbMZ8q7j0kjfnbp2IeV1OhRDCEPqz2w==
+graphql-extensions@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.4.tgz#af851b0d44ea6838cf54de9df3cfc6a8e575e571"
+  integrity sha512-lE6MroluEYocbR/ICwccv39w+Pz4cBPadJ11z1rJkbZv5wstISEganbDOwl9qN21rcZGiWzh7QUNxUiFUXXEDw==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.0"
     apollo-server-env "^2.4.3"
-    apollo-server-types "^0.2.4"
+    apollo-server-types "^0.2.5"
 
 graphql-import@0.7.1:
   version "0.7.1"

From 004de24b9e5cce02ab4eca7139038e726c14d286 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 04:51:11 +0000
Subject: [PATCH 124/212] build(deps-dev): bump @vue/cli-shared-utils in
 /webapp

Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 952913e4b..117a763ff 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -96,7 +96,7 @@
     "@storybook/addon-a11y": "^5.2.3",
     "@storybook/addon-actions": "^5.2.3",
     "@storybook/vue": "~5.2.3",
-    "@vue/cli-shared-utils": "~3.11.0",
+    "@vue/cli-shared-utils": "~3.12.0",
     "@vue/eslint-config-prettier": "~5.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.29",
     "@vue/test-utils": "~1.0.0-beta.29",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b6dca2ca6..7e5029c4c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2532,10 +2532,10 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     camelcase "^5.0.0"
 
-"@vue/cli-shared-utils@~3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.11.0.tgz#a3d6f809b0dfb367e626b71405f85dea0631310b"
-  integrity sha512-D7pst/4v9H1DD66fLxlZOwRR09R03MV0ROdKxBHmh3FmnApCA/RiaolFA/8w+B3CnevYMlV3SJ5fOAgedbswbA==
+"@vue/cli-shared-utils@~3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.12.0.tgz#48fcd786129cf02278b9c91f2c3491199f777248"
+  integrity sha512-8XEn4s0Cc+98eqdGSQJSrzSKIsf0FMDmfDvgXjT7I2qZWs9e0toOAm7RooypRSad2FhwxzY2bLPgCkNPDJN/jQ==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.1"

From faca2fdce0f68e1b63985271527bbe56ae2e16e9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2019 04:51:43 +0000
Subject: [PATCH 125/212] build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in
 /backend

Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.6.2 to 5.7.0.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.6.2...5.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |   2 +-
 backend/yarn.lock    | 104 +++++++++++++++++++++----------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3a0cf6be8..7e30249b7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^16.1.7",
-    "@sentry/node": "^5.6.2",
+    "@sentry/node": "^5.7.0",
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5adc174ce..361795465 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1042,60 +1042,60 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/core@5.6.2":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.6.2.tgz#8c5477654a83ebe41a72e86a79215deb5025e418"
-  integrity sha512-grbjvNmyxP5WSPR6UobN2q+Nss7Hvz+BClBT8QTr7VTEG5q89TwNddn6Ej3bGkaUVbct/GpVlI3XflWYDsnU6Q==
+"@sentry/core@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.0.tgz#c2aa5341e703ec7cf2acc69e51971a0b1f7d102a"
+  integrity sha512-gQel0d7LBSWJGHc7gfZllYAu+RRGD9GcYGmkRfemurmDyDGQDf/sfjiBi8f9QxUc2iFTHnvIR5nMTyf0U3yl3Q==
   dependencies:
-    "@sentry/hub" "5.6.1"
-    "@sentry/minimal" "5.6.1"
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/hub" "5.7.0"
+    "@sentry/minimal" "5.7.0"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.6.1.tgz#9f355c0abcc92327fbd10b9b939608aa4967bece"
-  integrity sha512-m+OhkIV5yTAL3R1+XfCwzUQka0UF/xG4py8sEfPXyYIcoOJ2ZTX+1kQJLy8QQJ4RzOBwZA+DzRKP0cgzPJ3+oQ==
+"@sentry/hub@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.0.tgz#f7c356202a9db1daae82ce7f48ebf1139e4e9d02"
+  integrity sha512-qNdYheJ6j4P9Sk0eqIINpJohImmu/+trCwFb4F8BGLQth5iGMVQD6D0YUrgjf4ZaQwfhw9tv4W6VEfF5tyASoA==
   dependencies:
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.6.1.tgz#09d92b26de0b24555cd50c3c33ba4c3e566009a1"
-  integrity sha512-ercCKuBWHog6aS6SsJRuKhJwNdJ2oRQVWT2UAx1zqvsbHT9mSa8ZRjdPHYOtqY3DoXKk/pLUFW/fkmAnpdMqRw==
+"@sentry/minimal@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.0.tgz#832d26bcd862c6ea628d48ad199ac7f966a2d907"
+  integrity sha512-0sizE2prS9nmfLyVUKmVzFFFqRNr9iorSCCejwnlRe3crqKqjf84tuRSzm6NkZjIyYj9djuuo9l9XN12NLQ/4A==
   dependencies:
-    "@sentry/hub" "5.6.1"
-    "@sentry/types" "5.6.1"
+    "@sentry/hub" "5.7.0"
+    "@sentry/types" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.6.2":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.6.2.tgz#4b62f056031da65cad78220d48c546b8bfbfaed7"
-  integrity sha512-A9CELco6SjF4zt8iS1pO3KdUVI2WVhtTGhSH6X04OVf2en1fimPR+Vs8YVY/04udwd7o+3mI6byT+rS9+/Qzow==
+"@sentry/node@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.7.0.tgz#153777f06b2fcd346edbff9adbb6b231c7e5fa0a"
+  integrity sha512-iqQbGAJDBlpQkp1rl9RkDCIfnukr4cOtHPgJPmLY19m/KXIHD2cdKhvbqoCvIPBTIAeSGQIvDT9jD5zT46eoqQ==
   dependencies:
-    "@sentry/core" "5.6.2"
-    "@sentry/hub" "5.6.1"
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
-    cookie "0.3.1"
-    https-proxy-agent "2.2.1"
-    lru_map "0.3.3"
+    "@sentry/core" "5.7.0"
+    "@sentry/hub" "5.7.0"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
+    cookie "^0.3.1"
+    https-proxy-agent "^3.0.0"
+    lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.6.1.tgz#5915e1ee4b7a678da3ac260c356b1cb91139a299"
-  integrity sha512-Kub8TETefHpdhvtnDj3kKfhCj0u/xn3Zi2zIC7PB11NJHvvPXENx97tciz4roJGp7cLRCJsFqCg4tHXniqDSnQ==
+"@sentry/types@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.0.tgz#e8677e57b40c2c63cad42c02add12b238e647c10"
+  integrity sha512-bFRVortg713dE2yJXNFgNe6sNBVVSkpoELLkGPatdVQi0dYc6OggIIX4UZZvkynFx72GwYqO1NOrtUcJY2gmMg==
 
-"@sentry/utils@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.6.1.tgz#69d9e151e50415bc91f2428e3bcca8beb9bc2815"
-  integrity sha512-rfgha+UsHW816GqlSRPlniKqAZylOmQWML2JsujoUP03nPu80zdN43DK9Poy/d9OxBxv0gd5K2n+bFdM2kqLQQ==
+"@sentry/utils@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.0.tgz#a6850aa4f5476fa26517cd5c6248f871d8d9939b"
+  integrity sha512-XmwQpLqea9mj8x1N7P/l4JvnEb0Rn5Py5OtBgl0ctk090W+GB1uM8rl9mkMf6698o1s1Z8T/tI/QY0yFA5uZXg==
   dependencies:
-    "@sentry/types" "5.6.1"
+    "@sentry/types" "5.7.0"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":
@@ -1444,7 +1444,7 @@ acorn@^7.0.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a"
   integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==
 
-agent-base@^4.1.0:
+agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
   integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
@@ -2565,16 +2565,16 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 cookie@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookie@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
 cookiejar@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -4332,12 +4332,12 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+https-proxy-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97"
+  integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
@@ -5641,7 +5641,7 @@ lru-cache@^5.0.0:
   dependencies:
     yallist "^3.0.2"
 
-lru_map@0.3.3:
+lru_map@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
   integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=

From 1cf3295e0bea1898959beb3133ec517b8738cfd1 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 02:03:09 +0200
Subject: [PATCH 126/212] update version to 0.1.4

---
 CHANGELOG.md | 200 +++++++++++++--------------------------------------
 1 file changed, 49 insertions(+), 151 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bcffad4f..404129bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,164 +2,62 @@
 
 ## [Unreleased](https://github.com/Human-Connection/Human-Connection/tree/HEAD)
 
-[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.0...HEAD)
-
-**Fixed bugs:**
-
-- 🐛 \[Bug\] Update maintenance page email [\#1731](https://github.com/Human-Connection/Human-Connection/issues/1731)
-- 🐛 \[Bug\] Editing comments is not reactive again [\#1718](https://github.com/Human-Connection/Human-Connection/issues/1718)
-- 🐛 \[Bug\] Comments with mentions in the end not displayed [\#1665](https://github.com/Human-Connection/Human-Connection/issues/1665)
-- 🐛 \[Bug\] Moderators and Admins can be blocked [\#1663](https://github.com/Human-Connection/Human-Connection/issues/1663)
-- 🐛 \[Bug\] Links in Comments don't show up [\#1661](https://github.com/Human-Connection/Human-Connection/issues/1661)
-- 🐛 \[Bug\] Delete the Sleep Icon [\#1659](https://github.com/Human-Connection/Human-Connection/issues/1659)
-- 🐛 \[Bug\] Mail Layout German/English not working in Webmail [\#1656](https://github.com/Human-Connection/Human-Connection/issues/1656)
-- 🐛 \[Bug\] Far to less Characters per Contribution \(2000\) [\#1639](https://github.com/Human-Connection/Human-Connection/issues/1639)
-- 🐛 \[Bug\] Notifications do just update with page reload [\#1637](https://github.com/Human-Connection/Human-Connection/issues/1637)
-- 🐛 \[Bug\] Admin statistics entries are missing [\#1633](https://github.com/Human-Connection/Human-Connection/issues/1633)
-- 🐛 \[Bug\] Can no users used all hashtags be correct? [\#1632](https://github.com/Human-Connection/Human-Connection/issues/1632)
-- 🐛 \[Bug\] Create account has no info about email, no localisation, no HC logo [\#1631](https://github.com/Human-Connection/Human-Connection/issues/1631)
-- 🐛 \[Bug\] Embeds are displayed when creating comments but get removed [\#1547](https://github.com/Human-Connection/Human-Connection/issues/1547)
-- 🐛 \[Bug\] One cypress test fails but it does not fail the build [\#1312](https://github.com/Human-Connection/Human-Connection/issues/1312)
-- 🐛 \[Bug\] TypeError: Cannot read property 'offsetTop' of null [\#1273](https://github.com/Human-Connection/Human-Connection/issues/1273)
+[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.4...HEAD)
 
 **Closed issues:**
 
-- 🚀 \[Feature\] Extend Emoticons [\#1745](https://github.com/Human-Connection/Human-Connection/issues/1745)
-- 🚀 \[Feature\] Show "Edited" on comments and Posts [\#1669](https://github.com/Human-Connection/Human-Connection/issues/1669)
-- 🚀 \[Feature\] Change slug [\#1650](https://github.com/Human-Connection/Human-Connection/issues/1650)
-- 🚀 \[Feature\] Make the slug more visible and usable [\#1486](https://github.com/Human-Connection/Human-Connection/issues/1486)
-- 🚀 \[Feature\] Report with reason [\#1469](https://github.com/Human-Connection/Human-Connection/issues/1469)
-- 🚀 \[Feature\] Update `lastActiveAt` on every JWT token check [\#1305](https://github.com/Human-Connection/Human-Connection/issues/1305)
-- 🚀 \[Feature\] Make Invite an Registration E-Mails translatable and pretty [\#1186](https://github.com/Human-Connection/Human-Connection/issues/1186)
-- 🚀 \[Feature\] @Username: Unique user identification if identical profile names exist [\#1069](https://github.com/Human-Connection/Human-Connection/issues/1069)
-- 🚀 \[Feature\] UserSettings - YourData - Email [\#407](https://github.com/Human-Connection/Human-Connection/issues/407)
+- 🚀 \[Feature\] Register as a new User [\#1785](https://github.com/Human-Connection/Human-Connection/issues/1785)
 
 **Merged pull requests:**
 
-- fixes\#1305 lastActiveAt [\#1809](https://github.com/Human-Connection/Human-Connection/pull/1809) ([iylim](https://github.com/iylim))
-- Show that a Post/Comment has been edited [\#1807](https://github.com/Human-Connection/Human-Connection/pull/1807) ([mattwr18](https://github.com/mattwr18))
-- fix invites count calculation for admin dashboard [\#1806](https://github.com/Human-Connection/Human-Connection/pull/1806) ([vbelolapotkov](https://github.com/vbelolapotkov))
+- Refactor embed settings page [\#1861](https://github.com/Human-Connection/Human-Connection/pull/1861) ([roschaefer](https://github.com/roschaefer))
+- Implement public registration [\#1814](https://github.com/Human-Connection/Human-Connection/pull/1814) ([roschaefer](https://github.com/roschaefer))
+
+## [0.1.4](https://github.com/Human-Connection/Human-Connection/tree/0.1.4) (2019-10-10)
+[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.3...0.1.4)
+
+**Fixed bugs:**
+
+- 🐛 \[Bug\] extend Title to 100 characters [\#1812](https://github.com/Human-Connection/Human-Connection/issues/1812)
+
+**Closed issues:**
+
+- 🚀 \[Feature\] Make Email of a User visible for Moderators [\#1704](https://github.com/Human-Connection/Human-Connection/issues/1704)
+- 🚀 \[Feature\] save embeds iframe permanently [\#1684](https://github.com/Human-Connection/Human-Connection/issues/1684)
+
+**Merged pull requests:**
+
+- Add Hall of Fame to README [\#1859](https://github.com/Human-Connection/Human-Connection/pull/1859) ([roschaefer](https://github.com/roschaefer))
+- build\(deps-dev\): bump cypress-cucumber-preprocessor from 1.16.1 to 1.16.2 [\#1855](https://github.com/Human-Connection/Human-Connection/pull/1855) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump nodemailer from 6.3.0 to 6.3.1 in /backend [\#1854](https://github.com/Human-Connection/Human-Connection/pull/1854) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Save user setting to show embed code II [\#1852](https://github.com/Human-Connection/Human-Connection/pull/1852) ([ogerly](https://github.com/ogerly))
+- Title character increased from 64 to 100 [\#1850](https://github.com/Human-Connection/Human-Connection/pull/1850) ([ogerly](https://github.com/ogerly))
+- build\(deps-dev\): bump @babel/core from 7.6.2 to 7.6.3 in /webapp [\#1848](https://github.com/Human-Connection/Human-Connection/pull/1848) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/cli from 7.6.2 to 7.6.3 in /backend [\#1847](https://github.com/Human-Connection/Human-Connection/pull/1847) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend [\#1846](https://github.com/Human-Connection/Human-Connection/pull/1846) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/node from 7.6.2 to 7.6.3 in /backend [\#1843](https://github.com/Human-Connection/Human-Connection/pull/1843) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump styleguide from `808b3c5` to `d46fc15` [\#1839](https://github.com/Human-Connection/Human-Connection/pull/1839) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/addon-actions from 5.2.1 to 5.2.3 in /webapp [\#1838](https://github.com/Human-Connection/Human-Connection/pull/1838) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend [\#1837](https://github.com/Human-Connection/Human-Connection/pull/1837) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/addon-a11y from 5.2.1 to 5.2.3 in /webapp [\#1836](https://github.com/Human-Connection/Human-Connection/pull/1836) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp [\#1835](https://github.com/Human-Connection/Human-Connection/pull/1835) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/vue from 5.2.1 to 5.2.3 in /webapp [\#1834](https://github.com/Human-Connection/Human-Connection/pull/1834) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cucumber from 6.0.1 to 6.0.2 in /backend [\#1833](https://github.com/Human-Connection/Human-Connection/pull/1833) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Fix typo in email template [\#1829](https://github.com/Human-Connection/Human-Connection/pull/1829) ([alina-beck](https://github.com/alina-beck))
+- build\(deps-dev\): bump cucumber from 5.1.0 to 6.0.1 in /backend [\#1827](https://github.com/Human-Connection/Human-Connection/pull/1827) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend [\#1826](https://github.com/Human-Connection/Human-Connection/pull/1826) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.10.0-alpine to 12.11.0-alpine in /webapp [\#1824](https://github.com/Human-Connection/Human-Connection/pull/1824) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump apollo-server-testing from 2.9.4 to 2.9.5 in /backend [\#1823](https://github.com/Human-Connection/Human-Connection/pull/1823) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump tiptap-extensions from 1.28.0 to 1.28.3 in /webapp [\#1822](https://github.com/Human-Connection/Human-Connection/pull/1822) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump tiptap from 1.26.0 to 1.26.3 in /webapp [\#1821](https://github.com/Human-Connection/Human-Connection/pull/1821) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /webapp [\#1819](https://github.com/Human-Connection/Human-Connection/pull/1819) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /backend [\#1818](https://github.com/Human-Connection/Human-Connection/pull/1818) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump @hapi/joi from 16.1.5 to 16.1.7 in /backend [\#1817](https://github.com/Human-Connection/Human-Connection/pull/1817) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cypress-cucumber-preprocessor from 1.16.0 to 1.16.1 [\#1816](https://github.com/Human-Connection/Human-Connection/pull/1816) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update to 0.1.3 [\#1813](https://github.com/Human-Connection/Human-Connection/pull/1813) ([mattwr18](https://github.com/mattwr18))
+- Display user email for administrators [\#1808](https://github.com/Human-Connection/Human-Connection/pull/1808) ([aonomike](https://github.com/aonomike))
 - build\(deps\): bump nuxt from 2.9.2 to 2.10.0 in /webapp [\#1804](https://github.com/Human-Connection/Human-Connection/pull/1804) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /webapp [\#1803](https://github.com/Human-Connection/Human-Connection/pull/1803) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend [\#1802](https://github.com/Human-Connection/Human-Connection/pull/1802) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /backend [\#1801](https://github.com/Human-Connection/Human-Connection/pull/1801) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps-dev\): bump cross-env from 6.0.2 to 6.0.3 [\#1800](https://github.com/Human-Connection/Human-Connection/pull/1800) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Remove language toggle from email template [\#1798](https://github.com/Human-Connection/Human-Connection/pull/1798) ([alina-beck](https://github.com/alina-beck))
-- Max aspect ratio of 1:1 for Post index page [\#1796](https://github.com/Human-Connection/Human-Connection/pull/1796) ([mattwr18](https://github.com/mattwr18))
-- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /backend [\#1794](https://github.com/Human-Connection/Human-Connection/pull/1794) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps-dev\): bump cross-env from 6.0.0 to 6.0.2 [\#1793](https://github.com/Human-Connection/Human-Connection/pull/1793) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump metascraper-description from 5.7.5 to 5.7.6 in /backend [\#1792](https://github.com/Human-Connection/Human-Connection/pull/1792) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /webapp [\#1791](https://github.com/Human-Connection/Human-Connection/pull/1791) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump @nuxtjs/apollo from 4.0.0-rc13.1 to 4.0.0-rc14 in /webapp [\#1790](https://github.com/Human-Connection/Human-Connection/pull/1790) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Update Post query for blockedByUsers [\#1788](https://github.com/Human-Connection/Human-Connection/pull/1788) ([mattwr18](https://github.com/mattwr18))
-- Update neo4j to Enterprise edition [\#1787](https://github.com/Human-Connection/Human-Connection/pull/1787) ([mattwr18](https://github.com/mattwr18))
-- Update to 0.1.2 [\#1786](https://github.com/Human-Connection/Human-Connection/pull/1786) ([mattwr18](https://github.com/mattwr18))
-- Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend [\#1783](https://github.com/Human-Connection/Human-Connection/pull/1783) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-url from 5.7.5 to 5.7.6 in /backend [\#1782](https://github.com/Human-Connection/Human-Connection/pull/1782) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql-middleware from 3.0.5 to 4.0.1 in /backend [\#1781](https://github.com/Human-Connection/Human-Connection/pull/1781) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint from 6.4.0 to 6.5.1 in /backend [\#1780](https://github.com/Human-Connection/Human-Connection/pull/1780) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-audio from 5.7.5 to 5.7.6 in /backend [\#1779](https://github.com/Human-Connection/Human-Connection/pull/1779) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-publisher from 5.7.4 to 5.7.6 in /backend [\#1778](https://github.com/Human-Connection/Human-Connection/pull/1778) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-youtube from 5.7.5 to 5.7.6 in /backend [\#1777](https://github.com/Human-Connection/Human-Connection/pull/1777) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /backend [\#1776](https://github.com/Human-Connection/Human-Connection/pull/1776) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-soundcloud from 5.7.4 to 5.7.6 in /backend [\#1775](https://github.com/Human-Connection/Human-Connection/pull/1775) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-author from 5.7.4 to 5.7.6 in /backend [\#1774](https://github.com/Human-Connection/Human-Connection/pull/1774) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix failing test [\#1772](https://github.com/Human-Connection/Human-Connection/pull/1772) ([aonomike](https://github.com/aonomike))
-- Bump metascraper-date from 5.7.4 to 5.7.6 in /backend [\#1771](https://github.com/Human-Connection/Human-Connection/pull/1771) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp [\#1770](https://github.com/Human-Connection/Human-Connection/pull/1770) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.3.0 to 2.4.1 in /backend [\#1769](https://github.com/Human-Connection/Human-Connection/pull/1769) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.4.0 to 2.4.1 in /webapp [\#1768](https://github.com/Human-Connection/Human-Connection/pull/1768) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql-middleware-sentry from 3.2.0 to 3.2.1 in /backend [\#1767](https://github.com/Human-Connection/Human-Connection/pull/1767) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-lang from 5.7.4 to 5.7.6 in /backend [\#1766](https://github.com/Human-Connection/Human-Connection/pull/1766) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump tiptap from 1.25.0 to 1.26.0 in /webapp [\#1765](https://github.com/Human-Connection/Human-Connection/pull/1765) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-video from 5.7.5 to 5.7.6 in /backend [\#1764](https://github.com/Human-Connection/Human-Connection/pull/1764) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump apollo-server from 2.9.3 to 2.9.4 in /backend [\#1762](https://github.com/Human-Connection/Human-Connection/pull/1762) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-image from 5.7.5 to 5.7.6 in /backend [\#1761](https://github.com/Human-Connection/Human-Connection/pull/1761) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp [\#1760](https://github.com/Human-Connection/Human-Connection/pull/1760) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-title from 5.7.5 to 5.7.6 in /backend [\#1759](https://github.com/Human-Connection/Human-Connection/pull/1759) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump nodemon from 1.19.2 to 1.19.3 in /backend [\#1758](https://github.com/Human-Connection/Human-Connection/pull/1758) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- fix email middleware transport config [\#1757](https://github.com/Human-Connection/Human-Connection/pull/1757) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 1273 fix post page nav suggestions [\#1756](https://github.com/Human-Connection/Human-Connection/pull/1756) ([roschaefer](https://github.com/roschaefer))
-- docs: moves storybook into webapp/README.md [\#1755](https://github.com/Human-Connection/Human-Connection/pull/1755) ([roschaefer](https://github.com/roschaefer))
-- Bump date-fns from 2.2.1 to 2.4.0 in /webapp [\#1752](https://github.com/Human-Connection/Human-Connection/pull/1752) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- fix: Github's security vulnerability warning [\#1751](https://github.com/Human-Connection/Human-Connection/pull/1751) ([roschaefer](https://github.com/roschaefer))
-- update neo4j docker-compose config [\#1750](https://github.com/Human-Connection/Human-Connection/pull/1750) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 🍰 Try to fix VSCode format works against ESLint [\#1749](https://github.com/Human-Connection/Human-Connection/pull/1749) ([Tirokk](https://github.com/Tirokk))
-- Bump neo4j from 3.5.9 to 3.5.11 in /neo4j [\#1739](https://github.com/Human-Connection/Human-Connection/pull/1739) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.7 to 14.5.8 in /backend [\#1738](https://github.com/Human-Connection/Human-Connection/pull/1738) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-youtube from 5.7.4 to 5.7.5 in /backend [\#1737](https://github.com/Human-Connection/Human-Connection/pull/1737) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Update to 0.1.1 [\#1734](https://github.com/Human-Connection/Human-Connection/pull/1734) ([roschaefer](https://github.com/roschaefer))
-- Update maintenance page email to support@... [\#1732](https://github.com/Human-Connection/Human-Connection/pull/1732) ([mattwr18](https://github.com/mattwr18))
-- Bump @babel/register from 7.6.0 to 7.6.2 in /backend [\#1730](https://github.com/Human-Connection/Human-Connection/pull/1730) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.7 to 14.5.8 in /webapp [\#1729](https://github.com/Human-Connection/Human-Connection/pull/1729) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/core from 7.6.0 to 7.6.2 in /backend [\#1728](https://github.com/Human-Connection/Human-Connection/pull/1728) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp [\#1727](https://github.com/Human-Connection/Human-Connection/pull/1727) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump apollo-server-express from 2.9.3 to 2.9.4 in /backend [\#1726](https://github.com/Human-Connection/Human-Connection/pull/1726) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/node from 7.6.1 to 7.6.2 in /backend [\#1725](https://github.com/Human-Connection/Human-Connection/pull/1725) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix bug UpdateComment, Fix styling on Comment [\#1719](https://github.com/Human-Connection/Human-Connection/pull/1719) ([mattwr18](https://github.com/mattwr18))
-- Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend [\#1717](https://github.com/Human-Connection/Human-Connection/pull/1717) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-title from 5.7.4 to 5.7.5 in /backend [\#1715](https://github.com/Human-Connection/Human-Connection/pull/1715) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.2.1 to 2.3.0 in /backend [\#1714](https://github.com/Human-Connection/Human-Connection/pull/1714) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/cli from 7.6.0 to 7.6.2 in /backend [\#1713](https://github.com/Human-Connection/Human-Connection/pull/1713) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- \[WIP\]1706 refactor shout spec [\#1712](https://github.com/Human-Connection/Human-Connection/pull/1712) ([aonomike](https://github.com/aonomike))
-- 407 change your email address [\#1711](https://github.com/Human-Connection/Human-Connection/pull/1711) ([roschaefer](https://github.com/roschaefer))
-- Remove repetitive labels from emote button [\#1702](https://github.com/Human-Connection/Human-Connection/pull/1702) ([roschaefer](https://github.com/roschaefer))
-- fix the bug with scrolling post comments into view [\#1701](https://github.com/Human-Connection/Human-Connection/pull/1701) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- Bump metascraper-description from 5.7.4 to 5.7.5 in /backend [\#1700](https://github.com/Human-Connection/Human-Connection/pull/1700) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-logo from 5.7.4 to 5.7.5 in /backend [\#1698](https://github.com/Human-Connection/Human-Connection/pull/1698) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-video from 5.7.4 to 5.7.5 in /backend [\#1697](https://github.com/Human-Connection/Human-Connection/pull/1697) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/core from 7.6.0 to 7.6.2 in /webapp [\#1696](https://github.com/Human-Connection/Human-Connection/pull/1696) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-image from 5.7.4 to 5.7.5 in /backend [\#1695](https://github.com/Human-Connection/Human-Connection/pull/1695) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp [\#1694](https://github.com/Human-Connection/Human-Connection/pull/1694) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-audio from 5.7.4 to 5.7.5 in /backend [\#1693](https://github.com/Human-Connection/Human-Connection/pull/1693) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-url from 5.7.4 to 5.7.5 in /backend [\#1692](https://github.com/Human-Connection/Human-Connection/pull/1692) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bugfix create user page - missing submit buttons [\#1690](https://github.com/Human-Connection/Human-Connection/pull/1690) ([roschaefer](https://github.com/roschaefer))
-- Remove sleep icon from comments list [\#1689](https://github.com/Human-Connection/Human-Connection/pull/1689) ([alina-beck](https://github.com/alina-beck))
-- Configure docker to work with storybook [\#1688](https://github.com/Human-Connection/Human-Connection/pull/1688) ([mattwr18](https://github.com/mattwr18))
-- Add Comment story, add spacing above user info [\#1685](https://github.com/Human-Connection/Human-Connection/pull/1685) ([mattwr18](https://github.com/mattwr18))
-- Fix create account page has no logo, localisation [\#1681](https://github.com/Human-Connection/Human-Connection/pull/1681) ([roschaefer](https://github.com/roschaefer))
-- Fix intermittent backend specs [\#1679](https://github.com/Human-Connection/Human-Connection/pull/1679) ([roschaefer](https://github.com/roschaefer))
-- Improve comments output [\#1678](https://github.com/Human-Connection/Human-Connection/pull/1678) ([mattwr18](https://github.com/mattwr18))
-- Fix intermittent failing test [\#1677](https://github.com/Human-Connection/Human-Connection/pull/1677) ([mattwr18](https://github.com/mattwr18))
-- Bump graphql from 14.5.6 to 14.5.7 in /webapp [\#1676](https://github.com/Human-Connection/Human-Connection/pull/1676) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.6 to 14.5.7 in /backend [\#1675](https://github.com/Human-Connection/Human-Connection/pull/1675) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp [\#1674](https://github.com/Human-Connection/Human-Connection/pull/1674) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend [\#1673](https://github.com/Human-Connection/Human-Connection/pull/1673) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump helmet from 3.21.0 to 3.21.1 in /backend [\#1672](https://github.com/Human-Connection/Human-Connection/pull/1672) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cypress-file-upload from 3.3.3 to 3.3.4 [\#1671](https://github.com/Human-Connection/Human-Connection/pull/1671) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump codecov from 3.6.0 to 3.6.1 [\#1670](https://github.com/Human-Connection/Human-Connection/pull/1670) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Make Human Connection a Progressive Web App [\#1668](https://github.com/Human-Connection/Human-Connection/pull/1668) ([roschaefer](https://github.com/roschaefer))
-- Remove contentExcerpt from comments [\#1667](https://github.com/Human-Connection/Human-Connection/pull/1667) ([mattwr18](https://github.com/mattwr18))
-- Remove follow type enum [\#1660](https://github.com/Human-Connection/Human-Connection/pull/1660) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 🍰 Notifications self update and refactoring [\#1658](https://github.com/Human-Connection/Human-Connection/pull/1658) ([Tirokk](https://github.com/Tirokk))
-- Bump mustache from 3.0.3 to 3.1.0 in /backend [\#1655](https://github.com/Human-Connection/Human-Connection/pull/1655) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.1.1 to 16.1.2 in /backend [\#1654](https://github.com/Human-Connection/Human-Connection/pull/1654) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @nuxtjs/apollo from 4.0.0-rc13 to 4.0.0-rc13.1 in /webapp [\#1653](https://github.com/Human-Connection/Human-Connection/pull/1653) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump codecov from 3.5.0 to 3.6.0 [\#1652](https://github.com/Human-Connection/Human-Connection/pull/1652) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Change your own slug [\#1651](https://github.com/Human-Connection/Human-Connection/pull/1651) ([roschaefer](https://github.com/roschaefer))
-- Fix bug where short comments scrub links [\#1649](https://github.com/Human-Connection/Human-Connection/pull/1649) ([mattwr18](https://github.com/mattwr18))
-- Fix styling issue in comments list [\#1648](https://github.com/Human-Connection/Human-Connection/pull/1648) ([mattwr18](https://github.com/mattwr18))
-- Provider list approval hard cut [\#1647](https://github.com/Human-Connection/Human-Connection/pull/1647) ([ogerly](https://github.com/ogerly))
-- Point the changelog to Github [\#1646](https://github.com/Human-Connection/Human-Connection/pull/1646) ([roschaefer](https://github.com/roschaefer))
-- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /webapp [\#1643](https://github.com/Human-Connection/Human-Connection/pull/1643) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /backend [\#1642](https://github.com/Human-Connection/Human-Connection/pull/1642) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix \#1639 - No limits for post length [\#1641](https://github.com/Human-Connection/Human-Connection/pull/1641) ([roschaefer](https://github.com/roschaefer))
-- 1486 make slug more usable [\#1640](https://github.com/Human-Connection/Human-Connection/pull/1640) ([roschaefer](https://github.com/roschaefer))
-- Update de.json [\#1636](https://github.com/Human-Connection/Human-Connection/pull/1636) ([datenbrei](https://github.com/datenbrei))
-- Exclude broken maintenance-worker docker image [\#1635](https://github.com/Human-Connection/Human-Connection/pull/1635) ([roschaefer](https://github.com/roschaefer))
-- Fix bug where about must not be empty string [\#1630](https://github.com/Human-Connection/Human-Connection/pull/1630) ([mattwr18](https://github.com/mattwr18))
-- Bump @storybook/addon-a11y from 5.2.0 to 5.2.1 in /webapp [\#1627](https://github.com/Human-Connection/Human-Connection/pull/1627) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @storybook/addon-actions from 5.2.0 to 5.2.1 in /webapp [\#1625](https://github.com/Human-Connection/Human-Connection/pull/1625) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @storybook/vue from 5.2.0 to 5.2.1 in /webapp [\#1624](https://github.com/Human-Connection/Human-Connection/pull/1624) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cross-env from 5.2.1 to 6.0.0 in /backend [\#1623](https://github.com/Human-Connection/Human-Connection/pull/1623) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.0.1 to 16.1.1 in /backend [\#1622](https://github.com/Human-Connection/Human-Connection/pull/1622) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cross-env from 5.2.1 to 6.0.0 [\#1621](https://github.com/Human-Connection/Human-Connection/pull/1621) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- 1612 refactor moderator spec [\#1620](https://github.com/Human-Connection/Human-Connection/pull/1620) ([aonomike](https://github.com/aonomike))
-- Fix disappearing embeds on comments [\#1618](https://github.com/Human-Connection/Human-Connection/pull/1618) ([mattwr18](https://github.com/mattwr18))
-- links\_to\_imprint\_and\_privacy\_policy\_changed\_to\_human-connection.org [\#1615](https://github.com/Human-Connection/Human-Connection/pull/1615) ([ogerly](https://github.com/ogerly))
-- Bump metascraper-author from 5.6.6 to 5.7.4 in /backend [\#1610](https://github.com/Human-Connection/Human-Connection/pull/1610) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Configure emails [\#1599](https://github.com/Human-Connection/Human-Connection/pull/1599) ([alina-beck](https://github.com/alina-beck))
-- Improve follow/ufollow mutation [\#1596](https://github.com/Human-Connection/Human-Connection/pull/1596) ([vbelolapotkov](https://github.com/vbelolapotkov))
+- \[TEST\] Save user setting to show embed code [\#1686](https://github.com/Human-Connection/Human-Connection/pull/1686) ([ogerly](https://github.com/ogerly))
 
 
 

From dab05d9e67ec1acc171adba7600f02f5fcea3cc5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 14:01:39 +0200
Subject: [PATCH 127/212] Fix embeds settings page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
---
 backend/Dockerfile                            |   1 +
 .../schema/resolvers/embeds/providers.json    | 257 ------------------
 webapp/locales/de.json                        |   4 +-
 webapp/locales/en.json                        |   4 +-
 webapp/pages/settings/embeds.vue              |  11 +-
 5 files changed, 13 insertions(+), 264 deletions(-)
 delete mode 100644 backend/src/schema/resolvers/embeds/providers.json

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 0d040a753..1df199c1f 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -24,4 +24,5 @@ FROM base as production
 ENV NODE_ENV=production
 COPY --from=build-and-test /nitro-backend/dist ./dist
 COPY ./public/img/ ./public/img/
+COPY ./public/providers.json ./public/providers.json
 RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache
diff --git a/backend/src/schema/resolvers/embeds/providers.json b/backend/src/schema/resolvers/embeds/providers.json
deleted file mode 100644
index ef9f04bff..000000000
--- a/backend/src/schema/resolvers/embeds/providers.json
+++ /dev/null
@@ -1,257 +0,0 @@
-[
-    {
-        "provider_name": "Codepen",
-        "provider_url": "https:\/\/codepen.io",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/codepen.io\/*",
-                    "https:\/\/codepen.io\/*"
-                ],
-                "url": "http:\/\/codepen.io\/api\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "DTube",
-        "provider_url": "https:\/\/d.tube\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/d.tube\/v\/*"
-                ],
-                "url": "https:\/\/api.d.tube\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Post)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/posts\/*",
-                    "https:\/\/www.facebook.com\/photos\/*",
-                    "https:\/\/www.facebook.com\/*\/photos\/*",
-                    "https:\/\/www.facebook.com\/photo.php*",
-                    "https:\/\/www.facebook.com\/photo.php",
-                    "https:\/\/www.facebook.com\/*\/activity\/*",
-                    "https:\/\/www.facebook.com\/permalink.php",
-                    "https:\/\/www.facebook.com\/media\/set?set=*",
-                    "https:\/\/www.facebook.com\/questions\/*",
-                    "https:\/\/www.facebook.com\/notes\/*\/*\/*"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/post\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Video)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/videos\/*",
-                    "https:\/\/www.facebook.com\/video.php"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/video\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Flickr",
-        "provider_url": "https:\/\/www.flickr.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/*.flickr.com\/photos\/*",
-                    "http:\/\/flic.kr\/p\/*",
-                    "https:\/\/*.flickr.com\/photos\/*",
-                    "https:\/\/flic.kr\/p\/*"
-                ],
-                "url": "https:\/\/www.flickr.com\/services\/oembed\/",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "GIPHY",
-        "provider_url": "https:\/\/giphy.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/giphy.com\/gifs\/*",
-                    "http:\/\/gph.is\/*",
-                    "https:\/\/media.giphy.com\/media\/*\/giphy.gif"
-                ],
-                "url": "https:\/\/giphy.com\/services\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Instagram",
-        "provider_url": "https:\/\/instagram.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/instagram.com\/p\/*",
-                    "http:\/\/instagr.am\/p\/*",
-                    "http:\/\/www.instagram.com\/p\/*",
-                    "http:\/\/www.instagr.am\/p\/*",
-                    "https:\/\/instagram.com\/p\/*",
-                    "https:\/\/instagr.am\/p\/*",
-                    "https:\/\/www.instagram.com\/p\/*",
-                    "https:\/\/www.instagr.am\/p\/*"
-                ],
-                "url": "https:\/\/api.instagram.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Meetup",
-        "provider_url": "http:\/\/www.meetup.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/meetup.com\/*",
-                    "https:\/\/www.meetup.com\/*",
-                    "https:\/\/meetup.com\/*",
-                    "http:\/\/meetu.ps\/*"
-                ],
-                "url": "https:\/\/api.meetup.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "MixCloud",
-        "provider_url": "https:\/\/mixcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.mixcloud.com\/*\/*\/",
-                    "https:\/\/www.mixcloud.com\/*\/*\/"
-                ],
-                "url": "https:\/\/www.mixcloud.com\/oembed\/"
-            }
-        ]
-    },
-    {
-        "provider_name": "Reddit",
-        "provider_url": "https:\/\/reddit.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/reddit.com\/r\/*\/comments\/*\/*",
-                    "https:\/\/www.reddit.com\/r\/*\/comments\/*\/*"
-                ],
-                "url": "https:\/\/www.reddit.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "SlideShare",
-        "provider_url": "http:\/\/www.slideshare.net\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.slideshare.net\/*\/*",
-                    "http:\/\/fr.slideshare.net\/*\/*",
-                    "http:\/\/de.slideshare.net\/*\/*",
-                    "http:\/\/es.slideshare.net\/*\/*",
-                    "http:\/\/pt.slideshare.net\/*\/*"
-                ],
-                "url": "http:\/\/www.slideshare.net\/api\/oembed\/2",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "SoundCloud",
-        "provider_url": "http:\/\/soundcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/soundcloud.com\/*",
-                    "https:\/\/soundcloud.com\/*"
-                ],
-                "url": "https:\/\/soundcloud.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitch",
-        "provider_url": "https:\/\/www.twitch.tv",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/clips.twitch.tv\/*",
-                    "https:\/\/clips.twitch.tv\/*",
-                    "http:\/\/www.twitch.tv\/*",
-                    "https:\/\/www.twitch.tv\/*",
-                    "http:\/\/twitch.tv\/*",
-                    "https:\/\/twitch.tv\/*"
-                ],
-                "url": "https:\/\/api.twitch.tv\/v4\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitter",
-        "provider_url": "http:\/\/www.twitter.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/twitter.com\/*\/status\/*",
-                    "https:\/\/*.twitter.com\/*\/status\/*"
-                ],
-                "url": "https:\/\/publish.twitter.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Vimeo",
-        "provider_url": "https:\/\/vimeo.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/vimeo.com\/*",
-                    "https:\/\/vimeo.com\/album\/*\/video\/*",
-                    "https:\/\/vimeo.com\/channels\/*\/*",
-                    "https:\/\/vimeo.com\/groups\/*\/videos\/*",
-                    "https:\/\/vimeo.com\/ondemand\/*\/*",
-                    "https:\/\/player.vimeo.com\/video\/*"
-                ],
-                "url": "https:\/\/vimeo.com\/api\/oembed.{format}",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "YouTube",
-        "provider_url": "https:\/\/www.youtube.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/*.youtube.com\/watch*",
-                    "https:\/\/*.youtube.com\/v\/*",
-                    "https:\/\/youtu.be\/*"
-                ],
-                "url": "https:\/\/www.youtube.com\/oembed",
-                "discovery": true
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 3f9ed718e..c9788e591 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -244,8 +244,8 @@
       "status": {
         "description": "Als Grundeinstellung für dich wird eingebetter Fremdcode von Drittanbietern",
         "disabled": {
-          "false": "zunächst nicht angezeigt",
-          "true": "sofort angezeigt"
+          "off": "zunächst nicht angezeigt",
+          "on": "sofort angezeigt"
         },
         "change": {
           "question": "Soll eingebetter Fremdcode von Dritten für dich immer angezeigt werden?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9ed1d8d40..9d68ae6a0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -245,8 +245,8 @@
       "status": {
         "description": "As a default for you, embedded code of third-party providers is",
         "disabled": {
-          "false": "initially not displayed",
-          "true": "displayed immediately"
+          "off": "initially not displayed",
+          "on": "displayed immediately"
         },
         "change": {
           "question": "Should embedded source code from third parties always be displayed to you?",
diff --git a/webapp/pages/settings/embeds.vue b/webapp/pages/settings/embeds.vue
index 7b85295c0..9314bb4ba 100644
--- a/webapp/pages/settings/embeds.vue
+++ b/webapp/pages/settings/embeds.vue
@@ -4,7 +4,12 @@
       <ds-text>
         {{ $t('settings.embeds.status.description') }}
         <ds-text bold>
-          {{ $t(`settings.embeds.status.disabled.${disabled}`) }}
+          <template v-if="disabled">
+            {{ $t(`settings.embeds.status.disabled.on`) }}
+          </template>
+          <template v-else>
+            {{ $t(`settings.embeds.status.disabled.off`) }}
+          </template>
         </ds-text>
         .
       </ds-text>
@@ -52,10 +57,10 @@ export default {
     }
   },
   mounted() {
-    axios.get('../api/providers.json').then(response => {
+    axios.get('/api/providers.json').then(response => {
       this.providers = response.data
     })
-    this.disabled = this.currentUser.allowEmbedIframes
+    if (this.currentUser.allowEmbedIframes) this.disabled = this.currentUser.allowEmbedIframes
   },
   methods: {
     ...mapMutations({

From b0e7ef34ed9d91116b03bf89585825528cf665ef Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 14:43:14 +0200
Subject: [PATCH 128/212] Update findProviders.json path

---
 backend/src/schema/resolvers/embeds/findProvider.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index a4240895f..8575599e1 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -2,7 +2,10 @@ import fs from 'fs'
 import path from 'path'
 import minimatch from 'minimatch'
 
-let oEmbedProvidersFile = fs.readFileSync(path.join(__dirname, './providers.json'), 'utf8')
+let oEmbedProvidersFile = fs.readFileSync(
+  path.join(__dirname, '../../../../public/providers.json'),
+  'utf8',
+)
 
 // some providers allow a format parameter
 // we need JSON

From 82228c6c99c4b33ab20ddfbc13cce6ac6f95792c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 16:35:15 +0200
Subject: [PATCH 129/212] Refactored backend database to a single `REPORTED`
 relation

---
 .../src/middleware/permissionsMiddleware.js   |   2 +-
 backend/src/schema/index.js                   |   2 +-
 backend/src/schema/resolvers/reports.js       |  69 +++-
 backend/src/schema/resolvers/reports.spec.js  | 296 ++++++++++++++++--
 backend/src/schema/types/schema.gql           |  23 --
 backend/src/schema/types/type/REPORTED.gql    |  10 +-
 webapp/graphql/Moderation.js                  |   4 +-
 7 files changed, 330 insertions(+), 76 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index df87f743e..31efb9316 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -122,7 +122,7 @@ const permissions = shield(
       embed: allow,
       Category: allow,
       Tag: allow,
-      Report: isModerator,
+      reports: isModerator,
       statistics: allow,
       currentUser: allow,
       Post: or(onlyEnabledContent, isModerator),
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index e3c835447..871810d47 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -35,7 +35,6 @@ export default applyScalars(
             'Notfication',
             'Post',
             'Comment',
-            'REPORTED',
             'Statistics',
             'LoggedInUser',
             'Location',
@@ -43,6 +42,7 @@ export default applyScalars(
             'User',
             'EMOTED',
             'NOTIFIED',
+            'REPORTED',
           ],
           // add 'User' here as soon as possible
         },
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 2cf1187e0..dd9375995 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,17 +1,10 @@
-import uuid from 'uuid/v4'
-
 export default {
   Mutation: {
-    report: async (
-      _parent,
-      { resourceId, reasonCategory, reasonDescription },
-      { driver, _req, user },
-      _resolveInfo,
-    ) => {
-      // Wolle const reportId = uuid()
+    report: async (_parent, params, { driver, _req, user }, _resolveInfo) => {
+      const { resourceId, reasonCategory, reasonDescription } = params
+
       const session = driver.session()
       const reportProperties = {
-        // Wolle id: reportId,
         createdAt: new Date().toISOString(),
         reasonCategory,
         reasonDescription,
@@ -54,7 +47,7 @@ export default {
         },
       )
 
-     session.close()
+      session.close()
 
       const [dbResponse] = res.records.map(r => {
         return {
@@ -88,6 +81,60 @@ export default {
           break
       }
 
+      return response
+    },
+  },
+  Query: {
+    reports: async (_parent, _params, { driver, _req, _user }, _resolveInfo) => {
+      const session = driver.session()
+      const res = await session.run(
+        `
+          MATCH (submitter:User)-[report:REPORTED]->(resource)
+          WHERE resource:User OR resource:Comment OR resource:Post
+          RETURN report, submitter, resource, labels(resource)[0] as type
+        `,
+        {},
+      )
+      session.close()
+
+      const dbResponse = res.records.map(r => {
+        return {
+          report: r.get('report'),
+          submitter: r.get('submitter'),
+          resource: r.get('resource'),
+          type: r.get('type'),
+        }
+      })
+      if (!dbResponse) return null
+
+      const response = []
+      dbResponse.forEach(ele => {
+        const { report, submitter, resource, type } = ele
+
+        const responseEle = {
+          ...report.properties,
+          resource: resource.properties,
+          resourceId: resource.properties.id,
+          post: null,
+          comment: null,
+          user: null,
+          submitter: submitter.properties,
+          type,
+        }
+        switch (type) {
+          case 'Post':
+            responseEle.post = resource.properties
+            break
+          case 'Comment':
+            responseEle.comment = resource.properties
+            break
+          case 'User':
+            responseEle.user = resource.properties
+            break
+        }
+        response.push(responseEle)
+      })
+
       return response
     },
   },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index cf89dab7a..919153611 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -1,51 +1,24 @@
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../../seed/factories'
-import { host, login } from '../../jest/helpers'
-import { neode } from '../../bootstrap/neo4j'
+import { host, login, gql } from '../../jest/helpers'
+import { getDriver, neode } from '../../bootstrap/neo4j'
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '../.././server'
 
 const factory = Factory()
 const instance = neode()
+const driver = getDriver()
 
-describe('report', () => {
+describe('report mutation', () => {
   let reportMutation
   let headers
+  let client
   let returnedObject
   let variables
   let createPostVariables
   let user
   const categoryIds = ['cat9']
 
-  beforeEach(async () => {
-    returnedObject = '{ createdAt }'
-    variables = {
-      resourceId: 'whatever',
-      reasonCategory: 'reason-category-dummy',
-      reasonDescription: 'Violates code of conduct !!!',
-    }
-    headers = {}
-    user = await factory.create('User', {
-      email: 'test@example.org',
-      password: '1234',
-      id: 'u1',
-    })
-    await factory.create('User', {
-      id: 'u2',
-      name: 'abusive-user',
-      role: 'user',
-      email: 'abusive-user@example.org',
-    })
-    await instance.create('Category', {
-      id: 'cat9',
-      name: 'Democracy & Politics',
-      icon: 'university',
-    })
-  })
-
-  afterEach(async () => {
-    await factory.cleanDatabase()
-  })
-
-  let client
   const action = () => {
     // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
     reportMutation = `
@@ -59,6 +32,37 @@ describe('report', () => {
     return client.request(reportMutation, variables)
   }
 
+  beforeEach(async () => {
+    returnedObject = '{ createdAt }'
+    variables = {
+      resourceId: 'whatever',
+      reasonCategory: 'reason-category-dummy',
+      reasonDescription: 'Violates code of conduct !!!',
+    }
+    headers = {}
+    user = await factory.create('User', {
+      id: 'u1',
+      role: 'user',
+      email: 'test@example.org',
+      password: '1234',
+    })
+    await factory.create('User', {
+      id: 'u2',
+      role: 'user',
+      name: 'abusive-user',
+      email: 'abusive-user@example.org',
+    })
+    await instance.create('Category', {
+      id: 'cat9',
+      name: 'Democracy & Politics',
+      icon: 'university',
+    })
+  })
+
+  afterEach(async () => {
+    await factory.cleanDatabase()
+  })
+
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       await expect(action()).rejects.toThrow('Not Authorised')
@@ -287,3 +291,227 @@ describe('report', () => {
     })
   })
 })
+
+describe('reports query', () => {
+  let query
+  let mutate
+  let authenticatedUser = null
+  let moderator
+  let user
+  let author
+  const categoryIds = ['cat9']
+
+  const reportMutation = gql`
+    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      report(
+        resourceId: $resourceId
+        reasonCategory: $reasonCategory
+        reasonDescription: $reasonDescription
+      ) {
+        type
+      }
+    }
+  `
+  const reportsQuery = gql`
+    query {
+      reports(orderBy: createdAt_desc) {
+        createdAt
+        reasonCategory
+        reasonDescription
+        submitter {
+          id
+        }
+        resourceId
+        type
+        user {
+          id
+        }
+        post {
+          id
+        }
+        comment {
+          id
+        }
+      }
+    }
+  `
+
+  beforeAll(() => {
+    const { server } = createServer({
+      context: () => {
+        return {
+          driver,
+          user: authenticatedUser,
+        }
+      },
+    })
+    query = createTestClient(server).query
+    mutate = createTestClient(server).mutate
+  })
+
+  beforeEach(async () => {
+    authenticatedUser = null
+
+    moderator = await factory.create('User', {
+      id: 'mod1',
+      role: 'moderator',
+      email: 'moderator@example.org',
+      password: '1234',
+    })
+    user = await factory.create('User', {
+      id: 'user1',
+      role: 'user',
+      email: 'test@example.org',
+      password: '1234',
+    })
+    author = await factory.create('User', {
+      id: 'auth1',
+      role: 'user',
+      name: 'abusive-user',
+      email: 'abusive-user@example.org',
+    })
+    await instance.create('Category', {
+      id: 'cat9',
+      name: 'Democracy & Politics',
+      icon: 'university',
+    })
+
+    await Promise.all([
+      factory.create('Post', {
+        author,
+        id: 'p1',
+        categoryIds,
+        content: 'Not for you',
+      }),
+      factory.create('Post', {
+        author: moderator,
+        id: 'p2',
+        categoryIds,
+        content: 'Already seen post mention',
+      }),
+      factory.create('Post', {
+        author: user,
+        id: 'p3',
+        categoryIds,
+        content: 'You have been mentioned in a post',
+      }),
+    ])
+    await Promise.all([
+      factory.create('Comment', {
+        author: user,
+        id: 'c1',
+        postId: 'p1',
+      }),
+    ])
+
+    authenticatedUser = await user.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p1',
+          reasonCategory: 'other',
+          reasonDescription: 'This comment is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'c1',
+          reasonCategory: 'discrimination-etc',
+          reasonDescription: 'This post is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'auth1',
+          reasonCategory: 'doxing',
+          reasonDescription: 'This user is harassing me with bigoted remarks',
+        },
+      }),
+    ])
+    authenticatedUser = null
+  })
+
+  afterEach(async () => {
+    await factory.cleanDatabase()
+  })
+
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      authenticatedUser = null
+      const { data, errors } = await query({ query: reportsQuery })
+      expect(data).toEqual({
+        reports: null,
+      })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+
+    it('roll "user" gets no reports', async () => {
+      authenticatedUser = await user.toJson()
+      const { data, errors } = await query({ query: reportsQuery })
+      expect(data).toEqual({
+        reports: null,
+      })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+
+    it('roll "moderator" gets reports', async () => {
+      const expected = {
+        // to check 'orderBy: createdAt_desc' is not possible here, because 'createdAt' does not differ
+        reports: expect.arrayContaining([
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'doxing',
+            reasonDescription: 'This user is harassing me with bigoted remarks',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'auth1',
+            type: 'User',
+            user: expect.objectContaining({
+              id: 'auth1',
+            }),
+            post: null,
+            comment: null,
+          }),
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'other',
+            reasonDescription: 'This comment is bigoted',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'p1',
+            type: 'Post',
+            user: null,
+            post: expect.objectContaining({
+              id: 'p1',
+            }),
+            comment: null,
+          }),
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'discrimination-etc',
+            reasonDescription: 'This post is bigoted',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'c1',
+            type: 'Comment',
+            user: null,
+            post: null,
+            comment: expect.objectContaining({
+              id: 'c1',
+            }),
+          }),
+        ]),
+      }
+
+      authenticatedUser = await moderator.toJson()
+      const { data } = await query({ query: reportsQuery })
+      expect(data).toEqual(expected)
+    })
+  })
+})
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index e4986ad73..27fd2206c 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -34,29 +34,6 @@ type Mutation {
   unfollowUser(id: ID!): User
 }
 
-# Wolle
-# type Report {
-  # not necessary
-  # id: ID!
-  # done
-  # createdAt: String!
-  # done
-  # reasonCategory: String!
-  # done
-  # reasonDescription: String!
-  # done
-  # submitter: User @relation(name: "REPORTED", direction: "IN")
-  # done
-  # type: String!
-  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
-  # seems unused
-  # comment: Comment @relation(name: "REPORTED", direction: "OUT")
-  # seems unused
-  # post: Post @relation(name: "REPORTED", direction: "OUT")
-  # seems unused
-  # user: User @relation(name: "REPORTED", direction: "OUT")
-# }
-
 enum Deletable {
   Post
   Comment
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 881184bb5..276c5913b 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -4,8 +4,9 @@ type REPORTED {
   reasonDescription: String
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
-  resource: ReportReource
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
+  # not yet supported
+  # resource: ReportReource
+  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
   resourceId: ID
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
   type: String
@@ -15,14 +16,15 @@ type REPORTED {
   comment: Comment
 }
 
-union ReportReource = User | Post | Comment
+# not yet supported
+# union ReportReource = User | Post | Comment
 
 enum ReportOrdering {
   createdAt_desc
 }
 
 type Query {
-  Report(orderBy: ReportOrdering): [REPORTED]
+  reports(orderBy: ReportOrdering): [REPORTED]
 }
 
 type Mutation {
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 981b8146e..8ead28b61 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,10 +1,10 @@
 import gql from 'graphql-tag'
 
 export const reportListQuery = () => {
-  // no limit vor the moment like before: "Report(first: 20, orderBy: createdAt_desc)"
+  // no limit vor the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
-      Report(orderBy: createdAt_desc) {
+      reports(orderBy: createdAt_desc) {
         createdAt
         reasonCategory
         reasonDescription

From 1c8385120cb03b58b2e8a001d6aa92e0b15a66c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 16:36:37 +0200
Subject: [PATCH 130/212] Add date-time to the moderators report list

---
 webapp/locales/de.json            |  1 +
 webapp/locales/en.json            |  1 +
 webapp/pages/moderation/index.vue | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e54fcfcb0..1277b5737 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -431,6 +431,7 @@
       "name": "Meldungen",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
+      "createdAt": "Datum",
       "submitter": "Gemeldet von",
       "disabledBy": "Deaktiviert von"
     }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index aa59a3732..7d08aa638 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -432,6 +432,7 @@
       "name": "Reports",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
+      "createdAt": "Date",
       "submitter": "Reported by",
       "disabledBy": "Disabled by"
     }
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1f05c93ab..535b2613c 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-    <ds-table v-if="Report && Report.length" :data="Report" :fields="fields" condensed>
+    <ds-table v-if="reports && reports.length" :data="reports" :fields="fields" condensed>
       <!-- Icon -->
       <template slot="type" slot-scope="scope">
         <ds-text color="soft">
@@ -82,6 +82,14 @@
           {{ scope.row.submitter.name }}
         </nuxt-link>
       </template>
+      <!-- createdAt -->
+      <template slot="createdAt" slot-scope="scope">
+        <ds-text size="small">
+          <client-only>
+            <hc-relative-date-time :date-time="scope.row.createdAt" />
+          </client-only>
+        </ds-text>
+      </template>
       <!-- disabledBy -->
       <template slot="disabledBy" slot-scope="scope">
         <nuxt-link
@@ -123,15 +131,17 @@
 
 <script>
 import HcEmpty from '~/components/Empty.vue'
+import HcRelativeDateTime from '~/components/RelativeDateTime'
 import { reportListQuery } from '~/graphql/Moderation.js'
 
 export default {
   components: {
     HcEmpty,
+    HcRelativeDateTime,
   },
   data() {
     return {
-      Report: [],
+      reports: [],
     }
   },
   computed: {
@@ -142,13 +152,14 @@ export default {
         reasonCategory: this.$t('moderation.reports.reasonCategory'),
         reasonDescription: this.$t('moderation.reports.reasonDescription'),
         submitter: this.$t('moderation.reports.submitter'),
+        createdAt: this.$t('moderation.reports.createdAt'),
         disabledBy: this.$t('moderation.reports.disabledBy'),
         // actions: ' '
       }
     },
   },
   apollo: {
-    Report: {
+    reports: {
       query: reportListQuery(),
       fetchPolicy: 'cache-and-network',
     },

From d5e1a67e0cb27cef670b849e748d2db290ecc3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 17:33:04 +0200
Subject: [PATCH 131/212] Manipulate database to replace report node with
 direct REPORTED relation

---
 .../20191011_changeReportNodeToRelationOnly.cql            | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql

diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
new file mode 100644
index 000000000..8c32cf5ec
--- /dev/null
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
@@ -0,0 +1,7 @@
+MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+DETACH DELETE report
+CREATE (submitter)-[reported:REPORTED]->(resource)
+SET reported.createdAt = toString(datetime())
+SET reported.reasonCategory = 'other'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Date-time is this creation date and time.'
+RETURN reported
\ No newline at end of file

From b87f2a52cfc1ae73463254682c70774c61ef2134 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 12 Oct 2019 15:04:43 +0300
Subject: [PATCH 132/212] Refactor rewards spec

- Refactor unauthorised path
---
 backend/src/schema/resolvers/rewards.spec.js | 48 ++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 3b94e93aa..ea6f737b0 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -1,10 +1,14 @@
-import { GraphQLClient } from 'graphql-request'
+import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
-import { host, login, gql } from '../../jest/helpers'
+import { gql } from '../../jest/helpers'
+import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
+import  createServer  from '../../server'
 
 const factory = Factory()
-let user
-let badge
+const driver = getDriver()
+const instance = getNeode()
+
+let authenticatedUser, regularUser, badge, query, mutate, variables
 
 describe('rewards', () => {
   const variables = {
@@ -12,20 +16,35 @@ describe('rewards', () => {
     to: 'u1',
   }
 
+  beforeAll(async()=>{
+    const { server } = createServer({
+      context: () => {
+        return {
+          driver,
+          neode: instance,
+          user: authenticatedUser,
+        }
+      },
+    })
+    query = createTestClient(server).query
+    mutate = createTestClient(server).mutate
+  })
+
   beforeEach(async () => {
-    user = await factory.create('User', {
-      id: 'u1',
+    
+    regularUser = await factory.create('User', {
+      id: 'regular-user-id',
       role: 'user',
       email: 'user@example.org',
       password: '1234',
     })
     await factory.create('User', {
-      id: 'u2',
+      id: 'moderator-id',
       role: 'moderator',
       email: 'moderator@example.org',
     })
     await factory.create('User', {
-      id: 'u3',
+      id: 'admin-id',
       role: 'admin',
       email: 'admin@example.org',
     })
@@ -54,11 +73,14 @@ describe('rewards', () => {
     `
 
     describe('unauthenticated', () => {
-      let client
-
-      it('throws authorization error', async () => {
-        client = new GraphQLClient(host)
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
+      it.only('throws authorization error', async () => {
+        const variables = {
+          from: 'indiegogo_en_rhino',
+          to: 'regular-user-id',
+        }
+        authenticatedUser = null
+        await expect(mutate({mutation, variables})).resolves.toMatchObject({ data: {reward: null},
+          errors: [{ message: 'Not Authorised!' }]})
       })
     })
 

From bd834824650af01df5c5ed8ba35a0de4cd03f564 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 12 Oct 2019 16:50:58 +0300
Subject: [PATCH 133/212] Complete refactor of logged in administrator spec
 path

---
 backend/src/schema/resolvers/rewards.spec.js | 144 +++++++++++++------
 1 file changed, 98 insertions(+), 46 deletions(-)

diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index ea6f737b0..4965f3fcf 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -2,13 +2,14 @@ import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
 import { gql } from '../../jest/helpers'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
-import  createServer  from '../../server'
+import createServer from '../../server'
+import { addMinutes } from 'date-fns'
 
 const factory = Factory()
 const driver = getDriver()
 const instance = getNeode()
 
-let authenticatedUser, regularUser, badge, query, mutate, variables
+let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate, variables
 
 describe('rewards', () => {
   const variables = {
@@ -16,7 +17,7 @@ describe('rewards', () => {
     to: 'u1',
   }
 
-  beforeAll(async()=>{
+  beforeAll(async () => {
     const { server } = createServer({
       context: () => {
         return {
@@ -31,19 +32,18 @@ describe('rewards', () => {
   })
 
   beforeEach(async () => {
-    
     regularUser = await factory.create('User', {
       id: 'regular-user-id',
       role: 'user',
       email: 'user@example.org',
       password: '1234',
     })
-    await factory.create('User', {
+    moderator = await factory.create('User', {
       id: 'moderator-id',
       role: 'moderator',
       email: 'moderator@example.org',
     })
-    await factory.create('User', {
+    administrator = await factory.create('User', {
       id: 'admin-id',
       role: 'admin',
       email: 'admin@example.org',
@@ -73,54 +73,62 @@ describe('rewards', () => {
     `
 
     describe('unauthenticated', () => {
-      it.only('throws authorization error', async () => {
+      it('throws authorization error', async () => {
         const variables = {
           from: 'indiegogo_en_rhino',
           to: 'regular-user-id',
         }
         authenticatedUser = null
-        await expect(mutate({mutation, variables})).resolves.toMatchObject({ data: {reward: null},
-          errors: [{ message: 'Not Authorised!' }]})
+        await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+          data: { reward: null },
+          errors: [{ message: 'Not Authorised!' }],
+        })
       })
     })
 
     describe('authenticated admin', () => {
-      let client
       beforeEach(async () => {
-        const headers = await login({ email: 'admin@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
+        authenticatedUser = await administrator.toJson()
       })
 
       describe('badge for id does not exist', () => {
         it('rejects with a telling error message', async () => {
           await expect(
-            client.request(mutation, {
-              ...variables,
-              from: 'bullshit',
-            }),
-          ).rejects.toThrow("Couldn't find a badge with that id")
+            mutate({ mutation, variables: { to: 'regular-user-id', from: 'ndiegogo_en_rhino' } }),
+          ).resolves.toMatchObject({
+            data: { reward: null },
+            errors: [{ message: "Couldn't find a badge with that id" }],
+          })
         })
       })
 
       describe('user for id does not exist', () => {
         it('rejects with a telling error message', async () => {
           await expect(
-            client.request(mutation, {
-              ...variables,
-              to: 'bullshit',
+            mutate({
+              mutation,
+              variables: { to: 'non-existent-user-id', from: 'non-existent-badge' },
             }),
-          ).rejects.toThrow("Couldn't find a user with that id")
+          ).resolves.toMatchObject({
+            data: { reward: null },
+            errors: [{ message: "Couldn't find a user with that id" }],
+          })
         })
       })
 
       it('rewards a badge to user', async () => {
         const expected = {
-          reward: {
-            id: 'u1',
-            badges: [{ id: 'indiegogo_en_rhino' }],
+          data: {
+            reward: {
+              id: 'regular-user-id',
+              badges: [{ id: 'indiegogo_en_rhino' }],
+            },
           },
+          errors: undefined,
         }
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
+        await expect(
+          mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }),
+        ).resolves.toMatchObject(expected)
       })
 
       it('rewards a second different badge to same user', async () => {
@@ -130,42 +138,83 @@ describe('rewards', () => {
         })
         const badges = [{ id: 'indiegogo_en_racoon' }, { id: 'indiegogo_en_rhino' }]
         const expected = {
-          reward: {
-            id: 'u1',
-            badges: expect.arrayContaining(badges),
+          data: {
+            reward: {
+              id: 'regular-user-id',
+              badges: expect.arrayContaining(badges),
+            },
           },
+          errors: undefined,
         }
-        await client.request(mutation, variables)
+        await mutate({
+          mutation,
+          variables: {
+            to: 'regular-user-id',
+            from: 'indiegogo_en_rhino',
+          },
+        })
         await expect(
-          client.request(mutation, {
-            ...variables,
-            from: 'indiegogo_en_racoon',
+          mutate({
+            mutation,
+            variables: {
+              to: 'regular-user-id',
+              from: 'indiegogo_en_racoon',
+            },
           }),
-        ).resolves.toEqual(expected)
+        ).resolves.toMatchObject(expected)
       })
 
       it('rewards the same badge as well to another user', async () => {
         const expected = {
-          reward: {
-            id: 'u2',
-            badges: [{ id: 'indiegogo_en_rhino' }],
+          data: {
+            reward: {
+              id: 'regular-user-2-id',
+              badges: [{ id: 'indiegogo_en_rhino' }],
+            },
           },
+          errors: undefined,
         }
+        await factory.create('User', {
+          id: 'regular-user-2-id',
+          email: 'regular2@email.com',
+        })
+        await mutate({
+          mutation,
+          variables: {
+            to: 'regular-user-id',
+            from: 'indiegogo_en_rhino',
+          },
+        })
         await expect(
-          client.request(mutation, {
-            ...variables,
-            to: 'u2',
+          mutate({
+            mutation,
+            variables: {
+              to: 'regular-user-2-id',
+              from: 'indiegogo_en_rhino',
+            },
           }),
-        ).resolves.toEqual(expected)
+        ).resolves.toMatchObject(expected)
       })
 
       it('creates no duplicate reward relationships', async () => {
-        await client.request(mutation, variables)
-        await client.request(mutation, variables)
+        await mutate({
+          mutation,
+          variables: {
+            to: 'regular-user-id',
+            from: 'indiegogo_en_rhino',
+          },
+        })
+        await mutate({
+          mutation,
+          variables: {
+            to: 'regular-user-id',
+            from: 'indiegogo_en_rhino',
+          },
+        })
 
-        const query = gql`
+        const userQuery = gql`
           {
-            User(id: "u1") {
+            User(id: "regular-user-id") {
               badgesCount
               badges {
                 id
@@ -173,9 +222,12 @@ describe('rewards', () => {
             }
           }
         `
-        const expected = { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] }
+        const expected = {
+          data: { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] },
+          errors: undefined,
+        }
 
-        await expect(client.request(query)).resolves.toEqual(expected)
+        await expect(query({ query: userQuery })).resolves.toMatchObject(expected)
       })
     })
 

From dcb40c2c33ef89fda0f04f18c8dd3abe8ad4a377 Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 12 Oct 2019 17:00:36 +0300
Subject: [PATCH 134/212] refactor moderator user path

---
 backend/src/schema/resolvers/rewards.spec.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 4965f3fcf..2acadfb8c 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -232,15 +232,15 @@ describe('rewards', () => {
     })
 
     describe('authenticated moderator', () => {
-      let client
       beforeEach(async () => {
-        const headers = await login({ email: 'moderator@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
+        authenticatedUser = moderator.toJson()
       })
 
-      describe('rewards bage to user', () => {
+      describe('rewards badge to user', () => {
         it('throws authorization error', async () => {
-          await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
+          await expect(
+            mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }),
+          ).resolves.toMatchObject({data: {reward: null}, errors: [{message: 'Not Authorised!'}]})
         })
       })
     })

From 0fe94a5d82ce08eae89b0c569bd193d4d37e71cb Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Sat, 12 Oct 2019 17:39:29 +0300
Subject: [PATCH 135/212] Complete refactor rewards spec

- Refactor unreward path
- refactor to use variables constant
---
 backend/src/schema/resolvers/rewards.spec.js | 83 +++++++++-----------
 1 file changed, 37 insertions(+), 46 deletions(-)

diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 2acadfb8c..2af16094d 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -3,18 +3,17 @@ import Factory from '../../seed/factories'
 import { gql } from '../../jest/helpers'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
-import { addMinutes } from 'date-fns'
 
 const factory = Factory()
 const driver = getDriver()
 const instance = getNeode()
 
-let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate, variables
+let authenticatedUser, regularUser, administrator, moderator, badge, query, mutate
 
 describe('rewards', () => {
   const variables = {
     from: 'indiegogo_en_rhino',
-    to: 'u1',
+    to: 'regular-user-id',
   }
 
   beforeAll(async () => {
@@ -74,10 +73,6 @@ describe('rewards', () => {
 
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
-        const variables = {
-          from: 'indiegogo_en_rhino',
-          to: 'regular-user-id',
-        }
         authenticatedUser = null
         await expect(mutate({ mutation, variables })).resolves.toMatchObject({
           data: { reward: null },
@@ -126,9 +121,7 @@ describe('rewards', () => {
           },
           errors: undefined,
         }
-        await expect(
-          mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }),
-        ).resolves.toMatchObject(expected)
+        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
       })
 
       it('rewards a second different badge to same user', async () => {
@@ -180,10 +173,7 @@ describe('rewards', () => {
         })
         await mutate({
           mutation,
-          variables: {
-            to: 'regular-user-id',
-            from: 'indiegogo_en_rhino',
-          },
+          variables,
         })
         await expect(
           mutate({
@@ -199,17 +189,11 @@ describe('rewards', () => {
       it('creates no duplicate reward relationships', async () => {
         await mutate({
           mutation,
-          variables: {
-            to: 'regular-user-id',
-            from: 'indiegogo_en_rhino',
-          },
+          variables,
         })
         await mutate({
           mutation,
-          variables: {
-            to: 'regular-user-id',
-            from: 'indiegogo_en_rhino',
-          },
+          variables,
         })
 
         const userQuery = gql`
@@ -238,9 +222,10 @@ describe('rewards', () => {
 
       describe('rewards badge to user', () => {
         it('throws authorization error', async () => {
-          await expect(
-            mutate({ mutation, variables: { to: 'regular-user-id', from: 'indiegogo_en_rhino' } }),
-          ).resolves.toMatchObject({data: {reward: null}, errors: [{message: 'Not Authorised!'}]})
+          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+            data: { reward: null },
+            errors: [{ message: 'Not Authorised!' }],
+          })
         })
       })
     })
@@ -248,9 +233,12 @@ describe('rewards', () => {
 
   describe('unreward', () => {
     beforeEach(async () => {
-      await user.relateTo(badge, 'rewarded')
+      await regularUser.relateTo(badge, 'rewarded')
     })
-    const expected = { unreward: { id: 'u1', badges: [] } }
+    const expected = {
+      data: { unreward: { id: 'regular-user-id', badges: [] } },
+      errors: undefined,
+    }
 
     const mutation = gql`
       mutation($from: ID!, $to: ID!) {
@@ -265,9 +253,10 @@ describe('rewards', () => {
 
     describe('check test setup', () => {
       it('user has one badge', async () => {
-        const query = gql`
+        authenticatedUser = regularUser.toJson()
+        const userQuery = gql`
           {
-            User(id: "u1") {
+            User(id: "regular-user-id") {
               badgesCount
               badges {
                 id
@@ -275,48 +264,50 @@ describe('rewards', () => {
             }
           }
         `
-        const expected = { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] }
-        const client = new GraphQLClient(host)
-        await expect(client.request(query)).resolves.toEqual(expected)
+        const expected = {
+          data: { User: [{ badgesCount: 1, badges: [{ id: 'indiegogo_en_rhino' }] }] },
+          errors: undefined,
+        }
+        await expect(query({ query: userQuery })).resolves.toMatchObject(expected)
       })
     })
 
     describe('unauthenticated', () => {
-      let client
-
       it('throws authorization error', async () => {
-        client = new GraphQLClient(host)
-        await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
+        authenticatedUser = null
+        await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+          data: { unreward: null },
+          errors: [{ message: 'Not Authorised!' }],
+        })
       })
     })
 
     describe('authenticated admin', () => {
-      let client
       beforeEach(async () => {
-        const headers = await login({ email: 'admin@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
+        authenticatedUser = await administrator.toJson()
       })
 
       it('removes a badge from user', async () => {
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
+        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
       })
 
       it('does not crash when unrewarding multiple times', async () => {
-        await client.request(mutation, variables)
-        await expect(client.request(mutation, variables)).resolves.toEqual(expected)
+        await mutate({ mutation, variables })
+        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
       })
     })
 
     describe('authenticated moderator', () => {
-      let client
       beforeEach(async () => {
-        const headers = await login({ email: 'moderator@example.org', password: '1234' })
-        client = new GraphQLClient(host, { headers })
+        authenticatedUser = await moderator.toJson()
       })
 
       describe('removes bage from user', () => {
         it('throws authorization error', async () => {
-          await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
+          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+            data: { unreward: null },
+            errors: [{ message: 'Not Authorised!' }],
+          })
         })
       })
     })

From a8a4d837ebf7bcc58d8f5ca756cf001d64b024f6 Mon Sep 17 00:00:00 2001
From: Janeth <janethavishka@gmail.com>
Date: Sun, 13 Oct 2019 09:22:26 +0530
Subject: [PATCH 136/212] Fix translation error in login page

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c9788e591..b2f1313da 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -103,7 +103,7 @@
     "email": "Deine E-Mail",
     "password": "Dein Passwort",
     "forgotPassword": "Passwort vergessen?",
-    "no-account": "Du hast noch keinen Benutzerkonto?",
+    "no-account": "Du hast noch kein Benutzerkonto?",
     "register": "Benutzerkonto erstellen",
     "moreInfo": "Was ist Human Connection?",
     "moreInfoURL": "https://human-connection.org",

From c2e8a9736aa7ada2c485e9c8644f6843662cd116 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 04:34:37 +0000
Subject: [PATCH 137/212] build(deps): bump @nuxtjs/apollo in /webapp

Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc14 to 4.0.0-rc15.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.14...v4.0.0-rc.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 952913e4b..8903b0ecc 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@human-connection/styleguide": "0.5.21",
-    "@nuxtjs/apollo": "^4.0.0-rc14",
+    "@nuxtjs/apollo": "^4.0.0-rc15",
     "@nuxtjs/axios": "~5.6.0",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.19",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b6dca2ca6..ece58de85 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1400,10 +1400,10 @@
     webpack-node-externals "^1.7.2"
     webpackbar "^4.0.0"
 
-"@nuxtjs/apollo@^4.0.0-rc14":
-  version "4.0.0-rc14"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc14.tgz#b589e72c6e6b36c93154b07c12a5ce59cc350942"
-  integrity sha512-ap/oiF/0i/EdeeFWnj8IkoHPTjqut6CW46sshdtanZxrGEmYody0Qi98KfQnoO7mYrQg7dbfHHNh1xCPhGYQ7A==
+"@nuxtjs/apollo@^4.0.0-rc15":
+  version "4.0.0-rc15"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc15.tgz#349d11e49339f0f53737bba596a4156345ac91fd"
+  integrity sha512-RiFVTA2Lt1mf5CWBzee0447nMxi7ayFnruuTR0zakJIasK8j5Nf25ROJkzbzdUMBkqekyf5RPuR8CkLgUIOqiA==
   dependencies:
     cross-fetch "^3.0.4"
     universal-cookie "^4.0.2"

From a95e55ce3478b5679daec9a47eb7988662435c6c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 04:35:43 +0000
Subject: [PATCH 138/212] build(deps-dev): bump core-js from 2.6.9 to 2.6.10 in
 /webapp

Bumps [core-js](https://github.com/zloirock/core-js) from 2.6.9 to 2.6.10.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v2.6.9...v2.6.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 952913e4b..d5f98a72e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -106,7 +106,7 @@
     "babel-jest": "~24.9.0",
     "babel-loader": "~8.0.6",
     "babel-preset-vue": "~2.0.2",
-    "core-js": "~2.6.9",
+    "core-js": "~2.6.10",
     "css-loader": "~3.2.0",
     "eslint": "~5.16.0",
     "eslint-config-prettier": "~6.4.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b6dca2ca6..90d5cdf61 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5423,10 +5423,10 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
-  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.10:
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
+  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
 
 core-js@^3.0.1, core-js@^3.0.4:
   version "3.1.4"

From 2cf2f2b011b908dbbea610941fdae08b07a29ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:20:51 +0200
Subject: [PATCH 139/212] Import report reason categories from a shared array

---
 shared/moderation/report.js             | 12 ++++++++++++
 webapp/components/Modal/ReportModal.vue | 15 +++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 shared/moderation/report.js

diff --git a/shared/moderation/report.js b/shared/moderation/report.js
new file mode 100644
index 000000000..a90837f67
--- /dev/null
+++ b/shared/moderation/report.js
@@ -0,0 +1,12 @@
+export const reportReasonCategoriesDatabaseList = () => {
+    return [
+      'other', // element # zero, because it is the nutral one
+      'discrimination-etc',
+      'pornographic-content-links',
+      'glorific-trivia-of-cruel-inhuman-acts',
+      'doxing',
+      'intentional-intimidation-stalking-persecution',
+      'advert-products-services-commercial',
+      'criminal-behavior-violation-german-law',
+    ]
+}
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 56e49f87f..c0fff5abf 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -50,6 +50,7 @@
 <script>
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import { reportMutation } from '~/graphql/Moderation.js'
+import { reportReasonCategoriesDatabaseList } from '~/../shared/moderation/report.js'
 
 export default {
   name: 'ReportModal',
@@ -62,16 +63,10 @@ export default {
     id: { type: String, required: true },
   },
   data() {
-    const valuesReasonCategoryOptions = [
-      'discrimination-etc',
-      'pornographic-content-links',
-      'glorific-trivia-of-cruel-inhuman-acts',
-      'doxing',
-      'intentional-intimidation-stalking-persecution',
-      'advert-products-services-commercial',
-      'criminal-behavior-violation-german-law',
-      'other',
-    ]
+    const reasonCategoryList = reportReasonCategoriesDatabaseList()
+    // move the first element "other" to the end
+    let valuesReasonCategoryOptions = reasonCategoryList.slice(1).concat(reasonCategoryList[0])
+
     let reasonCategoryOptions = []
     valuesReasonCategoryOptions.forEach(reasonCategory => {
       reasonCategoryOptions.push({

From b50896bb456bd48f4100aaf74ab299a6f11786a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:22:07 +0200
Subject: [PATCH 140/212] Update backend/src/schema/resolvers/reports.spec.js

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/schema/resolvers/reports.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 919153611..a7861e226 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -448,7 +448,7 @@ describe('reports query', () => {
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
-    it('roll "user" gets no reports', async () => {
+    it('role "user" gets no reports', async () => {
       authenticatedUser = await user.toJson()
       const { data, errors } = await query({ query: reportsQuery })
       expect(data).toEqual({

From 3c472293ac151ebf813f9c72e3b319073ac73350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:22:25 +0200
Subject: [PATCH 141/212] Update backend/src/schema/resolvers/reports.spec.js

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/schema/resolvers/reports.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index a7861e226..ee5b6dc16 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -457,7 +457,7 @@ describe('reports query', () => {
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
-    it('roll "moderator" gets reports', async () => {
+    it('role "moderator" gets reports', async () => {
       const expected = {
         // to check 'orderBy: createdAt_desc' is not possible here, because 'createdAt' does not differ
         reports: expect.arrayContaining([

From 47a2a21fc0db732d8b52992048f8fb9076f0bc5d Mon Sep 17 00:00:00 2001
From: aonomike <aonomike@gmail.com>
Date: Mon, 14 Oct 2019 16:46:37 +0300
Subject: [PATCH 142/212] Resolve review comments

---
 backend/src/schema/resolvers/rewards.spec.js | 51 ++++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 2af16094d..a81133373 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -60,7 +60,7 @@ describe('rewards', () => {
   })
 
   describe('reward', () => {
-    const mutation = gql`
+    const rewardMutation = gql`
       mutation($from: ID!, $to: ID!) {
         reward(badgeKey: $from, userId: $to) {
           id
@@ -74,7 +74,7 @@ describe('rewards', () => {
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         authenticatedUser = null
-        await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+        await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject({
           data: { reward: null },
           errors: [{ message: 'Not Authorised!' }],
         })
@@ -87,9 +87,12 @@ describe('rewards', () => {
       })
 
       describe('badge for id does not exist', () => {
-        it('rejects with a telling error message', async () => {
+        it('rejects with an informative error message', async () => {
           await expect(
-            mutate({ mutation, variables: { to: 'regular-user-id', from: 'ndiegogo_en_rhino' } }),
+            mutate({
+              mutation: rewardMutation,
+              variables: { to: 'regular-user-id', from: 'non-existent-badge-id' },
+            }),
           ).resolves.toMatchObject({
             data: { reward: null },
             errors: [{ message: "Couldn't find a badge with that id" }],
@@ -97,12 +100,12 @@ describe('rewards', () => {
         })
       })
 
-      describe('user for id does not exist', () => {
+      describe('non-existent user', () => {
         it('rejects with a telling error message', async () => {
           await expect(
             mutate({
-              mutation,
-              variables: { to: 'non-existent-user-id', from: 'non-existent-badge' },
+              mutation: rewardMutation,
+              variables: { to: 'non-existent-user-id', from: 'indiegogo_en_rhino' },
             }),
           ).resolves.toMatchObject({
             data: { reward: null },
@@ -121,7 +124,9 @@ describe('rewards', () => {
           },
           errors: undefined,
         }
-        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
+        await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
       })
 
       it('rewards a second different badge to same user', async () => {
@@ -140,7 +145,7 @@ describe('rewards', () => {
           errors: undefined,
         }
         await mutate({
-          mutation,
+          mutation: rewardMutation,
           variables: {
             to: 'regular-user-id',
             from: 'indiegogo_en_rhino',
@@ -148,7 +153,7 @@ describe('rewards', () => {
         })
         await expect(
           mutate({
-            mutation,
+            mutation: rewardMutation,
             variables: {
               to: 'regular-user-id',
               from: 'indiegogo_en_racoon',
@@ -172,12 +177,12 @@ describe('rewards', () => {
           email: 'regular2@email.com',
         })
         await mutate({
-          mutation,
+          mutation: rewardMutation,
           variables,
         })
         await expect(
           mutate({
-            mutation,
+            mutation: rewardMutation,
             variables: {
               to: 'regular-user-2-id',
               from: 'indiegogo_en_rhino',
@@ -188,11 +193,11 @@ describe('rewards', () => {
 
       it('creates no duplicate reward relationships', async () => {
         await mutate({
-          mutation,
+          mutation: rewardMutation,
           variables,
         })
         await mutate({
-          mutation,
+          mutation: rewardMutation,
           variables,
         })
 
@@ -222,7 +227,7 @@ describe('rewards', () => {
 
       describe('rewards badge to user', () => {
         it('throws authorization error', async () => {
-          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+          await expect(mutate({ mutation: rewardMutation, variables })).resolves.toMatchObject({
             data: { reward: null },
             errors: [{ message: 'Not Authorised!' }],
           })
@@ -240,7 +245,7 @@ describe('rewards', () => {
       errors: undefined,
     }
 
-    const mutation = gql`
+    const unrewardMutation = gql`
       mutation($from: ID!, $to: ID!) {
         unreward(badgeKey: $from, userId: $to) {
           id
@@ -275,7 +280,7 @@ describe('rewards', () => {
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         authenticatedUser = null
-        await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+        await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject({
           data: { unreward: null },
           errors: [{ message: 'Not Authorised!' }],
         })
@@ -288,12 +293,16 @@ describe('rewards', () => {
       })
 
       it('removes a badge from user', async () => {
-        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
+        await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
       })
 
       it('does not crash when unrewarding multiple times', async () => {
-        await mutate({ mutation, variables })
-        await expect(mutate({ mutation, variables })).resolves.toMatchObject(expected)
+        await mutate({ mutation: unrewardMutation, variables })
+        await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
       })
     })
 
@@ -304,7 +313,7 @@ describe('rewards', () => {
 
       describe('removes bage from user', () => {
         it('throws authorization error', async () => {
-          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
+          await expect(mutate({ mutation: unrewardMutation, variables })).resolves.toMatchObject({
             data: { unreward: null },
             errors: [{ message: 'Not Authorised!' }],
           })

From 6365d3df54b3f8bb26274615b83933e52c01dc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:53:36 +0200
Subject: [PATCH 143/212] Implement enum for report reason categories after
 Matts suggestion

---
 backend/src/schema/resolvers/reports.js    |  5 ++---
 backend/src/schema/types/type/REPORTED.gql | 14 +++++++++++++-
 shared/moderation/report.js                |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index dd9375995..3e63f1c1a 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,6 +1,6 @@
 export default {
   Mutation: {
-    report: async (_parent, params, { driver, _req, user }, _resolveInfo) => {
+    report: async (_parent, params, { driver, user }, _resolveInfo) => {
       const { resourceId, reasonCategory, reasonDescription } = params
 
       const session = driver.session()
@@ -85,7 +85,7 @@ export default {
     },
   },
   Query: {
-    reports: async (_parent, _params, { driver, _req, _user }, _resolveInfo) => {
+    reports: async (_parent, _params, { driver }, _resolveInfo) => {
       const session = driver.session()
       const res = await session.run(
         `
@@ -113,7 +113,6 @@ export default {
 
         const responseEle = {
           ...report.properties,
-          resource: resource.properties,
           resourceId: resource.properties.id,
           post: null,
           comment: null,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 276c5913b..b94dab882 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -1,6 +1,6 @@
 type REPORTED {
   createdAt: String
-  reasonCategory: String
+  reasonCategory: ReasonCategory
   reasonDescription: String
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
@@ -16,6 +16,18 @@ type REPORTED {
   comment: Comment
 }
 
+# list see "reportReasonCategoriesDatabaseList" in shared file "shared/moderation/report.js"
+enum ReasonCategory {
+  other
+  discrimination-etc
+  pornographic-content-links
+  glorific-trivia-of-cruel-inhuman-acts
+  doxing
+  intentional-intimidation-stalking-persecution
+  advert-products-services-commercial
+  criminal-behavior-violation-german-law
+}
+
 # not yet supported
 # union ReportReource = User | Post | Comment
 
diff --git a/shared/moderation/report.js b/shared/moderation/report.js
index a90837f67..75f6a076d 100644
--- a/shared/moderation/report.js
+++ b/shared/moderation/report.js
@@ -1,4 +1,5 @@
 export const reportReasonCategoriesDatabaseList = () => {
+    // list see "ReasonCategory" in backend GraphQL schema file "REPORTED.gql"
     return [
       'other', // element # zero, because it is the nutral one
       'discrimination-etc',

From c7849cedd85612345d80ecafa4f02b8f9295bd9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 16:12:21 +0200
Subject: [PATCH 144/212] Rename report reason category names to have '_'
 instead '-'

---
 backend/src/seed/seed-db.js                          |  2 +-
 cypress/integration/moderation/ReportContent.feature |  2 +-
 shared/moderation/report.js                          | 12 ++++++------
 webapp/locales/de.json                               | 12 ++++++------
 webapp/locales/en.json                               | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 9a16a8306..789211373 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -673,7 +673,7 @@ import { gql } from '../jest/helpers'
         mutation: reportMutation,
         variables: {
           resourceId: 'p1',
-          reasonCategory: 'discrimination-etc',
+          reasonCategory: 'discrimination_etc',
           reasonDescription: 'This post is bigoted',
         },
       }),
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 5701841cf..4eceb4bdf 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -51,7 +51,7 @@ Feature: Report and Moderate
   Scenario: Review reported content
     Given somebody reported the following posts:
       | submitterEmail           | resourceId | reasonCategory     | reasonDescription |
-      | p1.submitter@example.org | p1         | discrimination-etc | Offensive content |
+      | p1.submitter@example.org | p1         | discrimination_etc | Offensive content |
     And I am logged in with a "moderator" role
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
diff --git a/shared/moderation/report.js b/shared/moderation/report.js
index a90837f67..aad4aeed4 100644
--- a/shared/moderation/report.js
+++ b/shared/moderation/report.js
@@ -1,12 +1,12 @@
 export const reportReasonCategoriesDatabaseList = () => {
     return [
       'other', // element # zero, because it is the nutral one
-      'discrimination-etc',
-      'pornographic-content-links',
-      'glorific-trivia-of-cruel-inhuman-acts',
+      'discrimination_etc',
+      'pornographic_content_links',
+      'glorific_trivia_of_cruel_inhuman_acts',
       'doxing',
-      'intentional-intimidation-stalking-persecution',
-      'advert-products-services-commercial',
-      'criminal-behavior-violation-german-law',
+      'intentional_intimidation_stalking_persecution',
+      'advert_products_services_commercial',
+      'criminal_behavior_violation_german_law',
     ]
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 333f9ceea..6620bb6b2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -498,13 +498,13 @@
         "label": "Wähle eine Kategorie:",
         "placeholder": "Kategorie …",
         "options": {
-          "discrimination-etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
-          "pornographic-content-links": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
-          "glorific-trivia-of-cruel-inhuman-acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
+          "discrimination_etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
+          "pornographic_content_links": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
+          "glorific_trivia_of_cruel_inhuman_acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
           "doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
-          "intentional-intimidation-stalking-persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
-          "advert-products-services-commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
-          "criminal-behavior-violation-german-law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
+          "intentional_intimidation_stalking_persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
+          "advert_products_services_commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
+          "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
           "other": "Andere …"
         }
       },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 638ea94c5..7a901ebd1 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -499,13 +499,13 @@
         "label": "Select a category:",
         "placeholder": "Category …",
         "options": {
-          "discrimination-etc": "Discriminatory posts, comments, utterances or insults.",
-          "pornographic-content-links": "Posting or linking of clearly pornographic material.",
-          "glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
+          "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
+          "pornographic_content_links": "Posting or linking of clearly pornographic material.",
+          "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
           "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
-          "intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution.",
-          "advert-products-services-commercial": "Advertising products and services with commercial intent.",
-          "criminal-behavior-violation-german-law": "Criminal behavior or violation of German law.",
+          "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
+          "advert_products_services_commercial": "Advertising products and services with commercial intent.",
+          "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
           "other": "Other …"
         }
       },

From f7cff9cd0b5fc210d2cf94bd4c7a6efbe4f738af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 16:18:26 +0200
Subject: [PATCH 145/212] Delete shared file, because it doesn't work with jest
 tests

---
 shared/moderation/report.js             | 12 ------------
 webapp/components/Modal/ReportModal.vue | 14 ++++++++++----
 2 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 shared/moderation/report.js

diff --git a/shared/moderation/report.js b/shared/moderation/report.js
deleted file mode 100644
index aad4aeed4..000000000
--- a/shared/moderation/report.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const reportReasonCategoriesDatabaseList = () => {
-    return [
-      'other', // element # zero, because it is the nutral one
-      'discrimination_etc',
-      'pornographic_content_links',
-      'glorific_trivia_of_cruel_inhuman_acts',
-      'doxing',
-      'intentional_intimidation_stalking_persecution',
-      'advert_products_services_commercial',
-      'criminal_behavior_violation_german_law',
-    ]
-}
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index c0fff5abf..7c237c923 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -50,7 +50,6 @@
 <script>
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import { reportMutation } from '~/graphql/Moderation.js'
-import { reportReasonCategoriesDatabaseList } from '~/../shared/moderation/report.js'
 
 export default {
   name: 'ReportModal',
@@ -63,9 +62,16 @@ export default {
     id: { type: String, required: true },
   },
   data() {
-    const reasonCategoryList = reportReasonCategoriesDatabaseList()
-    // move the first element "other" to the end
-    let valuesReasonCategoryOptions = reasonCategoryList.slice(1).concat(reasonCategoryList[0])
+    let valuesReasonCategoryOptions = [
+      'discrimination_etc',
+      'pornographic_content_links',
+      'glorific_trivia_of_cruel_inhuman_acts',
+      'doxing',
+      'intentional_intimidation_stalking_persecution',
+      'advert_products_services_commercial',
+      'criminal_behavior_violation_german_law',
+      'other',
+    ]
 
     let reasonCategoryOptions = []
     valuesReasonCategoryOptions.forEach(reasonCategory => {

From d59defedf3df22f273486f7c7e2d1f90664981ac Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Sat, 21 Sep 2019 12:14:04 +0100
Subject: [PATCH 146/212] [WIP] - implement basic image cropping solution

#1466

- co-authored-by: mattwr18 <mattwr18@gmail.com>
---
 webapp/components/TeaserImage/TeaserImage.vue | 46 ++++++++++++++++++-
 webapp/package.json                           |  3 +-
 webapp/yarn.lock                              | 10 ++--
 3 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 53f79bfb0..0305fdf44 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -5,8 +5,8 @@
     id="postdropzone"
     class="ds-card-image"
     :use-custom-slot="true"
-    @vdropzone-thumbnail="thumbnail"
     @vdropzone-error="verror"
+    @vdropzone-thumbnail="transformImage"
   >
     <div class="dz-message">
       <div
@@ -31,6 +31,8 @@
 
 <script>
 import vueDropzone from 'nuxt-dropzone'
+import Cropper from 'cropperjs'
+import 'cropperjs/dist/cropper.css'
 
 export default {
   components: {
@@ -86,12 +88,52 @@ export default {
           uploadArea.classList.remove('hc-attachments-upload-area-update-post')
         }
         image = new Image()
-        image.src = URL.createObjectURL(file)
+        image.src = dataUrl
         image.classList.add('thumbnail-preview')
         if (thumbnailPreview) return thumbnailElement.replaceChild(image, thumbnailPreview)
         thumbnailElement.appendChild(image)
       }
     },
+    transformImage(file) {
+      let myDropZone = this
+
+      // Create the image editor overlay
+      let editor = document.createElement('div')
+      editor.style.position = 'fixed'
+      editor.style.left = 0
+      editor.style.right = 0
+      editor.style.top = 0
+      editor.style.bottom = 0
+      editor.style.zIndex = 9999
+      editor.style.backgroundColor = '#000'
+
+      // Create the confirm button
+      let confirm = document.createElement('button')
+      confirm.style.position = 'absolute'
+      confirm.style.left = '10px'
+      confirm.style.top = '10px'
+      confirm.style.zIndex = 9999
+      confirm.textContent = 'Confirm'
+      confirm.addEventListener('click', function() {
+        // Get the canvas with image data from Cropper.js
+        let canvas = cropper.getCroppedCanvas()
+        myDropZone.thumbnail(file, canvas.toDataURL())
+
+        // Remove the editor from view
+        editor.parentNode.removeChild(editor)
+      })
+      editor.appendChild(confirm)
+
+      // Load the image
+      let image = new Image()
+      image.src = URL.createObjectURL(file)
+      editor.appendChild(image)
+      // Append the editor to the page
+      document.body.appendChild(editor)
+
+      // Create Cropper.js and pass image
+      let cropper = new Cropper(image, {})
+    },
   },
 }
 </script>
diff --git a/webapp/package.json b/webapp/package.json
index 952913e4b..68323f93d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -64,6 +64,7 @@
     "cookie-universal-nuxt": "~2.0.18",
     "cross-env": "~6.0.3",
     "date-fns": "2.4.1",
+    "cropperjs": "^1.5.5",
     "express": "~4.17.1",
     "graphql": "~14.5.8",
     "isemail": "^3.2.0",
@@ -133,4 +134,4 @@
     "vue-svg-loader": "~0.12.0",
     "vue-template-compiler": "^2.6.10"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b6dca2ca6..a51aca386 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5538,6 +5538,11 @@ create-react-context@^0.2.1:
     fbjs "^0.8.0"
     gud "^1.0.0"
 
+cropperjs@^1.5.5:
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.6.tgz#82faf432bec709d828f2f7a96d1179198edaf0e2"
+  integrity sha512-eAgWf4j7sNJIG329qUHIFi17PSV0VtuWyAu9glZSgu/KlQSrfTQOC2zAz+jHGa5fAB+bJldEnQwvJEaJ8zRf5A==
+
 cross-env@~6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
@@ -13618,11 +13623,6 @@ serve-static@1.14.1, serve-static@^1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
 
 server-destroy@^1.0.1:
   version "1.0.1"

From fdcf2b5300832e3429cd460a7cc411fb292ba66f Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Sat, 21 Sep 2019 12:14:04 +0100
Subject: [PATCH 147/212] [WIP] - implement basic image cropping solution

#1466

- co-authored-by: mattwr18 <mattwr18@gmail.com>
---
 webapp/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/package.json b/webapp/package.json
index 68323f93d..127e15623 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,9 +62,9 @@
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
     "cookie-universal-nuxt": "~2.0.18",
+    "cropperjs": "^1.5.5",
     "cross-env": "~6.0.3",
     "date-fns": "2.4.1",
-    "cropperjs": "^1.5.5",
     "express": "~4.17.1",
     "graphql": "~14.5.8",
     "isemail": "^3.2.0",

From 45dfc5cff1fd231d103b610ac860521eb6d0bae9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 25 Sep 2019 15:35:09 +0200
Subject: [PATCH 148/212] Contain cropper overlay in image preview area

- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
---
 webapp/components/TeaserImage/TeaserImage.vue | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 0305fdf44..564a66260 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -95,29 +95,24 @@ export default {
       }
     },
     transformImage(file) {
-      let myDropZone = this
-
+      let thumbnailElement, editor, confirm
       // Create the image editor overlay
-      let editor = document.createElement('div')
-      editor.style.position = 'fixed'
-      editor.style.left = 0
-      editor.style.right = 0
-      editor.style.top = 0
-      editor.style.bottom = 0
-      editor.style.zIndex = 9999
-      editor.style.backgroundColor = '#000'
+      editor = document.createElement('div')
+      thumbnailElement = document.querySelectorAll('.dz-image')[0]
+      // dataDzThumbnail = document.querySelectorAll('[data-dz-thumbnail-bg]')[0]
+      // thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0]
 
+      editor.classList.add('crop-overlay')
+      // elementToReplace = thumbnailPreview || dataDzThumbnail
+      thumbnailElement.appendChild(editor)
       // Create the confirm button
-      let confirm = document.createElement('button')
-      confirm.style.position = 'absolute'
-      confirm.style.left = '10px'
-      confirm.style.top = '10px'
-      confirm.style.zIndex = 9999
+      confirm = document.createElement('button')
+      confirm.classList.add('crop-confirm')
       confirm.textContent = 'Confirm'
-      confirm.addEventListener('click', function() {
+      confirm.addEventListener('click', () => {
         // Get the canvas with image data from Cropper.js
         let canvas = cropper.getCroppedCanvas()
-        myDropZone.thumbnail(file, canvas.toDataURL())
+        this.thumbnail(file, canvas.toDataURL())
 
         // Remove the editor from view
         editor.parentNode.removeChild(editor)
@@ -129,7 +124,7 @@ export default {
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
       // Append the editor to the page
-      document.body.appendChild(editor)
+      // document.body.appendChild(editor)
 
       // Create Cropper.js and pass image
       let cropper = new Cropper(image, {})
@@ -223,4 +218,19 @@ export default {
 .contribution-image {
   max-height: 300px;
 }
+
+.crop-overlay {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  background-color: #000;
+}
+
+.crop-confirm {
+  position: absolute;
+  left: 10px;
+  top: 10px;
+  z-index: 9999;
+}
 </style>

From b089e824344d16078e9ba43421b8bbda3b67689c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 25 Sep 2019 16:14:25 +0200
Subject: [PATCH 149/212] Configure jest to mock CSS modules

- getting error from import cropperjs css
---
 webapp/package.json |  4 +++-
 webapp/yarn.lock    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/package.json b/webapp/package.json
index 127e15623..a8cfb9016 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -44,7 +44,8 @@
     ],
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
-      "^~/(.*)$": "<rootDir>/$1"
+      "^~/(.*)$": "<rootDir>/$1",
+      "\\.(css|less)$": "identity-obj-proxy"
     },
     "testMatch": [
       "**/?(*.)+(spec|test).js?(x)"
@@ -122,6 +123,7 @@
     "eslint-plugin-vue": "~5.2.3",
     "flush-promises": "^1.0.2",
     "fuse.js": "^3.4.5",
+    "identity-obj-proxy": "^3.0.0",
     "jest": "~24.9.0",
     "mutation-observer": "^1.0.3",
     "node-sass": "~4.12.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a51aca386..b9dd64d1d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7861,6 +7861,11 @@ hard-source-webpack-plugin@^0.13.1:
     webpack-sources "^1.0.1"
     write-json-file "^2.3.0"
 
+harmony-reflect@^1.4.6:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9"
+  integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -8271,6 +8276,13 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
   dependencies:
     postcss "^7.0.14"
 
+identity-obj-proxy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
+  integrity sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=
+  dependencies:
+    harmony-reflect "^1.4.6"
+
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"

From 227db5f13ac5de3b583b842b3b51e570be6aebfa Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Thu, 26 Sep 2019 14:27:01 +0100
Subject: [PATCH 150/212] refactored tranformImage to remove dupication

- styled confirm button
- added locale translations
- added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface.

- co-authored-by: mattwr18 <mattwr18@gmail.com>
---
 webapp/components/TeaserImage/TeaserImage.vue | 46 +++++++------------
 webapp/locales/de.json                        |  3 ++
 webapp/locales/en.json                        |  3 ++
 webapp/locales/es.json                        |  5 ++
 webapp/locales/fr.json                        |  5 ++
 webapp/locales/it.json                        |  5 ++
 webapp/locales/nl.json                        |  5 +-
 webapp/locales/pl.json                        |  3 ++
 webapp/locales/pt.json                        |  5 +-
 9 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 564a66260..1d922a073 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -7,6 +7,7 @@
     :use-custom-slot="true"
     @vdropzone-error="verror"
     @vdropzone-thumbnail="transformImage"
+    @vdropzone-drop="dropzoneDrop"
   >
     <div class="dz-message">
       <div
@@ -76,44 +77,28 @@ export default {
       this.$emit('addTeaserImage', file[0])
       return ''
     },
-    thumbnail: (file, dataUrl) => {
-      let thumbnailElement, contributionImage, uploadArea, thumbnailPreview, image
-      if (file.previewElement) {
-        thumbnailElement = document.querySelectorAll('#postdropzone')[0]
-        contributionImage = document.querySelectorAll('.contribution-image')[0]
-        thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0]
-        if (contributionImage) {
-          uploadArea = document.querySelectorAll('.hc-attachments-upload-area-update-post')[0]
-          uploadArea.removeChild(contributionImage)
-          uploadArea.classList.remove('hc-attachments-upload-area-update-post')
-        }
-        image = new Image()
-        image.src = dataUrl
-        image.classList.add('thumbnail-preview')
-        if (thumbnailPreview) return thumbnailElement.replaceChild(image, thumbnailPreview)
-        thumbnailElement.appendChild(image)
-      }
-    },
     transformImage(file) {
-      let thumbnailElement, editor, confirm
+      let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage
       // Create the image editor overlay
       editor = document.createElement('div')
       thumbnailElement = document.querySelectorAll('.dz-image')[0]
-      // dataDzThumbnail = document.querySelectorAll('[data-dz-thumbnail-bg]')[0]
-      // thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0]
-
+      thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0]
+      if (thumbnailPreview) thumbnailPreview.remove()
+      contributionImage = document.querySelectorAll('.contribution-image')[0]
+      if (contributionImage) contributionImage.remove()
       editor.classList.add('crop-overlay')
-      // elementToReplace = thumbnailPreview || dataDzThumbnail
       thumbnailElement.appendChild(editor)
       // Create the confirm button
       confirm = document.createElement('button')
-      confirm.classList.add('crop-confirm')
-      confirm.textContent = 'Confirm'
+      confirm.classList.add('crop-confirm', 'ds-button', 'ds-button-primary')
+      confirm.textContent = this.$t('contribution.teaserImage.cropperConfirm')
       confirm.addEventListener('click', () => {
         // Get the canvas with image data from Cropper.js
         let canvas = cropper.getCroppedCanvas()
-        this.thumbnail(file, canvas.toDataURL())
-
+        image = new Image()
+        image.src = canvas.toDataURL()
+        image.classList.add('thumbnail-preview')
+        thumbnailElement.appendChild(image)
         // Remove the editor from view
         editor.parentNode.removeChild(editor)
       })
@@ -123,12 +108,13 @@ export default {
       let image = new Image()
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
-      // Append the editor to the page
-      // document.body.appendChild(editor)
-
       // Create Cropper.js and pass image
       let cropper = new Cropper(image, {})
     },
+    dropzoneDrop() {
+      let cropOverlay = document.querySelectorAll('.crop-overlay')[0]
+      if (cropOverlay) cropOverlay.remove()
+    },
   },
 }
 </script>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b2f1313da..96c1cd322 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -562,6 +562,9 @@
         "it-internet-data-privacy": "IT, Internet & Datenschutz",
         "art-culture-sport": "Kunst, Kultur & Sport"
       }
+    },
+    "teaserImage": {
+      "cropperConfirm": "Bestätigen"
     }
   },
   "code-of-conduct": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9d68ae6a0..90bb84c37 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -563,6 +563,9 @@
         "it-internet-data-privacy": "IT, Internet & Data Privacy",
         "art-culture-sport": "Art, Culture, & Sport"
       }
+    },
+    "teaserImage": {
+      "cropperConfirm": "Confirm"
     }
   },
   "code-of-conduct": {
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index e52933c69..5890e4314 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -292,6 +292,11 @@
       "message": "¿Realmente quieres liberar el comentario de \"<b>{name}</b>\"?"
     }
   },
+  "contribution": {
+    "teaserImage": {
+      "cropperConfirm": "Confirmar"
+    }
+  },
   "user": {
     "avatar": {
       "submitted": "Carga con éxito"
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 631c9436a..3f3f59b05 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -287,6 +287,11 @@
       "message": "Voulez-vous vraiment publier le commentaire de \"<b>{name}</b>\"?"
     }
   },
+  "contribution": {
+    "teaserImage": {
+      "cropperConfirm": "Confirmer"
+    }
+  },
   "user": {
     "avatar": {
       "submitted": "Téléchargement réussi"
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index fc6371b24..26dea37bd 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -140,5 +140,10 @@
     "save": "Salva",
     "edit": "Modifica",
     "delete": "Cancella"
+  },
+  "contribution": {
+    "teaserImage": {
+      "cropperConfirm": "Confermare"
+    }
   }
 }
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index da763735a..c62ca9497 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -158,7 +158,10 @@
   },
   "contribution": {
     "edit": "Bijdrage bewerken",
-    "delete": "Bijdrage verwijderen"
+    "delete": "Bijdrage verwijderen",
+    "teaserImage": {
+      "cropperConfirm": "Bevestigen"
+    }
   },
   "comment": {
     "edit": "Commentaar bewerken",
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 305487717..4684290e9 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -362,6 +362,9 @@
     "languageSelectLabel": "Język",
     "categories": {
       "infoSelectedNoOfMaxCategories": "{chosen} z {max} wybrane kategorie"
+    },
+    "teaserImage": {
+      "cropperConfirm": "Potwierdzać"
     }
   }
 }
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index b43711998..6eccc2fc0 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -203,7 +203,10 @@
   },
   "contribution": {
     "edit": "Editar Contribuição",
-    "delete": "Apagar Contribuição"
+    "delete": "Apagar Contribuição",
+    "teaserImage": {
+      "cropperConfirm": "Confirmar"
+    }
   },
   "comment": {
     "content": {

From fa066968922fb4223c4592650ec3400fb2879104 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 2 Oct 2019 21:22:58 +0200
Subject: [PATCH 151/212] Convert canvas to blob to update file

- what was happening is that the file was being autocropped still and
sent to the backend with cropperjs autocrop... these changes update the
file's attributes so they can be saved properly
---
 webapp/components/TeaserImage/TeaserImage.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 1d922a073..e60a466e4 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -95,12 +95,19 @@ export default {
       confirm.addEventListener('click', () => {
         // Get the canvas with image data from Cropper.js
         let canvas = cropper.getCroppedCanvas()
-        image = new Image()
-        image.src = canvas.toDataURL()
-        image.classList.add('thumbnail-preview')
-        thumbnailElement.appendChild(image)
-        // Remove the editor from view
-        editor.parentNode.removeChild(editor)
+        canvas.toBlob(blob => {
+          this.$refs.el.manuallyAddFile(blob, canvas.toDataURL(), null, null, {
+            dontSubstractMaxFiles: false,
+            addToFiles: true,
+          })
+          image = new Image()
+          image.src = canvas.toDataURL()
+          image.classList.add('thumbnail-preview')
+          thumbnailElement.appendChild(image)
+          // Remove the editor from view
+          editor.parentNode.removeChild(editor)
+          this.addTeaserImage([blob])
+        })
       })
       editor.appendChild(confirm)
 

From db48e522cfebb9691c08053f00ccf64ce91c416d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 2 Oct 2019 22:35:03 +0200
Subject: [PATCH 152/212] Enforce a 16/9 aspect ratio

- if we set the max height any greater than this, it takes up the entire
page on a desktop screen
---
 .../src/schema/resolvers/fileUpload/index.js  |  4 +++-
 webapp/components/PostCard/index.vue          |  2 +-
 webapp/components/TeaserImage/TeaserImage.vue | 20 +++++++++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
index fa78238c3..81548cab3 100644
--- a/backend/src/schema/resolvers/fileUpload/index.js
+++ b/backend/src/schema/resolvers/fileUpload/index.js
@@ -11,14 +11,16 @@ const storeUpload = ({ createReadStream, fileLocation }) =>
   )
 
 export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) {
+  console.log('params', params)
   const upload = params[file]
+  console.log('upload', upload)
   if (upload) {
     const { createReadStream, filename } = await upload
     const { name } = path.parse(filename)
     const fileLocation = `/uploads/${Date.now()}-${slug(name)}`
     await uploadCallback({ createReadStream, fileLocation })
     delete params[file]
-
+    console.log('fileLocation', fileLocation)
     params[url] = fileLocation
   }
 
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index c6c967759..3ba575c0d 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -131,7 +131,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .ds-card-image img {
   width: 100%;
   max-height: 300px;
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index e60a466e4..3b9d65c1a 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -94,7 +94,12 @@ export default {
       confirm.textContent = this.$t('contribution.teaserImage.cropperConfirm')
       confirm.addEventListener('click', () => {
         // Get the canvas with image data from Cropper.js
-        let canvas = cropper.getCroppedCanvas()
+        let canvas = cropper.getCroppedCanvas({
+          minWidth: 256,
+          minHeight: 256,
+          maxWidth: 550,
+          maxHeight: 550,
+        })
         canvas.toBlob(blob => {
           this.$refs.el.manuallyAddFile(blob, canvas.toDataURL(), null, null, {
             dontSubstractMaxFiles: false,
@@ -116,7 +121,7 @@ export default {
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
       // Create Cropper.js and pass image
-      let cropper = new Cropper(image, {})
+      let cropper = new Cropper(image, { aspectRatio: 16 / 9 })
     },
     dropzoneDrop() {
       let cropOverlay = document.querySelectorAll('.crop-overlay')[0]
@@ -167,8 +172,7 @@ export default {
   color: hsl(0, 0%, 25%);
   transition: all 0.2s ease-out;
   font-size: 60px;
-  margin: 80px 5px;
-
+  margin: 180px 5px;
   background-color: $background-color-softest;
   opacity: 0.65;
 
@@ -209,13 +213,14 @@ export default {
 }
 
 .contribution-image {
-  max-height: 300px;
+  max-height: 471px;
 }
 
 .crop-overlay {
+  max-height: 471px;
   position: relative;
   width: 100%;
-  height: 100%;
+  // height: 100%;
   z-index: 9999;
   background-color: #000;
 }
@@ -226,4 +231,7 @@ export default {
   top: 10px;
   z-index: 9999;
 }
+.thumbnail-preview {
+  max-height: 471px;
+}
 </style>

From 3beddf1f69ef739b7babc9caa71b8bfa794cb00d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 2 Oct 2019 23:32:25 +0200
Subject: [PATCH 153/212] Contain post/contribution form to limit width

- enforce 1.25:1 aspect ratio to be as close to possible with the 1:1
aspect ratio on our root path where we have 3 columns of 300px and a
max-height of 300px
---
 .../ContributionForm/ContributionForm.vue     | 138 +++++++++---------
 webapp/components/TeaserImage/TeaserImage.vue |  15 +-
 2 files changed, 75 insertions(+), 78 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 73fa0afd9..3c67b8ae1 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -1,73 +1,75 @@
 <template>
-  <ds-form ref="contributionForm" v-model="form" :schema="formSchema">
-    <template slot-scope="{ errors }">
-      <hc-teaser-image :contribution="contribution" @addTeaserImage="addTeaserImage">
-        <img
-          v-if="contribution"
-          class="contribution-image"
-          :src="contribution.image | proxyApiUrl"
-        />
-      </hc-teaser-image>
-      <ds-card>
-        <ds-space />
-        <hc-user :user="currentUser" :trunc="35" />
-        <ds-space />
-        <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
-        <small class="smallTag">{{ form.title.length }}/{{ formSchema.title.max }}</small>
-        <client-only>
-          <hc-editor
-            :users="users"
-            :value="form.content"
-            :hashtags="hashtags"
-            @input="updateEditorContent"
+  <ds-container width="medium">
+    <ds-form ref="contributionForm" v-model="form" :schema="formSchema">
+      <template slot-scope="{ errors }">
+        <hc-teaser-image :contribution="contribution" @addTeaserImage="addTeaserImage">
+          <img
+            v-if="contribution"
+            class="contribution-image"
+            :src="contribution.image | proxyApiUrl"
           />
-          <small class="smallTag">{{ form.contentLength }}</small>
-        </client-only>
-        <ds-space margin-bottom="small" />
-        <hc-categories-select
-          model="categoryIds"
-          @updateCategories="updateCategories"
-          :existingCategoryIds="form.categoryIds"
-        />
-        <ds-flex class="contribution-form-footer">
-          <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
-          <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
-            <ds-space margin-bottom="small" />
-            <ds-select
-              model="language"
-              :options="form.languageOptions"
-              icon="globe"
-              :placeholder="locale"
-              :label="$t('contribution.languageSelectLabel')"
+        </hc-teaser-image>
+        <ds-card>
+          <ds-space />
+          <hc-user :user="currentUser" :trunc="35" />
+          <ds-space />
+          <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
+          <small class="smallTag">{{ form.title.length }}/{{ formSchema.title.max }}</small>
+          <client-only>
+            <hc-editor
+              :users="users"
+              :value="form.content"
+              :hashtags="hashtags"
+              @input="updateEditorContent"
             />
-          </ds-flex-item>
-        </ds-flex>
-        <ds-space />
-        <div slot="footer" style="text-align: right">
-          <ds-button
-            class="cancel-button"
-            :disabled="loading"
-            ghost
-            @click.prevent="$router.back()"
-          >
-            {{ $t('actions.cancel') }}
-          </ds-button>
-          <ds-button
-            class="submit-button-for-test"
-            type="submit"
-            icon="check"
-            :loading="loading"
-            :disabled="failsValidations || errors"
-            primary
-            @click.prevent="submit"
-          >
-            {{ $t('actions.save') }}
-          </ds-button>
-        </div>
-        <ds-space margin-bottom="large" />
-      </ds-card>
-    </template>
-  </ds-form>
+            <small class="smallTag">{{ form.contentLength }}</small>
+          </client-only>
+          <ds-space margin-bottom="small" />
+          <hc-categories-select
+            model="categoryIds"
+            @updateCategories="updateCategories"
+            :existingCategoryIds="form.categoryIds"
+          />
+          <ds-flex class="contribution-form-footer">
+            <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
+            <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
+              <ds-space margin-bottom="small" />
+              <ds-select
+                model="language"
+                :options="form.languageOptions"
+                icon="globe"
+                :placeholder="locale"
+                :label="$t('contribution.languageSelectLabel')"
+              />
+            </ds-flex-item>
+          </ds-flex>
+          <ds-space />
+          <div slot="footer" style="text-align: right">
+            <ds-button
+              class="cancel-button"
+              :disabled="loading"
+              ghost
+              @click.prevent="$router.back()"
+            >
+              {{ $t('actions.cancel') }}
+            </ds-button>
+            <ds-button
+              class="submit-button-for-test"
+              type="submit"
+              icon="check"
+              :loading="loading"
+              :disabled="failsValidations || errors"
+              primary
+              @click.prevent="submit"
+            >
+              {{ $t('actions.save') }}
+            </ds-button>
+          </div>
+          <ds-space margin-bottom="large" />
+        </ds-card>
+      </template>
+    </ds-form>
+  </ds-container>
 </template>
 
 <script>
@@ -262,7 +264,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .smallTag {
   width: 100%;
   position: relative;
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 3b9d65c1a..cb4a16001 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -94,12 +94,7 @@ export default {
       confirm.textContent = this.$t('contribution.teaserImage.cropperConfirm')
       confirm.addEventListener('click', () => {
         // Get the canvas with image data from Cropper.js
-        let canvas = cropper.getCroppedCanvas({
-          minWidth: 256,
-          minHeight: 256,
-          maxWidth: 550,
-          maxHeight: 550,
-        })
+        let canvas = cropper.getCroppedCanvas()
         canvas.toBlob(blob => {
           this.$refs.el.manuallyAddFile(blob, canvas.toDataURL(), null, null, {
             dontSubstractMaxFiles: false,
@@ -121,7 +116,7 @@ export default {
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
       // Create Cropper.js and pass image
-      let cropper = new Cropper(image, { aspectRatio: 16 / 9 })
+      let cropper = new Cropper(image, { aspectRatio: 1.25 / 1 })
     },
     dropzoneDrop() {
       let cropOverlay = document.querySelectorAll('.crop-overlay')[0]
@@ -213,11 +208,11 @@ export default {
 }
 
 .contribution-image {
-  max-height: 471px;
+  max-height: 620px;
 }
 
 .crop-overlay {
-  max-height: 471px;
+  max-height: 620px;
   position: relative;
   width: 100%;
   // height: 100%;
@@ -232,6 +227,6 @@ export default {
   z-index: 9999;
 }
 .thumbnail-preview {
-  max-height: 471px;
+  max-height: 620px;
 }
 </style>

From 2818b63fe91411adedb54e57fa8a6046238591ef Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 2 Oct 2019 23:42:42 +0200
Subject: [PATCH 154/212] Fix lint

---
 backend/src/schema/resolvers/fileUpload/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
index 81548cab3..960dde7f9 100644
--- a/backend/src/schema/resolvers/fileUpload/index.js
+++ b/backend/src/schema/resolvers/fileUpload/index.js
@@ -11,16 +11,13 @@ const storeUpload = ({ createReadStream, fileLocation }) =>
   )
 
 export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) {
-  console.log('params', params)
   const upload = params[file]
-  console.log('upload', upload)
   if (upload) {
     const { createReadStream, filename } = await upload
     const { name } = path.parse(filename)
     const fileLocation = `/uploads/${Date.now()}-${slug(name)}`
     await uploadCallback({ createReadStream, fileLocation })
     delete params[file]
-    console.log('fileLocation', fileLocation)
     params[url] = fileLocation
   }
 

From cabd68f7d8077f41f2b235c14dd832f156c4bee3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 7 Oct 2019 17:22:24 +0200
Subject: [PATCH 155/212] Clean up code

- Set dropzoneOptions.url to arrow function which returns empty
string... url is required, but we don't use a restful api, we crop the
image and save the update file(blob) to an image

- set min-height of vuedropzone to 500px to be closer to the cropped
image and to center image overlay

- remove dz-message div, as one is already created automatically by
vue2-dropzone
---
 webapp/components/TeaserImage/TeaserImage.vue | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index cb4a16001..5b46de5e4 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -9,22 +9,20 @@
     @vdropzone-thumbnail="transformImage"
     @vdropzone-drop="dropzoneDrop"
   >
-    <div class="dz-message">
+    <div
+      :class="{
+        'hc-attachments-upload-area-post': true,
+        'hc-attachments-upload-area-update-post': contribution,
+      }"
+    >
+      <slot></slot>
       <div
         :class="{
-          'hc-attachments-upload-area-post': true,
-          'hc-attachments-upload-area-update-post': contribution,
+          'hc-drag-marker-post': true,
+          'hc-drag-marker-update-post': contribution,
         }"
       >
-        <slot></slot>
-        <div
-          :class="{
-            'hc-drag-marker-post': true,
-            'hc-drag-marker-update-post': contribution,
-          }"
-        >
-          <ds-icon name="image" size="xxx-large" />
-        </div>
+        <ds-icon name="image" size="xxx-large" />
       </div>
     </div>
   </vue-dropzone>
@@ -45,7 +43,7 @@ export default {
   data() {
     return {
       dropzoneOptions: {
-        url: this.addTeaserImage,
+        url: () => '',
         maxFilesize: 5.0,
         previewTemplate: this.template(),
       },
@@ -73,15 +71,11 @@ export default {
       this.error = true
       this.$toast.error(file.status, message)
     },
-    addTeaserImage(file) {
-      this.$emit('addTeaserImage', file[0])
-      return ''
-    },
     transformImage(file) {
       let thumbnailElement, editor, confirm, thumbnailPreview, contributionImage
       // Create the image editor overlay
       editor = document.createElement('div')
-      thumbnailElement = document.querySelectorAll('.dz-image')[0]
+      thumbnailElement = document.querySelectorAll('#postdropzone')[0]
       thumbnailPreview = document.querySelectorAll('.thumbnail-preview')[0]
       if (thumbnailPreview) thumbnailPreview.remove()
       contributionImage = document.querySelectorAll('.contribution-image')[0]
@@ -106,7 +100,7 @@ export default {
           thumbnailElement.appendChild(image)
           // Remove the editor from view
           editor.parentNode.removeChild(editor)
-          this.addTeaserImage([blob])
+          this.$emit('addTeaserImage', blob)
         })
       })
       editor.appendChild(confirm)
@@ -128,7 +122,7 @@ export default {
 <style lang="scss">
 #postdropzone {
   width: 100%;
-  min-height: 300px;
+  min-height: 500px;
   background-color: $background-color-softest;
 }
 
@@ -164,10 +158,10 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  margin: 180px 5px;
   color: hsl(0, 0%, 25%);
   transition: all 0.2s ease-out;
   font-size: 60px;
-  margin: 180px 5px;
   background-color: $background-color-softest;
   opacity: 0.65;
 
@@ -208,11 +202,11 @@ export default {
 }
 
 .contribution-image {
-  max-height: 620px;
+  max-height: 710px;
 }
 
 .crop-overlay {
-  max-height: 620px;
+  max-height: 710px;
   position: relative;
   width: 100%;
   // height: 100%;
@@ -227,6 +221,6 @@ export default {
   z-index: 9999;
 }
 .thumbnail-preview {
-  max-height: 620px;
+  max-height: 710px;
 }
 </style>

From 0d5b334f66f7ad44af16624086162d0fb3b599db Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 7 Oct 2019 17:31:53 +0200
Subject: [PATCH 156/212] Remove unneeded max-heights

---
 webapp/components/TeaserImage/TeaserImage.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 5b46de5e4..5a8d6cff6 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -201,15 +201,9 @@ export default {
   border-top: $border-size-base solid $border-color-softest;
 }
 
-.contribution-image {
-  max-height: 710px;
-}
-
 .crop-overlay {
-  max-height: 710px;
   position: relative;
   width: 100%;
-  // height: 100%;
   z-index: 9999;
   background-color: #000;
 }
@@ -220,7 +214,4 @@ export default {
   top: 10px;
   z-index: 9999;
 }
-.thumbnail-preview {
-  max-height: 710px;
-}
 </style>

From c85b2d49b678542c4cebad3579319b1dd30644cf Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 7 Oct 2019 19:39:28 +0200
Subject: [PATCH 157/212] Remove outdated test directly calling method

---
 webapp/components/TeaserImage/TeaserImage.spec.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.spec.js b/webapp/components/TeaserImage/TeaserImage.spec.js
index 07b17e16b..4043cb978 100644
--- a/webapp/components/TeaserImage/TeaserImage.spec.js
+++ b/webapp/components/TeaserImage/TeaserImage.spec.js
@@ -25,17 +25,6 @@ describe('TeaserImage.vue', () => {
       wrapper = Wrapper()
     })
 
-    describe('File upload', () => {
-      const imageUpload = [
-        { file: { filename: 'avataar.svg', previewElement: '' }, url: 'someUrlToImage' },
-      ]
-
-      it('supports adding a teaser image', () => {
-        wrapper.vm.addTeaserImage(imageUpload)
-        expect(wrapper.emitted().addTeaserImage[0]).toEqual(imageUpload)
-      })
-    })
-
     describe('handles errors', () => {
       beforeEach(() => jest.useFakeTimers())
       const message = 'File upload failed'

From 1c6b5f941b3213e1b73af59eb17e7c8dc058d295 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 13:45:41 +0200
Subject: [PATCH 158/212] Remove aspect ratio on cropper, limit to max-height
 2000px

- discussed it today's internal meeting and agreed upon with
@alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack

- max-height was a suggestion and can be changed at any time
---
 .../ContributionForm/ContributionForm.vue     | 136 +++++++++---------
 webapp/components/PostCard/index.vue          |   2 +-
 webapp/components/TeaserImage/TeaserImage.vue |   2 +-
 webapp/pages/post/_id/_slug/index.vue         |   2 +-
 webapp/pages/post/_id/_slug/more-info.vue     |   4 -
 5 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 3c67b8ae1..2b21282ae 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -1,75 +1,73 @@
 <template>
-  <ds-container width="medium">
-    <ds-form ref="contributionForm" v-model="form" :schema="formSchema">
-      <template slot-scope="{ errors }">
-        <hc-teaser-image :contribution="contribution" @addTeaserImage="addTeaserImage">
-          <img
-            v-if="contribution"
-            class="contribution-image"
-            :src="contribution.image | proxyApiUrl"
+  <ds-form ref="contributionForm" v-model="form" :schema="formSchema">
+    <template slot-scope="{ errors }">
+      <hc-teaser-image :contribution="contribution" @addTeaserImage="addTeaserImage">
+        <img
+          v-if="contribution"
+          class="contribution-image"
+          :src="contribution.image | proxyApiUrl"
+        />
+      </hc-teaser-image>
+      <ds-card>
+        <ds-space />
+        <hc-user :user="currentUser" :trunc="35" />
+        <ds-space />
+        <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
+        <small class="smallTag">{{ form.title.length }}/{{ formSchema.title.max }}</small>
+        <client-only>
+          <hc-editor
+            :users="users"
+            :value="form.content"
+            :hashtags="hashtags"
+            @input="updateEditorContent"
           />
-        </hc-teaser-image>
-        <ds-card>
-          <ds-space />
-          <hc-user :user="currentUser" :trunc="35" />
-          <ds-space />
-          <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
-          <small class="smallTag">{{ form.title.length }}/{{ formSchema.title.max }}</small>
-          <client-only>
-            <hc-editor
-              :users="users"
-              :value="form.content"
-              :hashtags="hashtags"
-              @input="updateEditorContent"
+          <small class="smallTag">{{ form.contentLength }}</small>
+        </client-only>
+        <ds-space margin-bottom="small" />
+        <hc-categories-select
+          model="categoryIds"
+          @updateCategories="updateCategories"
+          :existingCategoryIds="form.categoryIds"
+        />
+        <ds-flex class="contribution-form-footer">
+          <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
+          <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
+            <ds-space margin-bottom="small" />
+            <ds-select
+              model="language"
+              :options="form.languageOptions"
+              icon="globe"
+              :placeholder="locale"
+              :label="$t('contribution.languageSelectLabel')"
             />
-            <small class="smallTag">{{ form.contentLength }}</small>
-          </client-only>
-          <ds-space margin-bottom="small" />
-          <hc-categories-select
-            model="categoryIds"
-            @updateCategories="updateCategories"
-            :existingCategoryIds="form.categoryIds"
-          />
-          <ds-flex class="contribution-form-footer">
-            <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
-            <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
-              <ds-space margin-bottom="small" />
-              <ds-select
-                model="language"
-                :options="form.languageOptions"
-                icon="globe"
-                :placeholder="locale"
-                :label="$t('contribution.languageSelectLabel')"
-              />
-            </ds-flex-item>
-          </ds-flex>
-          <ds-space />
-          <div slot="footer" style="text-align: right">
-            <ds-button
-              class="cancel-button"
-              :disabled="loading"
-              ghost
-              @click.prevent="$router.back()"
-            >
-              {{ $t('actions.cancel') }}
-            </ds-button>
-            <ds-button
-              class="submit-button-for-test"
-              type="submit"
-              icon="check"
-              :loading="loading"
-              :disabled="failsValidations || errors"
-              primary
-              @click.prevent="submit"
-            >
-              {{ $t('actions.save') }}
-            </ds-button>
-          </div>
-          <ds-space margin-bottom="large" />
-        </ds-card>
-      </template>
-    </ds-form>
-  </ds-container>
+          </ds-flex-item>
+        </ds-flex>
+        <ds-space />
+        <div slot="footer" style="text-align: right">
+          <ds-button
+            class="cancel-button"
+            :disabled="loading"
+            ghost
+            @click.prevent="$router.back()"
+          >
+            {{ $t('actions.cancel') }}
+          </ds-button>
+          <ds-button
+            class="submit-button-for-test"
+            type="submit"
+            icon="check"
+            :loading="loading"
+            :disabled="failsValidations || errors"
+            primary
+            @click.prevent="submit"
+          >
+            {{ $t('actions.save') }}
+          </ds-button>
+        </div>
+        <ds-space margin-bottom="large" />
+      </ds-card>
+    </template>
+  </ds-form>
 </template>
 
 <script>
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 3ba575c0d..66e42df26 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .ds-card-image img {
   width: 100%;
-  max-height: 300px;
+  max-height: 2000px;
   -o-object-fit: cover;
   object-fit: cover;
   -o-object-position: center;
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index 5a8d6cff6..e30efd37f 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -110,7 +110,7 @@ export default {
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
       // Create Cropper.js and pass image
-      let cropper = new Cropper(image, { aspectRatio: 1.25 / 1 })
+      let cropper = new Cropper(image, {})
     },
     dropzoneDrop() {
       let cropOverlay = document.querySelectorAll('.crop-overlay')[0]
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0bb8ef1d5..5f6c95dd2 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -200,7 +200,7 @@ export default {
 
     .ds-card-image {
       img {
-        max-height: 710px;
+        max-height: 2000px;
         object-fit: cover;
         object-position: center;
       }
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 7ee6803d2..a27f85527 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -87,9 +87,5 @@ export default {
 <style lang="scss">
 .related-post {
   box-shadow: $box-shadow-base;
-
-  .ds-card-image {
-    max-height: 80px;
-  }
 }
 </style>

From c45f63ffd9849db70850bbef80029f8c733f697e Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 16:41:07 +0200
Subject: [PATCH 159/212] Follow @alina-beck PR suggestions

---
 webapp/components/TeaserImage/TeaserImage.vue | 10 ++--------
 webapp/pages/index.vue                        |  4 ++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index e30efd37f..db5e72d0b 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -110,7 +110,7 @@ export default {
       image.src = URL.createObjectURL(file)
       editor.appendChild(image)
       // Create Cropper.js and pass image
-      let cropper = new Cropper(image, {})
+      let cropper = new Cropper(image, { zoomable: false })
     },
     dropzoneDrop() {
       let cropOverlay = document.querySelectorAll('.crop-overlay')[0]
@@ -126,12 +126,6 @@ export default {
   background-color: $background-color-softest;
 }
 
-@media only screen and (max-width: 960px) {
-  #postdropzone {
-    min-height: 200px;
-  }
-}
-
 .hc-attachments-upload-area-post {
   position: relative;
   display: flex;
@@ -202,9 +196,9 @@ export default {
 }
 
 .crop-overlay {
+  max-height: 2000px;
   position: relative;
   width: 100%;
-  z-index: 9999;
   background-color: #000;
 }
 
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 360a72303..a48cc17c7 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -190,6 +190,10 @@ export default {
 </script>
 
 <style lang="scss">
+.ds-card-image img {
+  max-height: 2000px;
+}
+
 .masonry-grid {
   display: grid;
   grid-gap: 10px;

From cae897808b5a560082f203a1bc84f8442d803e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 17:38:38 +0200
Subject: [PATCH 160/212] Follow Matts suggestions from his review

---
 backend/src/schema/index.js                  |   1 +
 backend/src/schema/resolvers/reports.spec.js | 116 ++++++++++---------
 backend/src/schema/types/type/REPORTED.gql   |  14 +--
 webapp/components/Modal/ReportModal.vue      |   1 +
 4 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 871810d47..95fa9ef61 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -23,6 +23,7 @@ export default applyScalars(
             'Location',
             'SocialMedia',
             'NOTIFIED',
+            'REPORTED',
           ],
           // add 'User' here as soon as possible
         },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index ee5b6dc16..238de25dd 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -13,17 +13,36 @@ describe('report mutation', () => {
   let reportMutation
   let headers
   let client
-  let returnedObject
   let variables
   let createPostVariables
   let user
   const categoryIds = ['cat9']
 
   const action = () => {
-    // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
-    reportMutation = `
+    reportMutation = gql`
       mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
-        report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) ${returnedObject}
+        report(
+          resourceId: $resourceId
+          reasonCategory: $reasonCategory
+          reasonDescription: $reasonDescription
+        ) {
+          createdAt
+          reasonCategory
+          reasonDescription
+          type
+          submitter {
+            email
+          }
+          user {
+            name
+          }
+          post {
+            title
+          }
+          comment {
+            content
+          }
+        }
       }
     `
     client = new GraphQLClient(host, {
@@ -33,10 +52,9 @@ describe('report mutation', () => {
   }
 
   beforeEach(async () => {
-    returnedObject = '{ createdAt }'
     variables = {
       resourceId: 'whatever',
-      reasonCategory: 'reason-category-dummy',
+      reasonCategory: 'other',
       reasonDescription: 'Violates code of conduct !!!',
     }
     headers = {}
@@ -95,8 +113,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "User"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'User',
             },
@@ -104,8 +121,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in user attribute', async () => {
-          returnedObject = '{ user { name } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               user: {
                 name: 'abusive-user',
@@ -115,8 +131,7 @@ describe('report mutation', () => {
         })
 
         it('returns the submitter', async () => {
-          returnedObject = '{ submitter { email } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               submitter: {
                 email: 'test@example.org',
@@ -126,36 +141,41 @@ describe('report mutation', () => {
         })
 
         it('returns a date', async () => {
-          returnedObject = '{ createdAt }'
-          await expect(action()).resolves.toEqual(
-            expect.objectContaining({
-              report: {
-                createdAt: expect.any(String),
-              },
-            }),
-          )
+          await expect(action()).resolves.toMatchObject({
+            report: {
+              createdAt: expect.any(String),
+            },
+          })
         })
 
         it('returns the reason category', async () => {
           variables = {
             ...variables,
-            reasonCategory: 'my-category',
+            reasonCategory: 'criminal_behavior_violation_german_law',
           }
-          returnedObject = '{ reasonCategory }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
-              reasonCategory: 'my-category',
+              reasonCategory: 'criminal_behavior_violation_german_law',
             },
           })
         })
 
+        it('gives an error if the reason category is not in enum "ReasonCategory"', async () => {
+          variables = {
+            ...variables,
+            reasonCategory: 'my_category',
+          }
+          await expect(action()).rejects.toThrow(
+            'Expected a value of type "ReasonCategory" but received: "my_category"',
+          )
+        })
+
         it('returns the reason description', async () => {
           variables = {
             ...variables,
             reasonDescription: 'My reason!',
           }
-          returnedObject = '{ reasonDescription }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               reasonDescription: 'My reason!',
             },
@@ -167,8 +187,7 @@ describe('report mutation', () => {
             ...variables,
             reasonDescription: 'My reason <sanitize></sanitize>!',
           }
-          returnedObject = '{ reasonDescription }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               reasonDescription: 'My reason !',
             },
@@ -191,8 +210,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "Post"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'Post',
             },
@@ -200,8 +218,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in post attribute', async () => {
-          returnedObject = '{ post { title } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               post: {
                 title: 'Matt and Robert having a pair-programming',
@@ -211,8 +228,7 @@ describe('report mutation', () => {
         })
 
         it('returns null in user attribute', async () => {
-          returnedObject = '{ user { name } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               user: null,
             },
@@ -245,8 +261,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "Comment"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'Comment',
             },
@@ -254,8 +269,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in comment attribute', async () => {
-          returnedObject = '{ comment { content } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               comment: {
                 content: 'Robert getting tired.',
@@ -280,7 +294,7 @@ describe('report mutation', () => {
         })
 
         it('returns null', async () => {
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: null,
           })
         })
@@ -381,19 +395,19 @@ describe('reports query', () => {
         author,
         id: 'p1',
         categoryIds,
-        content: 'Not for you',
+        content: 'Interesting Knowledge',
       }),
       factory.create('Post', {
         author: moderator,
         id: 'p2',
         categoryIds,
-        content: 'Already seen post mention',
+        content: 'More things to do …',
       }),
       factory.create('Post', {
         author: user,
         id: 'p3',
         categoryIds,
-        content: 'You have been mentioned in a post',
+        content: 'I am at school …',
       }),
     ])
     await Promise.all([
@@ -418,7 +432,7 @@ describe('reports query', () => {
         mutation: reportMutation,
         variables: {
           resourceId: 'c1',
-          reasonCategory: 'discrimination-etc',
+          reasonCategory: 'discrimination_etc',
           reasonDescription: 'This post is bigoted',
         },
       }),
@@ -441,20 +455,18 @@ describe('reports query', () => {
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       authenticatedUser = null
-      const { data, errors } = await query({ query: reportsQuery })
-      expect(data).toEqual({
-        reports: null,
+      expect(query({ query: reportsQuery })).resolves.toMatchObject({
+        data: { reports: null },
+        errors: [{ message: 'Not Authorised!' }],
       })
-      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
     it('role "user" gets no reports', async () => {
       authenticatedUser = await user.toJson()
-      const { data, errors } = await query({ query: reportsQuery })
-      expect(data).toEqual({
-        reports: null,
+      expect(query({ query: reportsQuery })).resolves.toMatchObject({
+        data: { reports: null },
+        errors: [{ message: 'Not Authorised!' }],
       })
-      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
     it('role "moderator" gets reports', async () => {
@@ -493,7 +505,7 @@ describe('reports query', () => {
           }),
           expect.objectContaining({
             createdAt: expect.any(String),
-            reasonCategory: 'discrimination-etc',
+            reasonCategory: 'discrimination_etc',
             reasonDescription: 'This post is bigoted',
             submitter: expect.objectContaining({
               id: 'user1',
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index b94dab882..f7be579a1 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -16,16 +16,16 @@ type REPORTED {
   comment: Comment
 }
 
-# list see "reportReasonCategoriesDatabaseList" in shared file "shared/moderation/report.js"
+# this list equals the strings of an array in file "webapp/components/Modal/ReportModal.vue"
 enum ReasonCategory {
   other
-  discrimination-etc
-  pornographic-content-links
-  glorific-trivia-of-cruel-inhuman-acts
+  discrimination_etc
+  pornographic_content_links
+  glorific_trivia_of_cruel_inhuman_acts
   doxing
-  intentional-intimidation-stalking-persecution
-  advert-products-services-commercial
-  criminal-behavior-violation-german-law
+  intentional_intimidation_stalking_persecution
+  advert_products_services_commercial
+  criminal_behavior_violation_german_law
 }
 
 # not yet supported
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 7c237c923..c33515a37 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -62,6 +62,7 @@ export default {
     id: { type: String, required: true },
   },
   data() {
+    // this list equals to enums in GraphQL schema file "backend/src/schema/types/type/REPORTED.gql"
     let valuesReasonCategoryOptions = [
       'discrimination_etc',
       'pornographic_content_links',

From b2cb65e942fd1089c345fbbc8f8bc445d04a2be4 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 19:13:00 +0200
Subject: [PATCH 161/212] Keep images from distorting or getting cropped

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/components/PostCard/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 66e42df26..85b19f105 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -135,6 +135,7 @@ export default {
 .ds-card-image img {
   width: 100%;
   max-height: 2000px;
+  object-fit: contain;
   -o-object-fit: cover;
   object-fit: cover;
   -o-object-position: center;

From 3e72660ed8a1ed99d8579df7eb4be34f57732497 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 19:14:27 +0200
Subject: [PATCH 162/212] Keep images from distorting or getting cropped

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/pages/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index a48cc17c7..91acb288c 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -192,6 +192,7 @@ export default {
 <style lang="scss">
 .ds-card-image img {
   max-height: 2000px;
+  object-fit: contain;
 }
 
 .masonry-grid {

From b605dd12c500256f79588cefd2d9ac3b9235f190 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 19:15:22 +0200
Subject: [PATCH 163/212] Keep images from distorting or getting cropped

great explanation by @alina-beck

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/pages/post/_id/_slug/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 5f6c95dd2..9a4d12c26 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -201,7 +201,7 @@ export default {
     .ds-card-image {
       img {
         max-height: 2000px;
-        object-fit: cover;
+        object-fit: contain;
         object-position: center;
       }
     }

From e307211ada1d91ed8f9acc21ba29f43d2a42b1ca Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 19:16:02 +0200
Subject: [PATCH 164/212] Keep button on top of crop overlay, but below navbar

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/components/TeaserImage/TeaserImage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index db5e72d0b..d5b618c03 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -206,6 +206,6 @@ export default {
   position: absolute;
   left: 10px;
   top: 10px;
-  z-index: 9999;
+  z-index: 1;
 }
 </style>

From faf0a15aee460395862f8f2e230b3daad140e40a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:07:55 +0200
Subject: [PATCH 165/212] Update to use enum in tests, seed data, etc, refactor
 resolver

- Extract validations to the validations middleware to clean it up
- Remove resourceId since it throws an error in the mutation if the user
asks for it back, and the resourceId is returned in post/comment/user.id
- use writeTxResultPromise to benefit from automatic retries
- more descriptive variable naming
- extract cypher query to make db manipulation into script so that it
can be run from the command line, at least locally.
---
 .../validation/validationMiddleware.js        |  29 ++++
 backend/src/schema/resolvers/reports.js       | 127 +++++++-----------
 backend/src/schema/resolvers/reports.spec.js  |  20 +--
 backend/src/schema/types/type/REPORTED.gql    |   8 +-
 backend/src/seed/seed-db.js                   |   2 +-
 ...0191011_changeReportNodeToRelationOnly.cql |   7 -
 neo4j/change_report_node_to_relationship.sh   |  26 ++++
 7 files changed, 115 insertions(+), 104 deletions(-)
 delete mode 100644 deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
 create mode 100755 neo4j/change_report_node_to_relationship.sh

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 0ecb6c115..ff3992ead 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -57,11 +57,40 @@ const validateUpdatePost = async (resolve, root, args, context, info) => {
   return validatePost(resolve, root, args, context, info)
 }
 
+const validateReport = async (resolve, root, args, context, info) => {
+  const { resourceId } = args
+  const { user, driver } = context
+  if (resourceId === user.id) throw new Error('You cannot report yourself!')
+  const session = driver.session()
+  const reportQueryRes = await session.run(
+    `
+      MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
+      RETURN labels(resource)[0] as label
+    `,
+    {
+      resourceId,
+      submitterId: user.id,
+    },
+  )
+  const [existingReportedResource] = reportQueryRes.records.map(record => {
+    return {
+      label: record.get('label'),
+    }
+  })
+
+  if (existingReportedResource)
+    throw new Error(
+      `You have already reported the ${existingReportedResource.label}, please only report the same ${existingReportedResource.label} once`,
+    )
+  return resolve(root, args, context, info)
+}
+
 export default {
   Mutation: {
     CreateComment: validateCommentCreation,
     UpdateComment: validateUpdateComment,
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
+    report: validateReport,
   },
 }
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 3e63f1c1a..48677429a 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,87 +1,60 @@
 export default {
   Mutation: {
     report: async (_parent, params, { driver, user }, _resolveInfo) => {
+      let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
-
       const session = driver.session()
-      const reportProperties = {
-        createdAt: new Date().toISOString(),
-        reasonCategory,
-        reasonDescription,
-      }
-
-      const reportQueryRes = await session.run(
-        `
-          MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
-          RETURN labels(resource)[0] as label
-        `,
-        {
-          resourceId,
-          submitterId: user.id,
-        },
-      )
-      const [rep] = reportQueryRes.records.map(record => {
-        return {
-          label: record.get('label'),
-        }
+      const writeTxResultPromise = session.writeTransaction(async txc => {
+        const reportRelationshipTransactionResponse = await txc.run(
+          `
+            MATCH (submitter:User {id: $submitterId})
+            MATCH (resource {id: $resourceId})
+            WHERE resource:User OR resource:Comment OR resource:Post
+            CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+            RETURN report, submitter, resource, labels(resource)[0] as type
+          `,
+          {
+            resourceId,
+            submitterId: user.id,
+            createdAt: new Date().toISOString(),
+            reasonCategory,
+            reasonDescription,
+          },
+        )
+        return reportRelationshipTransactionResponse.records.map(record => ({
+          report: record.get('report'),
+          submitter: record.get('submitter'),
+          resource: record.get('resource').properties,
+          type: record.get('type'),
+        }))
       })
-
-      if (rep) {
-        throw new Error(rep.label)
-      }
-
-      const res = await session.run(
-        `
-          MATCH (submitter:User {id: $submitterId})
-          MATCH (resource {id: $resourceId})
-          WHERE resource:User OR resource:Comment OR resource:Post
-          CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
-          RETURN report, submitter, resource, labels(resource)[0] as type
-        `,
-        {
-          resourceId,
-          submitterId: user.id,
-          createdAt: reportProperties.createdAt,
-          reasonCategory: reportProperties.reasonCategory,
-          reasonDescription: reportProperties.reasonDescription,
-        },
-      )
-
-      session.close()
-
-      const [dbResponse] = res.records.map(r => {
-        return {
-          report: r.get('report'),
-          submitter: r.get('submitter'),
-          resource: r.get('resource'),
-          type: r.get('type'),
+      try {
+        const txResult = await writeTxResultPromise
+        if (!txResult[0]) return null
+        const { report, submitter, resource, type } = txResult[0]
+        createdRelationshipWithNestedAttributes = {
+          ...report.properties,
+          post: null,
+          comment: null,
+          user: null,
+          submitter: submitter.properties,
+          type,
         }
-      })
-      if (!dbResponse) return null
-
-      const { report, submitter, resource, type } = dbResponse
-
-      const response = {
-        ...report.properties,
-        post: null,
-        comment: null,
-        user: null,
-        submitter: submitter.properties,
-        type,
+        switch (type) {
+          case 'Post':
+            createdRelationshipWithNestedAttributes.post = resource
+            break
+          case 'Comment':
+            createdRelationshipWithNestedAttributes.comment = resource
+            break
+          case 'User':
+            createdRelationshipWithNestedAttributes.user = resource
+            break
+        }
+      } finally {
+        session.close()
       }
-      switch (type) {
-        case 'Post':
-          response.post = resource.properties
-          break
-        case 'Comment':
-          response.comment = resource.properties
-          break
-        case 'User':
-          response.user = resource.properties
-          break
-      }
-
-      return response
+      return createdRelationshipWithNestedAttributes
     },
   },
   Query: {
@@ -113,13 +86,13 @@ export default {
 
         const responseEle = {
           ...report.properties,
-          resourceId: resource.properties.id,
           post: null,
           comment: null,
           user: null,
           submitter: submitter.properties,
           type,
         }
+
         switch (type) {
           case 'Post':
             responseEle.post = resource.properties
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 238de25dd..4022be1b1 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -20,7 +20,7 @@ describe('report mutation', () => {
 
   const action = () => {
     reportMutation = gql`
-      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(
           resourceId: $resourceId
           reasonCategory: $reasonCategory
@@ -166,7 +166,7 @@ describe('report mutation', () => {
             reasonCategory: 'my_category',
           }
           await expect(action()).rejects.toThrow(
-            'Expected a value of type "ReasonCategory" but received: "my_category"',
+            'got invalid value "my_category"; Expected type ReasonCategory',
           )
         })
 
@@ -307,16 +307,11 @@ describe('report mutation', () => {
 })
 
 describe('reports query', () => {
-  let query
-  let mutate
-  let authenticatedUser = null
-  let moderator
-  let user
-  let author
+  let query, mutate, authenticatedUser, moderator, user, author
   const categoryIds = ['cat9']
 
   const reportMutation = gql`
-    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
       report(
         resourceId: $resourceId
         reasonCategory: $reasonCategory
@@ -335,7 +330,6 @@ describe('reports query', () => {
         submitter {
           id
         }
-        resourceId
         type
         user {
           id
@@ -350,7 +344,8 @@ describe('reports query', () => {
     }
   `
 
-  beforeAll(() => {
+  beforeAll(async () => {
+    await factory.cleanDatabase()
     const { server } = createServer({
       context: () => {
         return {
@@ -480,7 +475,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'auth1',
             type: 'User',
             user: expect.objectContaining({
               id: 'auth1',
@@ -495,7 +489,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'p1',
             type: 'Post',
             user: null,
             post: expect.objectContaining({
@@ -510,7 +503,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'c1',
             type: 'Comment',
             user: null,
             post: null,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index f7be579a1..0822c14ed 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -5,10 +5,8 @@ type REPORTED {
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
   # not yet supported
-  # resource: ReportReource
+  # resource: ReportResource
   #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
-  resourceId: ID
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
   type: String
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
   user: User
@@ -29,7 +27,7 @@ enum ReasonCategory {
 }
 
 # not yet supported
-# union ReportReource = User | Post | Comment
+# union ReportResource = User | Post | Comment
 
 enum ReportOrdering {
   createdAt_desc
@@ -40,5 +38,5 @@ type Query {
 }
 
 type Mutation {
-  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): REPORTED
+  report(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): REPORTED
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 8d93a90cf..76fbb4875 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -649,7 +649,7 @@ import { gql } from '../jest/helpers'
 
     // There is no error logged or the 'try' fails if this mutation is wrong. Why?
     const reportMutation = gql`
-      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(
           resourceId: $resourceId
           reasonCategory: $reasonCategory
diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
deleted file mode 100644
index 8c32cf5ec..000000000
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
+++ /dev/null
@@ -1,7 +0,0 @@
-MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
-DETACH DELETE report
-CREATE (submitter)-[reported:REPORTED]->(resource)
-SET reported.createdAt = toString(datetime())
-SET reported.reasonCategory = 'other'
-SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Date-time is this creation date and time.'
-RETURN reported
\ No newline at end of file
diff --git a/neo4j/change_report_node_to_relationship.sh b/neo4j/change_report_node_to_relationship.sh
new file mode 100755
index 000000000..a17dc6fe0
--- /dev/null
+++ b/neo4j/change_report_node_to_relationship.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+ENV_FILE=$(dirname "$0")/.env
+[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
+
+if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
+  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
+  echo "Database manipulation is not possible without connecting to the database."
+  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
+fi
+
+until echo 'RETURN "Connection successful" as info;' | cypher-shell
+do
+  echo "Connecting to neo4j failed, trying again..."
+  sleep 1
+done
+
+echo "
+MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+DETACH DELETE report
+CREATE (submitter)-[reported:REPORTED]->(resource)
+SET reported.createdAt = toString(datetime())
+SET reported.reasonCategory = 'other'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! createdAt is when the database manipulation happened.'
+RETURN reported;
+" | cypher-shell

From 01c9e083eb9fe7e99ba50a60328f59844d1c0a16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 19:27:36 +0000
Subject: [PATCH 166/212] build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4
 in /backend

Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.3 to 7.6.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index d185688dd..e86f0fedb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -105,7 +105,7 @@
     "xregexp": "^4.2.4"
   },
   "devDependencies": {
-    "@babel/cli": "~7.6.3",
+    "@babel/cli": "~7.6.4",
     "@babel/core": "~7.6.4",
     "@babel/node": "~7.6.3",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 553e8cdca..4f466b039 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -14,10 +14,10 @@
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
-"@babel/cli@~7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.3.tgz#1b0c62098c8a5e01e4a4a59a52cba9682e7e0906"
-  integrity sha512-kWKOEeuylpa781yCeA5//eEx1u3WtLZqbi2VWXLKmb3QDPb5T2f7Yk311MK7bvvjR70dluAeiu4VXXsG1WwJsw==
+"@babel/cli@~7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.4.tgz#9b35a4e15fa7d8f487418aaa8229c8b0bc815f20"
+  integrity sha512-tqrDyvPryBM6xjIyKKUwr3s8CzmmYidwgdswd7Uc/Cv0ogZcuS1TYQTLx/eWKP3UbJ6JxZAiYlBZabXm/rtRsQ==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
@@ -27,7 +27,7 @@
     mkdirp "^0.5.1"
     output-file-sync "^2.0.0"
     slash "^2.0.0"
-    source-map "^0.6.1"
+    source-map "^0.5.0"
   optionalDependencies:
     chokidar "^2.1.8"
 

From d34018f6d44efb8b83bec9e955c8f5138aae8054 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 19:28:20 +0000
Subject: [PATCH 167/212] build(deps-dev): bump @babel/core from 7.6.3 to 7.6.4
 in /webapp

Bumps [@babel/core](https://github.com/babel/babel) from 7.6.3 to 7.6.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a8cfb9016..14420f663 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -92,7 +92,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.6.3",
+    "@babel/core": "~7.6.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.3",
     "@storybook/addon-a11y": "^5.2.3",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b9dd64d1d..b1b8a55b2 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -56,15 +56,15 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.3.tgz#44de824e89eaa089bb12da7337bc9bdff2ab68f9"
-  integrity sha512-QfQ5jTBgXLzJuo7Mo8bZK/ePywmgNRgk/UQykiKwEtZPiFIn8ZqE6jB+AnD1hbB1S2xQyL4//it5vuAUOVAMTw==
+"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
+  integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.3"
+    "@babel/generator" "^7.6.4"
     "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.3"
+    "@babel/parser" "^7.6.4"
     "@babel/template" "^7.6.0"
     "@babel/traverse" "^7.6.3"
     "@babel/types" "^7.6.3"
@@ -74,7 +74,7 @@
     lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
-    source-map "^0.6.1"
+    source-map "^0.5.0"
 
 "@babel/generator@7.5.5":
   version "7.5.5"
@@ -87,15 +87,15 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.3.tgz#71d5375264f93ec7bac7d9f35a67067733f5578e"
-  integrity sha512-hLhYbAb3pHwxjlijC4AQ7mqZdcoujiNaW7izCT04CIowHK8psN0IN8QjDv0iyFtycF5FowUOTwDloIheI25aMw==
+"@babel/generator@^7.4.0", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
+  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
   dependencies:
     "@babel/types" "^7.6.3"
     jsesc "^2.5.1"
     lodash "^4.17.13"
-    source-map "^0.6.1"
+    source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
@@ -294,10 +294,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.3.tgz#9eff8b9c3eeae16a74d8d4ff30da2bd0d6f0487e"
-  integrity sha512-sUZdXlva1dt2Vw2RqbMkmfoImubO0D0gaCrNngV6Hi0DA4x3o4mlrq0tbfY0dZEUIccH8I6wQ4qgEtwcpOR6Qg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
+  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"

From 30c3cf3e1ddd4d29b65119b60ad9fdc58e1282b2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 19:28:23 +0000
Subject: [PATCH 168/212] build(deps-dev): bump apollo-server-testing in
 /backend

Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.5...apollo-server-testing@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 16d051f63..76b8d8d22 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -111,7 +111,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.6.3",
     "@babel/register": "~7.6.2",
-    "apollo-server-testing": "~2.9.5",
+    "apollo-server-testing": "~2.9.6",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.3",
     "babel-jest": "~24.9.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a9ecf7ff8..eb7904e6e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1729,12 +1729,12 @@ apollo-server-plugin-base@^0.6.5:
   dependencies:
     apollo-server-types "^0.2.5"
 
-apollo-server-testing@~2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.5.tgz#ff5bbe3fefdf4d639bb138277d3dfc846b309438"
-  integrity sha512-IoElvnJ0Zex6i1QZj9v0szbDvCM6LF1gSZlQswRuIeTwvvquzixFVGMpLZKItojmjrCSxsT7DHJxeUFugZJUWA==
+apollo-server-testing@~2.9.6:
+  version "2.9.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.9.6.tgz#1cae51c93a8865b85e877e2c9927964cf32625e6"
+  integrity sha512-pbURQD5VjNFk4GMVVxyCds9rY4/NIqjvjE4tyf1k89RHwMdk+zuVggt/DGudteorZtqAqtsOIHWojMBU4s2klA==
   dependencies:
-    apollo-server-core "^2.9.5"
+    apollo-server-core "^2.9.6"
 
 apollo-server-types@^0.2.5:
   version "0.2.5"

From 8e34b9581ba6c4924b0f58c472dcf4bc6d77a4fb Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:45:46 +0200
Subject: [PATCH 169/212] Update sneaky report mutation

---
 webapp/graphql/Moderation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 8ead28b61..9c31fbd34 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -84,7 +84,7 @@ export const reportListQuery = () => {
 
 export const reportMutation = () => {
   return gql`
-    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
       report(
         resourceId: $resourceId
         reasonCategory: $reasonCategory

From f9fe93e5509278d0f281099a801bfc8e4575c21f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:56:28 +0200
Subject: [PATCH 170/212] Update reportListQuery to not request resourceId back

---
 webapp/graphql/Moderation.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 9c31fbd34..1a5bdb367 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -9,7 +9,6 @@ export const reportListQuery = () => {
         reasonCategory
         reasonDescription
         type
-        resourceId
         submitter {
           id
           slug

From 75d8b6f3fbb4f0d86ae360f4c36de13581b58b2d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 21:29:00 +0000
Subject: [PATCH 171/212] build(deps): bump nuxt from 2.10.0 to 2.10.1 in
 /webapp

Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.10.0...v2.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 253 +++++++++++++++++++++++++-------------------
 2 files changed, 143 insertions(+), 112 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 3e5c01134..5e606caa2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -72,7 +72,7 @@
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.2.0",
     "node-fetch": "^2.6.0",
-    "nuxt": "~2.10.0",
+    "nuxt": "~2.10.1",
     "nuxt-dropzone": "^1.0.4",
     "nuxt-env": "~0.1.0",
     "stack-utils": "^1.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 50f58036c..5bac75d16 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -56,7 +56,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.6.2", "@babel/core@~7.6.4":
+"@babel/core@^7.1.0", "@babel/core@^7.6.4", "@babel/core@~7.6.4":
   version "7.6.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
   integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
@@ -679,7 +679,7 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.2", "@babel/preset-env@~7.6.3":
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.3", "@babel/preset-env@~7.6.3":
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
   integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
@@ -750,13 +750,20 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"
+  integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
@@ -1158,28 +1165,28 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@nuxt/babel-preset-app@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.10.0.tgz#5f3cd3ef7dbd851d8120c28866f29ede7e64a43d"
-  integrity sha512-G+HY00F1e80ic2CwGMCA4FNAY1PcKMi/WshYOus8ObZxuHvlvsObKVilZq5l9P1xQqgcCoRyetEnhfMnpxqt7Q==
+"@nuxt/babel-preset-app@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.10.1.tgz#9669ff09d652011fefeb55cdc1684cd21f49b34a"
+  integrity sha512-kTJ1+kperaoPdkIE1Do6x+/2cMEk0zMKiLCc6a4vUvnhkfPLc5m5/ylwx2kke42xXqTGHNX84BSaJ891AxDJgQ==
   dependencies:
-    "@babel/core" "^7.6.2"
+    "@babel/core" "^7.6.4"
     "@babel/plugin-proposal-class-properties" "^7.5.5"
     "@babel/plugin-proposal-decorators" "^7.6.0"
     "@babel/plugin-transform-runtime" "^7.6.2"
-    "@babel/preset-env" "^7.6.2"
-    "@babel/runtime" "^7.6.2"
-    "@vue/babel-preset-jsx" "^1.1.0"
+    "@babel/preset-env" "^7.6.3"
+    "@babel/runtime" "^7.6.3"
+    "@vue/babel-preset-jsx" "^1.1.1"
     core-js "^2.6.5"
 
-"@nuxt/builder@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.10.0.tgz#3f59fe06c1bde1af25c969ca85ebfee7201d1151"
-  integrity sha512-c8NgfILAvFRBwstUu8x9l8TZUUM0FiDB8gPewvYPsP2uEuy5HEglhGzj8+/NDU/lgvHh2a9jToDjTX1LpYYHuQ==
+"@nuxt/builder@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.10.1.tgz#06df592cb0e3b76a82505dbf34030834650264b2"
+  integrity sha512-LyKVoR7f8CKkeIk1EYvpXaMxO6ShASH3iA/5ck0PDm0qcl6iyn4bTwvF55cwkbPP+hStEjqpkhTccNxDTWCgQQ==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.10.0"
-    "@nuxt/vue-app" "2.10.0"
+    "@nuxt/utils" "2.10.1"
+    "@nuxt/vue-app" "2.10.1"
     chokidar "^3.2.1"
     consola "^2.10.1"
     fs-extra "^8.1.0"
@@ -1192,18 +1199,18 @@
     serialize-javascript "^2.1.0"
     upath "^1.2.0"
 
-"@nuxt/cli@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.10.0.tgz#48c90a7c3d3be5d40b70daf8f2280f1865ccc2fe"
-  integrity sha512-nmARLjlBLWwWtWsgmyWTk4YGEkkUQvOqJS1YZlQy6CPU/itRdIDv9D/vbZZv2NkWegXQJOQ8UUv9iCue9g06bw==
+"@nuxt/cli@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.10.1.tgz#92b43e2d7ea39703b63da0514228f353f2284061"
+  integrity sha512-byXTGebvtQfzd7yBSVeHD7IZqB+Qeh9shCO8Cn6j803fHJA7s+XwzhZq3lOqOvHBO4rQ3LTkjKnsBaYtGGtVuw==
   dependencies:
-    "@nuxt/config" "2.10.0"
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/config" "2.10.1"
+    "@nuxt/utils" "2.10.1"
     boxen "^4.1.0"
     chalk "^2.4.2"
     consola "^2.10.1"
     esm "^3.2.25"
-    execa "^2.0.4"
+    execa "^2.1.0"
     exit "^0.1.2"
     fs-extra "^8.1.0"
     hable "^2.3.2"
@@ -1213,25 +1220,25 @@
     std-env "^2.2.1"
     wrap-ansi "^6.0.0"
 
-"@nuxt/config@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.10.0.tgz#72c1713d57b8e50b4f08c1abe6b816a64f7d2e28"
-  integrity sha512-avDv8sNBhffok7tJXE9bUQm7wcSGcN0ZQdM9N/PFNbHfROZ6wm8umsotQaQbg2XVJQZ2k2PNKCEN+hNKcFmrNw==
+"@nuxt/config@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.10.1.tgz#3a2fc555bcdecdedc366a8e5fac94f3553e86603"
+  integrity sha512-ydxDU1U4bEwLixn8wqYy8Y+4nVOtMaSodW0a4Kuyx9Z/3qnQbI0yvdO58I6CIw+6njAmATsAqaApIcX9bJQOeQ==
   dependencies:
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/utils" "2.10.1"
     consola "^2.10.1"
     std-env "^2.2.1"
 
-"@nuxt/core@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.10.0.tgz#71479a2f87160309486be5de358fea97b98cf072"
-  integrity sha512-Frhyoqz+uGVOvTXA3S1mTguOZVqxJFCbcx+FksC49WCR7q5OdrD8Z6mQeUmUW9dBa2l+p7hj9LCTa6ECf1wwvw==
+"@nuxt/core@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.10.1.tgz#fc934d70e9112fdc5fe7b459977d7f82b783c1d8"
+  integrity sha512-6GLUNo7wILEEeEzxcTLVc3N5ao+A7z36iW5RUK1PibT2CERwlJbyoQILMioxXwTldPTA4tPAm7xmOgb4CC66Yw==
   dependencies:
-    "@nuxt/config" "2.10.0"
+    "@nuxt/config" "2.10.1"
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/server" "2.10.0"
-    "@nuxt/utils" "2.10.0"
-    "@nuxt/vue-renderer" "2.10.0"
+    "@nuxt/server" "2.10.1"
+    "@nuxt/utils" "2.10.1"
+    "@nuxt/vue-renderer" "2.10.1"
     consola "^2.10.1"
     debug "^4.1.1"
     esm "^3.2.25"
@@ -1257,12 +1264,12 @@
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
-"@nuxt/generator@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.10.0.tgz#614ff34776f1796cbbd22c46dfcbbe7ad7e0ee60"
-  integrity sha512-5R6yuexDSSMXP5gGAnIZOJIBjfpmFXdaj8PsKkYjN3PNESVXTlJ8quBefV39QbCnyQgvNusOKppN3KmtpbDkdg==
+"@nuxt/generator@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.10.1.tgz#5430cd908f25f095af3a07df8fe6febff871a0a0"
+  integrity sha512-tjd1cf1fX3eGpdIeacgkdWloOIin3XQBFzJoquNbz4noqwWuhjyN6Noi+9FaDrFpMu6qZE5rvX1Zf0/6kP1SJg==
   dependencies:
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/utils" "2.10.1"
     chalk "^2.4.2"
     consola "^2.10.1"
     fs-extra "^8.1.0"
@@ -1287,13 +1294,13 @@
     consola "^2.10.1"
     node-fetch "^2.6.0"
 
-"@nuxt/server@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.10.0.tgz#354f9f7fec04c8544791331194aba60eb0631a32"
-  integrity sha512-K3317JyzvQe7lhVtveOb56k+L9NlFt1I2BgSg5GDt0lp21Rpf+qGUK53GQBXIpvWc9P5VT5hr8m+nxEdZZQYpA==
+"@nuxt/server@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.10.1.tgz#6f2a19ccde971df365f6a847c9a33181e81e2142"
+  integrity sha512-+1PMy8VknZWKj/uxKxwllTXuU+mgGOq17YSWfhKUAidlAb1YpdndlVOuWZgfdEsoQjJYq1vmIHMg8389chy7+g==
   dependencies:
-    "@nuxt/config" "2.10.0"
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/config" "2.10.1"
+    "@nuxt/utils" "2.10.1"
     "@nuxtjs/youch" "^4.2.3"
     chalk "^2.4.2"
     compression "^1.7.4"
@@ -1310,10 +1317,10 @@
     serve-static "^1.14.1"
     server-destroy "^1.0.1"
 
-"@nuxt/utils@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.10.0.tgz#7e1e618312c4048238050d97bf7ac61d1ce71804"
-  integrity sha512-DcBcUOf9qhVnaR0RqE/Ft+IbTgCQCttn4DM3CBRJJCQ9RV8CpLG8mfFsNtgnPTYrgDrUet67YrL5JcM9Ok02aw==
+"@nuxt/utils@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.10.1.tgz#273f14519354b7676aa8640456716967c0b56857"
+  integrity sha512-SXTm0vSh3H6Izpib/p0IepopmKaJz4JUtSuHVoauCv+CQMj09GRUeKwZ8SbXjBNQmGI+tdKedVlUUKKYY8R4LQ==
   dependencies:
     consola "^2.10.1"
     fs-extra "^8.1.0"
@@ -1324,47 +1331,47 @@
     signal-exit "^3.0.2"
     ua-parser-js "^0.7.20"
 
-"@nuxt/vue-app@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.10.0.tgz#fd5616d91c543ae0dfdf745167c481d8932381ec"
-  integrity sha512-63tnJCv5IReW9wJh63IHgw/F09hqkQ1ot+u8+umTsk45awYWE39VrwdNOkRdy2IHygIH2xxXIhtYkwZuX8xFhg==
+"@nuxt/vue-app@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.10.1.tgz#76fc682d45faddf953044806a7c9f4ed0c6e6945"
+  integrity sha512-GyjBOwyngKrb4NeSRP5s8tr4ccu05FhwuaN+TIlXsRSaPYaGz7LnLsxp5UgHrgMJH8TqIB6k4b9syejR7FT8Jg==
   dependencies:
     node-fetch "^2.6.0"
     unfetch "^4.1.0"
     vue "^2.6.10"
     vue-client-only "^2.0.0"
-    vue-meta "^2.2.2"
+    vue-meta "^2.3.1"
     vue-no-ssr "^1.1.1"
     vue-router "~3.0.7"
     vue-template-compiler "^2.6.10"
     vuex "^3.1.1"
 
-"@nuxt/vue-renderer@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.10.0.tgz#1e467d6b146670311cfb23e7e6f3933d2c58a296"
-  integrity sha512-uTkBDZUUJWi87RnViyC6x252NwQ9w3GuZMuN0Mv0v42+8S+BQ1/0bN84X2d5imdZz3kAlhsLJQ69GKrI75dCAA==
+"@nuxt/vue-renderer@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.10.1.tgz#80219f78cda19fd0e665ed05eccdfcf23e3ee956"
+  integrity sha512-gjI8/0U5Qe5ieaRW9Y7/a+QOePABgvp4zkUZCUdQKtjniJ3AMKpvppSORKIH0YJl1Uv+X/BY84MfjEnLYdB0AQ==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/utils" "2.10.1"
     consola "^2.10.1"
     fs-extra "^8.1.0"
     lru-cache "^5.1.1"
     vue "^2.6.10"
-    vue-meta "^2.2.2"
+    vue-meta "^2.3.1"
     vue-server-renderer "^2.6.10"
 
-"@nuxt/webpack@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.10.0.tgz#c71f54994dbba52f24849f55eb275d87667f2da7"
-  integrity sha512-ah1G6nIP3PJaeS5oQXrAUyPwmeWos1ycgZXvADN2rkXP4I2hdpdRuFBVrl1NfNoCNq+Hw0hZeEL9vgN4SbbPXQ==
+"@nuxt/webpack@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.10.1.tgz#515db338b5df1abc1fef1b196d21679ecc45b92e"
+  integrity sha512-AH88HI8mJPj6EcMztgsVbfEwcUT46kcAkgFpYbVeMmucf7IxChyS+uf1ev9q4+wWvw1B8Hp9enAIZXBfEIjYTg==
   dependencies:
-    "@babel/core" "^7.6.2"
-    "@nuxt/babel-preset-app" "2.10.0"
+    "@babel/core" "^7.6.4"
+    "@nuxt/babel-preset-app" "2.10.1"
     "@nuxt/friendly-errors-webpack-plugin" "^2.5.0"
-    "@nuxt/utils" "2.10.0"
+    "@nuxt/utils" "2.10.1"
     babel-loader "^8.0.6"
     cache-loader "^4.1.0"
-    caniuse-lite "^1.0.30000997"
+    caniuse-lite "^1.0.30000999"
     chalk "^2.4.2"
     consola "^2.10.1"
     css-loader "^3.2.0"
@@ -1388,10 +1395,10 @@
     semver "^6.3.0"
     std-env "^2.2.1"
     style-resources-loader "^1.2.1"
-    terser-webpack-plugin "^2.1.2"
+    terser-webpack-plugin "^2.1.3"
     thread-loader "^2.1.3"
     time-fix-plugin "^2.0.6"
-    url-loader "^2.1.0"
+    url-loader "^2.2.0"
     vue-loader "^15.7.1"
     webpack "^4.41.0"
     webpack-bundle-analyzer "^3.5.2"
@@ -2485,16 +2492,16 @@
     lodash.kebabcase "^4.1.1"
     svg-tags "^1.0.0"
 
-"@vue/babel-preset-jsx@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.0.tgz#c8001329f5b372297a3111a251eb4f9e956c1266"
-  integrity sha512-EeZ9gwEmu79B4A6LMLAw5cPCVYIcbKWgJgJafWtLzh1S+SgERUmTkVQ9Vx4k8zYBiCuxHK3XziZ3VJIMau7THA==
+"@vue/babel-preset-jsx@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.1.tgz#3a74642ca0ecea10aae13649df5ff70f9d24a6f5"
+  integrity sha512-SeyndwQZc8MAOkhbJaC34ocTwcKekKkwrwnTMC3YF8VmGp5IQWW5gPIU66bqO9WFBXFA3J3ANsUbP2pj8q8KdQ==
   dependencies:
     "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     "@vue/babel-sugar-functional-vue" "^1.0.0"
     "@vue/babel-sugar-inject-h" "^1.0.0"
-    "@vue/babel-sugar-v-model" "^1.0.0"
+    "@vue/babel-sugar-v-model" "^1.1.1"
     "@vue/babel-sugar-v-on" "^1.1.0"
 
 "@vue/babel-sugar-functional-vue@^1.0.0":
@@ -2511,10 +2518,10 @@
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@vue/babel-sugar-v-model@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0.tgz#f4da56aa67f65a349bd2c269a95e72e601af4613"
-  integrity sha512-Pfg2Al0io66P1eO6zUbRIgpyKCU2qTnumiE0lao/wA/uNdb7Dx5Tfd1W6tO5SsByETPnEs8i8+gawRIXX40rFw==
+"@vue/babel-sugar-v-model@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.1.tgz#a0f0750fcee20769805a20178299eebd4babf25a"
+  integrity sha512-qiPbdUTiqNQdhXzvWQMVfrYGHCiMmscY7j/cudLxdxWZ8AFhgPRVlniVgaWIT7A1iOjs92e8U6qVyqkf0d4ZrA==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
     "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
@@ -4573,7 +4580,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^13.0.0:
+cacache@^13.0.1:
   version "13.0.1"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
   integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
@@ -4732,10 +4739,10 @@ caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.300009
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
   integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
 
-caniuse-lite@^1.0.30000997:
-  version "1.0.30000998"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744"
-  integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==
+caniuse-lite@^1.0.30000999:
+  version "1.0.30000999"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"
+  integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -6829,6 +6836,21 @@ execa@^2.0.4:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -10882,18 +10904,18 @@ nuxt-env@~0.1.0:
   resolved "https://registry.yarnpkg.com/nuxt-env/-/nuxt-env-0.1.0.tgz#8ac50b9ff45391ad3044ea932cbd05f06a585f87"
   integrity sha512-7mTao3qG0zfN0hahk3O6SuDy0KEwYmNojammWQsMwhqMn3aUjX4nMYnWDa0pua+2/rwAY9oG53jQtLgJdG7f9w==
 
-nuxt@~2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.10.0.tgz#854c21e87c8b237359253b9419f05149b6214b63"
-  integrity sha512-Hl5hbT6gbfNXinY74oFvYroa0d0rCKpJQgJaLDN57e8CZu9kCe/90Gr21BX1+npcguIicjup5EXZ4GwzlcXKDA==
+nuxt@~2.10.1:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.10.1.tgz#d02237baea11bfaa63d65e45231c41c6a7c18d49"
+  integrity sha512-75QQ3x1WAcoBb7krHLzSXVK2/TKUFCHfsskd0bbdAl1KI9Xweyd6SGtdgGsdjWOlaUhijsXFqrPnfPPmrpLMzQ==
   dependencies:
-    "@nuxt/builder" "2.10.0"
-    "@nuxt/cli" "2.10.0"
-    "@nuxt/core" "2.10.0"
-    "@nuxt/generator" "2.10.0"
+    "@nuxt/builder" "2.10.1"
+    "@nuxt/cli" "2.10.1"
+    "@nuxt/core" "2.10.1"
+    "@nuxt/generator" "2.10.1"
     "@nuxt/loading-screen" "^1.2.0"
     "@nuxt/opencollective" "^0.3.0"
-    "@nuxt/webpack" "2.10.0"
+    "@nuxt/webpack" "2.10.1"
 
 nwsapi@^2.0.7:
   version "2.1.4"
@@ -14458,18 +14480,18 @@ terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz#2b9b8147a6f18918348200800cf9560c50f701bb"
-  integrity sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg==
+terser-webpack-plugin@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.3.tgz#85430da71ba88a60072bf659589eafaf6a00dc22"
+  integrity sha512-z5Utx0TxmirZvRNL1GC795tlDM+bO83ZfcbtkL1y1VLoWtZ7S2a9+HFCLnabSRE/Yjsu4zCEX6U6CIRo4dVmcQ==
   dependencies:
-    cacache "^13.0.0"
+    cacache "^13.0.1"
     find-cache-dir "^3.0.0"
     jest-worker "^24.9.0"
     schema-utils "^2.4.1"
     serialize-javascript "^2.1.0"
     source-map "^0.6.1"
-    terser "^4.3.4"
+    terser "^4.3.8"
     webpack-sources "^1.4.3"
 
 terser@^4.1.2:
@@ -14481,10 +14503,10 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.4.tgz#ad91bade95619e3434685d69efa621a5af5f877d"
-  integrity sha512-Kcrn3RiW8NtHBP0ssOAzwa2MsIRQ8lJWiBG/K7JgqPlomA3mtb2DEmp4/hrUA+Jujx+WZ02zqd7GYD+QRBB/2Q==
+terser@^4.3.8:
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
+  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -15082,7 +15104,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@^2.0.1, url-loader@^2.1.0:
+url-loader@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
   integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
@@ -15091,6 +15113,15 @@ url-loader@^2.0.1, url-loader@^2.1.0:
     mime "^2.4.4"
     schema-utils "^2.0.0"
 
+url-loader@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
+  integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw==
+  dependencies:
+    loader-utils "^1.2.3"
+    mime "^2.4.4"
+    schema-utils "^2.4.1"
+
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
@@ -15358,10 +15389,10 @@ vue-loader@^15.7.1, vue-loader@~15.7.0:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-meta@^2.2.2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.0.tgz#7f4af99b02c7a1811ad332110839f0c8ab1c4ea3"
-  integrity sha512-pLfbtVco5HXWQ6byjK+KdmGZJFaXcE441Dt1UmuQmT1lyX05QLRZo5laDYSHZdgGyHyiUsykZAKVBRXBCvDa6w==
+vue-meta@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.1.tgz#32a1c2634f49433f30e7e7a028aa5e5743f84f6a"
+  integrity sha512-hnZvDNvLh+PefJLfYkZhG6cSBNKikgQyiEK8lI/P2qscM1DC/qHHOfdACPQ/VDnlaWU9VlcobCTNyVtssTR4XQ==
   dependencies:
     deepmerge "^4.0.0"
 

From c8fdaef72984d9bb15668ef4699c6cf91fd6178e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2019 21:54:45 +0000
Subject: [PATCH 172/212] build(deps): bump apollo-server from 2.9.5 to 2.9.6
 in /backend

Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.5...apollo-server@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3d681cb8e..d52b11407 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,7 +47,7 @@
     "apollo-client": "~2.6.4",
     "apollo-link-context": "~1.0.19",
     "apollo-link-http": "~1.5.16",
-    "apollo-server": "~2.9.5",
+    "apollo-server": "~2.9.6",
     "apollo-server-express": "^2.9.6",
     "babel-plugin-transform-runtime": "^6.23.0",
     "bcryptjs": "~2.4.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 30ec32b2d..b8fd5828f 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1660,7 +1660,7 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.5, apollo-server-core@^2.9.6:
+apollo-server-core@^2.9.6:
   version "2.9.6"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.6.tgz#b6dc087200633f47ca4f08244d3e606b4d616320"
   integrity sha512-2tHAWQxP7HrETI/BZvg2fem6YlahF9HUp4Y6SSL95WP3uNMOJBlN12yM1y+O2u5K5e4jwdPNaLjoL2A/26XrLw==
@@ -1700,7 +1700,7 @@ apollo-server-errors@^2.3.3:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
   integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
-apollo-server-express@^2.9.5, apollo-server-express@^2.9.6:
+apollo-server-express@^2.9.6:
   version "2.9.6"
   resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.6.tgz#eec2ec43b829b059278e14994d06bd23e43266f9"
   integrity sha512-j80azBeXvLvyZsbqCnus7GH+w8vk+2IOnYzROZu/f0D2roDZtsu1XZkn+aplDJZXMcEXtqB6t4qNpyvV4zY0XQ==
@@ -1745,13 +1745,13 @@ apollo-server-types@^0.2.5:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-server@~2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.5.tgz#4f616337d04f2f0886d4bbe46b047a32a649b1fd"
-  integrity sha512-hbWZAZ3g186NG9U9bVmMpPcbUJ+/f/CSL+/tJsK6iQPp5L3hcVYoe+/qDw3zpfDMA5R2Jq/yHZtF2LcI5ylVnQ==
+apollo-server@~2.9.6:
+  version "2.9.6"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.6.tgz#11b6f1128ddb674d2651bb289e0c0fc28aa18653"
+  integrity sha512-sDvrGpMQsTGQ9FTkFm3xracrSUi8nFoh3svlD98pe6qb75UDDrXAZgxwQCSOwZ3BkaJ7UkdndfhnruhFstTeMw==
   dependencies:
-    apollo-server-core "^2.9.5"
-    apollo-server-express "^2.9.5"
+    apollo-server-core "^2.9.6"
+    apollo-server-express "^2.9.6"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"

From 807c3e1972e0312e880aa42f4a9da799db0ac343 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 15 Oct 2019 00:33:54 +0200
Subject: [PATCH 173/212] Update missed reasonCategory param in cypress test

---
 cypress/integration/common/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index ab9a90e36..c32d5e10a 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -127,7 +127,7 @@ Given('somebody reported the following posts:', table => {
     cy.factory()
       .create('User', submitter)
       .authenticateAs(submitter)
-      .mutate(`mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           type
         }

From 319de54265b91d93570652de0ab2f0ae60b726c9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 07:06:25 +0000
Subject: [PATCH 174/212] build(deps): bump node from 12.11.1-alpine to
 12.12.0-alpine in /backend

Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 1df199c1f..3dae08143 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.11.1-alpine as base
+FROM node:12.12.0-alpine as base
 LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 4000

From 34b441a5aaeef5a505200f815cc0b57f99e5662e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 07:06:54 +0000
Subject: [PATCH 175/212] build(deps): bump @nuxtjs/sentry from 3.0.0 to 3.0.1
 in /webapp

Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |    2 +-
 webapp/yarn.lock    | 1172 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 1040 insertions(+), 134 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 5e606caa2..6c56c2d2a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -57,7 +57,7 @@
     "@nuxtjs/axios": "~5.6.0",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.19",
-    "@nuxtjs/sentry": "^3.0.0",
+    "@nuxtjs/sentry": "^3.0.1",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.3",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5bac75d16..32738415f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1456,17 +1456,17 @@
     jimp-compact "^0.8.0"
     workbox-cdn "^4.3.1"
 
-"@nuxtjs/sentry@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.0.0.tgz#7ca3a25b7b2ea35a953292a7961deb515a6d9140"
-  integrity sha512-xVuSpnB6kepdjaZzP9u9DUwRVmJrbPXNIsbxWZNfzw9hv5ZXzjIydJticsnDuDTixzFEuLtsm+vfDY7oVEA8Gw==
+"@nuxtjs/sentry@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.0.1.tgz#4ff16fac4008c28349c90a5f51c84231b1a19dfd"
+  integrity sha512-6Yjx+ICRnBVppz3pAuNePNzevjHlD/27LqVplw8LMr2tRjFwFUXDD+rwFAHdyKhtN7M3CW4NLydDQLEQ4kjRtw==
   dependencies:
-    "@sentry/browser" "^5.2.0"
-    "@sentry/integrations" "^5.2.0"
-    "@sentry/node" "^5.2.0"
-    "@sentry/webpack-plugin" "^1.6.2"
-    consola "^2.6.1"
-    deepmerge "^3.2.0"
+    "@sentry/browser" "^5.7.0"
+    "@sentry/integrations" "^5.7.0"
+    "@sentry/node" "^5.7.0"
+    "@sentry/webpack-plugin" "^1.9.1"
+    consola "^2.10.1"
+    deepmerge "^4.1.1"
 
 "@nuxtjs/style-resources@~1.0.0":
   version "1.0.0"
@@ -1712,105 +1712,187 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/browser@^5.2.0":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.6.2.tgz#f39e95c3aff2d4b4fd5d0d4aa7192af73f20d24e"
-  integrity sha512-Nm/W/5ra6+OQCWQkdd86vHjcYUjHCVqCzQyPasd6HE7SNlWe5euGVfFfDuUFsiDrMAG5uKfGYw5u/AqoweiQkQ==
+"@sentry/browser@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.0.tgz#daaf36dfd30cf831b8c6d9c5a488a5fc629ebc6b"
+  integrity sha512-hbybYP5onstb8PfqjCubMuXkoXQBjZ3RCaxrOFLOIqpIxajrQ2zmbnaCzfBPWWwKeHa9P+i625OT973OhhHFMA==
   dependencies:
-    "@sentry/core" "5.6.2"
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/core" "5.7.0"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/cli@^1.44.4":
-  version "1.47.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.47.1.tgz#6a3238e5bfa4f618867bc0bc145b8e2ba191ff46"
-  integrity sha512-WijaRu1lb99OL6rHee6uOSb1wDyNCbrWcTJoRCuZD83K2fw3U58p68nli/y8CoMwQ55Mrg6CgtY8pmBiuseG0A==
+"@sentry/cli@^1.48.0":
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.48.0.tgz#cccf2badd3fab9aeaafeaf6ef21bc74e2f6b6790"
+  integrity sha512-Td6UpZP6BoI0R5Guctiq3NIphAfskbyeiboWx4H1yuXPA9p4F0hL+Hrz6k3NNfzkt3AQzEkeAhvpKmIfmUOkjA==
   dependencies:
     fs-copy-file-sync "^1.1.1"
-    https-proxy-agent "^2.2.1"
+    https-proxy-agent "^3.0.0"
     mkdirp "^0.5.1"
     node-fetch "^2.1.2"
     progress "2.0.0"
     proxy-from-env "^1.0.0"
 
-"@sentry/core@5.6.2":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.6.2.tgz#8c5477654a83ebe41a72e86a79215deb5025e418"
-  integrity sha512-grbjvNmyxP5WSPR6UobN2q+Nss7Hvz+BClBT8QTr7VTEG5q89TwNddn6Ej3bGkaUVbct/GpVlI3XflWYDsnU6Q==
+"@sentry/core@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.0.tgz#c2aa5341e703ec7cf2acc69e51971a0b1f7d102a"
+  integrity sha512-gQel0d7LBSWJGHc7gfZllYAu+RRGD9GcYGmkRfemurmDyDGQDf/sfjiBi8f9QxUc2iFTHnvIR5nMTyf0U3yl3Q==
   dependencies:
-    "@sentry/hub" "5.6.1"
-    "@sentry/minimal" "5.6.1"
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/hub" "5.7.0"
+    "@sentry/minimal" "5.7.0"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.6.1.tgz#9f355c0abcc92327fbd10b9b939608aa4967bece"
-  integrity sha512-m+OhkIV5yTAL3R1+XfCwzUQka0UF/xG4py8sEfPXyYIcoOJ2ZTX+1kQJLy8QQJ4RzOBwZA+DzRKP0cgzPJ3+oQ==
+"@sentry/hub@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.0.tgz#f7c356202a9db1daae82ce7f48ebf1139e4e9d02"
+  integrity sha512-qNdYheJ6j4P9Sk0eqIINpJohImmu/+trCwFb4F8BGLQth5iGMVQD6D0YUrgjf4ZaQwfhw9tv4W6VEfF5tyASoA==
   dependencies:
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/integrations@^5.2.0":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.6.1.tgz#fcee1a6e5535a07fdefd365178662283279ce0d7"
-  integrity sha512-bPtJbmhLDH9Exy0luIKxjlfqmuyAjUPTHZ2CLIw6YlhA5WgK9aYyyjLHTmWK+E9baZBqSp0ShVPAgue2jfpQmQ==
+"@sentry/integrations@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.7.0.tgz#17c294d93796f60f2a25be21af20816b9f2e7b90"
+  integrity sha512-Yin6w2D7w855BO1TaatW5uvsuteJHaZuQmdFYIh1EzDJ5cJC4qZd0Z78Q2e9+dSO/XlaLYgeQT48yJJ9hTVT8g==
   dependencies:
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.6.1.tgz#09d92b26de0b24555cd50c3c33ba4c3e566009a1"
-  integrity sha512-ercCKuBWHog6aS6SsJRuKhJwNdJ2oRQVWT2UAx1zqvsbHT9mSa8ZRjdPHYOtqY3DoXKk/pLUFW/fkmAnpdMqRw==
+"@sentry/minimal@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.0.tgz#832d26bcd862c6ea628d48ad199ac7f966a2d907"
+  integrity sha512-0sizE2prS9nmfLyVUKmVzFFFqRNr9iorSCCejwnlRe3crqKqjf84tuRSzm6NkZjIyYj9djuuo9l9XN12NLQ/4A==
   dependencies:
-    "@sentry/hub" "5.6.1"
-    "@sentry/types" "5.6.1"
+    "@sentry/hub" "5.7.0"
+    "@sentry/types" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.2.0":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.6.2.tgz#4b62f056031da65cad78220d48c546b8bfbfaed7"
-  integrity sha512-A9CELco6SjF4zt8iS1pO3KdUVI2WVhtTGhSH6X04OVf2en1fimPR+Vs8YVY/04udwd7o+3mI6byT+rS9+/Qzow==
+"@sentry/node@^5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.7.0.tgz#153777f06b2fcd346edbff9adbb6b231c7e5fa0a"
+  integrity sha512-iqQbGAJDBlpQkp1rl9RkDCIfnukr4cOtHPgJPmLY19m/KXIHD2cdKhvbqoCvIPBTIAeSGQIvDT9jD5zT46eoqQ==
   dependencies:
-    "@sentry/core" "5.6.2"
-    "@sentry/hub" "5.6.1"
-    "@sentry/types" "5.6.1"
-    "@sentry/utils" "5.6.1"
-    cookie "0.3.1"
-    https-proxy-agent "2.2.1"
-    lru_map "0.3.3"
+    "@sentry/core" "5.7.0"
+    "@sentry/hub" "5.7.0"
+    "@sentry/types" "5.7.0"
+    "@sentry/utils" "5.7.0"
+    cookie "^0.3.1"
+    https-proxy-agent "^3.0.0"
+    lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.6.1.tgz#5915e1ee4b7a678da3ac260c356b1cb91139a299"
-  integrity sha512-Kub8TETefHpdhvtnDj3kKfhCj0u/xn3Zi2zIC7PB11NJHvvPXENx97tciz4roJGp7cLRCJsFqCg4tHXniqDSnQ==
+"@sentry/types@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.0.tgz#e8677e57b40c2c63cad42c02add12b238e647c10"
+  integrity sha512-bFRVortg713dE2yJXNFgNe6sNBVVSkpoELLkGPatdVQi0dYc6OggIIX4UZZvkynFx72GwYqO1NOrtUcJY2gmMg==
 
-"@sentry/utils@5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.6.1.tgz#69d9e151e50415bc91f2428e3bcca8beb9bc2815"
-  integrity sha512-rfgha+UsHW816GqlSRPlniKqAZylOmQWML2JsujoUP03nPu80zdN43DK9Poy/d9OxBxv0gd5K2n+bFdM2kqLQQ==
+"@sentry/utils@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.0.tgz#a6850aa4f5476fa26517cd5c6248f871d8d9939b"
+  integrity sha512-XmwQpLqea9mj8x1N7P/l4JvnEb0Rn5Py5OtBgl0ctk090W+GB1uM8rl9mkMf6698o1s1Z8T/tI/QY0yFA5uZXg==
   dependencies:
-    "@sentry/types" "5.6.1"
+    "@sentry/types" "5.7.0"
     tslib "^1.9.3"
 
-"@sentry/webpack-plugin@^1.6.2":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.8.0.tgz#eb41194a222789fcf27aebc7d7d453fe85af9dc2"
-  integrity sha512-cRNvk70o50q0P952f0rArzvjk8Qvzw40K4B8dziLdNjIIYBGQ3fV+JCY7dta72AdBWB13g8L8SPqCQr8C3PgoQ==
+"@sentry/webpack-plugin@^1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.9.1.tgz#4c4a284cb80179f6cc002fc420b11a0b9d0b50e8"
+  integrity sha512-CzvPvlgIfer8eBNopvQKnoIeQWL227ZbC4TNEx/jVxyO7LO8PuiTLLkn/ciNA6MrLTWLh1A7tTzGDoK1WdNJew==
   dependencies:
-    "@sentry/cli" "^1.44.4"
+    "@sentry/cli" "^1.48.0"
+    snyk "^1.231.0"
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
+"@snyk/cli-interface@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456"
+  integrity sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg==
+  dependencies:
+    tslib "^1.9.3"
+
+"@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.1.0.tgz#2e7ecd9457c91b78ce3e5b91451e823f218a25af"
+  integrity sha512-b/magC8iNQP9QhSDeV9RQDSaY3sNy57k0UH1Y/sMOSvVLHLsA7dOi/HrPWTiLouyGqcuYzwjkz7bNbu8cwmVDQ==
+  dependencies:
+    tslib "^1.9.3"
+
+"@snyk/cocoapods-lockfile-parser@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz#296421454ba2ee9248ce1f13da57aa1b10b54de7"
+  integrity sha512-d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA==
+  dependencies:
+    "@snyk/dep-graph" "^1.11.0"
+    "@snyk/ruby-semver" "^2.0.4"
+    "@types/js-yaml" "^3.12.1"
+    core-js "^3.2.0"
+    js-yaml "^3.13.1"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+
+"@snyk/composer-lockfile-parser@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz#4b703883ec36f3cec63c64355031e06698c771f5"
+  integrity sha512-hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg==
+  dependencies:
+    lodash "^4.17.13"
+
+"@snyk/dep-graph@1.12.0":
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.12.0.tgz#aa0df8549849a4857bc5510e839da268293e4750"
+  integrity sha512-n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ==
+  dependencies:
+    graphlib "^2.1.5"
+    lodash "^4.7.14"
+    object-hash "^1.3.1"
+    semver "^6.0.0"
+    source-map-support "^0.5.11"
+    tslib "^1.9.3"
+
+"@snyk/dep-graph@1.13.0", "@snyk/dep-graph@^1.11.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.13.0.tgz#855f628da0b833dd16c02c2f977507bbf090b894"
+  integrity sha512-e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ==
+  dependencies:
+    graphlib "^2.1.5"
+    lodash "^4.7.14"
+    object-hash "^1.3.1"
+    semver "^6.0.0"
+    source-map-support "^0.5.11"
+    tslib "^1.9.3"
+
+"@snyk/gemfile@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457"
+  integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==
+
+"@snyk/ruby-semver@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@snyk/ruby-semver/-/ruby-semver-2.0.4.tgz#457686ea7a4d60b10efddde99587efb3a53ba884"
+  integrity sha512-ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ==
+  dependencies:
+    lodash "^4.17.14"
+
+"@snyk/snyk-cocoapods-plugin@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz#eb685590e6a478e1d86f1042c9493426f2f9764a"
+  integrity sha512-AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw==
+  dependencies:
+    "@snyk/cli-interface" "1.5.0"
+    "@snyk/cocoapods-lockfile-parser" "2.0.4"
+    "@snyk/dep-graph" "1.13.0"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+
 "@storybook/addon-a11y@^5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.3.tgz#bcfb50b92b2a17c36e4cbb0b42a0c586e40aa68e"
@@ -2143,6 +2225,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/agent-base@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.0.tgz#00644e8b395b40e1bf50aaf1d22cabc1200d5051"
+  integrity sha512-8mrhPstU+ZX0Ugya8tl5DsDZ1I5ZwQzbL/8PA0z8Gj0k9nql7nkaMzmPVLj+l/nixWaliXi+EBiLA8bptw3z7Q==
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+
 "@types/babel__core@^7.1.0":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.1.tgz#ce9a9e5d92b7031421e1d0d74ae59f572ba48be6"
@@ -2192,6 +2282,13 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/bunyan@*":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582"
+  integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
@@ -2221,6 +2318,11 @@
   dependencies:
     "@types/express" "*"
 
+"@types/debug@^4.1.4":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
+  integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2308,6 +2410,11 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/js-yaml@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
+  integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==
+
 "@types/json-schema@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -2362,6 +2469,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.6.tgz#9cbfcb62c50947217f4d88d4d274cc40c22625a9"
   integrity sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==
 
+"@types/node@^6.14.4":
+  version "6.14.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.7.tgz#2173f79d7a61d97d3aad2feeaac7ac69a3df39af"
+  integrity sha512-YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew==
+
 "@types/object-assign@^4.0.30":
   version "4.0.30"
   resolved "https://registry.yarnpkg.com/@types/object-assign/-/object-assign-4.0.30.tgz#8949371d5a99f4381ee0f1df0a9b7a187e07e652"
@@ -2405,6 +2517,19 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/restify@^4.3.6":
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/@types/restify/-/restify-4.3.6.tgz#5da5889b65c34c33937a67686bab591325dde806"
+  integrity sha512-4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA==
+  dependencies:
+    "@types/bunyan" "*"
+    "@types/node" "*"
+
+"@types/semver@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
+
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
@@ -2441,6 +2566,14 @@
     "@types/events" "*"
     "@types/node" "*"
 
+"@types/xml2js@0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.3.tgz#2f41bfc74d5a4022511721f872ed395a210ad3b7"
+  integrity sha512-Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
@@ -2765,12 +2898,17 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+"@yarnpkg/lockfile@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
   integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
-abbrev@1:
+abbrev@1, abbrev@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2831,13 +2969,20 @@ address@^1.0.1:
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709"
   integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==
 
-agent-base@^4.1.0, agent-base@^4.3.0:
+agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
   integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
+agent-base@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
 aggregate-error@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79"
@@ -2933,7 +3078,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
+ansi-escapes@3.2.0, ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -2991,7 +3136,7 @@ ansi-to-html@^0.6.11:
   dependencies:
     entities "^1.1.1"
 
-ansicolors@~0.3.2:
+ansicolors@^0.3.2, ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
@@ -3483,6 +3628,11 @@ aproba@^1.0.3, aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+archy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -3650,7 +3800,7 @@ ast-types@0.13.1:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.1.tgz#9461428a270c5a27fda44b738dd3bab2e9353003"
   integrity sha512-b+EeK0WlzrSmpMw5jktWvQGxblpWnvMrV+vOp69RLjzGiHwWV0vgq75DPKtUjppKni3yWwSW8WLGV3Ch/XIWcQ==
 
-ast-types@^0.13.0:
+ast-types@0.x.x, ast-types@^0.13.0:
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
   integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
@@ -3687,6 +3837,11 @@ async-validator@^3.1.0:
   resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.1.0.tgz#447db5eb003cbb47e650f040037a29fc3881ce92"
   integrity sha512-XyAHGwtpx3Y3aHIOaGXXFo4tiulnrh+mXBU9INxig6Q8rtmtmBxDuCxb60j7EIGbAsQg9cxfJ2jrUZ+fIqEnBQ==
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
 async@^2.1.4:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
@@ -4689,7 +4844,7 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase@^2.0.0:
+camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
@@ -5067,7 +5222,7 @@ clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
-cliui@^3.2.0:
+cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
@@ -5085,6 +5240,16 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+clone-deep@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
+  integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.1"
+    kind-of "^3.2.2"
+    shallow-clone "^0.1.2"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -5268,7 +5433,7 @@ config-chain@^1.1.12:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^3.0.0:
+configstore@^3.0.0, configstore@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
@@ -5290,7 +5455,7 @@ connect@^3.7.0:
     parseurl "~1.3.3"
     utils-merge "1.0.1"
 
-consola@^2.10.0, consola@^2.10.1, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.6.1, consola@^2.9.0:
+consola@^2.10.0, consola@^2.10.1, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.9.0:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz#4693edba714677c878d520e4c7e4f69306b4b927"
   integrity sha512-4sxpH6SGFYLADfUip4vuY65f/gEogrzJoniVhNUYkJHtng0l8ZjnDCqxxrSVRHOHwKxsy8Vm5ONZh1wOR3/l/w==
@@ -5372,16 +5537,16 @@ cookie-universal@^2.0.16:
     "@types/cookie" "^0.3.1"
     cookie "^0.3.1"
 
-cookie@0.3.1, cookie@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 cookie@0.4.0, cookie@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookie@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -5440,6 +5605,11 @@ core-js@^3.0.1, core-js@^3.0.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
   integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 
+core-js@^3.2.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42"
+  integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5874,6 +6044,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
+
 data-urls@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
@@ -5903,14 +6078,14 @@ de-indent@^1.0.2:
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@=3.1.0:
+debug@3.1.0, debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -5963,15 +6138,10 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
-  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
-
-deepmerge@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09"
-  integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==
+deepmerge@^4.0.0, deepmerge@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c"
+  integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg==
 
 defaults@^1.0.3:
   version "1.0.3"
@@ -6019,6 +6189,15 @@ defu@^0.0.3:
   resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.3.tgz#bdc3ea1e1ab2120d4d4a129147f3ba9b7f9fe103"
   integrity sha512-u/fe4fBwrD0KACvI0sYWTWFzooqONZq8ywPnK0ZkAgLNwaDTKpSWvMiiU4QmzhrQCXu8Y0+HIWP8amE18lsL4A==
 
+degenerator@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -6122,6 +6301,13 @@ dir-glob@2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dockerfile-ast@0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz#10b329d343329dab1de70375833495f85ad65913"
+  integrity sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==
+  dependencies:
+    vscode-languageserver-types "^3.5.0"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -6245,6 +6431,17 @@ dotenv@^8.0.0, dotenv@^8.1.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2"
   integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==
 
+dotnet-deps-parser@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/dotnet-deps-parser/-/dotnet-deps-parser-4.5.2.tgz#f3223fa2b9d0d247c3e855d6b5a292904c2c8109"
+  integrity sha512-bk5Q1luEwQ10rrBwZbtTxUNadaLz2dM6xzOLoTK+oUBcaq6saCeELmkIgdG+Fwkn58XRgLQvOySVS0gp4OG6RA==
+  dependencies:
+    "@types/xml2js" "0.4.3"
+    lodash "^4.17.11"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+    xml2js "0.4.19"
+
 dropzone@^5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.5.1.tgz#06e2f513e61d6aa363d4b556f18574f47cf7ba26"
@@ -6345,6 +6542,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -6494,6 +6696,18 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@1.x.x:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^1.9.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
@@ -6698,7 +6912,7 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^3.1.3:
+esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
   integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
@@ -7123,6 +7337,11 @@ file-system-cache@^1.0.5:
     fs-extra "^0.30.0"
     ramda "^0.21.0"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filesize@3.6.1, filesize@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -7279,11 +7498,23 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.2.6"
 
-for-in@^1.0.2:
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  dependencies:
+    for-in "^1.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -7442,6 +7673,14 @@ fstream@^1.0.0, fstream@^1.0.12:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -7532,6 +7771,18 @@ get-stream@^5.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-uri@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.4.tgz#d4937ab819e218d4cb5ae18e4f5962bef169cc6a"
+  integrity sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "~3.0.2"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -7562,6 +7813,21 @@ git-rev-sync@1.12.0:
     graceful-fs "4.1.11"
     shelljs "0.7.7"
 
+git-up@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
+  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
+  dependencies:
+    is-ssh "^1.3.0"
+    parse-url "^5.0.0"
+
+git-url-parse@11.1.2:
+  version "11.1.2"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
+  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
+  dependencies:
+    git-up "^4.0.0"
+
 glob-all@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab"
@@ -7741,6 +8007,13 @@ graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
+graphlib@^2.1.1, graphlib@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"
+  integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==
+  dependencies:
+    lodash "^4.17.5"
+
 graphql-anywhere@^4.1.0-alpha.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz#1f7c3a3d9004dbe81b1c553d7fd1ef2e16e14a85"
@@ -8102,6 +8375,11 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
   integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
+hosted-git-info@^2.7.1:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
@@ -8225,11 +8503,30 @@ http-errors@1.7.2, http-errors@^1.7.2, http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http-errors@1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 "http-parser-js@>=0.4.0 <0.4.11":
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
   integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@^0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -8263,14 +8560,6 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
-  dependencies:
-    agent-base "^4.1.0"
-    debug "^3.1.0"
-
 https-proxy-agent@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
@@ -8279,6 +8568,14 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+https-proxy-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97"
+  integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
 hyperlinker@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
@@ -8342,6 +8639,11 @@ ignore@^5.1.1, ignore@^5.1.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 immer@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
@@ -8445,7 +8747,12 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -8606,7 +8913,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.0.2, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -8879,6 +9186,13 @@ is-root@2.0.0:
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019"
   integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg==
 
+is-ssh@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
+  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
+  dependencies:
+    protocols "^1.1.0"
+
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -8935,6 +9249,11 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -9619,6 +9938,16 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jszip@^3.1.5:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.2.tgz#b143816df7e106a9597a94c77493385adca5bd1d"
+  integrity sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -9643,7 +9972,14 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
+  integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
+  dependencies:
+    is-buffer "^1.0.2"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
@@ -9709,6 +10045,11 @@ launch-editor@^2.2.1:
     chalk "^2.3.0"
     shell-quote "^1.6.1"
 
+lazy-cache@^0.2.3:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
+  integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
+
 lazy-universal-dotenv@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38"
@@ -9745,6 +10086,13 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 linkify-it@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
@@ -9898,12 +10246,37 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
+
+lodash.assignin@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.clone@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
+
+lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.get@^4:
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.get@^4, lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
@@ -9968,6 +10341,11 @@ lodash.pickby@4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
   integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=
 
+lodash.set@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
+
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
@@ -10008,7 +10386,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.14, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -10094,7 +10472,7 @@ lowlight@~1.9.1:
     fault "^1.0.2"
     highlight.js "~9.12.0"
 
-lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
+lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -10109,11 +10487,16 @@ lru-cache@^5.0.0, lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lru_map@0.3.3:
+lru_map@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
   integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=
 
+macos-release@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
+  integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -10457,6 +10840,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
 mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -10538,6 +10929,16 @@ natural-orderby@^2.0.1:
   resolved "https://registry.yarnpkg.com/natural-orderby/-/natural-orderby-2.0.3.tgz#8623bc518ba162f8ff1cdb8941d74deb0fdcc016"
   integrity sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==
 
+nconf@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2"
+  integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==
+  dependencies:
+    async "^1.4.0"
+    ini "^1.3.0"
+    secure-keys "^1.0.0"
+    yargs "^3.19.0"
+
 needle@^2.2.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.1.tgz#d272f2f4034afb9c4c9ab1379aabc17fc85c9388"
@@ -10547,6 +10948,15 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
+needle@^2.2.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -10557,6 +10967,11 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
+netmask@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
+
 netrc-parser@^3.1.4:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/netrc-parser/-/netrc-parser-3.1.6.tgz#7243c9ec850b8e805b9bdc7eae7b1450d4a96e72"
@@ -10833,7 +11248,7 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
-normalize-url@^3.0.0:
+normalize-url@^3.0.0, normalize-url@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
@@ -11077,6 +11492,13 @@ opn@^3.0.3:
   dependencies:
     object-assign "^4.0.1"
 
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimism@^0.10.0:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9"
@@ -11153,6 +11575,14 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
+os-name@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  dependencies:
+    macos-release "^2.2.0"
+    windows-release "^3.1.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -11262,6 +11692,31 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+pac-proxy-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    get-uri "^2.0.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    pac-resolver "^3.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "^4.0.1"
+
+pac-resolver@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
+  dependencies:
+    co "^4.6.0"
+    degenerator "^1.0.4"
+    ip "^1.1.5"
+    netmask "^1.0.6"
+    thunkify "^2.1.2"
+
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -11272,7 +11727,7 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pako@~1.0.5:
+pako@~1.0.2, pako@~1.0.5:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
@@ -11339,6 +11794,24 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
+  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
+  dependencies:
+    is-ssh "^1.3.0"
+    protocols "^1.4.0"
+
+parse-url@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
+  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
+  dependencies:
+    is-ssh "^1.3.0"
+    normalize-url "^3.3.0"
+    parse-path "^4.0.0"
+    protocols "^1.4.0"
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -12377,7 +12850,7 @@ promise.prototype.finally@^3.1.0:
     es-abstract "^1.9.0"
     function-bind "^1.1.1"
 
-promise@^7.1.1:
+"promise@>=3.2 <8", promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -12556,6 +13029,11 @@ protobufjs@^6.8.6:
     "@types/node" "^10.1.0"
     long "^4.0.0"
 
+protocols@^1.1.0, protocols@^1.4.0:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
+  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
+
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
@@ -12564,6 +13042,20 @@ proxy-addr@~2.0.5:
     forwarded "~0.1.2"
     ipaddr.js "1.9.0"
 
+proxy-agent@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
+  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    pac-proxy-agent "^3.0.0"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^4.0.1"
+
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -12723,6 +13215,16 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
+  integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.3"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26"
@@ -12983,7 +13485,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -12996,6 +13498,16 @@ read-pkg@^3.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@1.1.x:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^3.1.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
@@ -13515,7 +14027,7 @@ sass-resources-loader@^2.0.0:
     glob "^7.1.1"
     loader-utils "^1.0.4"
 
-sax@^1.2.4, sax@~1.2.4:
+sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -13566,6 +14078,11 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
+secure-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"
+  integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=
+
 select@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
@@ -13588,7 +14105,7 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -13668,6 +14185,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -13706,6 +14228,16 @@ sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-clone@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
+  integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^2.0.1"
+    lazy-cache "^0.2.3"
+    mixin-object "^2.0.1"
+
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -13834,6 +14366,11 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
@@ -13871,6 +14408,245 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+snyk-config@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.3.tgz#8e09bb98602ad044954d30a9fc1695ab5b6042fa"
+  integrity sha512-9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.17.15"
+    nconf "^0.10.0"
+
+snyk-docker-plugin@1.29.1:
+  version "1.29.1"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz#4ae989e5084eef744b371f88b2890a8d971ab871"
+  integrity sha512-Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A==
+  dependencies:
+    debug "^4.1.1"
+    dockerfile-ast "0.0.16"
+    semver "^6.1.0"
+    tslib "^1"
+
+snyk-go-parser@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz#427387507578baf008a3e73828e0e53ed8c796f3"
+  integrity sha512-jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg==
+  dependencies:
+    toml "^3.0.0"
+    tslib "^1.9.3"
+
+snyk-go-plugin@1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz#cd7c73c42bd3cf5faa2a90a54cd7c6db926fea5d"
+  integrity sha512-IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ==
+  dependencies:
+    debug "^4.1.1"
+    graphlib "^2.1.1"
+    snyk-go-parser "1.3.1"
+    tmp "0.0.33"
+    tslib "^1.10.0"
+
+snyk-gradle-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz#7e24b5da2210f18e2476a94a3b5586405c3ac262"
+  integrity sha512-789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==
+  dependencies:
+    "@snyk/cli-interface" "^2.1.0"
+    "@types/debug" "^4.1.4"
+    chalk "^2.4.2"
+    clone-deep "^0.3.0"
+    debug "^4.1.1"
+    tmp "0.0.33"
+    tslib "^1.9.3"
+
+snyk-module@1.9.1, snyk-module@^1.6.0, snyk-module@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804"
+  integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==
+  dependencies:
+    debug "^3.1.0"
+    hosted-git-info "^2.7.1"
+
+snyk-mvn-plugin@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz#b653050a4095feccffc1b9387dc3a3f2f1aa69da"
+  integrity sha512-Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ==
+  dependencies:
+    lodash "^4.17.15"
+    tslib "1.9.3"
+
+snyk-nodejs-lockfile-parser@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.0.tgz#1c1d0aba4643830901ef999415816e7a92b0974d"
+  integrity sha512-cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.0.2"
+    graphlib "^2.1.5"
+    lodash "^4.17.14"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+    uuid "^3.3.2"
+
+snyk-nuget-plugin@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz#6aa3d60c19bcf0731c8a4a594583ac9160500cb5"
+  integrity sha512-9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig==
+  dependencies:
+    debug "^3.1.0"
+    dotnet-deps-parser "4.5.2"
+    jszip "^3.1.5"
+    lodash "^4.17.14"
+    snyk-paket-parser "1.5.0"
+    tslib "^1.9.3"
+    xml2js "^0.4.17"
+
+snyk-paket-parser@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz#a0e96888d9d304b1ae6203a0369971575f099548"
+  integrity sha512-1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA==
+  dependencies:
+    tslib "^1.9.3"
+
+snyk-php-plugin@1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.6.4.tgz#c3470aea2f185d2f3417cfc5e966ecf7fd1efa20"
+  integrity sha512-FFQeimtbwq17nDUS0o0zuKgyjXSX7SpoC9iYTeKvxTXrmKf2QlxTtPvmMM4/hQxehEu1i40ow1Ozw0Ahxm8Dpw==
+  dependencies:
+    "@snyk/composer-lockfile-parser" "1.0.3"
+    tslib "1.9.3"
+
+snyk-policy@1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.13.5.tgz#c5cf262f759879a65ab0810dd58d59c8ec7e9e47"
+  integrity sha512-KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ==
+  dependencies:
+    debug "^3.1.0"
+    email-validator "^2.0.4"
+    js-yaml "^3.13.1"
+    lodash.clonedeep "^4.5.0"
+    semver "^6.0.0"
+    snyk-module "^1.9.1"
+    snyk-resolve "^1.0.1"
+    snyk-try-require "^1.3.1"
+    then-fs "^2.0.0"
+
+snyk-python-plugin@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz#34587001de2cca8fb400f3f21110c29b39a80e83"
+  integrity sha512-Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw==
+  dependencies:
+    "@snyk/cli-interface" "^2.0.3"
+    tmp "0.0.33"
+
+snyk-resolve-deps@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d"
+  integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ==
+  dependencies:
+    "@types/node" "^6.14.4"
+    "@types/semver" "^5.5.0"
+    ansicolors "^0.3.2"
+    debug "^3.2.5"
+    lodash.assign "^4.2.0"
+    lodash.assignin "^4.2.0"
+    lodash.clone "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.get "^4.4.2"
+    lodash.set "^4.3.2"
+    lru-cache "^4.0.0"
+    semver "^5.5.1"
+    snyk-module "^1.6.0"
+    snyk-resolve "^1.0.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "^1.1.1"
+    then-fs "^2.0.0"
+
+snyk-resolve@1.0.1, snyk-resolve@^1.0.0, snyk-resolve@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab"
+  integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==
+  dependencies:
+    debug "^3.1.0"
+    then-fs "^2.0.0"
+
+snyk-sbt-plugin@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz#6812e1df1c311e99a7aa565559032c7511d1e4d4"
+  integrity sha512-ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA==
+  dependencies:
+    semver "^6.1.2"
+    tmp "^0.1.0"
+    tree-kill "^1.2.1"
+    tslib "^1.10.0"
+
+snyk-tree@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8"
+  integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg=
+  dependencies:
+    archy "^1.0.0"
+
+snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212"
+  integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=
+  dependencies:
+    debug "^3.1.0"
+    lodash.clonedeep "^4.3.0"
+    lru-cache "^4.0.0"
+    then-fs "^2.0.0"
+
+snyk@^1.231.0:
+  version "1.235.0"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.235.0.tgz#62424d75e7ab071fbc762497abae71a5c0f1cf06"
+  integrity sha512-pnEXcvu4mGarDxlD7OArLj5/5L18+b+/kIQ9fUG0ykcGpLJ3Rsd8IOZw+O1vBzq11WQ6U3IGGiYya/E/wjcI4g==
+  dependencies:
+    "@snyk/cli-interface" "^2.0.3"
+    "@snyk/dep-graph" "1.12.0"
+    "@snyk/gemfile" "1.2.0"
+    "@snyk/snyk-cocoapods-plugin" "1.0.3"
+    "@types/agent-base" "^4.2.0"
+    "@types/restify" "^4.3.6"
+    abbrev "^1.1.1"
+    ansi-escapes "3.2.0"
+    chalk "^2.4.2"
+    configstore "^3.1.2"
+    debug "^3.1.0"
+    diff "^4.0.1"
+    git-url-parse "11.1.2"
+    glob "^7.1.3"
+    inquirer "^6.2.2"
+    lodash "^4.17.14"
+    needle "^2.2.4"
+    opn "^5.5.0"
+    os-name "^3.0.0"
+    proxy-agent "*"
+    proxy-from-env "^1.0.0"
+    semver "^6.0.0"
+    snyk-config "^2.2.1"
+    snyk-docker-plugin "1.29.1"
+    snyk-go-plugin "1.11.1"
+    snyk-gradle-plugin "3.1.0"
+    snyk-module "1.9.1"
+    snyk-mvn-plugin "2.4.0"
+    snyk-nodejs-lockfile-parser "1.16.0"
+    snyk-nuget-plugin "1.13.0"
+    snyk-php-plugin "1.6.4"
+    snyk-policy "1.13.5"
+    snyk-python-plugin "^1.13.3"
+    snyk-resolve "1.0.1"
+    snyk-resolve-deps "4.4.0"
+    snyk-sbt-plugin "2.8.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "1.3.1"
+    source-map-support "^0.5.11"
+    strip-ansi "^5.2.0"
+    tempfile "^2.0.0"
+    then-fs "^2.0.0"
+    update-notifier "^2.5.0"
+    uuid "^3.3.2"
+    wrap-ansi "^5.1.0"
+
 sockjs-client@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
@@ -13883,6 +14659,22 @@ sockjs-client@1.3.0:
     json3 "^3.3.2"
     url-parse "^1.4.3"
 
+socks-proxy-agent@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "4.0.2"
+
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -13913,18 +14705,18 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+source-map-support@^0.5.11, source-map-support@^0.5.7, source-map-support@~0.5.12:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.5.12:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+source-map-support@^0.5.6:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -14212,6 +15004,11 @@ string_decoder@^1.0.0, string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -14453,6 +15250,19 @@ telejson@^3.0.2:
     lodash "^4.17.15"
     memoizerific "^1.11.3"
 
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+
+tempfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  dependencies:
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -14527,6 +15337,13 @@ text-table@0.2.0, text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+then-fs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2"
+  integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=
+  dependencies:
+    promise ">=3.2 <8"
+
 thread-loader@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda"
@@ -14559,6 +15376,11 @@ through@^2.3.6:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
+thunkify@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
+
 time-fix-plugin@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/time-fix-plugin/-/time-fix-plugin-2.0.6.tgz#3210121d269b475a7e7661766e682bd768ba1ced"
@@ -14658,13 +15480,20 @@ title-case@^2.1.0:
     no-case "^2.2.0"
     upper-case "^1.0.3"
 
-tmp@^0.0.33:
+tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -14727,6 +15556,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 toposort@^1.0.0:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
@@ -14762,6 +15596,11 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
+tree-kill@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
+  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
@@ -14847,7 +15686,12 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tslib@^1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@1.9.3:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
+tslib@^1, tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
@@ -15199,6 +16043,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+uuid@^3.0.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+
 uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
@@ -15258,7 +16107,7 @@ vscode-languageserver-protocol@3.14.1:
     vscode-jsonrpc "^4.0.0"
     vscode-languageserver-types "3.14.0"
 
-vscode-languageserver-types@3.14.0:
+vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.5.0:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
   integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
@@ -15772,6 +16621,18 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
+window-size@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+
+windows-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
+  dependencies:
+    execa "^1.0.0"
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -15910,6 +16771,38 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml2js@0.4.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xml2js@^0.4.17:
+  version "0.4.22"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz#4fa2d846ec803237de86f30aa9b5f70b6600de02"
+  integrity sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==
+  dependencies:
+    sax ">=0.6.0"
+    util.promisify "~1.0.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+
 xregexp@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed"
@@ -15934,7 +16827,7 @@ xxhashjs@^0.2.1:
   dependencies:
     cuint "^0.2.2"
 
-y18n@^3.2.1:
+y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
   integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
@@ -15990,6 +16883,19 @@ yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
+yargs@^3.19.0:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
+  dependencies:
+    camelcase "^2.0.1"
+    cliui "^3.0.3"
+    decamelize "^1.1.1"
+    os-locale "^1.4.0"
+    string-width "^1.0.1"
+    window-size "^0.1.4"
+    y18n "^3.2.0"
+
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From 9aa486f060af77c37ba2611df8f07c6ef0504bef Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 07:08:05 +0000
Subject: [PATCH 176/212] build(deps-dev): bump @storybook/addon-actions in
 /webapp

Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.4/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 164 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 155 insertions(+), 11 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 5e606caa2..a4e872498 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -96,7 +96,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.3",
     "@storybook/addon-a11y": "^5.2.3",
-    "@storybook/addon-actions": "^5.2.3",
+    "@storybook/addon-actions": "^5.2.4",
     "@storybook/vue": "~5.2.3",
     "@vue/cli-shared-utils": "~3.12.0",
     "@vue/eslint-config-prettier": "~5.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5bac75d16..5939cf20c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1834,17 +1834,17 @@
     redux "^4.0.1"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.3.tgz#40675f1258428074eebd363e5f9468adeec79046"
-  integrity sha512-7/Ax5QX2HHuIYS/TwgysEtJhvsfNekc0ofzVQRSlowU+Io5u/wMaD+/FEn43Cx8MXzWxPs+x/KNZ5cWRXx2vjg==
+"@storybook/addon-actions@^5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.4.tgz#79d13c1b6e58c75dd548eb162aa6626a93dfd041"
+  integrity sha512-5E8uXopy6Gq5R3MXrPf0VM9QiLaGLxLCXtDYHQ0gku+HhPYR25KQudS/PyuO+OWzuyB0fsvTi240B3zw+zilOg==
   dependencies:
-    "@storybook/addons" "5.2.3"
-    "@storybook/api" "5.2.3"
-    "@storybook/client-api" "5.2.3"
-    "@storybook/components" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/theming" "5.2.3"
+    "@storybook/addons" "5.2.4"
+    "@storybook/api" "5.2.4"
+    "@storybook/client-api" "5.2.4"
+    "@storybook/components" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/theming" "5.2.4"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -1867,6 +1867,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.4.tgz#5c4f031e403c90a517cd6d208ec51d7e2455683a"
+  integrity sha512-Q+bnVlBA308qnELxnh18hBDRSUgltR9KbV537285dUL/okv/NC6n51mxJwIaG+ksBW2wU+5e6tqSayaKF3uHLw==
+  dependencies:
+    "@storybook/api" "5.2.4"
+    "@storybook/channels" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247"
@@ -1890,6 +1903,29 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.4.tgz#b0b3dbd93444d163a80b455fb877d816a37b3149"
+  integrity sha512-KqAB+NkHIHdwu749NDP+7i44jy1bFgpq7GTJlG+sx/XLZHQveK/8yn109g9bXHFth7SvdXI1+9GA/apzwBU/Mw==
+  dependencies:
+    "@storybook/channels" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/router" "5.2.4"
+    "@storybook/theming" "5.2.4"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.0.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a"
@@ -1901,6 +1937,17 @@
     global "^4.3.2"
     telejson "^3.0.2"
 
+"@storybook/channel-postmessage@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.4.tgz#e3735bdce42156e54bf462083aebaf23245ab5c3"
+  integrity sha512-ic7/Ho8z2/aOMjoEbr5p8rijOfO3SZdJnwMvDdUxrqvYq7yACZWidPo3w2+iBwQi9HLqEsWesP1c2doJBxVGRw==
+  dependencies:
+    "@storybook/channels" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.0.2"
+
 "@storybook/channels@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0"
@@ -1908,6 +1955,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.4.tgz#7ab5c9478517ddb9e8ac0c4188b408b9d7e6b7e4"
+  integrity sha512-/r39yEZ5QiGdiq95DhXBypdBo7urkD3Sp1WDyK48uGkZ0gdHWSPy3BBy8OJhEhfNz7nVisTiVIBr4gIrubKDjw==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872"
@@ -1929,6 +1983,27 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.4.tgz#2507a3a739a6f6b13e4afefb938a6f3eab34ed55"
+  integrity sha512-SOwzEFHoNapURhNqdcI7HA76o5tkWvs2+2s++i/S7xsAd3KyefIVDOdqSMlAxJkxZb8Mlrb3UNRxlrpA8SZqNA==
+  dependencies:
+    "@storybook/addons" "5.2.4"
+    "@storybook/channel-postmessage" "5.2.4"
+    "@storybook/channels" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/router" "5.2.4"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88"
@@ -1936,6 +2011,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.4.tgz#6ebe37cbc92e0efe27c7119f52d94f647fbb470c"
+  integrity sha512-ofp6QQPQZBU+RvlAH5KpZRsfAFHecCZDnl/7YG6FwjHseJr3jHTYmBGGjJDMHFHq+Q7FGQu/yVb9lMFgoQ43QQ==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf"
@@ -1960,6 +2042,30 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
+"@storybook/components@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.4.tgz#9ecd080416eac4e8453030dd601cbeaa32ce4126"
+  integrity sha512-APhw+XGag0RTCRJ8eCWKVr8dLt9SRqnS8LtzcZJbokCYRxRTFzhmX2eVEE1v+d0gHib1/yh2COxOjMzv3m/rQA==
+  dependencies:
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/theming" "5.2.4"
+    "@types/react-syntax-highlighter" "10.1.0"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^1.18.3"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^8.0.1"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+
 "@storybook/core-events@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00"
@@ -1967,6 +2073,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.4.tgz#210c968e96e2fc031cad1d3a09b06fa69ae433fc"
+  integrity sha512-nQknCmaz2S2HW6PSGcuFzve7Y1Js2Cb268vUG0ZMNtJZwFawqYc+KSQHqmOY0pVm8dyROTcWCudPA0k+hk6N5Q==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/core@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.3.tgz#e06cda6510b7778db1273696fc5b56f7ba33c025"
@@ -2065,6 +2178,19 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.4.tgz#e47af60478da7730c7d82de3d089d12c17077333"
+  integrity sha512-GL7eGdj5oYST0mE9fThJB9ye9tTTgrP+aP3okZ6MeMGtNytb7bmJRpAD2E4ouuPTQVppyHI5re8g/HUxUNOT1g==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.11"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+
 "@storybook/theming@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a"
@@ -2083,6 +2209,24 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
+"@storybook/theming@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.4.tgz#79c99f65992082fdb4d39fb652db435dd6bebaca"
+  integrity sha512-2ZlqBrmnm8N0352Fnu2+GB3pEsHL4Eb2eKxV0VLLgkjJuAlm7CK6+I/e4ZknQWxwYm2pQj1y6ta68A62fGBYyA==
+  dependencies:
+    "@emotion/core" "^10.0.14"
+    "@emotion/styled" "^10.0.14"
+    "@storybook/client-logger" "5.2.4"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.14"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+
 "@storybook/ui@5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.3.tgz#35e3a1147977da923c820db90fb95c95caf47126"

From 251c0d93e4ff6601e105f0fd2ed88dac818c3dea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 08:49:40 +0000
Subject: [PATCH 177/212] build(deps-dev): bump @storybook/vue from 5.2.3 to
 5.2.4 in /webapp

Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.4/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 102 +++++++++++++++-----------------------------
 2 files changed, 36 insertions(+), 68 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a4e872498..b6e536ce3 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -97,7 +97,7 @@
     "@babel/preset-env": "~7.6.3",
     "@storybook/addon-a11y": "^5.2.3",
     "@storybook/addon-actions": "^5.2.4",
-    "@storybook/vue": "~5.2.3",
+    "@storybook/vue": "~5.2.4",
     "@vue/cli-shared-utils": "~3.12.0",
     "@vue/eslint-config-prettier": "~5.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.29",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5939cf20c..94509c162 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1926,17 +1926,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a"
-  integrity sha512-ixlpr6aAYoRM72cKwEWU/W0rWzOn3mYqb/eUdIaz3Da5BtFGKm3yEFguII0l1my82uhMm5/d3UNfoh0rO3pUyg==
-  dependencies:
-    "@storybook/channels" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.0.2"
-
 "@storybook/channel-postmessage@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.4.tgz#e3735bdce42156e54bf462083aebaf23245ab5c3"
@@ -1962,27 +1951,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872"
-  integrity sha512-anXxcf2z+KQAk94xxdbeG1N6nTEWXj087XHQ22L3pOoX9TRzfG71UjL0/S7vj4EFUiXVHj8d6YUFwLb5LwpUIw==
-  dependencies:
-    "@storybook/addons" "5.2.3"
-    "@storybook/channel-postmessage" "5.2.3"
-    "@storybook/channels" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/router" "5.2.3"
-    common-tags "^1.8.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.4.tgz#2507a3a739a6f6b13e4afefb938a6f3eab34ed55"
@@ -2080,25 +2048,25 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.3.tgz#e06cda6510b7778db1273696fc5b56f7ba33c025"
-  integrity sha512-sktjYY8pH4kQGFRKjXwtwwShdG3ajjHkrnw8oh3R383MRPom7i9owx5yHHMuQedLCXIwAg84s2DzO01I2URTcg==
+"@storybook/core@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.4.tgz#188509ac0eb0c85144816c385c21acfb5c8fbefd"
+  integrity sha512-r5kDgZETNawHxpsAPw+h+pRk6l/mJhsSHeDo9/OdYtYFW7lmk2gadViXOTM+6gIWc6vQ8y750bgkahmyIIY0nQ==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.3.3"
     "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.2.3"
-    "@storybook/channel-postmessage" "5.2.3"
-    "@storybook/client-api" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/node-logger" "5.2.3"
-    "@storybook/router" "5.2.3"
-    "@storybook/theming" "5.2.3"
-    "@storybook/ui" "5.2.3"
+    "@storybook/addons" "5.2.4"
+    "@storybook/channel-postmessage" "5.2.4"
+    "@storybook/client-api" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/node-logger" "5.2.4"
+    "@storybook/router" "5.2.4"
+    "@storybook/theming" "5.2.4"
+    "@storybook/ui" "5.2.4"
     airbnb-js-shims "^1 || ^2"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.4.9"
@@ -2154,10 +2122,10 @@
     webpack-dev-middleware "^3.7.0"
     webpack-hot-middleware "^2.25.0"
 
-"@storybook/node-logger@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.3.tgz#cb746dbe0d1e56d905bf5601d16bb3a054123792"
-  integrity sha512-5p+5ltLdr7cZTSCG+vdIMDLHq5AAaL/CQ/bygjl+Rw/RSpvBO5Rg8hryszFyhogToHJbn2JinUbypLA+P6tcuQ==
+"@storybook/node-logger@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.4.tgz#52dc380c76bdac68de35e7d72efe920c3ba52a23"
+  integrity sha512-4OOzce02IAfrRv+Y7h3icyw6WIuDekpWF2eYjgYVVvAJYklCEwgeBTBCY0/2TJjPPTBDPUKHVP1Bdz3Vpci9pA==
   dependencies:
     chalk "^2.4.2"
     core-js "^3.0.1"
@@ -2227,19 +2195,19 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/ui@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.3.tgz#35e3a1147977da923c820db90fb95c95caf47126"
-  integrity sha512-SNyo5oxupb105N4Rz8O5/iJMs/THrmdvP+vsN7CpOTxebM01rHyvk51cNUwHKG1QwlZmpXL8GbtWlbvqL2d/gQ==
+"@storybook/ui@5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.4.tgz#7116c9be0dcdcc5d5b425d998263de1e27cdc078"
+  integrity sha512-zsS43k1h4bWEW6oj9FNHlUL3niHoJJ8v7iqYbRtVM12rxrYhV3K8TGVG3LCuNB75i3Be0Myy+/RHA4x9kco08A==
   dependencies:
-    "@storybook/addons" "5.2.3"
-    "@storybook/api" "5.2.3"
-    "@storybook/channels" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/components" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/router" "5.2.3"
-    "@storybook/theming" "5.2.3"
+    "@storybook/addons" "5.2.4"
+    "@storybook/api" "5.2.4"
+    "@storybook/channels" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/components" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/router" "5.2.4"
+    "@storybook/theming" "5.2.4"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2266,13 +2234,13 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.3.tgz#66ec9830e878ffc700aa55a489e3582c91245955"
-  integrity sha512-HK5vkiiVEHc9N+zjv5dKIP1HlDIzUfGWtAo8TCywnyPskeZXfAjjjuZb5kttdwKjULGuwmpLtzjGcaYRJ/ytkQ==
+"@storybook/vue@~5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.4.tgz#cc5c61612b50e77e1de18d266434dea40631bcc9"
+  integrity sha512-JmEGypIl9FOtIp13n4ATa1nPeRr2PMnJ3DgKSs8O8GeuX61cOtZMZ95dvgGW0vfXh8hnzqt83WTkJP7EH/qpEQ==
   dependencies:
-    "@storybook/addons" "5.2.3"
-    "@storybook/core" "5.2.3"
+    "@storybook/addons" "5.2.4"
+    "@storybook/core" "5.2.4"
     "@types/webpack-env" "^1.13.9"
     common-tags "^1.8.0"
     core-js "^3.0.1"

From b5d0170ab42578e77832f58868cb1f3af50eb77a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 08:53:30 +0000
Subject: [PATCH 178/212] build(deps): bump node from 12.11.1-alpine to
 12.12.0-alpine in /webapp

Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/Dockerfile             | 2 +-
 webapp/Dockerfile.maintenance | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 1a27e6d94..d0122ee0e 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.11.1-alpine as base
+FROM node:12.12.0-alpine as base
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index e32048252..5f4df1dbf 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,4 +1,4 @@
-FROM node:12.11.1-alpine as build
+FROM node:12.12.0-alpine as build
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000

From cd9f2633d732c1181e8326c1e99097bb0a3d0dcf Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 12:09:01 +0300
Subject: [PATCH 179/212] highlight comment targeted in anchor link

---
 webapp/components/Comment/Comment.vue | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index 534c45e6b..ab3230e97 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -10,7 +10,7 @@
     </ds-card>
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
-    <ds-card :id="anchor">
+    <ds-card :id="anchor" :class="{ 'comment--target': isTarget }">
       <ds-space margin-bottom="small" margin-top="small">
         <hc-user :user="author" :date-time="comment.createdAt">
           <template v-slot:dateTime>
@@ -116,6 +116,9 @@ export default {
       user: 'auth/user',
       isModerator: 'auth/isModerator',
     }),
+    isTarget() {
+      return this.$route.hash === `#${this.anchor}`
+    },
     anchor() {
       return `commentId-${this.comment.id}`
     },
@@ -204,4 +207,17 @@ span.show-more-or-less {
   margin: 0px 20px;
   cursor: pointer;
 }
+
+@keyframes highlight {
+  0% {
+    border: 1px solid $color-primary;
+  }
+  100% {
+    border: 1px solid transparent;
+  }
+}
+
+.comment--target {
+  animation: highlight 4s ease;
+}
 </style>

From 855caf78e9090b985c9d224a47802802243f271f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Oct 2019 13:05:51 +0200
Subject: [PATCH 180/212] reference to terms of use, data protection, minimum
 age at added

---
 webapp/components/Registration/Signup.vue | 10 ++++++++++
 webapp/locales/de.json                    |  3 +++
 webapp/locales/en.json                    |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index 00309b1c6..cbed5b9f8 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -30,6 +30,16 @@
         name="email"
         icon="envelope"
       />
+      <ds-list size="base">
+        <ds-list-item>
+          <ds-text v-html="$t('components.registration.signup.form.terms-and-condition')"></ds-text>
+        </ds-list-item>
+        <ds-list-item>
+          <ds-text v-html="$t('components.registration.signup.form.data-privacy')"></ds-text>
+        </ds-list-item>
+        <ds-list-item>{{ $t('components.registration.signup.form.minimum-age') }}</ds-list-item>
+      </ds-list>
+
       <ds-button
         :disabled="disabled"
         :loading="$apollo.loading"
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 96c1cd322..36d99ace3 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -30,6 +30,9 @@
         "title": "Mach mit bei Human Connection!",
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
+          "terms-and-condition": "Es gelten unsere <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen!</ds-text></a>",
+          "data-privacy": "Es gelten unsere <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen!",
+          "minimum-age": "Du musst das 18 Lebensjahr abgeschlossen haben!",
           "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
           "errors": {
             "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 90bb84c37..a22f7a4a4 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -31,6 +31,9 @@
         "title": "Join Human Connection!",
         "form": {
           "description": "To get started, enter your email address:",
+          "terms-and-condition": "Our <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > terms of conditions!</ds-text></a> apply!",
+          "data-privacy": "Our <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" > Data privacy </ds-text></a> apply!",
+          "minimum-age": "You must be at least 18 years old!",
           "invitation-code": "Your invitation code is: <b>{code}</b>",
           "errors": {
             "email-exists": "There is already a user account with this email address!",

From 6318ced7a0b1d7ada9fa126ab6b5d9f2ab30708b Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 14:52:02 +0300
Subject: [PATCH 181/212] refactor comment component to just use one content
 viewer

---
 webapp/components/Comment/Comment.vue      | 45 ++++++++--------------
 webapp/components/Editor/ContentViewer.vue |  5 ++-
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index ab3230e97..35c6205ae 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -43,35 +43,12 @@
         />
       </div>
       <div v-else>
-        <content-viewer
-          v-if="$filters.removeHtml(comment.content).length < 180"
-          :content="comment.content"
-          class="padding-left"
-        />
-        <div v-else class="show-more-or-less-div">
-          <content-viewer
-            v-if="isCollapsed"
-            :content="$filters.truncate(comment.content, 180)"
-            class="padding-left text-align-left"
-          />
-          <span class="show-more-or-less">
-            <a v-if="isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
-              {{ $t('comment.show.more') }}
-            </a>
-          </span>
-        </div>
-        <content-viewer
-          v-if="!isCollapsed"
-          :content="comment.content"
-          class="padding-left text-align-left"
-        />
-        <div class="show-more-or-less-div">
-          <span class="show-more-or-less">
-            <a v-if="!isCollapsed" class="padding-left" @click="isCollapsed = !isCollapsed">
-              {{ $t('comment.show.less') }}
-            </a>
-          </span>
-        </div>
+        <content-viewer :content="commentContent" class="padding-left text-align-left" />
+        <span v-if="isLongComment" class="show-more-or-less">
+          <a class="padding-left" @click="isCollapsed = !isCollapsed">
+            {{ isCollapsed ? $t('comment.show.more') : $t('comment.show.less') }}
+          </a>
+        </span>
       </div>
       <ds-space margin-bottom="small" />
     </ds-card>
@@ -119,6 +96,16 @@ export default {
     isTarget() {
       return this.$route.hash === `#${this.anchor}`
     },
+    isLongComment() {
+      return this.$filters.removeHtml(this.comment.content).length > 180
+    },
+    commentContent() {
+      if (this.isLongComment && this.isCollapsed) {
+        return this.$filters.truncate(this.comment.content, 180)
+      }
+
+      return this.comment.content
+    },
     anchor() {
       return `commentId-${this.comment.id}`
     },
diff --git a/webapp/components/Editor/ContentViewer.vue b/webapp/components/Editor/ContentViewer.vue
index ab07d11d6..b9a167df7 100644
--- a/webapp/components/Editor/ContentViewer.vue
+++ b/webapp/components/Editor/ContentViewer.vue
@@ -1,5 +1,5 @@
 <template>
-  <editor-content :editor="editor" />
+  <editor-content :editor="editor" :key="content" />
 </template>
 
 <script>
@@ -31,6 +31,9 @@ export default {
       }),
     }
   },
+  beforeUpdate() {
+    this.editor.setContent(this.content)
+  },
   beforeDestroy() {
     this.editor.destroy()
   },

From a42a910ac745e060fa75ff03b9efb219defa45dd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 12:01:43 +0000
Subject: [PATCH 182/212] build(deps-dev): bump eslint-plugin-jest in /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 4ff040992..67c721e0d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -121,7 +121,7 @@
     "eslint-config-prettier": "~6.4.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~22.17.0",
+    "eslint-plugin-jest": "~22.19.0",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index b9d5d05eb..f52556865 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3259,10 +3259,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.17.0:
-  version "22.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz#dc170ec8369cd1bff9c5dd8589344e3f73c88cf6"
-  integrity sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q==
+eslint-plugin-jest@~22.19.0:
+  version "22.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b"
+  integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^1.13.0"
 

From d0bb81585f764e2d58460c3868107cdca98c6b05 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 12:01:49 +0000
Subject: [PATCH 183/212] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.4/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 139 ++++----------------------------------------
 2 files changed, 12 insertions(+), 129 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 62d376a46..7ff8bf932 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -95,7 +95,7 @@
     "@babel/core": "~7.6.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.6.3",
-    "@storybook/addon-a11y": "^5.2.3",
+    "@storybook/addon-a11y": "^5.2.4",
     "@storybook/addon-actions": "^5.2.4",
     "@storybook/vue": "~5.2.4",
     "@vue/cli-shared-utils": "~3.12.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c00ad2e79..2bb2eaafe 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1893,17 +1893,17 @@
     source-map-support "^0.5.7"
     tslib "^1.9.3"
 
-"@storybook/addon-a11y@^5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.3.tgz#bcfb50b92b2a17c36e4cbb0b42a0c586e40aa68e"
-  integrity sha512-1N8hes5J3qyhCahHyFUXwiKif3JH892dzGalxc46jtvC0oCMM0r6lu+lj9J6THc15Oc8Icy9KJZuw4R0wRJl0Q==
+"@storybook/addon-a11y@^5.2.4":
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.4.tgz#01a641bf37e2fbeb5ac23ec60824847356cb8dfc"
+  integrity sha512-m7D78LiREpUzw7U+jiJXQXSsYoYZ+IkewBIxX5K15lh58AqTi0hD8DWHssgbi76GQwdaXKmMPIwI842dgPYobQ==
   dependencies:
-    "@storybook/addons" "5.2.3"
-    "@storybook/api" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/components" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/theming" "5.2.3"
+    "@storybook/addons" "5.2.4"
+    "@storybook/api" "5.2.4"
+    "@storybook/client-logger" "5.2.4"
+    "@storybook/components" "5.2.4"
+    "@storybook/core-events" "5.2.4"
+    "@storybook/theming" "5.2.4"
     axe-core "^3.3.2"
     common-tags "^1.8.0"
     core-js "^3.0.1"
@@ -1936,19 +1936,6 @@
     react-inspector "^3.0.2"
     uuid "^3.3.2"
 
-"@storybook/addons@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.3.tgz#02e35fad3ed4101625896e43e0a1e20215f6be38"
-  integrity sha512-LTkUJB8ZDc4++yt9acNHNjlnGWCyNtP+NVYPDvg7zFOaMip21Pj4T0pg9UwYxdqrFBWz9tVz7DJeXroS3egXxg==
-  dependencies:
-    "@storybook/api" "5.2.3"
-    "@storybook/channels" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.4.tgz#5c4f031e403c90a517cd6d208ec51d7e2455683a"
@@ -1962,29 +1949,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247"
-  integrity sha512-2csxa/d64rXy4Dwoc7YjbPeNUJRgcI/wJUo30CLujk2stEFzDnKeMPR1mlHMCIFDW+KDxJ28bW59VPxwrqJFjw==
-  dependencies:
-    "@storybook/channels" "5.2.3"
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/core-events" "5.2.3"
-    "@storybook/router" "5.2.3"
-    "@storybook/theming" "5.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.0.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.4.tgz#b0b3dbd93444d163a80b455fb877d816a37b3149"
@@ -2019,13 +1983,6 @@
     global "^4.3.2"
     telejson "^3.0.2"
 
-"@storybook/channels@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0"
-  integrity sha512-13Mlb+XbE0mHXiLLHdg0w9byhRy/bE605U7U96PGQp2cwX4lf+4jpViO2mDCsndAFRc0+2hexXPTkwgzvZzq0A==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.4.tgz#7ab5c9478517ddb9e8ac0c4188b408b9d7e6b7e4"
@@ -2054,13 +2011,6 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88"
-  integrity sha512-Z1irXW4jiFs7rClgqJqYOgg5op51ynV6dVuoIqxkSC0MrOG5s/VbX7T+ojGPXKyQWD4XYGw66Hnw9jouSfXL9g==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.4.tgz#6ebe37cbc92e0efe27c7119f52d94f647fbb470c"
@@ -2068,30 +2018,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/components@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.3.tgz#acf185b2ed2d1a64fff008b32cc2b2363d73d8cf"
-  integrity sha512-EiWKa3xONP2BPxrssiRdvKELhF2tO14HVL131CCFY+Zg/ylExzWWWVSBun7vYcKhkI52K5lmvC1vFSsB6Gmlhw==
-  dependencies:
-    "@storybook/client-logger" "5.2.3"
-    "@storybook/theming" "5.2.3"
-    "@types/react-syntax-highlighter" "10.1.0"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^1.18.3"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^8.0.1"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-
 "@storybook/components@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.4.tgz#9ecd080416eac4e8453030dd601cbeaa32ce4126"
@@ -2116,13 +2042,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/core-events@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00"
-  integrity sha512-sZEv93yE1o+/UJdhtqQ6vo2EauZ90FjN/L8F7CR7iqDEZzqo9g77Idg9LSgcN3TAeXcGAWVSrPb1vkK7H96L2g==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.4.tgz#210c968e96e2fc031cad1d3a09b06fa69ae433fc"
@@ -2215,19 +2134,6 @@
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/router@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.3.tgz#d10284325820275ab7971621333988b5021dd3c9"
-  integrity sha512-sOu6y2GySaY82SdXfF3yOn0IJTKMqd2BDOSGEno7PWWtSenHFQWY+z99C9k0dLBTkjRes5tPcgm0OJ7RdQVRDQ==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.11"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-
 "@storybook/router@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.4.tgz#e47af60478da7730c7d82de3d089d12c17077333"
@@ -2241,24 +2147,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/theming@5.2.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a"
-  integrity sha512-3/0bo8CaoaHDYZaexydpYcwP6WW8BKRqSQBGXJY9y0TLhwY2Who5nPX9XdOLyu9d7lN//PRZlt8JnZynuncxoQ==
-  dependencies:
-    "@emotion/core" "^10.0.14"
-    "@emotion/styled" "^10.0.14"
-    "@storybook/client-logger" "5.2.3"
-    common-tags "^1.8.0"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.14"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-
 "@storybook/theming@5.2.4":
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.4.tgz#79c99f65992082fdb4d39fb652db435dd6bebaca"
@@ -5712,12 +5600,7 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.10:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
   integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
 
-core-js@^3.0.1, core-js@^3.0.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
-  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
-
-core-js@^3.2.0:
+core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42"
   integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg==

From d1f2c7bb45f7aebc7863b159a08756820e18e0a8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2019 12:02:09 +0000
Subject: [PATCH 184/212] build(deps-dev): bump eslint-plugin-jest in /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 62d376a46..3d7c00e1a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -115,7 +115,7 @@
     "eslint-config-standard": "~12.0.0",
     "eslint-loader": "~3.0.2",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~22.17.0",
+    "eslint-plugin-jest": "~22.19.0",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c00ad2e79..a78631bdb 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6896,10 +6896,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.17.0:
-  version "22.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.17.0.tgz#dc170ec8369cd1bff9c5dd8589344e3f73c88cf6"
-  integrity sha512-WT4DP4RoGBhIQjv+5D0FM20fAdAUstfYAf/mkufLNTojsfgzc5/IYW22cIg/Q4QBavAZsROQlqppiWDpFZDS8Q==
+eslint-plugin-jest@~22.19.0:
+  version "22.19.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b"
+  integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^1.13.0"
 

From 597ca3029f9fd508bdcd2a6a7434d380155f285f Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 15:07:30 +0300
Subject: [PATCH 185/212] improve html and css for collapse-button

---
 webapp/components/Comment/Comment.vue | 30 ++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index 35c6205ae..ca7d1f741 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -43,12 +43,15 @@
         />
       </div>
       <div v-else>
-        <content-viewer :content="commentContent" class="padding-left text-align-left" />
-        <span v-if="isLongComment" class="show-more-or-less">
-          <a class="padding-left" @click="isCollapsed = !isCollapsed">
-            {{ isCollapsed ? $t('comment.show.more') : $t('comment.show.less') }}
-          </a>
-        </span>
+        <content-viewer :content="commentContent" class="comment-content" />
+        <button
+          v-if="isLongComment"
+          type="button"
+          class="collapse-button"
+          @click="isCollapsed = !isCollapsed"
+        >
+          {{ isCollapsed ? $t('comment.show.more') : $t('comment.show.less') }}
+        </button>
       </div>
       <ds-space margin-bottom="small" />
     </ds-card>
@@ -172,11 +175,24 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.collapse-button {
+  // TODO: move this to css resets
+  font-family: inherit;
+  font-size: inherit;
+  border: none;
+  background-color: transparent;
+
+  float: right;
+  padding: 0 16px 16px 16px;
+  color: $color-primary;
+  cursor: pointer;
+}
+
 .float-right {
   float: right;
 }
 
-.padding-left {
+.comment-content {
   padding-left: 40px;
 }
 

From 134cea4e47563866eb9d8f40160c3e124221db4b Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 15:44:22 +0300
Subject: [PATCH 186/212] expand targeted comment by default

---
 webapp/components/Comment/Comment.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index ca7d1f741..a923f65ec 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -69,9 +69,14 @@ import scrollToAnchor from '~/mixins/scrollToAnchor.js'
 
 export default {
   mixins: [scrollToAnchor],
-  data: function() {
+  data() {
+    const anchor = `commentId-${this.comment.id}`
+    const isTarget = this.$route.hash === `#${anchor}`
+
     return {
-      isCollapsed: true,
+      anchor,
+      isTarget,
+      isCollapsed: !isTarget,
       openEditCommentMenu: false,
     }
   },
@@ -96,9 +101,6 @@ export default {
       user: 'auth/user',
       isModerator: 'auth/isModerator',
     }),
-    isTarget() {
-      return this.$route.hash === `#${this.anchor}`
-    },
     isLongComment() {
       return this.$filters.removeHtml(this.comment.content).length > 180
     },
@@ -109,9 +111,6 @@ export default {
 
       return this.comment.content
     },
-    anchor() {
-      return `commentId-${this.comment.id}`
-    },
     displaysComment() {
       return !this.unavailable || this.isModerator
     },

From 202da2a67cb1081ec26b1fa283cecdef26ab6ff7 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 15:47:24 +0300
Subject: [PATCH 187/212] remove unused css

---
 webapp/components/Comment/Comment.vue | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index a923f65ec..a8b1576b9 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -187,27 +187,12 @@ export default {
   cursor: pointer;
 }
 
-.float-right {
-  float: right;
-}
-
 .comment-content {
   padding-left: 40px;
 }
 
-.text-align-left {
-  text-align: left;
-}
-
-div.show-more-or-less-div {
-  text-align: right;
-  margin-right: 20px;
-}
-
-span.show-more-or-less {
-  display: block;
-  margin: 0px 20px;
-  cursor: pointer;
+.float-right {
+  float: right;
 }
 
 @keyframes highlight {

From 2090e3939b6a08844697d958decc565d1b429962 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 15 Oct 2019 16:07:09 +0300
Subject: [PATCH 188/212] add $route mock to Comment and CommentList spec

---
 webapp/components/Comment/Comment.spec.js         | 3 +++
 webapp/components/CommentList/CommentList.spec.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/webapp/components/Comment/Comment.spec.js b/webapp/components/Comment/Comment.spec.js
index 59e3f6c5a..31ce8a40e 100644
--- a/webapp/components/Comment/Comment.spec.js
+++ b/webapp/components/Comment/Comment.spec.js
@@ -32,6 +32,9 @@ describe('Comment.vue', () => {
         truncate: a => a,
         removeHtml: a => a,
       },
+      $route: {
+        hash: '',
+      },
       $scrollTo: jest.fn(),
       $apollo: {
         mutate: jest.fn().mockResolvedValue({
diff --git a/webapp/components/CommentList/CommentList.spec.js b/webapp/components/CommentList/CommentList.spec.js
index 3287b7cd4..16b284134 100644
--- a/webapp/components/CommentList/CommentList.spec.js
+++ b/webapp/components/CommentList/CommentList.spec.js
@@ -42,6 +42,9 @@ describe('CommentList.vue', () => {
           truncate: a => a,
           removeHtml: a => a,
         },
+        $route: {
+          hash: '',
+        },
         $scrollTo: jest.fn(),
         $apollo: {
           queries: {

From 461defd4606dd2f4a68c0133e1dd528c164f09a5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Oct 2019 15:43:31 +0200
Subject: [PATCH 189/212] WITH CHECKBOXES

---
 webapp/components/Registration/Signup.vue | 36 ++++++++++++++++-------
 webapp/locales/de.json                    |  6 ++--
 webapp/locales/en.json                    |  6 ++--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index cbed5b9f8..18750b300 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -30,15 +30,24 @@
         name="email"
         icon="envelope"
       />
-      <ds-list size="base">
-        <ds-list-item>
-          <ds-text v-html="$t('components.registration.signup.form.terms-and-condition')"></ds-text>
-        </ds-list-item>
-        <ds-list-item>
-          <ds-text v-html="$t('components.registration.signup.form.data-privacy')"></ds-text>
-        </ds-list-item>
-        <ds-list-item>{{ $t('components.registration.signup.form.minimum-age') }}</ds-list-item>
-      </ds-list>
+      <p>
+        <label class="add-checkbox">
+          <input @change="handleInputValid" type="checkbox" v-model="checkbox1" />
+          <span v-html="$t('components.registration.signup.form.terms-and-condition')"></span>
+        </label>
+      </p>
+      <p>
+        <label class="add-checkbox">
+          <input@change="handleInputValid" type="checkbox" v-model="checkbox2"/>
+          <span v-html="$t('components.registration.signup.form.data-privacy')"></span>
+        </label>
+      </p>
+      <p>
+        <label class="add-checkbox">
+          <input @change="handleInputValid" type="checkbox" v-model="checkbox3" />
+          <span v-html="$t('components.registration.signup.form.minimum-age')"></span>
+        </label>
+      </p>
 
       <ds-button
         :disabled="disabled"
@@ -112,6 +121,9 @@ export default {
       disabled: true,
       success: false,
       error: null,
+      checkbox1: false,
+      checkbox2: false,
+      checkbox3: false,
     }
   },
   computed: {
@@ -125,7 +137,11 @@ export default {
       this.disabled = true
     },
     handleInputValid() {
-      this.disabled = false
+      if (this.checkbox1 && this.checkbox2 && this.checkbox3) {
+        this.disabled = false
+      } else {
+        this.disabled = true
+      }
     },
     async handleSubmit() {
       const mutation = this.token ? SignupByInvitationMutation : SignupMutation
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 36d99ace3..39549a6a2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -30,9 +30,9 @@
         "title": "Mach mit bei Human Connection!",
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
-          "terms-and-condition": "Es gelten unsere <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen!</ds-text></a>",
-          "data-privacy": "Es gelten unsere <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen!",
-          "minimum-age": "Du musst das 18 Lebensjahr abgeschlossen haben!",
+          "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen!</ds-text></a>zu.",
+          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen!</ds-text></a> gelesen und verstanden",
+          "minimum-age": "Ich bin 18 Jahre oder älter.",
           "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
           "errors": {
             "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail Adresse!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a22f7a4a4..a97a84a73 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -31,9 +31,9 @@
         "title": "Join Human Connection!",
         "form": {
           "description": "To get started, enter your email address:",
-          "terms-and-condition": "Our <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > terms of conditions!</ds-text></a> apply!",
-          "data-privacy": "Our <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" > Data privacy </ds-text></a> apply!",
-          "minimum-age": "You must be at least 18 years old!",
+          "terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>.",
+          "data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ",
+          "minimum-age": "I'm 18 years or older.",
           "invitation-code": "Your invitation code is: <b>{code}</b>",
           "errors": {
             "email-exists": "There is already a user account with this email address!",

From b2dccfb51ca6f91b1e9646d8be4f956012811c26 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 15 Oct 2019 15:25:54 +0200
Subject: [PATCH 190/212] refactor: improve locale imports

While refactoring the login form component I found many inconsistent
ways of importing the list of locales. So I decided to refactor the
imports altogether. Don't use `process.env` to import locales!
---
 package.json                                  |  1 +
 .../components/LocaleSwitch/LocaleSwitch.vue  |  3 ++-
 webapp/components/RelativeDateTime/index.vue  | 14 ++-----------
 webapp/locales/index.js                       | 19 ++++++++++++++++-
 .../source/nuxt.config.maintenance.js         |  8 +------
 webapp/nuxt.config.js                         |  2 --
 webapp/plugins/i18n.js                        |  3 ++-
 webapp/plugins/vue-filters.js                 | 21 +++----------------
 yarn.lock                                     |  5 +++++
 9 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 6b51d9cca..3ed077b6e 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "cypress-cucumber-preprocessor": "^1.16.2",
     "cypress-file-upload": "^3.3.4",
     "cypress-plugin-retries": "^1.3.0",
+    "date-fns": "^2.4.1",
     "dotenv": "^8.1.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index f765c534f..88959e27b 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -36,6 +36,7 @@
 import Dropdown from '~/components/Dropdown'
 import find from 'lodash/find'
 import orderBy from 'lodash/orderBy'
+import locales from '~/locales'
 
 export default {
   components: {
@@ -47,7 +48,7 @@ export default {
   },
   data() {
     return {
-      locales: orderBy(process.env.locales, 'name'),
+      locales: orderBy(locales, 'name'),
     }
   },
   computed: {
diff --git a/webapp/components/RelativeDateTime/index.vue b/webapp/components/RelativeDateTime/index.vue
index a6187425f..19018c24b 100644
--- a/webapp/components/RelativeDateTime/index.vue
+++ b/webapp/components/RelativeDateTime/index.vue
@@ -3,17 +3,8 @@
 </template>
 
 <script>
+import { getDateFnsLocale } from '~/locales'
 import formatRelative from 'date-fns/formatRelative'
-import { enUS, de, nl, fr, pt, es } from 'date-fns/locale' // pl currently not working library wise
-const locales = {
-  en: enUS,
-  de,
-  nl,
-  fr,
-  es,
-  pt,
-  // pl
-}
 
 export default {
   name: 'HcRelativeDateTime',
@@ -25,8 +16,7 @@ export default {
   },
   computed: {
     relativeDateTime() {
-      let locale = locales[this.$i18n.locale() || 'en']
-      return formatRelative(new Date(this.dateTime), new Date(), { locale })
+      return formatRelative(new Date(this.dateTime), new Date(), { locale: getDateFnsLocale(this) })
     },
   },
 }
diff --git a/webapp/locales/index.js b/webapp/locales/index.js
index b4dbedc6e..c4a21c724 100644
--- a/webapp/locales/index.js
+++ b/webapp/locales/index.js
@@ -1,50 +1,67 @@
-module.exports = [
+import { enUS, de, nl, fr, es, it, pt, pl } from 'date-fns/locale'
+import find from 'lodash/find'
+
+const locales = [
   {
     name: 'English',
     code: 'en',
     iso: 'en-US',
     enabled: true,
+    dateFnsLocale: enUS,
   },
   {
     name: 'Deutsch',
     code: 'de',
     iso: 'de-DE',
     enabled: true,
+    dateFnsLocale: de,
   },
   {
     name: 'Nederlands',
     code: 'nl',
     iso: 'nl-NL',
     enabled: true,
+    dateFnsLocale: nl,
   },
   {
     name: 'Français',
     code: 'fr',
     iso: 'fr-FR',
     enabled: true,
+    dateFnsLocale: fr,
   },
   {
     name: 'Italiano',
     code: 'it',
     iso: 'it-IT',
     enabled: true,
+    dateFnsLocale: it,
   },
   {
     name: 'Español',
     code: 'es',
     iso: 'es-ES',
     enabled: true,
+    dateFnsLocale: es,
   },
   {
     name: 'Português',
     code: 'pt',
     iso: 'pt-PT',
     enabled: true,
+    dateFnsLocale: pt,
   },
   {
     name: 'Polski',
     code: 'pl',
     iso: 'pl-PL',
     enabled: true,
+    dateFnsLocale: pl,
   },
 ]
+
+export default locales
+export function getDateFnsLocale({ $i18n }) {
+  const { dateFnsLocale } = find(locales, { code: $i18n.locale() }) || {}
+  return dateFnsLocale || enUS
+}
diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js
index 738178786..5478fd97d 100644
--- a/webapp/maintenance/source/nuxt.config.maintenance.js
+++ b/webapp/maintenance/source/nuxt.config.maintenance.js
@@ -1,16 +1,10 @@
 import defaultConfig from './nuxt.config.js'
 
-const {
-  css,
-  styleResources,
-  env: { locales },
-  manifest,
-} = defaultConfig
+const { css, styleResources, manifest } = defaultConfig
 
 export default {
   css,
   styleResources,
-  env: { locales },
   manifest,
 
   head: {
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 312e19325..ec2502379 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -52,8 +52,6 @@ export default {
     ],
     // pages to keep alive
     keepAlivePages: ['index'],
-    // active locales
-    locales: require('./locales'),
   },
   /*
    ** Headers of the page
diff --git a/webapp/plugins/i18n.js b/webapp/plugins/i18n.js
index 591387d00..e3f0c5fd2 100644
--- a/webapp/plugins/i18n.js
+++ b/webapp/plugins/i18n.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js'
 import { isEmpty, find } from 'lodash'
+import locales from '~/locales'
 
 /**
  * TODO: Refactor and simplify browser detection
@@ -76,7 +77,7 @@ export default ({ app, req, cookie, store }) => {
     }
   }
 
-  const availableLocales = process.env.locales.filter(lang => !!lang.enabled)
+  const availableLocales = locales.filter(lang => !!lang.enabled)
   const locale = find(availableLocales, ['code', userLocale]) ? userLocale : 'en'
 
   if (locale !== 'en') {
diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js
index b13af8fa0..df594f5e5 100644
--- a/webapp/plugins/vue-filters.js
+++ b/webapp/plugins/vue-filters.js
@@ -1,36 +1,21 @@
 import Vue from 'vue'
-
-import { enUS, de, nl, fr, es } from 'date-fns/locale'
 import format from 'date-fns/format'
 import accounting from 'accounting'
 import trunc from 'trunc-html'
+import { getDateFnsLocale } from '~/locales'
 
 export default ({ app = {} }) => {
-  const locales = {
-    en: enUS,
-    de: de,
-    nl: nl,
-    fr: fr,
-    es: es,
-    pt: es,
-    pl: de,
-  }
-  const getLocalizedFormat = () => {
-    let locale = app.$i18n.locale()
-    locale = locales[locale] ? locale : 'en'
-    return locales[locale]
-  }
   app.$filters = Object.assign(app.$filters || {}, {
     date: (value, fmt = 'dd. MMM yyyy') => {
       if (!value) return ''
       return format(new Date(value), fmt, {
-        locale: getLocalizedFormat(),
+        locale: getDateFnsLocale(app),
       })
     },
     dateTime: (value, fmt = 'dd. MMM yyyy HH:mm') => {
       if (!value) return ''
       return format(new Date(value), fmt, {
-        locale: getLocalizedFormat(),
+        locale: getDateFnsLocale(app),
       })
     },
     number: (value, precision = 2, thousands = '.', decimals = ',', fallback = null) => {
diff --git a/yarn.lock b/yarn.lock
index bd9d62653..3b44b19a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1965,6 +1965,11 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
+date-fns@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e"
+  integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw==
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"

From d7dc0646e002263920b2feadfe638052ae7074a2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 15 Oct 2019 19:21:05 +0200
Subject: [PATCH 191/212] Confirm, privacy policy, minimum age at registration

---
 .../Registration/CreateUserAccount.spec.js    |  4 ++-
 .../Registration/CreateUserAccount.vue        | 18 ++++++++++--
 webapp/components/Registration/Signup.vue     | 28 +------------------
 webapp/locales/de.json                        |  2 +-
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js
index 67a14b3c5..3bea5a975 100644
--- a/webapp/components/Registration/CreateUserAccount.spec.js
+++ b/webapp/components/Registration/CreateUserAccount.spec.js
@@ -61,7 +61,9 @@ describe('CreateUserAccount', () => {
             wrapper.find('input#password').setValue('hellopassword')
             wrapper.find('textarea#about').setValue('Hello I am the `about` attribute')
             wrapper.find('input#passwordConfirmation').setValue('hellopassword')
-            wrapper.find('input#checkbox').setChecked()
+            wrapper.find('input#checkbox0').setChecked()
+            wrapper.find('input#checkbox1').setChecked()
+            wrapper.find('input#checkbox2').setChecked()
             await wrapper.find('form').trigger('submit')
             await wrapper.html()
           }
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index be01e0bb0..7fc64a545 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -64,7 +64,7 @@
 
         <ds-text>
           <input
-            id="checkbox"
+            id="checkbox0"
             type="checkbox"
             v-model="termsAndConditionsConfirmed"
             :checked="termsAndConditionsConfirmed"
@@ -74,12 +74,24 @@
             v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
           ></label>
         </ds-text>
+        <p>
+          <label>
+            <input id="checkbox1" type="checkbox" v-model="dataPrivacy" :checked="dataPrivacy" />
+            <span v-html="$t('components.registration.signup.form.data-privacy')"></span>
+          </label>
+        </p>
+        <p>
+          <label>
+            <input id="checkbox2" type="checkbox" v-model="minimumAge" :checked="minimumAge" />
+            <span v-html="$t('components.registration.signup.form.minimum-age')"></span>
+          </label>
+        </p>
         <ds-button
           style="float: right;"
           icon="check"
           type="submit"
           :loading="$apollo.loading"
-          :disabled="errors || !termsAndConditionsConfirmed"
+          :disabled="errors || !termsAndConditionsConfirmed || !dataPrivacy || !minimumAge"
           primary
         >
           {{ $t('actions.save') }}
@@ -129,6 +141,8 @@ export default {
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
       termsAndConditionsConfirmed: false,
+      dataPrivacy: false,
+      minimumAge: false,
     }
   },
   props: {
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index 18750b300..00309b1c6 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -30,25 +30,6 @@
         name="email"
         icon="envelope"
       />
-      <p>
-        <label class="add-checkbox">
-          <input @change="handleInputValid" type="checkbox" v-model="checkbox1" />
-          <span v-html="$t('components.registration.signup.form.terms-and-condition')"></span>
-        </label>
-      </p>
-      <p>
-        <label class="add-checkbox">
-          <input@change="handleInputValid" type="checkbox" v-model="checkbox2"/>
-          <span v-html="$t('components.registration.signup.form.data-privacy')"></span>
-        </label>
-      </p>
-      <p>
-        <label class="add-checkbox">
-          <input @change="handleInputValid" type="checkbox" v-model="checkbox3" />
-          <span v-html="$t('components.registration.signup.form.minimum-age')"></span>
-        </label>
-      </p>
-
       <ds-button
         :disabled="disabled"
         :loading="$apollo.loading"
@@ -121,9 +102,6 @@ export default {
       disabled: true,
       success: false,
       error: null,
-      checkbox1: false,
-      checkbox2: false,
-      checkbox3: false,
     }
   },
   computed: {
@@ -137,11 +115,7 @@ export default {
       this.disabled = true
     },
     handleInputValid() {
-      if (this.checkbox1 && this.checkbox2 && this.checkbox3) {
-        this.disabled = false
-      } else {
-        this.disabled = true
-      }
+      this.disabled = false
     },
     async handleSubmit() {
       const mutation = this.token ? SignupByInvitationMutation : SignupMutation
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 39549a6a2..154dc67b6 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -30,7 +30,7 @@
         "title": "Mach mit bei Human Connection!",
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
-          "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen!</ds-text></a>zu.",
+          "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen</ds-text></a>zu.",
           "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen!</ds-text></a> gelesen und verstanden",
           "minimum-age": "Ich bin 18 Jahre oder älter.",
           "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",

From e8c694114246c0f09c298176946b349aabc2e001 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 15 Oct 2019 20:23:47 +0200
Subject: [PATCH 192/212] Follow @roschaefer's `PR` review suggestions

- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
---
 .../validation/validationMiddleware.js        |  5 +-
 webapp/components/Modal/ReportModal.vue       | 76 +++++++------------
 webapp/components/utils/ReportModal.js        | 25 ++++++
 webapp/components/utils/ReportModal.spec.js   | 36 +++++++++
 webapp/constants/modals.js                    | 11 +++
 webapp/locales/de.json                        |  3 +-
 webapp/locales/en.json                        |  3 +-
 webapp/pages/moderation/index.vue             |  2 +-
 8 files changed, 104 insertions(+), 57 deletions(-)
 create mode 100644 webapp/components/utils/ReportModal.js
 create mode 100644 webapp/components/utils/ReportModal.spec.js
 create mode 100644 webapp/constants/modals.js

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index ff3992ead..1dbd36b72 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -78,10 +78,7 @@ const validateReport = async (resolve, root, args, context, info) => {
     }
   })
 
-  if (existingReportedResource)
-    throw new Error(
-      `You have already reported the ${existingReportedResource.label}, please only report the same ${existingReportedResource.label} once`,
-    )
+  if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
   return resolve(root, args, context, info)
 }
 
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index c33515a37..9b155e8b6 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -8,9 +8,8 @@
 
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
-
     <ds-radio
-      :value="form.reasonCategory"
+      v-model="form.reasonCategory"
       :schema="formSchema.reasonCategory"
       :label="$t('report.reason.category.label')"
       :options="form.reasonCategoryOptions"
@@ -18,7 +17,7 @@
     />
     <ds-input
       class="reason-description"
-      :value="form.reasonDescription"
+      v-model="form.reasonDescription"
       :schema="formSchema.reasonDescription"
       :label="$t('report.reason.description.label')"
       :placeholder="$t('report.reason.description.placeholder')"
@@ -29,15 +28,16 @@
       {{ form.reasonDescription.length }}/{{ formSchema.reasonDescription.max }}
     </small>
     <ds-space />
-
-    <template slot="footer">
-      <ds-button class="cancel" icon="close" @click="cancel">{{ $t('report.cancel') }}</ds-button>
+    <template #footer>
+      <ds-button class="cancel" icon="close" @click="cancel">
+        {{ $t('report.cancel') }}
+      </ds-button>
 
       <ds-button
         danger
         class="confirm"
         icon="exclamation-circle"
-        :disabled="failsValidations"
+        :disabled="!form.reasonCategory"
         :loading="loading"
         @click="confirm"
       >
@@ -50,6 +50,8 @@
 <script>
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import { reportMutation } from '~/graphql/Moderation.js'
+import { valuesReasonCategoryOptions } from '~/constants/modals.js'
+import validReport from '~/components/utils/ReportModal'
 
 export default {
   name: 'ReportModal',
@@ -62,58 +64,25 @@ export default {
     id: { type: String, required: true },
   },
   data() {
-    // this list equals to enums in GraphQL schema file "backend/src/schema/types/type/REPORTED.gql"
-    let valuesReasonCategoryOptions = [
-      'discrimination_etc',
-      'pornographic_content_links',
-      'glorific_trivia_of_cruel_inhuman_acts',
-      'doxing',
-      'intentional_intimidation_stalking_persecution',
-      'advert_products_services_commercial',
-      'criminal_behavior_violation_german_law',
-      'other',
-    ]
-
-    let reasonCategoryOptions = []
-    valuesReasonCategoryOptions.forEach(reasonCategory => {
-      reasonCategoryOptions.push({
-        label: this.$t('report.reason.category.options.' + reasonCategory),
-        value: reasonCategory,
-      })
-    })
-
     return {
       isOpen: true,
       success: false,
       loading: false,
-      failsValidations: true,
       form: {
         reasonCategory: null,
-        reasonCategoryOptions,
+        reasonCategoryOptions: [],
         reasonDescription: '',
       },
-      formSchema: {
-        reasonCategory: {
-          type: 'enum',
-          required: true,
-          validator: (rule, value, callback, source, options) => {
-            this.form.reasonCategory = value
-            this.failsValidations = !this.form.reasonCategory
-            callback()
-          },
-        },
-        reasonDescription: {
-          type: 'string',
-          min: 0,
-          max: 200,
-          validator: (rule, value, callback, source, options) => {
-            this.form.reasonDescription = value
-            callback()
-          },
-        },
-      },
     }
   },
+  created() {
+    this.form.reasonCategoryOptions = valuesReasonCategoryOptions.map(reasonCategory => {
+      return {
+        label: this.$t('report.reason.category.options.' + reasonCategory),
+        value: reasonCategory,
+      }
+    })
+  },
   computed: {
     title() {
       return this.$t(`report.${this.type}.title`)
@@ -122,6 +91,12 @@ export default {
       const name = this.$filters.truncate(this.name, 30)
       return this.$t(`report.${this.type}.message`, { name })
     },
+    formSchema() {
+      const validReportSchema = validReport({ translate: this.$t })
+      return {
+        ...validReportSchema.formSchema,
+      }
+    },
   },
   methods: {
     async cancel() {
@@ -134,7 +109,6 @@ export default {
     },
     async confirm() {
       const { reasonCategory, reasonDescription } = this.form
-
       this.loading = true
       // TODO: Use the "modalData" structure introduced in "ConfirmModal" and refactor this here. Be aware that all the Jest tests have to be refactored as well !!!
       // await this.modalData.buttons.confirm.callback()
@@ -172,6 +146,8 @@ export default {
             case 'GraphQL error: Comment':
               this.$toast.error(this.$t('report.comment.error'))
               break
+            default:
+              this.$toast.error(err.message)
           }
           this.loading = false
         })
diff --git a/webapp/components/utils/ReportModal.js b/webapp/components/utils/ReportModal.js
new file mode 100644
index 000000000..da40704ad
--- /dev/null
+++ b/webapp/components/utils/ReportModal.js
@@ -0,0 +1,25 @@
+import { valuesReasonCategoryOptions } from '~/constants/modals.js'
+
+export default function validReport({ translate }) {
+  return {
+    formSchema: {
+      reasonCategory: {
+        type: 'object',
+        required: true,
+        fields: {
+          value: {
+            type: 'enum',
+            enum: valuesReasonCategoryOptions,
+            required: true,
+            message: translate('report.reason.category.invalid'),
+          },
+        },
+      },
+      reasonDescription: {
+        type: 'string',
+        min: 0,
+        max: 200,
+      },
+    },
+  }
+}
diff --git a/webapp/components/utils/ReportModal.spec.js b/webapp/components/utils/ReportModal.spec.js
new file mode 100644
index 000000000..de4277c4c
--- /dev/null
+++ b/webapp/components/utils/ReportModal.spec.js
@@ -0,0 +1,36 @@
+import validReport from './ReportModal'
+import Schema from 'async-validator'
+
+let translate
+
+beforeEach(() => {
+  translate = jest.fn(() => 'Validation error')
+})
+
+describe('validReport', () => {
+  let validate = object => {
+    const { formSchema } = validReport({ translate })
+    const validator = new Schema(formSchema)
+    return validator.validate(object, { suppressWarning: true }).catch(({ errors }) => {
+      throw new Error(errors[0].message)
+    })
+  }
+
+  describe('reasonCategory', () => {
+    describe('invalid enum', () => {
+      it('rejects', async () => {
+        await expect(validate({ reasonCategory: { value: 'invalid_enum' } })).rejects.toThrow(
+          'Validation error',
+        )
+      })
+    })
+
+    describe('valid enum', () => {
+      it('resolves', async () => {
+        await expect(
+          validate({ reasonCategory: { value: 'discrimination_etc' } }),
+        ).resolves.toBeUndefined()
+      })
+    })
+  })
+})
diff --git a/webapp/constants/modals.js b/webapp/constants/modals.js
new file mode 100644
index 000000000..f1d08fdc3
--- /dev/null
+++ b/webapp/constants/modals.js
@@ -0,0 +1,11 @@
+// this list equals to enums in GraphQL schema file "backend/src/schema/types/type/REPORTED.gql"
+export const valuesReasonCategoryOptions = [
+  'discrimination_etc',
+  'pornographic_content_links',
+  'glorific_trivia_of_cruel_inhuman_acts',
+  'doxing',
+  'intentional_intimidation_stalking_persecution',
+  'advert_products_services_commercial',
+  'criminal_behavior_violation_german_law',
+  'other',
+]
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9b5bfb934..ceffeb99c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -507,7 +507,8 @@
           "advert_products_services_commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
           "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
           "other": "Andere …"
-        }
+        },
+        "invalid": "Bitte wählen Sie eine gültige Kategorie aus"
       },
       "description": {
         "label": "Bitte erkläre: Warum möchtest du dies melden?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 43fb9239f..b36e99272 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -508,7 +508,8 @@
           "advert_products_services_commercial": "Advertising products and services with commercial intent.",
           "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
           "other": "Other …"
-        }
+        },
+        "invalid": "Please select a valid category"
       },
       "description": {
         "label": "Please explain: Why you like to report this?",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 535b2613c..ab72c0588 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -67,7 +67,7 @@
       <template slot="reasonCategory" slot-scope="scope">
         {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
       </template>
-      <!-- reasonCategory -->
+      <!-- reasonDescription -->
       <template slot="reasonDescription" slot-scope="scope">
         {{ scope.row.reasonDescription }}
       </template>

From 58fb4d56c6fd47285a10f27651b7bc88db37e64d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 15 Oct 2019 22:29:03 +0200
Subject: [PATCH 193/212] fix: use informal way of addressing in German

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ceffeb99c..979c3ac43 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -508,7 +508,7 @@
           "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
           "other": "Andere …"
         },
-        "invalid": "Bitte wählen Sie eine gültige Kategorie aus"
+        "invalid": "Bitte wähle eine gültige Kategorie aus"
       },
       "description": {
         "label": "Bitte erkläre: Warum möchtest du dies melden?",

From 17ead964507a0cfb3cae22d686f52104959f61ea Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 15 Oct 2019 23:50:34 +0200
Subject: [PATCH 194/212] Add missing translations for Title placeholder

---
 webapp/components/ContributionForm/ContributionForm.vue | 8 +++++++-
 webapp/locales/de.json                                  | 1 +
 webapp/locales/en.json                                  | 1 +
 webapp/locales/pt.json                                  | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 2b21282ae..6c87512b9 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -12,7 +12,13 @@
         <ds-space />
         <hc-user :user="currentUser" :trunc="35" />
         <ds-space />
-        <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
+        <ds-input
+          model="title"
+          class="post-title"
+          :placeholder="$t('contribution.title')"
+          name="title"
+          autofocus
+        />
         <small class="smallTag">{{ form.title.length }}/{{ formSchema.title.max }}</small>
         <client-only>
           <hc-editor
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 154dc67b6..0e2099ca3 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -531,6 +531,7 @@
     }
   },
   "contribution": {
+    "title": "Titel",
     "newPost": "Erstelle einen neuen Beitrag",
     "filterFollow": "Beiträge filtern von Usern denen ich folge",
     "filterALL": "Alle Beiträge anzeigen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a97a84a73..cc05f07bf 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -532,6 +532,7 @@
     }
   },
   "contribution": {
+    "title": "Title",
     "newPost": "Create a new Post",
     "filterFollow": "Filter contributions from users I follow",
     "filterALL": "View all contributions",
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 6eccc2fc0..809302ff7 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -202,6 +202,7 @@
     }
   },
   "contribution": {
+    "title": "Título",
     "edit": "Editar Contribuição",
     "delete": "Apagar Contribuição",
     "teaserImage": {

From 72016452e21275218b207a71c3430f1970553c0d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 16 Oct 2019 00:20:43 +0200
Subject: [PATCH 195/212] fix: typo in German translation

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 154dc67b6..05d4f335f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -31,7 +31,7 @@
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
           "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen</ds-text></a>zu.",
-          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen!</ds-text></a> gelesen und verstanden",
+          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen</ds-text></a> gelesen und verstanden",
           "minimum-age": "Ich bin 18 Jahre oder älter.",
           "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
           "errors": {

From 6a50ef6134a240d5725df87c039908d937bb846d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 16 Oct 2019 00:50:43 +0200
Subject: [PATCH 196/212] fix: storybook story of Comment.vue

This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
---
 webapp/components/Comment/Comment.spec.js         |  3 ---
 webapp/components/Comment/Comment.vue             | 12 ++++--------
 webapp/components/CommentList/CommentList.spec.js |  3 ---
 webapp/components/CommentList/CommentList.vue     |  2 ++
 webapp/pages/post/_id/_slug/index.vue             |  2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/webapp/components/Comment/Comment.spec.js b/webapp/components/Comment/Comment.spec.js
index 31ce8a40e..59e3f6c5a 100644
--- a/webapp/components/Comment/Comment.spec.js
+++ b/webapp/components/Comment/Comment.spec.js
@@ -32,9 +32,6 @@ describe('Comment.vue', () => {
         truncate: a => a,
         removeHtml: a => a,
       },
-      $route: {
-        hash: '',
-      },
       $scrollTo: jest.fn(),
       $apollo: {
         mutate: jest.fn().mockResolvedValue({
diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index a8b1576b9..abb1ff4eb 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -71,7 +71,7 @@ export default {
   mixins: [scrollToAnchor],
   data() {
     const anchor = `commentId-${this.comment.id}`
-    const isTarget = this.$route.hash === `#${anchor}`
+    const isTarget = this.routeHash === `#${anchor}`
 
     return {
       anchor,
@@ -87,13 +87,9 @@ export default {
     HcCommentForm,
   },
   props: {
-    post: { type: Object, default: () => {} },
-    comment: {
-      type: Object,
-      default() {
-        return {}
-      },
-    },
+    routeHash: { type: String, default: () => '' },
+    post: { type: Object, default: () => ({}) },
+    comment: { type: Object, default: () => ({}) },
     dateTime: { type: [Date, String], default: null },
   },
   computed: {
diff --git a/webapp/components/CommentList/CommentList.spec.js b/webapp/components/CommentList/CommentList.spec.js
index 16b284134..3287b7cd4 100644
--- a/webapp/components/CommentList/CommentList.spec.js
+++ b/webapp/components/CommentList/CommentList.spec.js
@@ -42,9 +42,6 @@ describe('CommentList.vue', () => {
           truncate: a => a,
           removeHtml: a => a,
         },
-        $route: {
-          hash: '',
-        },
         $scrollTo: jest.fn(),
         $apollo: {
           queries: {
diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue
index f1cdf910b..b1a79fd21 100644
--- a/webapp/components/CommentList/CommentList.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -22,6 +22,7 @@
         :key="comment.id"
         :comment="comment"
         :post="post"
+        :routeHash="routeHash"
         @deleteComment="updateCommentList"
         @updateComment="updateCommentList"
       />
@@ -38,6 +39,7 @@ export default {
     Comment,
   },
   props: {
+    routeHash: { type: String, default: () => '' },
     post: { type: Object, default: () => {} },
   },
   methods: {
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 9a4d12c26..0cb26b62e 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -68,7 +68,7 @@
       </ds-space>
       <!-- Comments -->
       <ds-section slot="footer">
-        <hc-comment-list :post="post" />
+        <hc-comment-list :post="post" :routeHash="$route.hash" />
         <ds-space margin-bottom="large" />
         <hc-comment-form :post="post" @createComment="createComment" />
       </ds-section>

From 5e5f6ec1ccf81309e607dbd1aca6b4e6e4230aea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 06:58:30 +0000
Subject: [PATCH 197/212] build(deps): bump dotenv from 8.1.0 to 8.2.0 in
 /backend

Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 67c721e0d..298c2272a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -56,7 +56,7 @@
     "cross-env": "~6.0.3",
     "date-fns": "2.4.1",
     "debug": "~4.1.1",
-    "dotenv": "~8.1.0",
+    "dotenv": "~8.2.0",
     "express": "^4.17.1",
     "faker": "Marak/faker.js#master",
     "graphql": "^14.5.8",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f52556865..2505d18e1 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3031,10 +3031,10 @@ dotenv@^4.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
   integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
 
-dotenv@~8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2"
-  integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==
+dotenv@~8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
+  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
 duplexer3@^0.1.4:
   version "0.1.4"

From 51ef7a7c8cce02a1ff7cd477be8456789bfc988c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 07:00:48 +0000
Subject: [PATCH 198/212] build(deps-dev): bump nodemon from 1.19.3 to 1.19.4
 in /backend

Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.3...v1.19.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 67c721e0d..7a76adc4c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -128,7 +128,7 @@
     "eslint-plugin-standard": "~4.0.1",
     "graphql-request": "~1.8.2",
     "jest": "~24.9.0",
-    "nodemon": "~1.19.3",
+    "nodemon": "~1.19.4",
     "prettier": "~1.18.2",
     "supertest": "~4.0.2"
   }
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f52556865..379ede44a 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2320,7 +2320,7 @@ cheerio@~1.0.0-rc.2, cheerio@~1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^2.1.5, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -6187,18 +6187,18 @@ nodemailer@^6.3.1:
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.3.1.tgz#2784beebac6b9f014c424c54dbdcc5c4d1221346"
   integrity sha512-j0BsSyaMlyadEDEypK/F+xlne2K5m6wzPYMXS/yxKI0s7jmT1kBx6GEKRVbZmyYfKOsjkeC/TiMVDJBI/w5gMQ==
 
-nodemon@~1.19.3:
-  version "1.19.3"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.3.tgz#db71b3e62aef2a8e1283a9fa00164237356102c0"
-  integrity sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w==
+nodemon@~1.19.4:
+  version "1.19.4"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.19.4.tgz#56db5c607408e0fdf8920d2b444819af1aae0971"
+  integrity sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==
   dependencies:
-    chokidar "^2.1.5"
-    debug "^3.1.0"
+    chokidar "^2.1.8"
+    debug "^3.2.6"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
-    pstree.remy "^1.1.6"
-    semver "^5.5.0"
-    supports-color "^5.2.0"
+    pstree.remy "^1.1.7"
+    semver "^5.7.1"
+    supports-color "^5.5.0"
     touch "^3.1.0"
     undefsafe "^2.0.2"
     update-notifier "^2.5.0"
@@ -6895,7 +6895,7 @@ psl@^1.1.24, psl@^1.1.28:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd"
   integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==
 
-pstree.remy@^1.1.6:
+pstree.remy@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.7.tgz#c76963a28047ed61542dc361aa26ee55a7fa15f3"
   integrity sha512-xsMgrUwRpuGskEzBFkH8NmTimbZ5PcPup0LA8JJkHIm2IMUbQcpo3yeLNWVrufEYjh8YwtSVh0xz6UeWc5Oh5A==
@@ -7407,7 +7407,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -7890,7 +7890,7 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.2.0, supports-color@^5.3.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==

From 47fac15032e8cd06200fdc45ba35be0e424c999f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 07:05:18 +0000
Subject: [PATCH 199/212] build(deps-dev): bump neode from 0.3.3 to 0.3.6

Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.3 to 0.3.6.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 3ed077b6e..172738553 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
     "neo4j-driver": "^1.7.6",
-    "neode": "^0.3.3",
+    "neode": "^0.3.6",
     "npm-run-all": "^4.1.5",
     "slug": "^1.1.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 3b44b19a0..0ccd0b065 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3482,7 +3482,7 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-neo4j-driver@^1.7.5, neo4j-driver@^1.7.6:
+neo4j-driver@^1.7.6:
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.6.tgz#eccb135a71eba9048c68717444593a6424cffc49"
   integrity sha512-6c3ALO3vYDfUqNoCy8OFzq+fQ7q/ab3LCuJrmm8P04M7RmyRCCnUtJ8IzSTGbiZvyhcehGK+azNDAEJhxPV/hA==
@@ -3491,14 +3491,14 @@ neo4j-driver@^1.7.5, neo4j-driver@^1.7.6:
     text-encoding-utf-8 "^1.0.2"
     uri-js "^4.2.2"
 
-neode@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/neode/-/neode-0.3.3.tgz#a539830cce6f6e4825462f6cb03f2969a0003f1b"
-  integrity sha512-pArHG1hD2kVwrzLlz6B1+IgdOJRQj/BgR6KzH6DlVzSA6geoZRe68fbpvmOJtzyPU7iuUYxXVk87PpPM1A7dlg==
+neode@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.3.6.tgz#7daf791eff6d170e52c338ea2e5cca6fdc6bfbe3"
+  integrity sha512-jCskCPobtHpsIIYQD72h5lRjMJEX70KwIeqgpt1VOLI+d1zJZvUlDkcOKgarAW0fmwtHIrPOP6mLPe5G/ZG9+g==
   dependencies:
     "@hapi/joi" "^15.1.0"
     dotenv "^4.0.0"
-    neo4j-driver "^1.7.5"
+    neo4j-driver "^1.7.6"
     uuid "^3.3.2"
 
 next-tick@^1.0.0:

From 7067867f76003c9b03b42b4af6bf812f2b981f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Oct 2019 09:25:50 +0200
Subject: [PATCH 200/212] Changed mentioned file in comment

---
 backend/src/schema/types/type/REPORTED.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 0822c14ed..7455de8c7 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -14,7 +14,7 @@ type REPORTED {
   comment: Comment
 }
 
-# this list equals the strings of an array in file "webapp/components/Modal/ReportModal.vue"
+# this list equals the strings of an array in file "webapp/constants/modals.js"
 enum ReasonCategory {
   other
   discrimination_etc

From 3c9627ea075a95faedd820fa620e03bdd9c23dd6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 07:32:31 +0000
Subject: [PATCH 201/212] build(deps-dev): bump date-fns from 2.4.1 to 2.5.0

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3ed077b6e..c8d2ebbab 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "cypress-cucumber-preprocessor": "^1.16.2",
     "cypress-file-upload": "^3.3.4",
     "cypress-plugin-retries": "^1.3.0",
-    "date-fns": "^2.4.1",
+    "date-fns": "^2.5.0",
     "dotenv": "^8.1.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
diff --git a/yarn.lock b/yarn.lock
index 3b44b19a0..d504a7216 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1965,10 +1965,10 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-fns@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e"
-  integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw==
+date-fns@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec"
+  integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==
 
 date-now@^0.1.4:
   version "0.1.4"

From d18017e2489351c71f225d0d0588f250c0dc1cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 16 Oct 2019 12:09:03 +0200
Subject: [PATCH 202/212] Update webapp/locales/de.json

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 05d4f335f..a9dce5145 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -31,7 +31,7 @@
         "form": {
           "description": "Um loszulegen, gib deine E-Mail Adresse ein:",
           "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Nutzungsbedingungen</ds-text></a>zu.",
-          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärungen</ds-text></a> gelesen und verstanden",
+          "data-privacy": "Ich habe die  <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung</ds-text></a> gelesen und verstanden",
           "minimum-age": "Ich bin 18 Jahre oder älter.",
           "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
           "errors": {

From 58cbd07e1b92159e2cc1eaa3130d327f43bf8133 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 10:17:55 +0000
Subject: [PATCH 203/212] build(deps): bump styleguide from `808b3c5` to
 `d46fc15`

Bumps [styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `808b3c5` to `d46fc15`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](https://github.com/Human-Connection/Nitro-Styleguide/compare/808b3c5a9523505cb80b20b50348d29ba9932845...d46fc1570c6bcea328ae4cc3a4892745edea7319)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 styleguide | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styleguide b/styleguide
index 808b3c5a9..d46fc1570 160000
--- a/styleguide
+++ b/styleguide
@@ -1 +1 @@
-Subproject commit 808b3c5a9523505cb80b20b50348d29ba9932845
+Subproject commit d46fc1570c6bcea328ae4cc3a4892745edea7319

From 8d5e0b0e2c20f4ec0052e29b97235ac85c775cdd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 10:18:30 +0000
Subject: [PATCH 204/212] build(deps): bump date-fns from 2.4.1 to 2.5.0 in
 /backend

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index ea65785d6..64cfcbfe5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -54,7 +54,7 @@
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
     "cross-env": "~6.0.3",
-    "date-fns": "2.4.1",
+    "date-fns": "2.5.0",
     "debug": "~4.1.1",
     "dotenv": "~8.2.0",
     "express": "^4.17.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index ab8c0d88a..b29318b5a 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2782,10 +2782,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e"
-  integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw==
+date-fns@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec"
+  integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"

From a815d92eb26c69b9d8594b49ff5e3418f5ac6c95 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2019 10:19:18 +0000
Subject: [PATCH 205/212] build(deps): bump date-fns from 2.4.1 to 2.5.0 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 7c892f181..19848882a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -65,7 +65,7 @@
     "cookie-universal-nuxt": "~2.0.18",
     "cropperjs": "^1.5.5",
     "cross-env": "~6.0.3",
-    "date-fns": "2.4.1",
+    "date-fns": "2.5.0",
     "express": "~4.17.1",
     "graphql": "~14.5.8",
     "isemail": "^3.2.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 23aae565b..567620dda 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6053,10 +6053,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.4.1.tgz#b53f9bb65ae6bd9239437035710e01cf383b625e"
-  integrity sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw==
+date-fns@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.5.0.tgz#b939f17c2902ce81cffe449702ba22c0781b38ec"
+  integrity sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==
 
 date-fns@^1.27.2:
   version "1.30.1"

From a306b9cf4bd550302e16508bdb2f52fe6934385c Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 16 Oct 2019 13:56:57 +0300
Subject: [PATCH 206/212] use constants, truncate only comments with more than
 300 characters

---
 webapp/components/Comment/Comment.vue | 5 +++--
 webapp/constants/comment.js           | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Comment/Comment.vue b/webapp/components/Comment/Comment.vue
index abb1ff4eb..a7be75b10 100644
--- a/webapp/components/Comment/Comment.vue
+++ b/webapp/components/Comment/Comment.vue
@@ -60,6 +60,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { COMMENT_MAX_UNTRUNCATED_LENGTH, COMMENT_TRUNCATE_TO_LENGTH } from '~/constants/comment'
 import HcUser from '~/components/User/User'
 import ContentMenu from '~/components/ContentMenu'
 import ContentViewer from '~/components/Editor/ContentViewer'
@@ -98,11 +99,11 @@ export default {
       isModerator: 'auth/isModerator',
     }),
     isLongComment() {
-      return this.$filters.removeHtml(this.comment.content).length > 180
+      return this.$filters.removeHtml(this.comment.content).length > COMMENT_MAX_UNTRUNCATED_LENGTH
     },
     commentContent() {
       if (this.isLongComment && this.isCollapsed) {
-        return this.$filters.truncate(this.comment.content, 180)
+        return this.$filters.truncate(this.comment.content, COMMENT_TRUNCATE_TO_LENGTH)
       }
 
       return this.comment.content
diff --git a/webapp/constants/comment.js b/webapp/constants/comment.js
index bab79ad37..09d6ed9ea 100644
--- a/webapp/constants/comment.js
+++ b/webapp/constants/comment.js
@@ -1 +1,3 @@
 export const COMMENT_MIN_LENGTH = 1
+export const COMMENT_MAX_UNTRUNCATED_LENGTH = 300
+export const COMMENT_TRUNCATE_TO_LENGTH = 180

From 30f268525f6f7289d8619b0742e3d04c9cc878db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Oct 2019 13:32:45 +0200
Subject: [PATCH 207/212] Add Cypher statement for ordering

- minor db manipulation text change
---
 backend/src/schema/resolvers/reports.js     | 99 ++++++++++++---------
 neo4j/change_report_node_to_relationship.sh |  2 +-
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 48677429a..426c35aea 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,8 +1,9 @@
 export default {
   Mutation: {
-    report: async (_parent, params, { driver, user }, _resolveInfo) => {
+    report: async (_parent, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
+      const { driver, user } = context
       const session = driver.session()
       const writeTxResultPromise = session.writeTransaction(async txc => {
         const reportRelationshipTransactionResponse = await txc.run(
@@ -58,54 +59,68 @@ export default {
     },
   },
   Query: {
-    reports: async (_parent, _params, { driver }, _resolveInfo) => {
+    reports: async (_parent, params, context, _resolveInfo) => {
+      const { driver } = context
       const session = driver.session()
-      const res = await session.run(
-        `
+      let response
+      let orderByClause
+      switch (params.orderBy) {
+        // case 'createdAt_asc':
+        //   orderByClause = 'ORDER BY report.createdAt ASC'
+        //   break
+        case 'createdAt_desc':
+          orderByClause = 'ORDER BY report.createdAt DESC'
+          break
+        default:
+          orderByClause = ''
+      }
+      try {
+        const cypher = `
           MATCH (submitter:User)-[report:REPORTED]->(resource)
           WHERE resource:User OR resource:Comment OR resource:Post
           RETURN report, submitter, resource, labels(resource)[0] as type
-        `,
-        {},
-      )
-      session.close()
+          ${orderByClause}
+        `
+        const result = await session.run(cypher, {})
+        const dbResponse = result.records.map(r => {
+          return {
+            report: r.get('report'),
+            submitter: r.get('submitter'),
+            resource: r.get('resource'),
+            type: r.get('type'),
+          }
+        })
+        if (!dbResponse) return null
 
-      const dbResponse = res.records.map(r => {
-        return {
-          report: r.get('report'),
-          submitter: r.get('submitter'),
-          resource: r.get('resource'),
-          type: r.get('type'),
-        }
-      })
-      if (!dbResponse) return null
+        response = []
+        dbResponse.forEach(ele => {
+          const { report, submitter, resource, type } = ele
 
-      const response = []
-      dbResponse.forEach(ele => {
-        const { report, submitter, resource, type } = ele
+          const responseEle = {
+            ...report.properties,
+            post: null,
+            comment: null,
+            user: null,
+            submitter: submitter.properties,
+            type,
+          }
 
-        const responseEle = {
-          ...report.properties,
-          post: null,
-          comment: null,
-          user: null,
-          submitter: submitter.properties,
-          type,
-        }
-
-        switch (type) {
-          case 'Post':
-            responseEle.post = resource.properties
-            break
-          case 'Comment':
-            responseEle.comment = resource.properties
-            break
-          case 'User':
-            responseEle.user = resource.properties
-            break
-        }
-        response.push(responseEle)
-      })
+          switch (type) {
+            case 'Post':
+              responseEle.post = resource.properties
+              break
+            case 'Comment':
+              responseEle.comment = resource.properties
+              break
+            case 'User':
+              responseEle.user = resource.properties
+              break
+          }
+          response.push(responseEle)
+        })
+      } finally {
+        session.close()
+      }
 
       return response
     },
diff --git a/neo4j/change_report_node_to_relationship.sh b/neo4j/change_report_node_to_relationship.sh
index a17dc6fe0..f8dd639be 100755
--- a/neo4j/change_report_node_to_relationship.sh
+++ b/neo4j/change_report_node_to_relationship.sh
@@ -21,6 +21,6 @@ DETACH DELETE report
 CREATE (submitter)-[reported:REPORTED]->(resource)
 SET reported.createdAt = toString(datetime())
 SET reported.reasonCategory = 'other'
-SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! createdAt is when the database manipulation happened.'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 RETURN reported;
 " | cypher-shell

From d62ee23f2af3336978c4c561a0cd91851d789e1c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 16 Oct 2019 17:20:35 +0200
Subject: [PATCH 208/212] Create new File with blob

- maintain filename
- reduce image size
---
 webapp/components/TeaserImage/TeaserImage.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
index d5b618c03..dc096710d 100644
--- a/webapp/components/TeaserImage/TeaserImage.vue
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -100,8 +100,9 @@ export default {
           thumbnailElement.appendChild(image)
           // Remove the editor from view
           editor.parentNode.removeChild(editor)
-          this.$emit('addTeaserImage', blob)
-        })
+          const croppedImageFile = new File([blob], file.name, { type: 'image/jpeg' })
+          this.$emit('addTeaserImage', croppedImageFile)
+        }, 'image/jpeg')
       })
       editor.appendChild(confirm)
 

From 5b25240aed6381f688a09c04c53f5c7285ab0da7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2019 08:04:54 +0000
Subject: [PATCH 209/212] build(deps-dev): bump dotenv from 8.1.0 to 8.2.0

Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8f2e2278b..5387c6111 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "cypress-file-upload": "^3.3.4",
     "cypress-plugin-retries": "^1.3.0",
     "date-fns": "^2.5.0",
-    "dotenv": "^8.1.0",
+    "dotenv": "^8.2.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
     "neo4j-driver": "^1.7.6",
diff --git a/yarn.lock b/yarn.lock
index 1ee6d911d..de68fd788 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2113,10 +2113,10 @@ dotenv@^4.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
   integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
 
-dotenv@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2"
-  integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==
+dotenv@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
+  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"

From 72290e1c8a7035814c7c9293952d4e29806c4206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 17 Oct 2019 10:16:27 +0200
Subject: [PATCH 210/212] Add ascendant ordering as enum to `ReportOrdering`

---
 backend/src/schema/resolvers/reports.js    | 6 +++---
 backend/src/schema/types/type/REPORTED.gql | 1 +
 styleguide                                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 426c35aea..083c94362 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -65,9 +65,9 @@ export default {
       let response
       let orderByClause
       switch (params.orderBy) {
-        // case 'createdAt_asc':
-        //   orderByClause = 'ORDER BY report.createdAt ASC'
-        //   break
+        case 'createdAt_asc':
+          orderByClause = 'ORDER BY report.createdAt ASC'
+          break
         case 'createdAt_desc':
           orderByClause = 'ORDER BY report.createdAt DESC'
           break
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 7455de8c7..5042672a7 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -30,6 +30,7 @@ enum ReasonCategory {
 # union ReportResource = User | Post | Comment
 
 enum ReportOrdering {
+  createdAt_asc
   createdAt_desc
 }
 
diff --git a/styleguide b/styleguide
index d46fc1570..808b3c5a9 160000
--- a/styleguide
+++ b/styleguide
@@ -1 +1 @@
-Subproject commit d46fc1570c6bcea328ae4cc3a4892745edea7319
+Subproject commit 808b3c5a9523505cb80b20b50348d29ba9932845

From 5505deee79326a8fb70b3b448654203b473c6e2c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 17 Oct 2019 12:44:30 +0200
Subject: [PATCH 211/212] Follow @alina-beck and @Tirokk PR suggestions

---
 webapp/locales/en.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 1a2ea643b..9860aa457 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -4,9 +4,9 @@
       "request": {
         "title": "Reset your password",
         "form": {
-          "description": "A password reset email will be sent to the given email address.",
-          "submit": "Request email",
-          "submitted": "An email with further instructions has been sent to <b>{email}</b>"
+          "description": "A password reset e-mail will be sent to the given e-mail address.",
+          "submit": "Request e-mail",
+          "submitted": "An e-mail with further instructions has been sent to <b>{email}</b>"
         }
       },
       "change-password": {
@@ -30,13 +30,13 @@
         "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server.",
         "title": "Join Human Connection!",
         "form": {
-          "description": "To get started, enter your email address:",
+          "description": "To get started, enter your e-mail address:",
           "terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>.",
           "data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ",
           "minimum-age": "I'm 18 years or older.",
           "invitation-code": "Your invitation code is: <b>{code}</b>",
           "errors": {
-            "email-exists": "There is already a user account with this email address!",
+            "email-exists": "There is already a user account with this e-mail address!",
             "invalid-invitation-token": "It looks like as if the invitation has been used already. Invitation links can only be used once."
           },
           "submit": "Create an account",
@@ -54,7 +54,7 @@
   "maintenance": {
     "title": "Human Connection is under maintenance",
     "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
-    "questions": "Any Questions or concerns, send an email to"
+    "questions": "Any Questions or concerns, send an e-mail to"
   },
   "index": {
     "no-results": "No contributions found.",
@@ -104,7 +104,7 @@
     "copy": "If you already have a human-connection account, please login.",
     "login": "Login",
     "logout": "Logout",
-    "email": "Your Email",
+    "email": "Your E-mail",
     "password": "Your Password",
     "forgotPassword": "Forgot Password?",
     "no-account": "Don't have an account?",
@@ -152,8 +152,8 @@
     },
     "invites": {
       "title": "Invite somebody to Human Connection!",
-      "description": "Enter thier email address for invitation.",
-      "emailPlaceholder": "Email to invite"
+      "description": "Enter thier e-mail address for invitation.",
+      "emailPlaceholder": "E-mail to invite"
     }
   },
   "notifications": {
@@ -182,23 +182,23 @@
     },
     "email": {
       "validation": {
-        "same-email": "This is your current email address"
+        "same-email": "This is your current e-mail address"
       },
-      "name": "Your email",
-      "labelEmail": "Change your email address",
-      "labelNewEmail": "New email Address",
+      "name": "Your e-mail",
+      "labelEmail": "Change your e-mail address",
+      "labelNewEmail": "New e-mail Address",
       "labelNonce": "Enter your code",
-      "success": "A new email address has been registered.",
-      "submitted": "An email to verify your address has been sent to <b>{email}</b>.",
-      "change-successful": "Your email address has been changed successfully.",
+      "success": "A new e-mail address has been registered.",
+      "submitted": "An e-mail to verify your address has been sent to <b>{email}</b>.",
+      "change-successful": "Your e-mail address has been changed successfully.",
       "verification-error": {
-        "message": "Your email could not be changed.",
+        "message": "Your e-mail could not be changed.",
         "explanation": "This can have different causes:",
         "reason": {
           "invalid-nonce": "Is the confirmation code invalid?",
-          "no-email-request": "Are you certain that you requested a change of your email address?"
+          "no-email-request": "Are you certain that you requested a change of your e-mail address?"
         },
-        "support": "If the problem persists, please contact us by email at"
+        "support": "If the problem persists, please contact us by e-mail at"
       }
     },
     "validation": {
@@ -312,7 +312,7 @@
     "users": {
       "name": "Users",
       "form": {
-        "placeholder": "email, name or description"
+        "placeholder": "e-mail, name or description"
       },
       "table": {
         "columns": {
@@ -415,7 +415,7 @@
     "loading": "loading",
     "reportContent": "Report",
     "validations": {
-      "email": "must be a valid email address",
+      "email": "must be a valid e-mail address",
       "url": "must be a valid URL"
     }
   },

From 20d9ba2439f46b99e7e09f3c532195fba2377cb3 Mon Sep 17 00:00:00 2001
From: Vasily Belolapotkov <belolapotkov.v@gmail.com>
Date: Thu, 17 Oct 2019 16:45:09 +0300
Subject: [PATCH 212/212] wrap user component with client-only

---
 webapp/components/ContributionForm/ContributionForm.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 6c87512b9..eb849c71f 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -10,7 +10,9 @@
       </hc-teaser-image>
       <ds-card>
         <ds-space />
-        <hc-user :user="currentUser" :trunc="35" />
+        <client-only>
+          <hc-user :user="currentUser" :trunc="35" />
+        </client-only>
         <ds-space />
         <ds-input
           model="title"