From a110a067fa8443cf69bfb1918489fb5364b7bdbc Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Sat, 8 Jun 2019 14:24:55 -0300
Subject: [PATCH 01/27] Add teaser image to contribution form

---
 webapp/components/ContributionForm/index.vue | 94 ++++++++++++++++++++
 webapp/components/Upload/index.vue           |  4 +-
 webapp/pages/post/create.vue                 |  4 +-
 webapp/pages/profile/_id/_slug.vue           |  4 +-
 4 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index cf90a23b4..fd6ad18bc 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -2,6 +2,21 @@
   <ds-form ref="contributionForm" v-model="form" :schema="formSchema" @submit="submit">
     <template slot-scope="{ errors }">
       <ds-card>
+        <vue-dropzone
+          :options="dropzoneOptions"
+          ref="el"
+          id="postdropzone"
+          :use-custom-slot="true"
+          @vdropzone-error="verror"
+        >
+          <div class="dz-message" @mouseover="hover = true" @mouseleave="hover = false">
+            <div class="hc-attachments-upload-area">
+              <div class="hc-drag-marker">
+                <ds-icon v-if="hover" name="image" size="xxx-large" />
+              </div>
+            </div>
+          </div>
+        </vue-dropzone>
         <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
         <no-ssr>
           <hc-editor :users="users" :value="form.content" @input="updateEditorContent" />
@@ -20,6 +35,7 @@
             {{ $t('actions.save') }}
           </ds-button>
         </div>
+        <ds-space margin-bottom="large" />
       </ds-card>
     </template>
   </ds-form>
@@ -27,11 +43,13 @@
 
 <script>
 import gql from 'graphql-tag'
+import vueDropzone from 'nuxt-dropzone'
 import HcEditor from '~/components/Editor'
 
 export default {
   components: {
     HcEditor,
+    vueDropzone,
   },
   props: {
     contribution: { type: Object, default: () => {} },
@@ -41,6 +59,7 @@ export default {
       form: {
         title: '',
         content: '',
+        teaserImage: '',
       },
       formSchema: {
         title: { required: true, min: 3, max: 64 },
@@ -51,6 +70,12 @@ export default {
       disabled: false,
       slug: null,
       users: [],
+      dropzoneOptions: {
+        url: this.vddrop,
+        maxFilesize: 5.0,
+        previewTemplate: this.template(),
+      },
+      hover: false,
     }
   },
   watch: {
@@ -103,6 +128,18 @@ export default {
       // this.form.content = value
       this.$refs.contributionForm.update('content', value)
     },
+    template() {
+      return `<div class="dz-preview dz-file-preview">
+                <div class="dz-image">
+                  <div data-dz-thumbnail-bg></div>
+                </div>
+              </div>
+      `
+    },
+    vddrop(file) {
+      this.form.teaserImage = file[0]
+    },
+    verror(file, message) {},
   },
   apollo: {
     User: {
@@ -135,4 +172,61 @@ export default {
     padding-right: 0;
   }
 }
+
+#postdropzone {
+  height: 160px;
+  background-color: $background-color-softest;
+}
+
+.hc-attachments-upload-area {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.hc-drag-marker {
+  position: relative;
+  width: 122px;
+  height: 122px;
+  border-radius: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: hsl(0, 0%, 25%);
+  transition: all 0.2s ease-out;
+  font-size: 60px;
+  margin: 20px auto 5px;
+
+  background-color: rgba(255, 255, 255, 0.3);
+  opacity: 0.65;
+
+  &:before {
+    position: absolute;
+    content: '';
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    border-radius: 100%;
+    border: 20px solid rgba(255, 255, 255, 0.4);
+    visibility: hidden;
+  }
+
+  &:after {
+    position: absolute;
+    content: '';
+    top: 10px;
+    left: 10px;
+    bottom: 10px;
+    right: 10px;
+    border-radius: 100%;
+    border: 1px dashed hsl(0, 0%, 25%);
+  }
+
+  .hc-attachments-upload-area:hover & {
+    opacity: 1;
+  }
+}
 </style>
diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue
index f7f730632..3f84f8a7c 100644
--- a/webapp/components/Upload/index.vue
+++ b/webapp/components/Upload/index.vue
@@ -9,7 +9,7 @@
       @vdropzone-error="verror"
     >
       <div class="dz-message" @mouseover="hover = true" @mouseleave="hover = false">
-        <hc-avatar :user="user" class="profile-avatar" size="x-large"></hc-avatar>
+        <slot></slot>
         <div class="hc-attachments-upload-area">
           <div class="hc-drag-marker">
             <ds-icon v-if="hover" name="image" size="xxx-large" />
@@ -22,12 +22,10 @@
 <script>
 import vueDropzone from 'nuxt-dropzone'
 import gql from 'graphql-tag'
-import HcAvatar from '~/components/Avatar/Avatar.vue'
 
 export default {
   components: {
     vueDropzone,
-    HcAvatar,
   },
   props: {
     user: { type: Object, default: null },
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index 108cead09..a5781032b 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -3,9 +3,7 @@
     <ds-flex-item :width="{ base: '100%', md: 3 }">
       <hc-contribution-form />
     </ds-flex-item>
-    <ds-flex-item :width="{ base: '100%', md: 1 }">
-      &nbsp;
-    </ds-flex-item>
+    <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
   </ds-flex>
 </template>
 
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index eedcd199b..f5c5f8745 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -10,7 +10,9 @@
           :class="{ 'disabled-content': user.disabled }"
           style="position: relative; height: auto;"
         >
-          <hc-upload v-if="myProfile" :user="user" />
+          <hc-upload v-if="myProfile" :user="user">
+            <hc-avatar :user="user" class="profile-avatar" size="x-large"></hc-avatar>
+          </hc-upload>
           <hc-avatar v-else :user="user" class="profile-avatar" size="x-large" />
           <no-ssr>
             <content-menu

From be70088dd7d5f07a55fd8c3ad64da550eee42995 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 20 Jun 2019 17:04:03 -0300
Subject: [PATCH 02/27] Get imageUpload working for Posts

---
 .../src/schema/resolvers/fileUpload/index.js  |  1 -
 webapp/components/ContributionForm/index.vue  | 66 +++++++++++++++++--
 webapp/graphql/PostMutations.js               | 27 ++++++--
 webapp/pages/post/_id/_slug/index.vue         |  2 +-
 4 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
index c37d87e39..fa78238c3 100644
--- a/backend/src/schema/resolvers/fileUpload/index.js
+++ b/backend/src/schema/resolvers/fileUpload/index.js
@@ -12,7 +12,6 @@ const storeUpload = ({ createReadStream, fileLocation }) =>
 
 export default async function fileUpload(params, { file, url }, uploadCallback = storeUpload) {
   const upload = params[file]
-
   if (upload) {
     const { createReadStream, filename } = await upload
     const { name } = path.parse(filename)
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index de5c5d75f..e0aaf8c79 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -7,9 +7,16 @@
           ref="el"
           id="postdropzone"
           :use-custom-slot="true"
+          @vdropzone-thumbnail="thumbnail"
+          @vdropzone-success="vsuccess"
           @vdropzone-error="verror"
         >
-          <div class="dz-message" @mouseover="hover = true" @mouseleave="hover = false">
+          <div
+            v-if="!teaser"
+            class="dz-message"
+            @mouseover="hover = true"
+            @mouseleave="hover = false"
+          >
             <div class="hc-attachments-upload-area">
               <div class="hc-drag-marker">
                 <ds-icon v-if="hover" name="image" size="xxx-large" />
@@ -95,11 +102,13 @@ export default {
       slug: null,
       users: [],
       dropzoneOptions: {
-        url: this.vddrop,
+        url: 'https://httpbin.org/post',
         maxFilesize: 5.0,
         previewTemplate: this.template(),
       },
       hover: false,
+      error: false,
+      teaser: false,
     }
   },
   watch: {
@@ -116,6 +125,12 @@ export default {
         this.form.language = this.locale
       },
     },
+    error() {
+      let that = this
+      setTimeout(function() {
+        that.error = false
+      }, 2000)
+    },
   },
   computed: {
     locale() {
@@ -140,6 +155,7 @@ export default {
             title: this.form.title,
             content: this.form.content,
             language: this.form.language ? this.form.language.value : this.$i18n.locale(),
+            imageUpload: this.form.teaserImage,
           },
         })
         .then(res => {
@@ -172,15 +188,31 @@ export default {
               </div>
       `
     },
-    vddrop(file) {
-      this.form.teaserImage = file[0]
+    verror(file, message) {
+      this.error = true
+      this.$toast.error(file.status, message)
     },
-    verror(file, message) {},
     availableLocales() {
       orderBy(locales, 'name').map(locale => {
         this.form.languageOptions.push({ label: locale.name, value: locale.code })
       })
     },
+    vsuccess(file, response) {
+      this.form.teaserImage = file
+    },
+    thumbnail: function(file, dataUrl) {
+      this.teaser = true
+      var j, len, ref, thumbnailElement
+      if (file.previewElement) {
+        ref = document.querySelectorAll('#postdropzone')
+        for (j = 0, len = ref.length; j < len; j++) {
+          thumbnailElement = ref[j]
+          thumbnailElement.classList.add('image-preview')
+          thumbnailElement.alt = file.name
+          thumbnailElement.style.backgroundImage = 'url("' + dataUrl + '")'
+        }
+      }
+    },
   },
   apollo: {
     User: {
@@ -215,10 +247,31 @@ export default {
 }
 
 #postdropzone {
-  height: 160px;
+  min-height: 160px;
   background-color: $background-color-softest;
 }
 
+#postdropzone.image-preview {
+  background-repeat: no-repeat;
+  background-size: 100%;
+  height: 600px;
+  transition: all 0.2s ease-out;
+
+  width: 100%;
+}
+
+@media only screen and (max-width: 400px) {
+  #postdropzone.image-preview {
+    height: 200px;
+  }
+}
+
+@media only screen and (min-width: 401px) and (max-width: 960px) {
+  #postdropzone.image-preview {
+    height: 400px;
+  }
+}
+
 .hc-attachments-upload-area {
   position: relative;
   display: flex;
@@ -269,6 +322,7 @@ export default {
   .hc-attachments-upload-area:hover & {
     opacity: 1;
   }
+}
 .contribution-form-footer {
   border-top: $border-size-base solid $border-color-softest;
 }
diff --git a/webapp/graphql/PostMutations.js b/webapp/graphql/PostMutations.js
index ad629bee7..31e618bfb 100644
--- a/webapp/graphql/PostMutations.js
+++ b/webapp/graphql/PostMutations.js
@@ -3,26 +3,45 @@ import gql from 'graphql-tag'
 export default () => {
   return {
     CreatePost: gql`
-      mutation($title: String!, $content: String!, $language: String) {
-        CreatePost(title: $title, content: $content, language: $language) {
+      mutation($title: String!, $content: String!, $language: String, $imageUpload: Upload) {
+        CreatePost(
+          title: $title
+          content: $content
+          language: $language
+          imageUpload: $imageUpload
+        ) {
           id
           title
           slug
           content
           contentExcerpt
           language
+          imageUpload
         }
       }
     `,
     UpdatePost: gql`
-      mutation($id: ID!, $title: String!, $content: String!, $language: String) {
-        UpdatePost(id: $id, title: $title, content: $content, language: $language) {
+      mutation(
+        $id: ID!
+        $title: String!
+        $content: String!
+        $language: String
+        $imageUpload: Upload
+      ) {
+        UpdatePost(
+          id: $id
+          title: $title
+          content: $content
+          language: $language
+          imageUpload: $imageUpload
+        ) {
           id
           title
           slug
           content
           contentExcerpt
           language
+          imageUpload
         }
       }
     `,
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 5751f42b0..0019157c7 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -2,7 +2,7 @@
   <transition name="fade" appear>
     <ds-card
       v-if="post && ready"
-      :image="post.image"
+      :image="post.image | proxyApiUrl"
       :class="{ 'post-card': true, 'disabled-content': post.disabled }"
     >
       <ds-space margin-bottom="small" />

From 51153ca870212b9b6fa027360f4a36d6b9d4ff97 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 20 Jun 2019 18:04:21 -0300
Subject: [PATCH 03/27] Update test, use destructuring to clean up code

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

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 8b741443f..c8ae187db 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -89,10 +89,16 @@ describe('ContributionForm.vue', () => {
       })
 
       describe('valid form submission', () => {
-        expectedParams = {
-          variables: { title: postTitle, content: postContent, language: 'en', id: null },
-        }
         beforeEach(async () => {
+          expectedParams = {
+            variables: {
+              title: postTitle,
+              content: postContent,
+              language: 'en',
+              id: null,
+              imageUpload: null,
+            },
+          }
           postTitleInput = wrapper.find('.ds-input')
           postTitleInput.setValue('this is a title for a post')
           wrapper.vm.updateEditorContent('this is a post')
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index e0aaf8c79..035e78682 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -88,7 +88,7 @@ export default {
       form: {
         title: '',
         content: '',
-        teaserImage: '',
+        teaserImage: null,
         language: null,
         languageOptions: [],
       },
@@ -123,6 +123,7 @@ export default {
         this.form.content = contribution.content
         this.form.title = contribution.title
         this.form.language = this.locale
+        this.form.teaserImage = contribution.imageUpload
       },
     },
     error() {
@@ -146,16 +147,17 @@ export default {
   },
   methods: {
     submit() {
+      const { title, content, language, teaserImage } = this.form
       this.loading = true
       this.$apollo
         .mutate({
           mutation: this.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
           variables: {
             id: this.id,
-            title: this.form.title,
-            content: this.form.content,
-            language: this.form.language ? this.form.language.value : this.$i18n.locale(),
-            imageUpload: this.form.teaserImage,
+            title,
+            content,
+            language: language ? language.value : this.$i18n.locale(),
+            imageUpload: teaserImage,
           },
         })
         .then(res => {

From d2d692ec8f4d6031f2cc9b01bf2cd44b57cea587 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 20 Jun 2019 22:47:31 -0300
Subject: [PATCH 04/27] Get working with edit contribution, styling

---
 webapp/components/ContributionForm/index.vue | 26 +++++++++-----------
 webapp/pages/post/edit/_id.vue               |  4 ++-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 035e78682..d21894b53 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -11,15 +11,11 @@
           @vdropzone-success="vsuccess"
           @vdropzone-error="verror"
         >
-          <div
-            v-if="!teaser"
-            class="dz-message"
-            @mouseover="hover = true"
-            @mouseleave="hover = false"
-          >
+          <div v-if="!teaser" class="dz-message">
             <div class="hc-attachments-upload-area">
-              <div class="hc-drag-marker">
-                <ds-icon v-if="hover" name="image" size="xxx-large" />
+              <slot></slot>
+              <div class="hc-drag-marker-post" v-if="!contribution">
+                <ds-icon name="image" size="xxx-large" />
               </div>
             </div>
           </div>
@@ -106,7 +102,6 @@ export default {
         maxFilesize: 5.0,
         previewTemplate: this.template(),
       },
-      hover: false,
       error: false,
       teaser: false,
     }
@@ -249,14 +244,15 @@ export default {
 }
 
 #postdropzone {
-  min-height: 160px;
+  width: 100%;
+  height: auto;
   background-color: $background-color-softest;
 }
 
 #postdropzone.image-preview {
   background-repeat: no-repeat;
-  background-size: 100%;
-  height: 600px;
+  background-size: cover;
+  height: 300px;
   transition: all 0.2s ease-out;
 
   width: 100%;
@@ -270,7 +266,7 @@ export default {
 
 @media only screen and (min-width: 401px) and (max-width: 960px) {
   #postdropzone.image-preview {
-    height: 400px;
+    height: 300px;
   }
 }
 
@@ -282,7 +278,7 @@ export default {
   cursor: pointer;
 }
 
-.hc-drag-marker {
+.hc-drag-marker-post {
   position: relative;
   width: 122px;
   height: 122px;
@@ -293,7 +289,7 @@ export default {
   color: hsl(0, 0%, 25%);
   transition: all 0.2s ease-out;
   font-size: 60px;
-  margin: 20px auto 5px;
+  margin: 30px 5px;
 
   background-color: rgba(255, 255, 255, 0.3);
   opacity: 0.65;
diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index 150087ce2..a7c34f5a9 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -1,7 +1,9 @@
 <template>
   <ds-flex :width="{ base: '100%' }" gutter="base">
     <ds-flex-item :width="{ base: '100%', md: 3 }">
-      <hc-contribution-form :contribution="contribution" />
+      <hc-contribution-form :contribution="contribution">
+        <img :src="contribution.image | proxyApiUrl" />
+      </hc-contribution-form>
     </ds-flex-item>
     <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
   </ds-flex>

From 6367d226ff73778c769c1166d4646defd89c3b09 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 21 Jun 2019 13:16:18 -0300
Subject: [PATCH 05/27] Styling, tweak to work with edit and create

---
 .../ContributionForm/ContributionForm.spec.js | 11 +++
 webapp/components/ContributionForm/index.vue  | 71 +++++++++++++------
 webapp/pages/post/edit/_id.vue                |  2 +-
 3 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index c8ae187db..2275193df 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -89,6 +89,10 @@ describe('ContributionForm.vue', () => {
       })
 
       describe('valid form submission', () => {
+        const imageUpload = {
+          file: { filename: 'avataar.svg', previewElement: '' },
+          url: 'someUrlToImage',
+        }
         beforeEach(async () => {
           expectedParams = {
             variables: {
@@ -121,6 +125,13 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
+        it('supports adding a teaser image', async () => {
+          expectedParams.variables.imageUpload = imageUpload
+          wrapper.vm.vsuccess(imageUpload)
+          await wrapper.find('form').trigger('submit')
+          expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+        })
+
         it("pushes the user to the post's page", async () => {
           expect(mocks.$router.push).toHaveBeenCalledTimes(1)
         })
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index d21894b53..e052860f0 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -11,10 +11,20 @@
           @vdropzone-success="vsuccess"
           @vdropzone-error="verror"
         >
-          <div v-if="!teaser" class="dz-message">
-            <div class="hc-attachments-upload-area">
+          <div class="dz-message">
+            <div
+              :class="{
+                'hc-attachments-upload-area-post': createOrUpdate,
+                'hc-attachments-upload-area-update-post': contribution,
+              }"
+            >
               <slot></slot>
-              <div class="hc-drag-marker-post" v-if="!contribution">
+              <div
+                :class="{
+                  'hc-drag-marker-post': createOrUpdate,
+                  'hc-drag-marker-update-post': contribution,
+                }"
+              >
                 <ds-icon name="image" size="xxx-large" />
               </div>
             </div>
@@ -103,7 +113,7 @@ export default {
         previewTemplate: this.template(),
       },
       error: false,
-      teaser: false,
+      createOrUpdate: true,
     }
   },
   watch: {
@@ -197,17 +207,19 @@ export default {
     vsuccess(file, response) {
       this.form.teaserImage = file
     },
-    thumbnail: function(file, dataUrl) {
-      this.teaser = true
-      var j, len, ref, thumbnailElement
+    thumbnail: (file, dataUrl) => {
+      let thumbnailElement, contributionImage, uploadArea
       if (file.previewElement) {
-        ref = document.querySelectorAll('#postdropzone')
-        for (j = 0, len = ref.length; j < len; j++) {
-          thumbnailElement = ref[j]
-          thumbnailElement.classList.add('image-preview')
-          thumbnailElement.alt = file.name
-          thumbnailElement.style.backgroundImage = 'url("' + dataUrl + '")'
+        thumbnailElement = document.querySelectorAll('#postdropzone')[0]
+        contributionImage = document.querySelectorAll('.contribution-image')[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')
         }
+        thumbnailElement.classList.add('image-preview')
+        thumbnailElement.alt = file.name
+        thumbnailElement.style.backgroundImage = 'url("' + dataUrl + '")'
       }
     },
   },
@@ -245,14 +257,15 @@ export default {
 
 #postdropzone {
   width: 100%;
-  height: auto;
+  min-height: 300px;
   background-color: $background-color-softest;
 }
 
 #postdropzone.image-preview {
   background-repeat: no-repeat;
   background-size: cover;
-  height: 300px;
+  background-position: center;
+  height: auto;
   transition: all 0.2s ease-out;
 
   width: 100%;
@@ -270,16 +283,23 @@ export default {
   }
 }
 
-.hc-attachments-upload-area {
+.hc-attachments-upload-area-post {
   position: relative;
   display: flex;
-  align-items: center;
   justify-content: center;
   cursor: pointer;
 }
 
+.hc-attachments-upload-area-update-post {
+  align-items: center;
+}
+
+.hc-attachments-upload-area-update-post:hover {
+  opacity: 0.7;
+}
+
 .hc-drag-marker-post {
-  position: relative;
+  position: absolute;
   width: 122px;
   height: 122px;
   border-radius: 100%;
@@ -289,9 +309,9 @@ export default {
   color: hsl(0, 0%, 25%);
   transition: all 0.2s ease-out;
   font-size: 60px;
-  margin: 30px 5px;
+  margin: 80px 5px;
 
-  background-color: rgba(255, 255, 255, 0.3);
+  background-color: $background-color-softest;
   opacity: 0.65;
 
   &:before {
@@ -302,7 +322,7 @@ export default {
     bottom: 0;
     right: 0;
     border-radius: 100%;
-    border: 20px solid rgba(255, 255, 255, 0.4);
+    border: 20px solid $text-color-base;
     visibility: hidden;
   }
 
@@ -314,13 +334,18 @@ export default {
     bottom: 10px;
     right: 10px;
     border-radius: 100%;
-    border: 1px dashed hsl(0, 0%, 25%);
+    border: $border-size-base dashed $text-color-base;
   }
 
-  .hc-attachments-upload-area:hover & {
+  .hc-attachments-upload-area-post:hover & {
     opacity: 1;
   }
 }
+
+.hc-drag-marker-update-post {
+  opacity: 0;
+}
+
 .contribution-form-footer {
   border-top: $border-size-base solid $border-color-softest;
 }
diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index a7c34f5a9..873b45939 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -2,7 +2,7 @@
   <ds-flex :width="{ base: '100%' }" gutter="base">
     <ds-flex-item :width="{ base: '100%', md: 3 }">
       <hc-contribution-form :contribution="contribution">
-        <img :src="contribution.image | proxyApiUrl" />
+        <img class="contribution-image" :src="contribution.image | proxyApiUrl" />
       </hc-contribution-form>
     </ds-flex-item>
     <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>

From 9cbeacea64f5e40040387c3352e2cef8050e7164 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 21 Jun 2019 19:00:02 -0300
Subject: [PATCH 06/27] Update test to use filters

---
 webapp/pages/post/_id/_slug/index.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/pages/post/_id/_slug/index.spec.js b/webapp/pages/post/_id/_slug/index.spec.js
index 33916c7a5..7a2c398b6 100644
--- a/webapp/pages/post/_id/_slug/index.spec.js
+++ b/webapp/pages/post/_id/_slug/index.spec.js
@@ -2,11 +2,13 @@ import { config, shallowMount, createLocalVue } from '@vue/test-utils'
 import PostSlug from './index.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
+import Filters from '~/plugins/vue-filters'
 
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
 localVue.use(Styleguide)
+localVue.use(Filters)
 
 config.stubs['no-ssr'] = '<span><slot /></span>'
 

From aff2b4aaf0efebbc646661fbd3057634b683dfc3 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Sat, 22 Jun 2019 13:55:03 -0300
Subject: [PATCH 07/27] Revert graphql-shield

- broke the CreatePost functionality when image was added :shrug:

Co-authored-by: Mike Aono <aonomike@gmail.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 85a51fa14..b7110cc4e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
-    "graphql-shield": "~5.7.1",
+    "graphql-shield": "~5.6.1",
     "graphql-tag": "~2.10.1",
     "graphql-yoga": "~1.18.0",
     "helmet": "~3.18.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index dee5b8d20..769e05c29 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1110,10 +1110,10 @@
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
   integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
 
-"@types/yup@0.26.17":
-  version "0.26.17"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.17.tgz#5cb7cfc211d8e985b21d88289542591c92cad9dc"
-  integrity sha512-MN7VHlPsZQ2MTBxLE2Gl+Qfg2WyKsoz+vIr8xN0OSZ4AvJDrrKBlxc8b59UXCCIG9tPn9XhxTXh3j/htHbzC2Q==
+"@types/yup@0.26.16":
+  version "0.26.16"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.16.tgz#75c428236207c48d9f8062dd1495cda8c5485a15"
+  integrity sha512-E2RNc7DSeQ+2EIJ1H3+yFjYu6YiyQBUJ7yNpIxomrYJ3oFizLZ5yDS3T1JTUNBC2OCRkgnhLS0smob5UuCHfNA==
 
 "@types/zen-observable@^0.5.3":
   version "0.5.4"
@@ -3789,12 +3789,12 @@ graphql-request@~1.8.2:
   dependencies:
     cross-fetch "2.2.2"
 
-graphql-shield@~5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.7.1.tgz#04095fb8148a463997f7c509d4aeb2a6abf79f98"
-  integrity sha512-UZ0K1uAqRAoGA1U2DsUu4vIZX2Vents4Xim99GFEUBTgvSDkejiE+k/Dywqfu76lJFEE8qu3vG5fhJN3SmnKbA==
+graphql-shield@~5.6.1:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.6.2.tgz#27eaad2ce2591ed81b1203e8915df99b28fb5ad5"
+  integrity sha512-DlS6r39s7AaP07yMM6i7GI87UkfL65O1tUPW4kNqp67fD1BU71Ekl7Kt/1L3rxS/gcQdGufuKka5oKUa5GKo2A==
   dependencies:
-    "@types/yup" "0.26.17"
+    "@types/yup" "0.26.16"
     lightercollective "^0.3.0"
     object-hash "^1.3.1"
     yup "^0.27.0"

From 7796483a469160bfaec9a68a1ff0e7b102fd326c Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 24 Jun 2019 12:45:53 -0300
Subject: [PATCH 08/27] Add test for upload error, update variable name

---
 .../ContributionForm/ContributionForm.spec.js | 21 +++++++++++++++++++
 webapp/components/ContributionForm/index.vue  |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 2275193df..5da3bdf04 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -151,6 +151,7 @@ describe('ContributionForm.vue', () => {
 
       describe('handles errors', () => {
         beforeEach(async () => {
+          jest.useFakeTimers()
           wrapper = Wrapper()
           postTitleInput = wrapper.find('.ds-input')
           postTitleInput.setValue('this is a title for a post')
@@ -158,11 +159,31 @@ describe('ContributionForm.vue', () => {
           // second submission causes mutation to reject
           await wrapper.find('form').trigger('submit')
         })
+
         it('shows an error toaster when apollo mutation rejects', async () => {
           await wrapper.find('form').trigger('submit')
           await mocks.$apollo.mutate
           expect(mocks.$toast.error).toHaveBeenCalledWith('Not Authorised!')
         })
+
+        const message = 'File upload failed'
+        const fileError = { status: 'error' }
+
+        it('defaults to error false', () => {
+          expect(wrapper.vm.error).toEqual(false)
+        })
+
+        it('shows an error toaster when verror is called', () => {
+          wrapper.vm.verror(fileError, message)
+          expect(mocks.$toast.error).toHaveBeenCalledWith(fileError.status, message)
+        })
+
+        it('changes error status from false to true to false', () => {
+          wrapper.vm.verror(fileError, message)
+          expect(wrapper.vm.error).toEqual(true)
+          jest.runAllTimers()
+          expect(wrapper.vm.error).toEqual(false)
+        })
       })
     })
   })
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index e052860f0..f2a30a51a 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -14,14 +14,14 @@
           <div class="dz-message">
             <div
               :class="{
-                'hc-attachments-upload-area-post': createOrUpdate,
+                'hc-attachments-upload-area-post': createAndUpdate,
                 'hc-attachments-upload-area-update-post': contribution,
               }"
             >
               <slot></slot>
               <div
                 :class="{
-                  'hc-drag-marker-post': createOrUpdate,
+                  'hc-drag-marker-post': createAndUpdate,
                   'hc-drag-marker-update-post': contribution,
                 }"
               >
@@ -113,7 +113,7 @@ export default {
         previewTemplate: this.template(),
       },
       error: false,
-      createOrUpdate: true,
+      createAndUpdate: true,
     }
   },
   watch: {

From 9f8720df81748032899b21f1ec0e28d044420a74 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 25 Jun 2019 12:09:48 -0300
Subject: [PATCH 09/27] Remove need for third party url upload

- we can save the file to a variable, it requires a "url" returned
- we can get by returning an empty string
---
 backend/src/schema/types/scalar/Upload.gql            |  2 +-
 .../ContributionForm/ContributionForm.spec.js         | 11 +++++------
 webapp/components/ContributionForm/index.vue          |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/backend/src/schema/types/scalar/Upload.gql b/backend/src/schema/types/scalar/Upload.gql
index fca9ea1fc..cf3965846 100644
--- a/backend/src/schema/types/scalar/Upload.gql
+++ b/backend/src/schema/types/scalar/Upload.gql
@@ -1 +1 @@
-scalar Upload
\ No newline at end of file
+scalar Upload
diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index f8decfc8e..8a9298619 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -97,10 +97,9 @@ describe('ContributionForm.vue', () => {
       })
 
       describe('valid form submission', () => {
-        const imageUpload = {
-          file: { filename: 'avataar.svg', previewElement: '' },
-          url: 'someUrlToImage',
-        }
+        const imageUpload = [
+          { file: { filename: 'avataar.svg', previewElement: '' }, url: 'someUrlToImage' },
+        ]
         beforeEach(async () => {
           expectedParams = {
             mutation: PostMutations().CreatePost,
@@ -135,8 +134,8 @@ describe('ContributionForm.vue', () => {
         })
 
         it('supports adding a teaser image', async () => {
-          expectedParams.variables.imageUpload = imageUpload
-          wrapper.vm.vsuccess(imageUpload)
+          expectedParams.variables.imageUpload = imageUpload[0]
+          wrapper.vm.addTeaserImage(imageUpload)
           await wrapper.find('form').trigger('submit')
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 2ddbf353f..135486c10 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -8,7 +8,6 @@
           id="postdropzone"
           :use-custom-slot="true"
           @vdropzone-thumbnail="thumbnail"
-          @vdropzone-success="vsuccess"
           @vdropzone-error="verror"
         >
           <div class="dz-message">
@@ -108,7 +107,7 @@ export default {
       slug: null,
       users: [],
       dropzoneOptions: {
-        url: 'https://httpbin.org/post',
+        url: this.addTeaserImage,
         maxFilesize: 5.0,
         previewTemplate: this.template(),
       },
@@ -204,8 +203,9 @@ export default {
         this.form.languageOptions.push({ label: locale.name, value: locale.code })
       })
     },
-    vsuccess(file, response) {
-      this.form.teaserImage = file
+    addTeaserImage(file) {
+      this.form.teaserImage = file[0]
+      return ''
     },
     thumbnail: (file, dataUrl) => {
       let thumbnailElement, contributionImage, uploadArea

From 6d8e98104313880750f3fa39ca218a48d2206ecc Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 25 Jun 2019 19:20:26 -0300
Subject: [PATCH 10/27] Fix styling for EditPost teaser image

---
 webapp/components/ContributionForm/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 135486c10..b4bf48048 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -291,6 +291,7 @@ export default {
 }
 
 .hc-attachments-upload-area-update-post {
+  background-color: $background-color-base;
   align-items: center;
 }
 
@@ -349,4 +350,8 @@ export default {
 .contribution-form-footer {
   border-top: $border-size-base solid $border-color-softest;
 }
+
+.contribution-image {
+  max-height: 300px;
+}
 </style>

From 2baaf85b21690ca8ac9d0c060394868761959ac4 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 25 Jun 2019 20:49:09 -0300
Subject: [PATCH 11/27] Extract TeaserImage component, refactor tests

---
 .../ContributionForm/ContributionForm.spec.js |  39 +---
 webapp/components/ContributionForm/index.vue  | 194 ++---------------
 .../TeaserImage/TeaserImage.spec.js           |  61 ++++++
 webapp/components/TeaserImage/TeaserImage.vue | 197 ++++++++++++++++++
 webapp/pages/post/edit/_id.vue                |   4 +-
 5 files changed, 290 insertions(+), 205 deletions(-)
 create mode 100644 webapp/components/TeaserImage/TeaserImage.spec.js
 create mode 100644 webapp/components/TeaserImage/TeaserImage.vue

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 8a9298619..caeeafdf6 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -3,11 +3,14 @@ import ContributionForm from './index.vue'
 import Styleguide from '@human-connection/styleguide'
 import Vuex from 'vuex'
 import PostMutations from '~/graphql/PostMutations.js'
+import Filters from '~/plugins/vue-filters'
+import TeaserImage from '~/components/TeaserImage/TeaserImage'
 
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
 localVue.use(Styleguide)
+localVue.use(Filters)
 
 config.stubs['no-ssr'] = '<span><slot /></span>'
 
@@ -21,6 +24,10 @@ describe('ContributionForm.vue', () => {
   let propsData
   const postTitle = 'this is a title for a post'
   const postContent = 'this is a post'
+  const imageUpload = {
+    file: { filename: 'avataar.svg', previewElement: '' },
+    url: 'someUrlToImage',
+  }
 
   beforeEach(() => {
     mocks = {
@@ -97,9 +104,6 @@ describe('ContributionForm.vue', () => {
       })
 
       describe('valid form submission', () => {
-        const imageUpload = [
-          { file: { filename: 'avataar.svg', previewElement: '' }, url: 'someUrlToImage' },
-        ]
         beforeEach(async () => {
           expectedParams = {
             mutation: PostMutations().CreatePost,
@@ -134,8 +138,8 @@ describe('ContributionForm.vue', () => {
         })
 
         it('supports adding a teaser image', async () => {
-          expectedParams.variables.imageUpload = imageUpload[0]
-          wrapper.vm.addTeaserImage(imageUpload)
+          expectedParams.variables.imageUpload = imageUpload
+          wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
           await wrapper.find('form').trigger('submit')
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
@@ -173,25 +177,6 @@ describe('ContributionForm.vue', () => {
           await mocks.$apollo.mutate
           expect(mocks.$toast.error).toHaveBeenCalledWith('Not Authorised!')
         })
-
-        const message = 'File upload failed'
-        const fileError = { status: 'error' }
-
-        it('defaults to error false', () => {
-          expect(wrapper.vm.error).toEqual(false)
-        })
-
-        it('shows an error toaster when verror is called', () => {
-          wrapper.vm.verror(fileError, message)
-          expect(mocks.$toast.error).toHaveBeenCalledWith(fileError.status, message)
-        })
-
-        it('changes error status from false to true to false', () => {
-          wrapper.vm.verror(fileError, message)
-          expect(wrapper.vm.error).toEqual(true)
-          jest.runAllTimers()
-          expect(wrapper.vm.error).toEqual(false)
-        })
       })
     })
 
@@ -204,6 +189,7 @@ describe('ContributionForm.vue', () => {
             title: 'dies ist ein Post',
             content: 'auf Deutsch geschrieben',
             language: 'de',
+            imageUpload,
           },
         }
         wrapper = Wrapper()
@@ -225,10 +211,6 @@ describe('ContributionForm.vue', () => {
         expect(wrapper.vm.form.content).toEqual(propsData.contribution.content)
       })
 
-      it('sets language equal to contribution language', () => {
-        expect(wrapper.vm.form.language).toEqual({ value: propsData.contribution.language })
-      })
-
       it('calls the UpdatePost apollo mutation', async () => {
         expectedParams = {
           mutation: PostMutations().UpdatePost,
@@ -237,6 +219,7 @@ describe('ContributionForm.vue', () => {
             content: postContent,
             language: propsData.contribution.language,
             id: propsData.contribution.id,
+            imageUpload,
           },
         }
         postTitleInput = wrapper.find('.ds-input')
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index b4bf48048..57eb105be 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -2,33 +2,13 @@
   <ds-form ref="contributionForm" v-model="form" :schema="formSchema" @submit="submit">
     <template slot-scope="{ errors }">
       <ds-card>
-        <vue-dropzone
-          :options="dropzoneOptions"
-          ref="el"
-          id="postdropzone"
-          :use-custom-slot="true"
-          @vdropzone-thumbnail="thumbnail"
-          @vdropzone-error="verror"
-        >
-          <div class="dz-message">
-            <div
-              :class="{
-                'hc-attachments-upload-area-post': createAndUpdate,
-                'hc-attachments-upload-area-update-post': contribution,
-              }"
-            >
-              <slot></slot>
-              <div
-                :class="{
-                  'hc-drag-marker-post': createAndUpdate,
-                  'hc-drag-marker-update-post': contribution,
-                }"
-              >
-                <ds-icon name="image" size="xxx-large" />
-              </div>
-            </div>
-          </div>
-        </vue-dropzone>
+        <hc-teaser-image :contribution="contribution" @addTeaserImage="addTeaserImage">
+          <img
+            v-if="contribution"
+            class="contribution-image"
+            :src="contribution.image | proxyApiUrl"
+          />
+        </hc-teaser-image>
         <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
         <no-ssr>
           <hc-editor :users="users" :value="form.content" @input="updateEditorContent" />
@@ -74,16 +54,16 @@
 
 <script>
 import gql from 'graphql-tag'
-import vueDropzone from 'nuxt-dropzone'
 import HcEditor from '~/components/Editor'
 import orderBy from 'lodash/orderBy'
 import locales from '~/locales'
 import PostMutations from '~/graphql/PostMutations.js'
+import HcTeaserImage from '~/components/TeaserImage/TeaserImage'
 
 export default {
   components: {
     HcEditor,
-    vueDropzone,
+    HcTeaserImage,
   },
   props: {
     contribution: { type: Object, default: () => {} },
@@ -106,13 +86,6 @@ export default {
       disabled: false,
       slug: null,
       users: [],
-      dropzoneOptions: {
-        url: this.addTeaserImage,
-        maxFilesize: 5.0,
-        previewTemplate: this.template(),
-      },
-      error: false,
-      createAndUpdate: true,
     }
   },
   watch: {
@@ -127,15 +100,8 @@ export default {
         this.form.content = contribution.content
         this.form.title = contribution.title
         this.form.teaserImage = contribution.imageUpload
-        this.form.language = { value: contribution.language }
       },
     },
-    error() {
-      let that = this
-      setTimeout(function() {
-        that.error = false
-      }, 2000)
-    },
   },
   computed: {
     locale() {
@@ -151,7 +117,15 @@ export default {
   },
   methods: {
     submit() {
-      const { title, content, language, teaserImage } = this.form
+      const { title, content, teaserImage } = this.form
+      let language
+      if (this.form.language) {
+        language = this.form.language.value
+      } else if (this.contribution && this.contribution.language) {
+        language = this.contribution.language
+      } else {
+        language = this.$i18n.locale()
+      }
       this.loading = true
       this.$apollo
         .mutate({
@@ -160,7 +134,7 @@ export default {
             id: this.id,
             title,
             content,
-            language: language ? language.value : this.$i18n.locale(),
+            language,
             imageUpload: teaserImage,
           },
         })
@@ -186,41 +160,13 @@ export default {
       // this.form.content = value
       this.$refs.contributionForm.update('content', value)
     },
-    template() {
-      return `<div class="dz-preview dz-file-preview">
-                <div class="dz-image">
-                  <div data-dz-thumbnail-bg></div>
-                </div>
-              </div>
-      `
-    },
-    verror(file, message) {
-      this.error = true
-      this.$toast.error(file.status, message)
-    },
     availableLocales() {
       orderBy(locales, 'name').map(locale => {
         this.form.languageOptions.push({ label: locale.name, value: locale.code })
       })
     },
     addTeaserImage(file) {
-      this.form.teaserImage = file[0]
-      return ''
-    },
-    thumbnail: (file, dataUrl) => {
-      let thumbnailElement, contributionImage, uploadArea
-      if (file.previewElement) {
-        thumbnailElement = document.querySelectorAll('#postdropzone')[0]
-        contributionImage = document.querySelectorAll('.contribution-image')[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')
-        }
-        thumbnailElement.classList.add('image-preview')
-        thumbnailElement.alt = file.name
-        thumbnailElement.style.backgroundImage = 'url("' + dataUrl + '")'
-      }
+      this.form.teaserImage = file
     },
   },
   apollo: {
@@ -254,104 +200,4 @@ export default {
     padding-right: 0;
   }
 }
-
-#postdropzone {
-  width: 100%;
-  min-height: 300px;
-  background-color: $background-color-softest;
-}
-
-#postdropzone.image-preview {
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-position: center;
-  height: auto;
-  transition: all 0.2s ease-out;
-
-  width: 100%;
-}
-
-@media only screen and (max-width: 400px) {
-  #postdropzone.image-preview {
-    height: 200px;
-  }
-}
-
-@media only screen and (min-width: 401px) and (max-width: 960px) {
-  #postdropzone.image-preview {
-    height: 300px;
-  }
-}
-
-.hc-attachments-upload-area-post {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  cursor: pointer;
-}
-
-.hc-attachments-upload-area-update-post {
-  background-color: $background-color-base;
-  align-items: center;
-}
-
-.hc-attachments-upload-area-update-post:hover {
-  opacity: 0.7;
-}
-
-.hc-drag-marker-post {
-  position: absolute;
-  width: 122px;
-  height: 122px;
-  border-radius: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: hsl(0, 0%, 25%);
-  transition: all 0.2s ease-out;
-  font-size: 60px;
-  margin: 80px 5px;
-
-  background-color: $background-color-softest;
-  opacity: 0.65;
-
-  &:before {
-    position: absolute;
-    content: '';
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    border-radius: 100%;
-    border: 20px solid $text-color-base;
-    visibility: hidden;
-  }
-
-  &:after {
-    position: absolute;
-    content: '';
-    top: 10px;
-    left: 10px;
-    bottom: 10px;
-    right: 10px;
-    border-radius: 100%;
-    border: $border-size-base dashed $text-color-base;
-  }
-
-  .hc-attachments-upload-area-post:hover & {
-    opacity: 1;
-  }
-}
-
-.hc-drag-marker-update-post {
-  opacity: 0;
-}
-
-.contribution-form-footer {
-  border-top: $border-size-base solid $border-color-softest;
-}
-
-.contribution-image {
-  max-height: 300px;
-}
 </style>
diff --git a/webapp/components/TeaserImage/TeaserImage.spec.js b/webapp/components/TeaserImage/TeaserImage.spec.js
new file mode 100644
index 000000000..07b17e16b
--- /dev/null
+++ b/webapp/components/TeaserImage/TeaserImage.spec.js
@@ -0,0 +1,61 @@
+import { mount, createLocalVue } from '@vue/test-utils'
+import TeaserImage from './TeaserImage.vue'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = createLocalVue()
+
+localVue.use(Styleguide)
+
+describe('TeaserImage.vue', () => {
+  let wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      $toast: {
+        error: jest.fn(),
+      },
+    }
+  })
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(TeaserImage, { mocks, localVue })
+    }
+    beforeEach(() => {
+      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'
+      const fileError = { status: 'error' }
+
+      it('defaults to error false', () => {
+        expect(wrapper.vm.error).toEqual(false)
+      })
+
+      it('shows an error toaster when verror is called', () => {
+        wrapper.vm.verror(fileError, message)
+        expect(mocks.$toast.error).toHaveBeenCalledWith(fileError.status, message)
+      })
+
+      it('changes error status from false to true to false', () => {
+        wrapper.vm.verror(fileError, message)
+        expect(wrapper.vm.error).toEqual(true)
+        jest.runAllTimers()
+        expect(wrapper.vm.error).toEqual(false)
+      })
+    })
+  })
+})
diff --git a/webapp/components/TeaserImage/TeaserImage.vue b/webapp/components/TeaserImage/TeaserImage.vue
new file mode 100644
index 000000000..cb657fe9a
--- /dev/null
+++ b/webapp/components/TeaserImage/TeaserImage.vue
@@ -0,0 +1,197 @@
+<template>
+  <vue-dropzone
+    :options="dropzoneOptions"
+    ref="el"
+    id="postdropzone"
+    :use-custom-slot="true"
+    @vdropzone-thumbnail="thumbnail"
+    @vdropzone-error="verror"
+  >
+    <div class="dz-message">
+      <div
+        :class="{
+          'hc-attachments-upload-area-post': createAndUpdate,
+          'hc-attachments-upload-area-update-post': contribution,
+        }"
+      >
+        <slot></slot>
+        <div
+          :class="{
+            'hc-drag-marker-post': createAndUpdate,
+            'hc-drag-marker-update-post': contribution,
+          }"
+        >
+          <ds-icon name="image" size="xxx-large" />
+        </div>
+      </div>
+    </div>
+  </vue-dropzone>
+</template>
+
+<script>
+import vueDropzone from 'nuxt-dropzone'
+
+export default {
+  components: {
+    vueDropzone,
+  },
+  props: {
+    contribution: { type: Object, default: () => {} },
+  },
+  data() {
+    return {
+      dropzoneOptions: {
+        url: this.addTeaserImage,
+        maxFilesize: 5.0,
+        previewTemplate: this.template(),
+      },
+      error: false,
+      createAndUpdate: true,
+    }
+  },
+  watch: {
+    error() {
+      let that = this
+      setTimeout(function() {
+        that.error = false
+      }, 2000)
+    },
+  },
+  methods: {
+    template() {
+      return `<div class="dz-preview dz-file-preview">
+                <div class="dz-image">
+                  <div data-dz-thumbnail-bg></div>
+                </div>
+              </div>
+      `
+    },
+    verror(file, message) {
+      this.error = true
+      this.$toast.error(file.status, message)
+    },
+    addTeaserImage(file) {
+      this.$emit('addTeaserImage', file[0])
+      return ''
+    },
+    thumbnail: (file, dataUrl) => {
+      let thumbnailElement, contributionImage, uploadArea
+      if (file.previewElement) {
+        thumbnailElement = document.querySelectorAll('#postdropzone')[0]
+        contributionImage = document.querySelectorAll('.contribution-image')[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')
+        }
+        thumbnailElement.classList.add('image-preview')
+        thumbnailElement.alt = file.name
+        thumbnailElement.style.backgroundImage = 'url("' + dataUrl + '")'
+      }
+    },
+  },
+}
+</script>
+<style lang="scss">
+#postdropzone {
+  width: 100%;
+  min-height: 300px;
+  background-color: $background-color-softest;
+}
+
+#postdropzone.image-preview {
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: center;
+  height: auto;
+  transition: all 0.2s ease-out;
+
+  width: 100%;
+}
+
+@media only screen and (max-width: 400px) {
+  #postdropzone.image-preview {
+    height: 200px;
+  }
+}
+
+@media only screen and (min-width: 401px) and (max-width: 960px) {
+  #postdropzone.image-preview {
+    height: 300px;
+  }
+}
+
+.hc-attachments-upload-area-post {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.hc-attachments-upload-area-update-post img {
+  object-fit: cover;
+  object-position: center;
+  display: block;
+  width: 100%;
+}
+
+.hc-attachments-upload-area-update-post:hover {
+  opacity: 0.7;
+}
+
+.hc-drag-marker-post {
+  position: absolute;
+  width: 122px;
+  height: 122px;
+  border-radius: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: hsl(0, 0%, 25%);
+  transition: all 0.2s ease-out;
+  font-size: 60px;
+  margin: 80px 5px;
+
+  background-color: $background-color-softest;
+  opacity: 0.65;
+
+  &:before {
+    position: absolute;
+    content: '';
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    border-radius: 100%;
+    border: 20px solid $text-color-base;
+    visibility: hidden;
+  }
+
+  &:after {
+    position: absolute;
+    content: '';
+    top: 10px;
+    left: 10px;
+    bottom: 10px;
+    right: 10px;
+    border-radius: 100%;
+    border: $border-size-base dashed $text-color-base;
+  }
+
+  .hc-attachments-upload-area-post:hover & {
+    opacity: 1;
+  }
+}
+
+.hc-drag-marker-update-post {
+  opacity: 0;
+}
+
+.contribution-form-footer {
+  border-top: $border-size-base solid $border-color-softest;
+}
+
+.contribution-image {
+  max-height: 300px;
+}
+</style>
diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index 873b45939..150087ce2 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -1,9 +1,7 @@
 <template>
   <ds-flex :width="{ base: '100%' }" gutter="base">
     <ds-flex-item :width="{ base: '100%', md: 3 }">
-      <hc-contribution-form :contribution="contribution">
-        <img class="contribution-image" :src="contribution.image | proxyApiUrl" />
-      </hc-contribution-form>
+      <hc-contribution-form :contribution="contribution" />
     </ds-flex-item>
     <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
   </ds-flex>

From fad044731214279cd752b5b7ceed2626e006bffe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2019 09:03:03 +0000
Subject: [PATCH 12/27] Bump eslint-config-prettier from 5.0.0 to 6.0.0 in
 /webapp

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 5.0.0 to 6.0.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/v5.0.0...v6.0.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 0353b0fd9..c014b46dd 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -91,7 +91,7 @@
     "babel-eslint": "~10.0.2",
     "babel-jest": "~24.8.0",
     "eslint": "~5.16.0",
-    "eslint-config-prettier": "~5.0.0",
+    "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
     "eslint-loader": "~2.1.2",
     "eslint-plugin-import": "~2.18.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f214b42f3..da920d71d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4236,10 +4236,10 @@ eslint-config-prettier@^3.3.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-config-prettier@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-5.0.0.tgz#f7a94b2b8ae7cbf25842c36fa96c6d32cd0a697c"
-  integrity sha512-c17Aqiz5e8LEqoc/QPmYnaxQFAHTx2KlCZBPxXXjEMmNchOLnV/7j0HoPZuC+rL/tDC9bazUYOKJW9bOhftI/w==
+eslint-config-prettier@~6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#f429a53bde9fc7660e6353910fd996d6284d3c25"
+  integrity sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==
   dependencies:
     get-stdin "^6.0.0"
 

From df29412dd1437e33727e888ce7feac513f909557 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2019 09:06:01 +0000
Subject: [PATCH 13/27] Bump apollo-server from 2.6.4 to 2.6.6 in /backend

Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.4 to 2.6.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.6.4...apollo-server@2.6.6)

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

diff --git a/backend/package.json b/backend/package.json
index e05b41463..276daed2f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,7 +47,7 @@
     "apollo-client": "~2.6.3",
     "apollo-link-context": "~1.0.18",
     "apollo-link-http": "~1.5.15",
-    "apollo-server": "~2.6.4",
+    "apollo-server": "~2.6.6",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index dec5d7f4f..eb6a714ea 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1279,14 +1279,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-apollo-cache-control@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.2.tgz#b8852422d973c582493e85c776abc9c660090162"
-  integrity sha512-7prjFN8H9lRE0npqGG8kM3XICvNCcgQt6eCy8kkcPOIZwM+F8m8ShjEfNF9UWW32i+poOk3G67HegPRyjCc6/Q==
-  dependencies:
-    apollo-server-env "2.4.0"
-    graphql-extensions "0.7.2"
-
 apollo-cache-control@0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.4.tgz#0cb5c7be0e0dd0c44b1257144cd7f9f2a3c374e6"
@@ -1350,18 +1342,6 @@ apollo-engine-reporting-protobuf@0.3.1:
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.2.tgz#b2569f79eb1a7a7380f49340db61465f449284fe"
-  integrity sha512-Q9XUZ3CTqddjCswlbn+OD2oYxZ5p4lCAnsWOGMfYnSmCXLagyNK28UFFQodjFOy73p6nlTAg9cwaJ9yMOBeeXA==
-  dependencies:
-    apollo-engine-reporting-protobuf "0.3.1"
-    apollo-graphql "^0.3.2"
-    apollo-server-core "2.6.4"
-    apollo-server-env "2.4.0"
-    async-retry "^1.2.1"
-    graphql-extensions "0.7.3"
-
 apollo-engine-reporting@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.4.tgz#65e12f94221d80b3b1740c26e82ce9bb6bdfb7ee"
@@ -1442,32 +1422,6 @@ apollo-server-caching@0.4.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.4.tgz#0372e3a28f221b9db83bdfbb0fd0b2960cd29bab"
-  integrity sha512-GBF+tQoJ/ysaY2CYMkuuAwJM1nk1yLJumrsBTFfcvalSzS64VdS5VN/zox1eRI+LHQQzHM18HYEAgDGa/EX+gw==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-    "@apollographql/graphql-playground-html" "1.6.20"
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "0.7.2"
-    apollo-datasource "0.5.0"
-    apollo-engine-reporting "1.3.2"
-    apollo-server-caching "0.4.0"
-    apollo-server-env "2.4.0"
-    apollo-server-errors "2.3.0"
-    apollo-server-plugin-base "0.5.3"
-    apollo-tracing "0.7.2"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.7.3"
-    graphql-subscriptions "^1.0.0"
-    graphql-tag "^2.9.2"
-    graphql-tools "^4.0.0"
-    graphql-upload "^8.0.2"
-    sha.js "^2.4.11"
-    subscriptions-transport-ws "^0.9.11"
-    ws "^6.0.0"
-
 apollo-server-core@2.6.6:
   version "2.6.6"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.6.tgz#55fea7980a943948c49dea20d81b9bbfc0e04f87"
@@ -1516,10 +1470,10 @@ apollo-server-errors@2.3.0:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
   integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
 
-apollo-server-express@2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.4.tgz#fc1d661be73fc1880aa53a56e1abe3733d08eada"
-  integrity sha512-U6hiZxty/rait39V5d+QeueNHlwfl68WbYtsutDUVxnq2Jws2ZDrvIkaWWN6HQ77+nBy5gGVxycvWIyoHHfi+g==
+apollo-server-express@2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.6.tgz#ec2b955354d7dd4d12fe01ea7e983d302071d5b9"
+  integrity sha512-bY/xrr9lZH+hsjchiQuSXpW3ivXfL1h81M5VE9Ppus1PVwwEIar/irBN+PFp97WxERZPDjVZzrRKa+lRHjtJsA==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.20"
     "@types/accepts" "^1.3.5"
@@ -1527,7 +1481,7 @@ apollo-server-express@2.6.4:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.0"
     accepts "^1.3.5"
-    apollo-server-core "2.6.4"
+    apollo-server-core "2.6.6"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
@@ -1555,11 +1509,6 @@ apollo-server-module-graphiql@^1.3.4, apollo-server-module-graphiql@^1.4.0:
   resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec"
   integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==
 
-apollo-server-plugin-base@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.3.tgz#234c6330c412a2e83ff49305a0c2f991fb40a266"
-  integrity sha512-Ax043vQTzPgFeJk6m6hmPm9NMfogO3LlTKJfrWHuyZhPNeTLweHNK30vpdzzgPalcryyDMDfLYFzxuDm0W+rRQ==
-
 apollo-server-plugin-base@0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.5.tgz#364e4a2fca4d95ddeb9fd3e78940ed1da58865c2"
@@ -1572,25 +1521,17 @@ apollo-server-testing@~2.6.6:
   dependencies:
     apollo-server-core "2.6.6"
 
-apollo-server@~2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.4.tgz#34b3a50135e20b8df8c194a14e4636eb9c2898b2"
-  integrity sha512-f0TZOc969XNNlSm8sVsU34D8caQfPNwS0oqmWUxb8xXl88HlFzB+HBmOU6ZEKdpMCksTNDbqYo0jXiGJ0rL/0g==
+apollo-server@~2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.6.tgz#0570fce4a682eb1de8bc1b86dbe2543de440cd4e"
+  integrity sha512-7Bulb3RnOO4/SGA66LXu3ZHCXIK8MYMrsxy4yti1/adDIUmcniolDqJwOYUGoTmv1AQjRxgJb4TVZ0Dk9nrrYg==
   dependencies:
-    apollo-server-core "2.6.4"
-    apollo-server-express "2.6.4"
+    apollo-server-core "2.6.6"
+    apollo-server-express "2.6.6"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
 
-apollo-tracing@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.2.tgz#7730159a4670bca465ac1bfa01f9902610a7aba4"
-  integrity sha512-bT4/n8Vy9DweC3+XWJelJD41FBlKMXR0OVxjLMiCe9clb4yTgKhYxRGTyh9KjmhWsng9gG/DphO0ixWsOgdXmA==
-  dependencies:
-    apollo-server-env "2.4.0"
-    graphql-extensions "0.7.2"
-
 apollo-tracing@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.3.tgz#8533e3e2dca2d5a25e8439ce498ea33ff4d159ee"
@@ -3779,20 +3720,6 @@ graphql-deduplicator@^2.0.1:
   resolved "https://registry.yarnpkg.com/graphql-deduplicator/-/graphql-deduplicator-2.0.2.tgz#d8608161cf6be97725e178df0c41f6a1f9f778f3"
   integrity sha512-0CGmTmQh4UvJfsaTPppJAcHwHln8Ayat7yXXxdnuWT+Mb1dBzkbErabCWzjXyKh/RefqlGTTA7EQOZHofMaKJA==
 
-graphql-extensions@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.2.tgz#8711543f835661eaf24b48d6ac2aad44dbbd5506"
-  integrity sha512-TuVINuAOrEtzQAkAlCZMi9aP5rcZ+pVaqoBI5fD2k5O9fmb8OuXUQOW028MUhC66tg4E7h4YSF1uYUIimbu4SQ==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-
-graphql-extensions@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.3.tgz#2ab7331c72ae657e4cbfa4ff004c400b19f56cdf"
-  integrity sha512-D+FZM0t5gFntJUizeRCurZuUqsyVP13CRejRX+cDJivyGkE6OMWYkCWlzHcbye79q+hYN1m6a3NhlrJRaD9D0w==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-
 graphql-extensions@0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.4.tgz#78327712822281d5778b9210a55dc59c93a9c184"

From ee1be0ba27e34bbf5d3f5e730b3502e00bbaa442 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2019 12:08:23 +0000
Subject: [PATCH 14/27] Bump eslint-config-prettier from 5.0.0 to 6.0.0 in
 /backend

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 5.0.0 to 6.0.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/v5.0.0...v6.0.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 276daed2f..6da8e5a14 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -95,7 +95,7 @@
     "chai": "~4.2.0",
     "cucumber": "~5.1.0",
     "eslint": "~6.0.1",
-    "eslint-config-prettier": "~5.0.0",
+    "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
     "eslint-plugin-import": "~2.18.0",
     "eslint-plugin-jest": "~22.7.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index eb6a714ea..784db090e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3000,10 +3000,10 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-5.0.0.tgz#f7a94b2b8ae7cbf25842c36fa96c6d32cd0a697c"
-  integrity sha512-c17Aqiz5e8LEqoc/QPmYnaxQFAHTx2KlCZBPxXXjEMmNchOLnV/7j0HoPZuC+rL/tDC9bazUYOKJW9bOhftI/w==
+eslint-config-prettier@~6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#f429a53bde9fc7660e6353910fd996d6284d3c25"
+  integrity sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==
   dependencies:
     get-stdin "^6.0.0"
 

From d383592c099959d3e6c1bb6d19bb460924ab004f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 04:21:37 +0000
Subject: [PATCH 15/27] Bump apollo-server-testing from 2.6.6 to 2.6.7 in
 /backend

Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.7.
- [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.6.6...apollo-server-testing@2.6.7)

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

diff --git a/backend/package.json b/backend/package.json
index 276daed2f..289d4a981 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -88,7 +88,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.4.5",
     "@babel/register": "~7.4.4",
-    "apollo-server-testing": "~2.6.6",
+    "apollo-server-testing": "~2.6.7",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.2",
     "babel-jest": "~24.8.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index eb6a714ea..a87c577aa 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1354,6 +1354,18 @@ apollo-engine-reporting@1.3.4:
     async-retry "^1.2.1"
     graphql-extensions "0.7.5"
 
+apollo-engine-reporting@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.5.tgz#075424d39dfe77a20f96e8e33b7ae52d58c38e1e"
+  integrity sha512-pSwjPgXK/elFsR22LXALtT3jI4fpEpeTNTHgNwLVLohaolusMYgBc/9FnVyFWFfMFS9k+3RmfeQdHhZ6T7WKFQ==
+  dependencies:
+    apollo-engine-reporting-protobuf "0.3.1"
+    apollo-graphql "^0.3.3"
+    apollo-server-core "2.6.7"
+    apollo-server-env "2.4.0"
+    async-retry "^1.2.1"
+    graphql-extensions "0.7.6"
+
 apollo-env@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3"
@@ -1379,6 +1391,14 @@ apollo-graphql@^0.3.2:
     apollo-env "0.5.1"
     lodash.sortby "^4.7.0"
 
+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==
+  dependencies:
+    apollo-env "0.5.1"
+    lodash.sortby "^4.7.0"
+
 apollo-link-context@~1.0.18:
   version "1.0.18"
   resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.18.tgz#9e700e3314da8ded50057fee0a18af2bfcedbfc3"
@@ -1448,6 +1468,32 @@ apollo-server-core@2.6.6:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
+apollo-server-core@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.7.tgz#85b0310f40cfec43a702569c73af16d88776a6f0"
+  integrity sha512-HfOGLvEwPgDWTvd3ZKRPEkEnICKb7xadn1Mci4+auMTsL/NVkfpjPa8cdzubi/kS2/MvioIn7Bg74gmiSLghGQ==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/graphql-playground-html" "1.6.20"
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "0.7.4"
+    apollo-datasource "0.5.0"
+    apollo-engine-reporting "1.3.5"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.4.0"
+    apollo-server-errors "2.3.0"
+    apollo-server-plugin-base "0.5.6"
+    apollo-tracing "0.7.3"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "0.7.6"
+    graphql-subscriptions "^1.0.0"
+    graphql-tag "^2.9.2"
+    graphql-tools "^4.0.0"
+    graphql-upload "^8.0.2"
+    sha.js "^2.4.11"
+    subscriptions-transport-ws "^0.9.11"
+    ws "^6.0.0"
+
 apollo-server-core@^1.3.6, apollo-server-core@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.4.0.tgz#4faff7f110bfdd6c3f47008302ae24140f94c592"
@@ -1514,12 +1560,17 @@ apollo-server-plugin-base@0.5.5:
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.5.tgz#364e4a2fca4d95ddeb9fd3e78940ed1da58865c2"
   integrity sha512-agiuhknyu3lnnEsqUh99tzxwPCGp+TuDK+TSRTkXU1RUG6lY4C3uJp0JGJw03cP+M6ze73TbRjMA4E68g/ks5A==
 
-apollo-server-testing@~2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.6.tgz#3d96486ebdb151219183fcb715973a8385c66e0a"
-  integrity sha512-GfzEAqXGzhWp1YgNJONAijC3mC34E6cI5XiOdLX9FGAnBmZvDURlZwloZbdNgvqvXnwuxuNgo4xvCnTe7kndqg==
+apollo-server-plugin-base@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz#3a7128437a0f845e7d873fa43ef091ff7bf27975"
+  integrity sha512-wJvcPqfm/kiBwY5JZT85t2A4pcHv24xdQIpWMNt1zsnx77lIZqJmhsc22eSUSrlnYqUMXC4XMVgSUfAO4oI9wg==
+
+apollo-server-testing@~2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.7.tgz#cfc6366921eb99fd0cbc5d02552a8a5b268787d5"
+  integrity sha512-lqgZuSqBd5hkRILeVEleo2ScJjukR/E71Mv67vPBUs01s0gEHNnjSRnuOJJOM3cAFBQOdKPc42cHGANzf2ZZTw==
   dependencies:
-    apollo-server-core "2.6.6"
+    apollo-server-core "2.6.7"
 
 apollo-server@~2.6.6:
   version "2.6.6"
@@ -3734,6 +3785,13 @@ graphql-extensions@0.7.5:
   dependencies:
     "@apollographql/apollo-tools" "^0.3.6"
 
+graphql-extensions@0.7.6:
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.6.tgz#80cdddf08b0af12525529d1922ee2ea0d0cc8ecf"
+  integrity sha512-RV00O3YFD1diehvdja180BlKOGWgeigr/8/Wzr6lXwLcFtk6FecQC/7nf6oW1qhuXczHyNjt/uCr0WWbWq6mYg==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+
 graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.10.tgz#34bdb2546d43f6a5bc89ab23c295ec0466c6843d"

From 0a05a520951a65efc3950319905de23db77be52e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 04:22:16 +0000
Subject: [PATCH 16/27] Bump graphql from 14.3.1 to 14.4.0 in /backend

Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.1 to 14.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.1...v14.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 276daed2f..4a9efc76a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -57,7 +57,7 @@
     "dotenv": "~8.0.0",
     "express": "~4.17.1",
     "faker": "Marak/faker.js#master",
-    "graphql": "~14.3.1",
+    "graphql": "~14.4.0",
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index eb6a714ea..65a2b4515 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3866,10 +3866,10 @@ graphql-yoga@~1.18.0:
     graphql-upload "^8.0.0"
     subscriptions-transport-ws "^0.9.8"
 
-"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.2.1, graphql@~14.3.1:
-  version "14.3.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.1.tgz#b3aa50e61a841ada3c1f9ccda101c483f8e8c807"
-  integrity sha512-FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA==
+"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.2.1, graphql@~14.4.0:
+  version "14.4.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.0.tgz#e97086acfc0338e4fdc8f7dba519c6b8a6badfd9"
+  integrity sha512-E55z1oK6e4cGxCqlSsRWytYDPcIUxky3XkbuQUf6TIjCmn6C7CuBJpmkMF1066q95yPAGOZVPTVT7jABKbRFSA==
   dependencies:
     iterall "^1.2.2"
 

From 71d98e53703f4dadf09ed6f3d4aa5085dc6a103b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 04:22:49 +0000
Subject: [PATCH 17/27] Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in
 /backend

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.1.
- [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.0.0-alpha.37...v2.0.0-beta.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 276daed2f..a1be30d6d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -52,7 +52,7 @@
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
     "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-alpha.37",
+    "date-fns": "2.0.0-beta.1",
     "debug": "~4.1.1",
     "dotenv": "~8.0.0",
     "express": "~4.17.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index eb6a714ea..33c7bbc86 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2584,10 +2584,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.0.0-alpha.37:
-  version "2.0.0-alpha.37"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.37.tgz#c58b3e827da4f860ec8dc123e54019efb4a610e0"
-  integrity sha512-fyIv/h6fkFd1u2NHXni5LPRPoa9FFh3hY67JSjNfa+k/u4EKvfrpGtoTM16Y/BJOqTb4W05UjcmwBna1ElyxDA==
+date-fns@2.0.0-beta.1:
+  version "2.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.1.tgz#6f3209ea8be559211be5160e0a6379a7eade227b"
+  integrity sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw==
 
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"

From 84e81f88c4c41b7b5242870ba5be7ff8066e8f92 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 04:22:55 +0000
Subject: [PATCH 18/27] Bump graphql from 14.3.1 to 14.4.0 in /webapp

Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.1 to 14.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.1...v14.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 98dd8b057..a8fcf463d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
     "cross-env": "~5.2.0",
     "date-fns": "2.0.0-alpha.37",
     "express": "~4.17.1",
-    "graphql": "~14.3.1",
+    "graphql": "~14.4.0",
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.1.0",
     "nuxt": "~2.8.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 4bf473c52..ee700727b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5216,10 +5216,10 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.2"
     object-path "^0.11.4"
 
-graphql@^14.1.1, graphql@~14.3.1:
-  version "14.3.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.1.tgz#b3aa50e61a841ada3c1f9ccda101c483f8e8c807"
-  integrity sha512-FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA==
+graphql@^14.1.1, graphql@~14.4.0:
+  version "14.4.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.0.tgz#e97086acfc0338e4fdc8f7dba519c6b8a6badfd9"
+  integrity sha512-E55z1oK6e4cGxCqlSsRWytYDPcIUxky3XkbuQUf6TIjCmn6C7CuBJpmkMF1066q95yPAGOZVPTVT7jABKbRFSA==
   dependencies:
     iterall "^1.2.2"
 

From 3eab153164720c68a25d73923fe4dd6ea9fbddc9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 04:24:11 +0000
Subject: [PATCH 19/27] Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.1.
- [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.0.0-alpha.37...v2.0.0-beta.1)

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 98dd8b057..59445fb1d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -60,7 +60,7 @@
     "apollo-client": "~2.6.3",
     "cookie-universal-nuxt": "~2.0.16",
     "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-alpha.37",
+    "date-fns": "2.0.0-beta.1",
     "express": "~4.17.1",
     "graphql": "~14.3.1",
     "jsonwebtoken": "~8.5.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 4bf473c52..b5aafaae8 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3754,10 +3754,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.0.0-alpha.37:
-  version "2.0.0-alpha.37"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.37.tgz#c58b3e827da4f860ec8dc123e54019efb4a610e0"
-  integrity sha512-fyIv/h6fkFd1u2NHXni5LPRPoa9FFh3hY67JSjNfa+k/u4EKvfrpGtoTM16Y/BJOqTb4W05UjcmwBna1ElyxDA==
+date-fns@2.0.0-beta.1:
+  version "2.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.1.tgz#6f3209ea8be559211be5160e0a6379a7eade227b"
+  integrity sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw==
 
 date-now@^0.1.4:
   version "0.1.4"

From 058eae515e08938ecfa45fb49b79b9dfc8ce7c15 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2019 21:17:31 +0000
Subject: [PATCH 20/27] Bump apollo-server from 2.6.6 to 2.6.7 in /backend

Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.7.
- [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.6.6...apollo-server@2.6.7)

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

diff --git a/backend/package.json b/backend/package.json
index 4c4513821..cc904b121 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,7 +47,7 @@
     "apollo-client": "~2.6.3",
     "apollo-link-context": "~1.0.18",
     "apollo-link-http": "~1.5.15",
-    "apollo-server": "~2.6.6",
+    "apollo-server": "~2.6.7",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 92c7edf9a..2686d95d5 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1342,18 +1342,6 @@ apollo-engine-reporting-protobuf@0.3.1:
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.4.tgz#65e12f94221d80b3b1740c26e82ce9bb6bdfb7ee"
-  integrity sha512-DJdYghyUBzT0/LcPLwuQNXDCw06r1RfxkVfNTGKoTv6a+leVvjhDJmXvc+jSuBPwaNsc+RYRnfyQ2qUn9fmfyA==
-  dependencies:
-    apollo-engine-reporting-protobuf "0.3.1"
-    apollo-graphql "^0.3.2"
-    apollo-server-core "2.6.6"
-    apollo-server-env "2.4.0"
-    async-retry "^1.2.1"
-    graphql-extensions "0.7.5"
-
 apollo-engine-reporting@1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.5.tgz#075424d39dfe77a20f96e8e33b7ae52d58c38e1e"
@@ -1383,14 +1371,6 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
-apollo-graphql@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.2.tgz#8881a87f1d5fcf80837b34dba90737e664eabe9a"
-  integrity sha512-YbzYGR14GV0023m//EU66vOzZ3i7c04V/SF8Qk+60vf1sOWyKgO6mxZJ4BKhw10qWUayirhSDxq3frYE+qSG0A==
-  dependencies:
-    apollo-env "0.5.1"
-    lodash.sortby "^4.7.0"
-
 apollo-graphql@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
@@ -1442,32 +1422,6 @@ apollo-server-caching@0.4.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.6.tgz#55fea7980a943948c49dea20d81b9bbfc0e04f87"
-  integrity sha512-PFSjJbqkV1eetfFJxu11gzklQYC8BrF0RZfvC1d1mhvtxAOKl25uhPHxltN0Omyjp7LW4YeoC6zwl9rLWuhZFQ==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-    "@apollographql/graphql-playground-html" "1.6.20"
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "0.7.4"
-    apollo-datasource "0.5.0"
-    apollo-engine-reporting "1.3.4"
-    apollo-server-caching "0.4.0"
-    apollo-server-env "2.4.0"
-    apollo-server-errors "2.3.0"
-    apollo-server-plugin-base "0.5.5"
-    apollo-tracing "0.7.3"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.7.5"
-    graphql-subscriptions "^1.0.0"
-    graphql-tag "^2.9.2"
-    graphql-tools "^4.0.0"
-    graphql-upload "^8.0.2"
-    sha.js "^2.4.11"
-    subscriptions-transport-ws "^0.9.11"
-    ws "^6.0.0"
-
 apollo-server-core@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.7.tgz#85b0310f40cfec43a702569c73af16d88776a6f0"
@@ -1516,10 +1470,10 @@ apollo-server-errors@2.3.0:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
   integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
 
-apollo-server-express@2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.6.tgz#ec2b955354d7dd4d12fe01ea7e983d302071d5b9"
-  integrity sha512-bY/xrr9lZH+hsjchiQuSXpW3ivXfL1h81M5VE9Ppus1PVwwEIar/irBN+PFp97WxERZPDjVZzrRKa+lRHjtJsA==
+apollo-server-express@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.7.tgz#22307e08b75be1553f4099d00028abe52597767d"
+  integrity sha512-qbCQM+8LxXpwPNN5Sdvcb+Sne8zuCORFt25HJtPJRkHlyBUzOd7JA7SEnUn5e2geTiiGoVIU5leh+++C51udTw==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.20"
     "@types/accepts" "^1.3.5"
@@ -1527,7 +1481,7 @@ apollo-server-express@2.6.6:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.0"
     accepts "^1.3.5"
-    apollo-server-core "2.6.6"
+    apollo-server-core "2.6.7"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
@@ -1555,11 +1509,6 @@ apollo-server-module-graphiql@^1.3.4, apollo-server-module-graphiql@^1.4.0:
   resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec"
   integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==
 
-apollo-server-plugin-base@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.5.tgz#364e4a2fca4d95ddeb9fd3e78940ed1da58865c2"
-  integrity sha512-agiuhknyu3lnnEsqUh99tzxwPCGp+TuDK+TSRTkXU1RUG6lY4C3uJp0JGJw03cP+M6ze73TbRjMA4E68g/ks5A==
-
 apollo-server-plugin-base@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz#3a7128437a0f845e7d873fa43ef091ff7bf27975"
@@ -1572,13 +1521,13 @@ apollo-server-testing@~2.6.7:
   dependencies:
     apollo-server-core "2.6.7"
 
-apollo-server@~2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.6.tgz#0570fce4a682eb1de8bc1b86dbe2543de440cd4e"
-  integrity sha512-7Bulb3RnOO4/SGA66LXu3ZHCXIK8MYMrsxy4yti1/adDIUmcniolDqJwOYUGoTmv1AQjRxgJb4TVZ0Dk9nrrYg==
+apollo-server@~2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.7.tgz#b707ede529b4d45f2f00a74f3b457658b0e62e83"
+  integrity sha512-4wk9JykURLed6CnNIj9jhU6ueeTVmGBTyAnnvnlhRrOf50JAFszUErZIKg6lw5vVr5riaByrGFIkMBTySCHgPQ==
   dependencies:
-    apollo-server-core "2.6.6"
-    apollo-server-express "2.6.6"
+    apollo-server-core "2.6.7"
+    apollo-server-express "2.6.7"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
@@ -3778,13 +3727,6 @@ graphql-extensions@0.7.4:
   dependencies:
     "@apollographql/apollo-tools" "^0.3.6"
 
-graphql-extensions@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.5.tgz#fab2b9e53cf6014952e6547456d50680ff0ea579"
-  integrity sha512-B1m+/WEJa3IYKWqBPS9W/7OasfPmlHOSz5hpEAq2Jbn6T0FQ/d2YWFf2HBETHR3RR2qfT+55VMiYovl2ga3qcg==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-
 graphql-extensions@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.6.tgz#80cdddf08b0af12525529d1922ee2ea0d0cc8ecf"

From 5980249703418615099dd0003fac5aa859dd37df Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2019 04:22:52 +0000
Subject: [PATCH 21/27] Bump cypress from 3.3.1 to 3.3.2

Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.1...v3.3.2)

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

diff --git a/package.json b/package.json
index 38c5c9a39..856a241de 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "codecov": "^3.5.0",
     "cross-env": "^5.2.0",
-    "cypress": "^3.3.1",
+    "cypress": "^3.3.2",
     "cypress-cucumber-preprocessor": "^1.12.0",
     "cypress-file-upload": "^3.1.4",
     "cypress-plugin-retries": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index a0c7c3288..f09a4e33f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1832,10 +1832,10 @@ cypress-plugin-retries@^1.2.2:
   resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.2.2.tgz#7235371ca575ad9e16f883169e7f1588379f80f2"
   integrity sha512-+bVAqJAIwpFQbgM1mAdTgCXXhowEK0pF5DqhId2h0Wq+HQ+QQ2w3hspisVUPTY+HGvncMkddUQQGF5fATuaTvQ==
 
-cypress@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.3.1.tgz#8a127b1d9fa74bff21f111705abfef58d595fdef"
-  integrity sha512-JIo47ZD9P3jAw7oaK7YKUoODzszJbNw41JmBrlMMiupHOlhmXvZz75htuo7mfRFPC9/1MDQktO4lX/V2+a6lGQ==
+cypress@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.3.2.tgz#105d9283c747884d534b88a8e6c857d977887024"
+  integrity sha512-d2gFX0KBBdNfMMZ/ud9ouNqjDtMM3Tf5Z50hkl8Ldb8T+jKc7RLFo/4FjMu9i28T2x+50Sx8sN/kLzxr2oeWNg==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
@@ -1850,7 +1850,7 @@ cypress@^3.3.1:
     execa "0.10.0"
     executable "4.1.1"
     extract-zip "1.6.7"
-    fs-extra "4.0.1"
+    fs-extra "5.0.0"
     getos "3.1.1"
     glob "7.1.3"
     is-ci "1.2.1"
@@ -2405,13 +2405,13 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fs-extra@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880"
-  integrity sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=
+fs-extra@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
   dependencies:
     graceful-fs "^4.1.2"
-    jsonfile "^3.0.0"
+    jsonfile "^4.0.0"
     universalify "^0.1.0"
 
 fs-extra@7.0.0:
@@ -3120,13 +3120,6 @@ json5@^0.5.0:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
-jsonfile@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"

From 0271f9514670a25d22b8fb2e24e4bdb3af3b1265 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2019 04:23:19 +0000
Subject: [PATCH 22/27] Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.2 in
 /backend

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.1 to 2.0.0-beta.2.
- [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.0.0-beta.1...v2.0.0-beta.2)

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 064fbce89..d4af97330 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -52,7 +52,7 @@
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
     "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-beta.1",
+    "date-fns": "2.0.0-beta.2",
     "debug": "~4.1.1",
     "dotenv": "~8.0.0",
     "express": "~4.17.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 137657b4d..aa2baeb43 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2635,10 +2635,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.0.0-beta.1:
-  version "2.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.1.tgz#6f3209ea8be559211be5160e0a6379a7eade227b"
-  integrity sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw==
+date-fns@2.0.0-beta.2:
+  version "2.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.2.tgz#ccd556df832ef761baa88c600f53d2e829245999"
+  integrity sha512-4cicZF707RNerr3/Q3CcdLo+3OHMCfrRXE7h5iFgn7AMvX07sqKLxSf8Yp+WJW5bvKr2cy9/PkctXLv4iFtOaA==
 
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"

From 4e687a06ea02255f77f6b40c3b741f2293375614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Sat, 29 Jun 2019 13:45:37 +0200
Subject: [PATCH 23/27] Patch cypher injection vulnerability

@mattwr18 this patches the vulnerability. However we should never do
string interpolation with user input.
---
 backend/src/schema/resolvers/users.spec.js | 2 +-
 backend/src/schema/types/schema.gql        | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 352d38eaa..9df5473bf 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -143,7 +143,7 @@ describe('users', () => {
     let deleteUserVariables
     let asAuthor
     const deleteUserMutation = gql`
-      mutation($id: ID!, $resource: [String]) {
+      mutation($id: ID!, $resource: [Deletable]) {
         DeleteUser(id: $id, resource: $resource) {
           id
           contributions {
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 1ef83bac3..8b0f422c8 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -40,7 +40,7 @@ type Mutation {
   follow(id: ID!, type: FollowTypeEnum): Boolean!
   # Unfollow the given Type and ID
   unfollow(id: ID!, type: FollowTypeEnum): Boolean!
-  DeleteUser(id: ID!, resource: [String]): User
+  DeleteUser(id: ID!, resource: [Deletable]): User
 }
 
 type Statistics {
@@ -92,6 +92,11 @@ type Report {
   user: User @relation(name: "REPORTED", direction: "OUT")
 }
 
+enum Deletable {
+  Post
+  Comment
+}
+
 enum ShoutTypeEnum {
   Post
   Organization

From 2e48a3529b0190dae9e789f9c06237db4707339c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 29 Jun 2019 16:22:49 +0000
Subject: [PATCH 24/27] Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.2 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.2.
- [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.0.0-alpha.37...v2.0.0-beta.2)

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 0599265dc..ab5f3a5fe 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -60,7 +60,7 @@
     "apollo-client": "~2.6.3",
     "cookie-universal-nuxt": "~2.0.16",
     "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-beta.1",
+    "date-fns": "2.0.0-beta.2",
     "express": "~4.17.1",
     "graphql": "~14.4.0",
     "jsonwebtoken": "~8.5.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 9acd3f438..7162319c4 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3754,10 +3754,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.0.0-beta.1:
-  version "2.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.1.tgz#6f3209ea8be559211be5160e0a6379a7eade227b"
-  integrity sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw==
+date-fns@2.0.0-beta.2:
+  version "2.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.2.tgz#ccd556df832ef761baa88c600f53d2e829245999"
+  integrity sha512-4cicZF707RNerr3/Q3CcdLo+3OHMCfrRXE7h5iFgn7AMvX07sqKLxSf8Yp+WJW5bvKr2cy9/PkctXLv4iFtOaA==
 
 date-now@^0.1.4:
   version "0.1.4"

From 118e53fa022207410e7167686183ffbf42f6348e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 29 Jun 2019 19:21:20 +0200
Subject: [PATCH 25/27] Added a missing `Deletable`

---
 webapp/components/DeleteData/DeleteData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/DeleteData/DeleteData.vue b/webapp/components/DeleteData/DeleteData.vue
index 14b6bc9c3..293e65221 100644
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@@ -111,7 +111,7 @@ export default {
       this.$apollo
         .mutate({
           mutation: gql`
-            mutation($id: ID!, $resource: [String]) {
+            mutation($id: ID!, $resource: [Deletable]) {
               DeleteUser(id: $id, resource: $resource) {
                 id
               }

From 51a7a0e5d8b434dfcc9f0c9bba89e17731536adc Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 1 Jul 2019 07:29:06 -0300
Subject: [PATCH 26/27] Add back test accidentally deleted

---
 webapp/components/ContributionForm/ContributionForm.spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index caeeafdf6..5fafdf17f 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -144,6 +144,10 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
+        it('sets language equal to contribution language', () => {
+          expect(wrapper.vm.form.language).toEqual({ value: propsData.contribution.language })
+        })
+
         it("pushes the user to the post's page", async () => {
           expect(mocks.$router.push).toHaveBeenCalledTimes(1)
         })

From 2edf99148da5b6e7fd1ab2e3cf1eb1f43f8b54e9 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 1 Jul 2019 08:22:46 -0300
Subject: [PATCH 27/27] Remove test

- we don't set the form language because we want to have the name of the language as a placeholder, not its code
---
 webapp/components/ContributionForm/ContributionForm.spec.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 5fafdf17f..caeeafdf6 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -144,10 +144,6 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
-        it('sets language equal to contribution language', () => {
-          expect(wrapper.vm.form.language).toEqual({ value: propsData.contribution.language })
-        })
-
         it("pushes the user to the post's page", async () => {
           expect(mocks.$router.push).toHaveBeenCalledTimes(1)
         })