From be6c73745264fccef140451d76f949e0ad7508c4 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 26 Feb 2020 14:03:11 +0100
Subject: [PATCH 001/106] Change: render link to /notifications when no new
 notifications

---
 .../NotificationMenu/NotificationMenu.spec.js | 23 ++++++++++++-------
 .../NotificationMenu/NotificationMenu.vue     |  8 ++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.spec.js b/webapp/components/NotificationMenu/NotificationMenu.spec.js
index 8020c8bb4..2f6227810 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.spec.js
+++ b/webapp/components/NotificationMenu/NotificationMenu.spec.js
@@ -1,4 +1,4 @@
-import { config, mount } from '@vue/test-utils'
+import { config, mount, RouterLinkStub } from '@vue/test-utils'
 import NotificationMenu from './NotificationMenu'
 
 const localVue = global.localVue
@@ -11,6 +11,7 @@ describe('NotificationMenu.vue', () => {
   let wrapper
   let mocks
   let data
+  let stubs
   beforeEach(() => {
     mocks = {
       $t: jest.fn(),
@@ -20,6 +21,9 @@ describe('NotificationMenu.vue', () => {
         notifications: [],
       }
     }
+    stubs = {
+      NuxtLink: RouterLinkStub
+    }
   })
 
   describe('mount', () => {
@@ -28,12 +32,14 @@ describe('NotificationMenu.vue', () => {
         data,
         mocks,
         localVue,
+        stubs
       })
     }
 
-    it('counter displays 0', () => {
+    it('renders as link without counter', () => {
       wrapper = Wrapper()
-      expect(wrapper.find('.count').text()).toEqual('0')
+      expect(wrapper.is('a.notifications-menu')).toBe(true)
+      expect(() => wrapper.get('.count')).toThrow()
     })
 
     it('no dropdown is rendered', () => {
@@ -41,7 +47,7 @@ describe('NotificationMenu.vue', () => {
       expect(wrapper.contains('.dropdown')).toBe(false)
     })
 
-    describe('given only unread notifications', () => {
+    describe('given only read notifications', () => {
       beforeEach(() => {
         data = () => {
           return {
@@ -65,14 +71,15 @@ describe('NotificationMenu.vue', () => {
         }
       })
 
-      it('counter displays 0', () => {
+      it('renders as link without counter', () => {
         wrapper = Wrapper()
-        expect(wrapper.find('.count').text()).toEqual('0')
+        expect(wrapper.is('a.notifications-menu')).toBe(true)
+        expect(() => wrapper.get('.count')).toThrow()
       })
 
-      it('counter is not colored', () => {
+      it('no dropdown is rendered', () => {
         wrapper = Wrapper()
-        expect(wrapper.find('.count').classes()).toContain('--inactive')
+        expect(wrapper.contains('.dropdown')).toBe(false)
       })
     })
 
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index d00ab2837..4d780c374 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -1,7 +1,9 @@
 <template>
-  <base-button v-if="!notifications.length" class="notifications-menu" disabled ghost circle>
-    <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
-  </base-button>
+  <nuxt-link v-if="!unreadNotificationsCount" :to="{ name: 'notifications' }">
+    <base-button class="notifications-menu" ghost circle>
+      <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
+    </base-button>
+  </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
     <template slot="default" slot-scope="{ toggleMenu }">
       <base-button @click="toggleMenu" ghost circle>

From d5cbfb142f892e45e3220e428a5e3f0db3241e4a Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 26 Feb 2020 15:34:50 +0100
Subject: [PATCH 002/106] Change: remove counter from link to /notifications

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 4d780c374..d20672965 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -1,8 +1,6 @@
 <template>
-  <nuxt-link v-if="!unreadNotificationsCount" :to="{ name: 'notifications' }">
-    <base-button class="notifications-menu" ghost circle>
-      <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
-    </base-button>
+  <nuxt-link v-if="!unreadNotificationsCount" class="notifications-menu" :to="{ name: 'notifications' }">
+    <base-button icon="bell" ghost circle />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
     <template slot="default" slot-scope="{ toggleMenu }">

From 8ffda5e908d0524d21dbc7cc45b005d69bd7eaea Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 28 Feb 2020 13:37:14 +0100
Subject: [PATCH 003/106] Fix: linting, integration tests

---
 cypress/integration/common/steps.js                   | 11 +++++------
 cypress/integration/notifications/Mentions.feature    |  6 +++---
 .../NotificationMenu/NotificationMenu.spec.js         |  4 ++--
 .../components/NotificationMenu/NotificationMenu.vue  |  6 +++++-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index c02829b25..468ce578a 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -422,14 +422,13 @@ When("mention {string} in the text", mention => {
     .click();
 });
 
-Then("the notification gets marked as read", () => {
-  cy.get(".notifications-menu-popover .notification")
-    .first()
-    .should("have.class", "--read");
+Then("the unread counter is removed", () => {
+  cy.get('.notifications-menu .counter-icon').should('not.exist');
 });
 
-Then("there are no notifications in the top menu", () => {
-  cy.get(".notifications-menu").should("contain", "0");
+Then("the notification menu button links to the all notifications page", () => {
+  cy.get(".notifications-menu").click();
+  cy.location("pathname").should("contain", "/notifications");
 });
 
 Given("there is an annoying user called {string}", name => {
diff --git a/cypress/integration/notifications/Mentions.feature b/cypress/integration/notifications/Mentions.feature
index 08eddcacd..1cf265624 100644
--- a/cypress/integration/notifications/Mentions.feature
+++ b/cypress/integration/notifications/Mentions.feature
@@ -24,6 +24,6 @@ Feature: Notification for a mention
     And see 1 unread notifications in the top menu
     And open the notification menu and click on the first item
     Then I get to the post page of ".../hey-matt"
-    And the notification gets marked as read
-    But when I refresh the page
-    Then there are no notifications in the top menu
+    And the unread counter is removed
+    And the notification menu button links to the all notifications page    
+
diff --git a/webapp/components/NotificationMenu/NotificationMenu.spec.js b/webapp/components/NotificationMenu/NotificationMenu.spec.js
index 2f6227810..a44d7a94d 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.spec.js
+++ b/webapp/components/NotificationMenu/NotificationMenu.spec.js
@@ -22,7 +22,7 @@ describe('NotificationMenu.vue', () => {
       }
     }
     stubs = {
-      NuxtLink: RouterLinkStub
+      NuxtLink: RouterLinkStub,
     }
   })
 
@@ -32,7 +32,7 @@ describe('NotificationMenu.vue', () => {
         data,
         mocks,
         localVue,
-        stubs
+        stubs,
       })
     }
 
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index d20672965..fb047a0c3 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -1,5 +1,9 @@
 <template>
-  <nuxt-link v-if="!unreadNotificationsCount" class="notifications-menu" :to="{ name: 'notifications' }">
+  <nuxt-link
+    v-if="!unreadNotificationsCount"
+    class="notifications-menu"
+    :to="{ name: 'notifications' }"
+  >
     <base-button icon="bell" ghost circle />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">

From f3a7c10e8ad1e3961e51e339919c85e944eb885b Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sun, 23 Feb 2020 07:52:41 +0100
Subject: [PATCH 004/106] Fix: content shift when y-scrollbar disappears

---
 webapp/components/Dropdown.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 6743529e8..c03726981 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -48,11 +48,16 @@ export default {
           if (isOpen) {
             this.$nextTick(() => {
               setTimeout(() => {
-                document.getElementsByTagName('body')[0].classList.add('dropdown-open')
+                const paddingRightStyle = `${window.innerWidth - document.documentElement.clientWidth}px`
+                document.body.style.paddingRight = paddingRightStyle
+                document.querySelector('.main-navigation').style.paddingRight = paddingRightStyle
+                document.body.classList.add('dropdown-open')
               }, 20)
             })
           } else {
-            document.getElementsByTagName('body')[0].classList.remove('dropdown-open')
+            document.body.style.paddingRight = null
+            document.querySelector('.main-navigation').style.paddingRight = null
+            document.body.classList.remove('dropdown-open')
           }
         } catch (err) {}
       },

From f3d2d35b269361e07b7e5c28320e17d3b30b42cc Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 24 Feb 2020 20:20:21 +0100
Subject: [PATCH 005/106] Change: only attempt to style .main-navigation, if it
 exists

---
 webapp/components/Dropdown.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index c03726981..be1157961 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -48,16 +48,23 @@ export default {
           if (isOpen) {
             this.$nextTick(() => {
               setTimeout(() => {
-                const paddingRightStyle = `${window.innerWidth - document.documentElement.clientWidth}px`
+                const paddingRightStyle = `${window.innerWidth -
+                  document.documentElement.clientWidth}px`
+                const navigationElement = document.querySelector('.main-navigation')
                 document.body.style.paddingRight = paddingRightStyle
-                document.querySelector('.main-navigation').style.paddingRight = paddingRightStyle
                 document.body.classList.add('dropdown-open')
+                if (navigationElement) {
+                  navigationElement.style.paddingRight = paddingRightStyle
+                }
               }, 20)
             })
           } else {
+            const navigationElement = document.querySelector('.main-navigation')
             document.body.style.paddingRight = null
-            document.querySelector('.main-navigation').style.paddingRight = null
             document.body.classList.remove('dropdown-open')
+            if (navigationElement) {
+              navigationElement.style.paddingRight = null
+            }
           }
         } catch (err) {}
       },

From 21d42da4f1dd9a68d4e5b223cadd667baa067321 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2020 10:36:35 +0000
Subject: [PATCH 006/106] build(deps): bump metascraper-description in /backend

Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.11.1 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.1...v5.11.6)

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

diff --git a/backend/package.json b/backend/package.json
index 2e939513d..d82763534 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -74,7 +74,7 @@
     "metascraper-author": "^5.11.6",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.11.6",
-    "metascraper-description": "^5.11.1",
+    "metascraper-description": "^5.11.6",
     "metascraper-image": "^5.11.6",
     "metascraper-lang": "^5.11.1",
     "metascraper-lang-detector": "^4.10.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e1d63fd90..83a04e5da 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6252,12 +6252,12 @@ metascraper-date@^5.11.6:
   dependencies:
     "@metascraper/helpers" "^5.11.6"
 
-metascraper-description@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.11.1.tgz#55a90f165e73dae9289fb922e5269f902cc57d6b"
-  integrity sha512-xClk2kxYYeAY5yHgrUXQXiSz8I6qa3JNPietWIk4dtUQ+DxHyUOBo6B6pQmlbfX/BjCLh35m0srAqzZ7+r1s2g==
+metascraper-description@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.11.6.tgz#515368b5ca88cb5fa1fd92c0946458795b03960f"
+  integrity sha512-rGD6hEWLHPlZ/091htCoFAJGft2oRDAaAoDcnafMdTBcuukBIpZ3QNOR3rYpliWHbpS8cwiX2Q9IawyqB4iK0g==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
+    "@metascraper/helpers" "^5.11.6"
 
 metascraper-image@^5.11.6:
   version "5.11.6"

From bcf4b626e630ed206ed2e3b681f76bfbaa260f05 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2020 10:37:17 +0000
Subject: [PATCH 007/106] build(deps): bump metascraper-audio from 5.11.1 to
 5.11.6 in /backend

Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.11.1 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.1...v5.11.6)

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

diff --git a/backend/package.json b/backend/package.json
index 2e939513d..ace56c8a4 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -70,7 +70,7 @@
     "lodash": "~4.17.14",
     "merge-graphql-schemas": "^1.7.6",
     "metascraper": "^5.11.6",
-    "metascraper-audio": "^5.11.1",
+    "metascraper-audio": "^5.11.6",
     "metascraper-author": "^5.11.6",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.11.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e1d63fd90..6cfcf9e83 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6223,12 +6223,12 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-metascraper-audio@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.11.1.tgz#46a45fc8d9c4ccc1c24340d46a8c25dc3685d7b9"
-  integrity sha512-L5eGfw5cOww4/f3ppMa/k+bix3LdICKcKJ2WVTLgz1QkKTWt5IQrgdW+kRfwUdaUTH6w0Tco+nOO7yUCaWytAQ==
+metascraper-audio@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.11.6.tgz#392b4b84309ac017bce4b4d0d52948f3a17d7ecc"
+  integrity sha512-X1nEPP+bgTUStXmWuy/s/h5dix2Smuphx8VdH47/uqXRkifGByQ4nHt9Rd+rg3BNOI15bCib/Nc56awtUOG+3Q==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
+    "@metascraper/helpers" "^5.11.6"
 
 metascraper-author@^5.11.6:
   version "5.11.6"

From 0fb85c2da658e29d5edf6199bc9447bf00c0f2c5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2020 10:41:39 +0000
Subject: [PATCH 008/106] build(deps): bump metascraper-lang from 5.11.1 to
 5.11.6 in /backend

Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.11.1 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.1...v5.11.6)

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

diff --git a/backend/package.json b/backend/package.json
index 47ec7a1c7..441428836 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -76,7 +76,7 @@
     "metascraper-date": "^5.11.6",
     "metascraper-description": "^5.11.1",
     "metascraper-image": "^5.11.6",
-    "metascraper-lang": "^5.11.1",
+    "metascraper-lang": "^5.11.6",
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.11.6",
     "metascraper-publisher": "^5.11.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 12182c25f..ebea6f50b 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6275,12 +6275,12 @@ metascraper-lang-detector@^4.10.2:
     franc "~4.0.0"
     iso-639-3 "~1.1.0"
 
-metascraper-lang@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.11.1.tgz#494d080f30c76bfe2d10ce2c50a55f64bd534e1d"
-  integrity sha512-g0XjUFbaMwKa5ws09/gJj5WOM6FsB2v0P9gWLIj2bYo9+QXXGZqn9MusYXGMHiCNELkesPyFXQY8oTjJ7z2hMA==
+metascraper-lang@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-lang/-/metascraper-lang-5.11.6.tgz#bf8b38c220c472bf46fb1adb78e36b4d2a223cfe"
+  integrity sha512-gIHrmR6YE1+W2FUmYMggiD8NU7oCuQUYG8fYE0zKxdoAseM2qQcmZ+aGgYAFL4RlgMQwm+9zxhcLX+Te4oMRDw==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
+    "@metascraper/helpers" "^5.11.6"
 
 metascraper-logo@^5.11.6:
   version "5.11.6"

From 030eca5e5c2a356091c9b0fe9de800a74673725a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 9 Mar 2020 12:37:51 +0100
Subject: [PATCH 009/106] doc added for locales script

---
 webapp/README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/README.md b/webapp/README.md
index 897bb56ca..7a9d578e1 100644
--- a/webapp/README.md
+++ b/webapp/README.md
@@ -72,7 +72,7 @@ You can then visit the Storybook playground on `http://localhost:3002`
 After starting the application following the above guidelines, open new terminal windows and navigate to the `/webapp` directory for each of these commands:
 
 ```bash
-# run eslint in /webapp
+# run eslint in /webapp (use option --fix to normalize the files)
 $ yarn lint
 ```
 
@@ -81,6 +81,11 @@ $ yarn lint
 $ yarn test
 ```
 
+```bash
+# run locales in /webapp (use option --fix to sort the locales)
+$ yarn locales
+```
+
 ```bash
 # start storybook in /webapp
 $ yarn storybook

From a48de22a93be1fcd4dfcdc245aa0a35e759d5085 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 9 Mar 2020 15:20:12 +0100
Subject: [PATCH 010/106] v0.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3462fcd1..41998245c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Fullstack and API tests with cypress and cucumber for Human Connection",
   "author": "Human Connection gGmbh",
   "license": "MIT",

From 31d75698574a78e9fd6622204637e017eb67c8b8 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 9 Mar 2020 15:21:14 +0100
Subject: [PATCH 011/106] Update to v0.4.1

---
 CHANGELOG.md         | 86 ++++++++++++++++++++++++++++++++++++++++++++
 backend/package.json |  2 +-
 webapp/package.json  |  2 +-
 3 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 664c6cbe0..22efb08dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,96 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.4.1](https://github.com/Human-Connection/Human-Connection/compare/v0.4.0...v0.4.1)
+
+> 9 March 2020
+
+- build(deps): bump metascraper-publisher from 5.11.1 to 5.11.6 in /backend [`#3226`](https://github.com/Human-Connection/Human-Connection/pull/3226)
+- build(deps-dev): bump eslint-plugin-vue from 6.2.1 to 6.2.2 in /webapp [`#3238`](https://github.com/Human-Connection/Human-Connection/pull/3238)
+- build(deps): bump metascraper-date from 5.11.1 to 5.11.6 in /backend [`#3236`](https://github.com/Human-Connection/Human-Connection/pull/3236)
+- build(deps): bump metascraper-image from 5.11.1 to 5.11.6 in /backend [`#3224`](https://github.com/Human-Connection/Human-Connection/pull/3224)
+- build(deps): bump uuid from 7.0.1 to 7.0.2 in /backend [`#3214`](https://github.com/Human-Connection/Human-Connection/pull/3214)
+- build(deps-dev): bump cypress from 4.0.2 to 4.1.0 [`#3190`](https://github.com/Human-Connection/Human-Connection/pull/3190)
+- build(deps): bump cross-env from 7.0.1 to 7.0.2 in /webapp [`#3230`](https://github.com/Human-Connection/Human-Connection/pull/3230)
+- build(deps): bump vue-infinite-loading from 2.4.4 to 2.4.5 in /webapp [`#3227`](https://github.com/Human-Connection/Human-Connection/pull/3227)
+- build(deps): bump metascraper-youtube from 5.11.1 to 5.11.6 in /backend [`#3225`](https://github.com/Human-Connection/Human-Connection/pull/3225)
+- build(deps): bump metascraper-url from 5.11.1 to 5.11.6 in /backend [`#3223`](https://github.com/Human-Connection/Human-Connection/pull/3223)
+- build(deps): bump metascraper-author from 5.11.1 to 5.11.6 in /backend [`#3222`](https://github.com/Human-Connection/Human-Connection/pull/3222)
+- build(deps): bump metascraper-logo from 5.11.1 to 5.11.6 in /backend [`#3221`](https://github.com/Human-Connection/Human-Connection/pull/3221)
+- build(deps): bump metascraper from 5.11.4 to 5.11.6 in /backend [`#3220`](https://github.com/Human-Connection/Human-Connection/pull/3220)
+- build(deps-dev): bump @storybook/addon-a11y from 5.3.13 to 5.3.14 in /webapp [`#3167`](https://github.com/Human-Connection/Human-Connection/pull/3167)
+- build(deps-dev): bump @babel/core from 7.8.6 to 7.8.7 in /backend [`#3213`](https://github.com/Human-Connection/Human-Connection/pull/3213)
+- build(deps): bump metascraper-soundcloud from 5.11.4 to 5.11.5 in /backend [`#3189`](https://github.com/Human-Connection/Human-Connection/pull/3189)
+- build(deps-dev): bump @babel/preset-env from 7.8.6 to 7.8.7 in /backend [`#3211`](https://github.com/Human-Connection/Human-Connection/pull/3211)
+- build(deps-dev): bump @babel/core from 7.8.6 to 7.8.7 [`#3210`](https://github.com/Human-Connection/Human-Connection/pull/3210)
+- build(deps-dev): bump @babel/core from 7.8.6 to 7.8.7 in /webapp [`#3216`](https://github.com/Human-Connection/Human-Connection/pull/3216)
+- build(deps-dev): bump @babel/node from 7.8.4 to 7.8.7 in /backend [`#3212`](https://github.com/Human-Connection/Human-Connection/pull/3212)
+- build(deps-dev): bump @babel/preset-env from 7.8.6 to 7.8.7 [`#3209`](https://github.com/Human-Connection/Human-Connection/pull/3209)
+- perf(neo4j): Improve currentUser read performance [`#3207`](https://github.com/Human-Connection/Human-Connection/pull/3207)
+- build(deps-dev): bump apollo-server-testing from 2.10.1 to 2.11.0 in /backend [`#3205`](https://github.com/Human-Connection/Human-Connection/pull/3205)
+- build(deps): bump apollo-server from 2.10.1 to 2.11.0 in /backend [`#3201`](https://github.com/Human-Connection/Human-Connection/pull/3201)
+- build(deps): bump cross-env from 7.0.0 to 7.0.1 in /webapp [`#3206`](https://github.com/Human-Connection/Human-Connection/pull/3206)
+- build(deps): bump apollo-server-express from 2.10.1 to 2.11.0 in /backend [`#3202`](https://github.com/Human-Connection/Human-Connection/pull/3202)
+- build(deps): bump graphql-redis-subscriptions from 2.1.2 to 2.2.1 in /backend [`#3203`](https://github.com/Human-Connection/Human-Connection/pull/3203)
+- build(deps): bump cross-env from 7.0.0 to 7.0.1 in /backend [`#3204`](https://github.com/Human-Connection/Human-Connection/pull/3204)
+- build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 [`#3175`](https://github.com/Human-Connection/Human-Connection/pull/3175)
+- feat: Russian Translations Update By Ewald Arnold [`#3198`](https://github.com/Human-Connection/Human-Connection/pull/3198)
+- feat: Translations update [`#3111`](https://github.com/Human-Connection/Human-Connection/pull/3111)
+- build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /backend [`#3172`](https://github.com/Human-Connection/Human-Connection/pull/3172)
+- build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 [`#3173`](https://github.com/Human-Connection/Human-Connection/pull/3173)
+- fix: Update user.updatedAt when password is reset [`#3197`](https://github.com/Human-Connection/Human-Connection/pull/3197)
+- build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 in /backend [`#3174`](https://github.com/Human-Connection/Human-Connection/pull/3174)
+- build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /webapp [`#3183`](https://github.com/Human-Connection/Human-Connection/pull/3183)
+- build(deps-dev): bump eslint-plugin-jest from 23.8.0 to 23.8.1 in /backend [`#3191`](https://github.com/Human-Connection/Human-Connection/pull/3191)
+- build(deps): bump wait-on from 4.0.0 to 4.0.1 in /backend [`#3176`](https://github.com/Human-Connection/Human-Connection/pull/3176)
+- build(deps-dev): bump @babel/register from 7.8.3 to 7.8.6 [`#3179`](https://github.com/Human-Connection/Human-Connection/pull/3179)
+- build(deps-dev): bump @babel/preset-env from 7.8.4 to 7.8.6 in /backend [`#3181`](https://github.com/Human-Connection/Human-Connection/pull/3181)
+- build(deps-dev): bump @babel/core from 7.8.4 to 7.8.6 in /webapp [`#3182`](https://github.com/Human-Connection/Human-Connection/pull/3182)
+- build(deps-dev): bump @vue/cli-shared-utils from 4.2.2 to 4.2.3 in /webapp [`#3184`](https://github.com/Human-Connection/Human-Connection/pull/3184)
+- build(deps): bump @sentry/node from 5.12.4 to 5.13.1 in /backend [`#3192`](https://github.com/Human-Connection/Human-Connection/pull/3192)
+- build(deps): bump nodemailer from 6.4.3 to 6.4.4 in /backend [`#3193`](https://github.com/Human-Connection/Human-Connection/pull/3193)
+- build(deps-dev): bump eslint-plugin-jest from 23.8.0 to 23.8.1 in /webapp [`#3195`](https://github.com/Human-Connection/Human-Connection/pull/3195)
+- build(deps): bump date-fns from 2.9.0 to 2.10.0 in /backend [`#3159`](https://github.com/Human-Connection/Human-Connection/pull/3159)
+- build(deps-dev): bump @storybook/vue from 5.3.13 to 5.3.14 in /webapp [`#3165`](https://github.com/Human-Connection/Human-Connection/pull/3165)
+- build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /webapp [`#3168`](https://github.com/Human-Connection/Human-Connection/pull/3168)
+- build(deps-dev): bump @storybook/addon-actions from 5.3.13 to 5.3.14 in /webapp [`#3166`](https://github.com/Human-Connection/Human-Connection/pull/3166)
+- build(deps-dev): bump date-fns from 2.9.0 to 2.10.0 [`#3160`](https://github.com/Human-Connection/Human-Connection/pull/3160)
+- build(deps-dev): bump @storybook/addon-notes from 5.3.13 to 5.3.14 in /webapp [`#3164`](https://github.com/Human-Connection/Human-Connection/pull/3164)
+- build(deps): bump date-fns from 2.9.0 to 2.10.0 in /webapp [`#3163`](https://github.com/Human-Connection/Human-Connection/pull/3163)
+- build(deps-dev): bump babel-eslint from 10.0.3 to 10.1.0 in /backend [`#3162`](https://github.com/Human-Connection/Human-Connection/pull/3162)
+- build(deps): bump uuid from 7.0.0 to 7.0.1 in /backend [`#3161`](https://github.com/Human-Connection/Human-Connection/pull/3161)
+- build(deps): bump xregexp from 4.2.4 to 4.3.0 in /backend [`#3044`](https://github.com/Human-Connection/Human-Connection/pull/3044)
+- build(deps): bump metascraper-url from 5.10.7 to 5.11.1 in /backend [`#3147`](https://github.com/Human-Connection/Human-Connection/pull/3147)
+- chore(build): Fix uuid deprecations [`#3156`](https://github.com/Human-Connection/Human-Connection/pull/3156)
+- build(deps): bump graphql-shield from 7.0.13 to 7.0.14 in /backend [`#3153`](https://github.com/Human-Connection/Human-Connection/pull/3153)
+- build(deps): bump metascraper-title from 5.10.7 to 5.11.1 in /backend [`#3148`](https://github.com/Human-Connection/Human-Connection/pull/3148)
+- build(deps): bump helmet from 3.21.2 to 3.21.3 in /backend [`#3154`](https://github.com/Human-Connection/Human-Connection/pull/3154)
+- build(deps): bump uuid from 3.4.0 to 7.0.0 in /backend [`#3155`](https://github.com/Human-Connection/Human-Connection/pull/3155)
+- build(deps-dev): bump eslint-plugin-jest from 23.7.0 to 23.8.0 in /webapp [`#3150`](https://github.com/Human-Connection/Human-Connection/pull/3150)
+- fix(webapp): remove ribbon z-index [`#3152`](https://github.com/Human-Connection/Human-Connection/pull/3152)
+- build(deps): bump metascraper-description from 5.11.0 to 5.11.1 in /backend [`#3149`](https://github.com/Human-Connection/Human-Connection/pull/3149)
+- build(deps-dev): bump eslint-plugin-jest from 23.7.0 to 23.8.0 in /backend [`#3146`](https://github.com/Human-Connection/Human-Connection/pull/3146)
+- build(deps): bump sanitize-html from 1.21.1 to 1.22.0 in /backend [`#3145`](https://github.com/Human-Connection/Human-Connection/pull/3145)
+- build(deps): bump nodemailer from 6.4.2 to 6.4.3 in /backend [`#3144`](https://github.com/Human-Connection/Human-Connection/pull/3144)
+- build(deps): bump metascraper-video from 5.10.7 to 5.11.1 in /backend [`#3143`](https://github.com/Human-Connection/Human-Connection/pull/3143)
+- feat: the point -no political use - added [`#3138`](https://github.com/Human-Connection/Human-Connection/pull/3138)
+- build(deps): bump metascraper-lang from 5.10.7 to 5.11.1 in /backend [`#3071`](https://github.com/Human-Connection/Human-Connection/pull/3071)
+- build(deps): bump metascraper from 5.11.0 to 5.11.4 in /backend [`#3136`](https://github.com/Human-Connection/Human-Connection/pull/3136)
+- build(deps): bump metascraper-soundcloud from 5.10.7 to 5.11.4 in /backend [`#3137`](https://github.com/Human-Connection/Human-Connection/pull/3137)
+- chore: Update to v0.4.0 [`#3132`](https://github.com/Human-Connection/Human-Connection/pull/3132)
+- build(deps): bump metascraper-logo from 5.10.7 to 5.11.1 in /backend [`#3126`](https://github.com/Human-Connection/Human-Connection/pull/3126)
+- chore(cypress): Favor firefox in cypress [`#3121`](https://github.com/Human-Connection/Human-Connection/pull/3121)
+- build(deps): bump graphql-shield from 7.0.11 to 7.0.13 in /backend [`#3127`](https://github.com/Human-Connection/Human-Connection/pull/3127)
+- build(deps): bump ioredis from 4.14.1 to 4.16.0 in /backend [`#3128`](https://github.com/Human-Connection/Human-Connection/pull/3128)
+- build(deps-dev): bump @storybook/addon-notes in /webapp [`5ef2b25`](https://github.com/Human-Connection/Human-Connection/commit/5ef2b25ee6a3402a2ebe2f3f55dd65a6e0a1111e)
+- build(deps-dev): bump @storybook/addon-a11y in /webapp [`f209436`](https://github.com/Human-Connection/Human-Connection/commit/f209436147fbf9afacfbd6edb6135847e6c4faed)
+- build(deps): bump apollo-server-express in /backend [`3b35487`](https://github.com/Human-Connection/Human-Connection/commit/3b35487f0671490dee1e636fb938c408722bfd45)
+
 #### [v0.4.0](https://github.com/Human-Connection/Human-Connection/compare/v0.3.1...v0.4.0)
 
 > 21 February 2020
 
+- build(deps): bump apollo-server from 2.10.0 to 2.10.1 in /backend [`#3125`](https://github.com/Human-Connection/Human-Connection/pull/3125)
 - fix: Favor Cypress.Promise over async/await in e2e tests [`#3115`](https://github.com/Human-Connection/Human-Connection/pull/3115)
 - docs(setup): Fix links in tests [`#3120`](https://github.com/Human-Connection/Human-Connection/pull/3120)
 - feat: 🍰 Expose sensitive report type to moderators only [`#3075`](https://github.com/Human-Connection/Human-Connection/pull/3075)
diff --git a/backend/package.json b/backend/package.json
index 47ec7a1c7..a1e7eec96 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-backend",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
diff --git a/webapp/package.json b/webapp/package.json
index 98402aeb4..91ace4ccf 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-webapp",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Human Connection Frontend",
   "authors": [
     "Grzegorz Leoniec (appinteractive)",

From 646ef13a06cad8fa603b9c0905eda942b7644113 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:16:28 +0000
Subject: [PATCH 012/106] build(deps): bump metascraper-title from 5.11.1 to
 5.11.6 in /backend

Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.11.1 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.1...v5.11.6)

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

diff --git a/backend/package.json b/backend/package.json
index a1e7eec96..328895aa6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -81,7 +81,7 @@
     "metascraper-logo": "^5.11.6",
     "metascraper-publisher": "^5.11.6",
     "metascraper-soundcloud": "^5.11.5",
-    "metascraper-title": "^5.11.1",
+    "metascraper-title": "^5.11.6",
     "metascraper-url": "^5.11.6",
     "metascraper-video": "^5.11.1",
     "metascraper-youtube": "^5.11.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 12182c25f..fa0b6da80 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6304,12 +6304,12 @@ metascraper-soundcloud@^5.11.5:
     "@metascraper/helpers" "^5.11.1"
     tldts "~5.6.9"
 
-metascraper-title@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.11.1.tgz#fb32da17e71b2c64dc45d12c3602ca9330ab4bd5"
-  integrity sha512-fZ8qjf+d5ntwz/75X2r3BYD8X+tioZS1s+k9G3gfc+6ByJvrL9/ey6YzlDlU4zYqX73Vdx7+zUyy2ct0aJqWFA==
+metascraper-title@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.11.6.tgz#286d6b0e4a9ee51c54524ea441be50629d4e91f3"
+  integrity sha512-oIVEo+erZZ1s/3E4VGh1Dk9AGeunHQaR0bslkBT3OuwO0hqf94n5pA0fMmbhmv/Pdon+ZTTL6JV+uEYQnV6EKw==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
+    "@metascraper/helpers" "^5.11.6"
     lodash "~4.17.15"
 
 metascraper-url@^5.11.6:

From f927f6e0bd363d57c9bbb63d8a0456f4a628efd6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:16:51 +0000
Subject: [PATCH 013/106] build(deps): bump cross-env from 7.0.1 to 7.0.2 in
 /backend

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.1...v7.0.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 a1e7eec96..b3f397f05 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -49,7 +49,7 @@
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
-    "cross-env": "~7.0.1",
+    "cross-env": "~7.0.2",
     "date-fns": "2.10.0",
     "debug": "~4.1.1",
     "dotenv": "~8.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 12182c25f..9c3915cdd 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2979,10 +2979,10 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-cross-env@~7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.1.tgz#c8e03412ea0e1370fe3f0066929a70b8e1e90c39"
-  integrity sha512-1+DmLosu38kC4s1H4HzNkcolwdANifu9+5bE6uKQCV4L6jvVdV9qdRAk8vV3GoWRe0x4z+K2fFhgoDMqwNsPqQ==
+cross-env@~7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
+  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
   dependencies:
     cross-spawn "^7.0.1"
 

From ad1cad026d1a05e3a262b57df9c164ff9a01908f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 08:14:18 +0000
Subject: [PATCH 014/106] build(deps): bump metascraper-soundcloud in /backend

Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.11.5 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

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

diff --git a/backend/package.json b/backend/package.json
index 328895aa6..0de4119b5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -80,7 +80,7 @@
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.11.6",
     "metascraper-publisher": "^5.11.6",
-    "metascraper-soundcloud": "^5.11.5",
+    "metascraper-soundcloud": "^5.11.6",
     "metascraper-title": "^5.11.6",
     "metascraper-url": "^5.11.6",
     "metascraper-video": "^5.11.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index fa0b6da80..1cdef5442 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6296,13 +6296,13 @@ metascraper-publisher@^5.11.6:
   dependencies:
     "@metascraper/helpers" "^5.11.6"
 
-metascraper-soundcloud@^5.11.5:
-  version "5.11.5"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.11.5.tgz#989665c8d4177e0b687e12de3d951b79d69704bc"
-  integrity sha512-SbDtLkp/Uyg+gykNdmF+6Hy15TbNBnBWuVbRk99x+9XDoLbsK98kp1pJm0lU//RlRJAPfeWXPyMjhBMbDbeE/A==
+metascraper-soundcloud@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.11.6.tgz#01699553a37d5e02f73cd5b15792986f761e94e9"
+  integrity sha512-KR/KNK5pWthgwuixqyfL13uSwr+mUanzhC6LEYSL7kHYTtYl0mwG7P64Ab+OdloLMwRkekITK6EaD3T8Omj2tw==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
-    tldts "~5.6.9"
+    "@metascraper/helpers" "^5.11.6"
+    tldts "~5.6.10"
 
 metascraper-title@^5.11.6:
   version "5.11.6"
@@ -8667,17 +8667,17 @@ tlds@^1.187.0, tlds@^1.203.0:
   resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
   integrity sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==
 
-tldts-core@^5.6.9:
-  version "5.6.9"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.9.tgz#70e9b1d944b3b93008e0b31ffd8d1de6ce690bc9"
-  integrity sha512-MOvSUUxUyNmNK7R7cJKBvWys1rufuobWpPaVcGJd8EEsIyJzSVOlA5Y9l9V1Z0FdzlPMBAYPcpKuoQkvH7pfRg==
+tldts-core@^5.6.10:
+  version "5.6.10"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.10.tgz#509a93c2bfd79da5a456f06ef099a19fa00bc2c9"
+  integrity sha512-bbz6I/200adIZgrUcnCD2RiOWkOeyDSuRSyueYN6XFs/Jwoser30nQwEqFaXeKCRsUl4IobnOGWbvUC5ihcxCA==
 
-tldts@~5.6.9:
-  version "5.6.9"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.6.9.tgz#6fb3a10161aae568b1a862e4c96101a79adb557f"
-  integrity sha512-Dt5c+gD6tC3hvcUZEI/yMvru1gbnFzx95s7Di+GWZUrfEjI6vQg+vthje2Apduv9RHXXPEr5BLA51OsAwPvhWQ==
+tldts@~5.6.10:
+  version "5.6.10"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.6.10.tgz#b9a07d7ed14c7a2b7bcf48ac1f6908d5b06d28e1"
+  integrity sha512-YM/3+cMeulrAqGQE8EhU7Ugmw5PAqTUJJq51XTVzsh0S9VxEwFZRkJSn7B4OY/tgQIMu8GXzPMd9fIoiOxsRYA==
   dependencies:
-    tldts-core "^5.6.9"
+    tldts-core "^5.6.10"
 
 tmp@^0.0.33:
   version "0.0.33"

From df86ac1961876c412383e22aeb262a41b898c0dc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Mar 2020 10:39:04 +0000
Subject: [PATCH 015/106] build(deps): bump metascraper-video from 5.11.1 to
 5.11.6 in /backend

Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.11.1 to 5.11.6.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.1...v5.11.6)

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

diff --git a/backend/package.json b/backend/package.json
index b94bcf92b..6efb0f26d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -83,7 +83,7 @@
     "metascraper-soundcloud": "^5.11.6",
     "metascraper-title": "^5.11.6",
     "metascraper-url": "^5.11.6",
-    "metascraper-video": "^5.11.1",
+    "metascraper-video": "^5.11.6",
     "metascraper-youtube": "^5.11.6",
     "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index ead60bef9..9d9d122c1 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6319,12 +6319,12 @@ metascraper-url@^5.11.6:
   dependencies:
     "@metascraper/helpers" "^5.11.6"
 
-metascraper-video@^5.11.1:
-  version "5.11.1"
-  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.11.1.tgz#4018a635d816f3123c7ba97fe7669e4d61af2196"
-  integrity sha512-g8x6R4ntX7pt7ntuRCzL1+xIRd0JFAp/LoVPYFvdwn/D78u9GMJi+JvrNuLIEcrmtb6re6rE9MIOy8qMo1g3qA==
+metascraper-video@^5.11.6:
+  version "5.11.6"
+  resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.11.6.tgz#da8a2f81f07891391b1245346750a5450a3ae8c6"
+  integrity sha512-jxcLqSTvkPku1OMz/x8epDs6mnN3/IgBbcffC2TIzM7yJxcHpzxOGfVcUZ4igwKlz70lk8P8V5gIHMYAFDNdrQ==
   dependencies:
-    "@metascraper/helpers" "^5.11.1"
+    "@metascraper/helpers" "^5.11.6"
     lodash "~4.17.15"
 
 metascraper-youtube@^5.11.6:

From 3d8fe4d85039d22a3a80c5f0f6f7b5065840ff7c Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 13 Feb 2020 13:40:20 +0100
Subject: [PATCH 016/106] feature: Delete_user_as_admin_through_API_only

---
 backend/src/middleware/permissionsMiddleware.js | 2 +-
 backend/src/schema/resolvers/users.js           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 10dc98845..fa88d9348 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -133,7 +133,7 @@ export default shield(
       CreateComment: isAuthenticated,
       UpdateComment: isAuthor,
       DeleteComment: isAuthor,
-      DeleteUser: isDeletingOwnAccount,
+      DeleteUser: or(isDeletingOwnAccount, isAdmin),
       requestPasswordReset: allow,
       resetPassword: allow,
       AddPostEmotions: isAuthenticated,
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index a1b68e20d..c29b021be 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -175,6 +175,7 @@ export default {
     DeleteUser: async (object, params, context, resolveInfo) => {
       const { resource } = params
       const session = context.driver.session()
+      const { id: userId } = params
       try {
         if (resource && resource.length) {
           await session.writeTransaction(transaction => {
@@ -190,7 +191,7 @@ export default {
                     RETURN author
                   `,
                 {
-                  userId: context.user.id,
+                  userId,
                 },
               )
             })
@@ -212,7 +213,7 @@ export default {
               DETACH DELETE socialMedia
               RETURN user
             `,
-            { userId: context.user.id },
+            { userId },
           )
           log(deleteUserTransactionResponse)
           return deleteUserTransactionResponse.records.map(record => record.get('user').properties)

From 84c154798efac0cec4c13dfefae18a6a9542058a Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 13 Feb 2020 14:30:54 +0100
Subject: [PATCH 017/106] feature: test delete user as admin

---
 backend/src/schema/resolvers/users.spec.js | 327 +++++++++++++++++++++
 1 file changed, 327 insertions(+)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 9e24b8082..34b2db0ba 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -568,3 +568,330 @@ describe('DeleteUser', () => {
     })
   })
 })
+
+
+
+describe('DeleteUser as Admin', () => {
+  const deleteUserMutation = gql`
+    mutation($id: ID!, $resource: [Deletable]) {
+      DeleteUser(id: $id, resource: $resource) {
+        id
+        name
+        about
+        deleted
+        contributions {
+          id
+          content
+          contentExcerpt
+          deleted
+          comments {
+            id
+            content
+            contentExcerpt
+            deleted
+          }
+        }
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+    }
+  `
+  beforeEach(async () => {
+    variables = { id: ' u343', resource: [] }
+
+    user = await Factory.build('user', {
+      name: 'My name should be deleted',
+      about: 'along with my about',
+      id: 'u343',
+    })
+    await Factory.build(
+      'user',
+      {
+        id: 'not-my-account',
+      },
+      {
+        email: 'friends-account@example.org',
+      },
+    )
+  })
+
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+  })
+
+  describe('authenticated as Admin', () => {
+    beforeEach(async () => {
+      const admin = await Factory.build(
+        'user',
+        {
+          role: 'admin',
+        },
+        {
+          email: 'admin@example.org',
+          password: '1234',
+        },
+      )
+      authenticatedUser = await admin.toJson()
+    })
+ 
+
+    describe('attempting to delete a foreign account by an Admin', () => {
+      beforeEach(() => {
+        variables = { ...variables, id: 'u343' }
+      })
+
+      describe('given posts and comments', () => {
+        beforeEach(async () => {
+          await Factory.build('category', {
+            id: 'cat9',
+            name: 'Democracy & Politics',
+            icon: 'university',
+          })
+          await Factory.build(
+            'post',
+            {
+              id: 'p139',
+              content: 'Post by user u343',
+            },
+            {
+              author: user,
+              categoryIds,
+            },
+          )
+          await Factory.build(
+            'comment',
+            {
+              id: 'c155',
+              content: 'Comment by user u343',
+            },
+            {
+              author: user,
+            },
+          )
+          await Factory.build(
+            'comment',
+            {
+              id: 'c156',
+              content: "A comment by someone else on user u343's post",
+            },
+            {
+              postId: 'p139',
+            },
+          )
+        })
+
+        it("deletes my account, but doesn't delete posts or comments by default", async () => {
+          const expectedResponse = {
+            data: {
+              DeleteUser: {
+                id: 'u343',
+                name: 'UNAVAILABLE',
+                about: 'UNAVAILABLE',
+                deleted: true,
+                contributions: [
+                  {
+                    id: 'p139',
+                    content: 'Post by user u343',
+                    contentExcerpt: 'Post by user u343',
+                    deleted: false,
+                    comments: [
+                      {
+                        id: 'c156',
+                        content: "A comment by someone else on user u343's post",
+                        contentExcerpt: "A comment by someone else on user u343's post",
+                        deleted: false,
+                      },
+                    ],
+                  },
+                ],
+                comments: [
+                  {
+                    id: 'c155',
+                    content: 'Comment by user u343',
+                    contentExcerpt: 'Comment by user u343',
+                    deleted: false,
+                  },
+                ],
+              },
+            },
+            errors: undefined,
+          }
+          await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
+            expectedResponse,
+          )
+        })
+
+        describe('deletion of all post requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Post'] }
+          })
+
+          describe("marks user's posts as deleted", () => {
+            it('posts on request', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: 'UNAVAILABLE',
+                            contentExcerpt: 'UNAVAILABLE',
+                            deleted: true,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'Comment by user u343',
+                        contentExcerpt: 'Comment by user u343',
+                        deleted: false,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
+        })
+
+        describe('deletion of all comments requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Comment'] }
+          })
+
+          it('marks comments as deleted', async () => {
+            const expectedResponse = {
+              data: {
+                DeleteUser: {
+                  id: 'u343',
+                  name: 'UNAVAILABLE',
+                  about: 'UNAVAILABLE',
+                  deleted: true,
+                  contributions: [
+                    {
+                      id: 'p139',
+                      content: 'Post by user u343',
+                      contentExcerpt: 'Post by user u343',
+                      deleted: false,
+                      comments: [
+                        {
+                          id: 'c156',
+                          content: "A comment by someone else on user u343's post",
+                          contentExcerpt: "A comment by someone else on user u343's post",
+                          deleted: false,
+                        },
+                      ],
+                    },
+                  ],
+                  comments: [
+                    {
+                      id: 'c155',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                    },
+                  ],
+                },
+              },
+              errors: undefined,
+            }
+            await expect(
+              mutate({ mutation: deleteUserMutation, variables }),
+            ).resolves.toMatchObject(expectedResponse)
+          })
+        })
+
+        describe('deletion of all post and comments requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Post', 'Comment'] }
+          })
+
+          it('marks posts and comments as deleted', async () => {
+            const expectedResponse = {
+              data: {
+                DeleteUser: {
+                  id: 'u343',
+                  name: 'UNAVAILABLE',
+                  about: 'UNAVAILABLE',
+                  deleted: true,
+                  contributions: [
+                    {
+                      id: 'p139',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                      comments: [
+                        {
+                          id: 'c156',
+                          content: 'UNAVAILABLE',
+                          contentExcerpt: 'UNAVAILABLE',
+                          deleted: true,
+                        },
+                      ],
+                    },
+                  ],
+                  comments: [
+                    {
+                      id: 'c155',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                    },
+                  ],
+                },
+              },
+              errors: undefined,
+            }
+            await expect(
+              mutate({ mutation: deleteUserMutation, variables }),
+            ).resolves.toMatchObject(expectedResponse)
+          })
+        })
+      })
+
+      describe('connected `EmailAddress` nodes', () => {
+        it('will be removed completely', async () => {
+          await expect(neode.all('EmailAddress')).resolves.toHaveLength(3)
+          await mutate({ mutation: deleteUserMutation, variables })
+          await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+        })
+      })
+
+      describe('connected `SocialMedia` nodes', () => {
+        beforeEach(async () => {
+          const socialMedia = await Factory.build('socialMedia')
+          await socialMedia.relateTo(user, 'ownedBy')
+        })
+
+        it('will be removed completely', async () => {
+          await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
+          await mutate({ mutation: deleteUserMutation, variables })
+          await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
+        })
+      })
+    })
+  })
+})

From 5f8d58f46a3fc652d9b1dd2a1f15f5c37d33f7b5 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 14 Feb 2020 10:21:13 +0100
Subject: [PATCH 018/106] test deleteuser as admin, moderator, another user and
 as I myself

---
 backend/src/schema/resolvers/users.spec.js | 164 ++++++++++++++++++---
 1 file changed, 145 insertions(+), 19 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 34b2db0ba..1a2093f49 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -571,6 +571,144 @@ describe('DeleteUser', () => {
 
 
 
+describe('DeleteUser as another user', () => {
+  const deleteUserMutation = gql`
+  mutation($id: ID!, $resource: [Deletable]) {
+    DeleteUser(id: $id, resource: $resource) {
+      id
+      name
+      about
+      deleted
+      contributions {
+        id
+        content
+        contentExcerpt
+        deleted
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+      comments {
+        id
+        content
+        contentExcerpt
+        deleted
+      }
+    }
+  }
+`
+beforeEach(async () => {
+  variables = { id: ' u343', resource: [] }
+
+  user = await Factory.build('user', {
+    name: 'My name should be deleted',
+    about: 'along with my about',
+    id: 'u343',
+  })
+ 
+})
+
+  beforeEach(async () => {
+    
+
+    const anotherUser = await Factory.build(
+      'user',
+      {
+        role: 'user',
+      },
+      {
+        email: 'user@example.org',
+        password: '1234',
+      },
+    )
+   
+    authenticatedUser = await anotherUser.toJson()
+  })
+
+  it('a user has no authorization to delete another user accounts', async () => {
+    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+  })
+})
+
+
+
+
+describe('DeleteUser as moderator', () => {
+  const deleteUserMutation = gql`
+  mutation($id: ID!, $resource: [Deletable]) {
+    DeleteUser(id: $id, resource: $resource) {
+      id
+      name
+      about
+      deleted
+      contributions {
+        id
+        content
+        contentExcerpt
+        deleted
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+      comments {
+        id
+        content
+        contentExcerpt
+        deleted
+      }
+    }
+  }
+`
+beforeEach(async () => {
+  variables = { id: ' u343', resource: [] }
+
+  user = await Factory.build('user', {
+    name: 'My name should be deleted',
+    about: 'along with my about',
+    id: 'u343',
+  })
+ 
+})
+
+beforeEach(async () => {
+      
+
+  const moderator = await Factory.build(
+    'user',
+    {
+      role: 'moderator',
+    },
+    {
+      email: 'moderator@example.org',
+      password: '1234',
+    },
+  )
+ 
+
+  authenticatedUser = await moderator.toJson()
+})
+
+it('moderator is not allowed to delete other user accounts', async () => {
+  const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+  expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+})
+
+ 
+
+})
+
+
+
+
+
+
 describe('DeleteUser as Admin', () => {
   const deleteUserMutation = gql`
     mutation($id: ID!, $resource: [Deletable]) {
@@ -608,23 +746,11 @@ describe('DeleteUser as Admin', () => {
       about: 'along with my about',
       id: 'u343',
     })
-    await Factory.build(
-      'user',
-      {
-        id: 'not-my-account',
-      },
-      {
-        email: 'friends-account@example.org',
-      },
-    )
+   
   })
 
-  describe('unauthenticated', () => {
-    it('throws authorization error', async () => {
-      const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
-    })
-  })
+   
+  
 
   describe('authenticated as Admin', () => {
     beforeEach(async () => {
@@ -642,7 +768,7 @@ describe('DeleteUser as Admin', () => {
     })
  
 
-    describe('attempting to delete a foreign account by an Admin', () => {
+    describe('deleting a user account', () => {
       beforeEach(() => {
         variables = { ...variables, id: 'u343' }
       })
@@ -687,7 +813,7 @@ describe('DeleteUser as Admin', () => {
           )
         })
 
-        it("deletes my account, but doesn't delete posts or comments by default", async () => {
+        it("deletes account, but doesn't delete posts or comments by default", async () => {
           const expectedResponse = {
             data: {
               DeleteUser: {
@@ -874,9 +1000,9 @@ describe('DeleteUser as Admin', () => {
 
       describe('connected `EmailAddress` nodes', () => {
         it('will be removed completely', async () => {
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(3)
-          await mutate({ mutation: deleteUserMutation, variables })
           await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+          await mutate({ mutation: deleteUserMutation, variables })
+          await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
         })
       })
 

From 3983612c56ac92473a192a318959e4c691a3e7b8 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 14 Feb 2020 10:25:05 +0100
Subject: [PATCH 019/106] test deleteuser as admin, moderator, another user and
 as I myself, fix lint

---
 backend/src/schema/resolvers/users.spec.js | 883 ++++++++++-----------
 1 file changed, 429 insertions(+), 454 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 1a2093f49..ebcd2e3cb 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -244,7 +244,435 @@ describe('UpdateUser', () => {
   })
 })
 
-describe('DeleteUser', () => {
+describe('DeleteUser as another user', () => {
+  const deleteUserMutation = gql`
+    mutation($id: ID!, $resource: [Deletable]) {
+      DeleteUser(id: $id, resource: $resource) {
+        id
+        name
+        about
+        deleted
+        contributions {
+          id
+          content
+          contentExcerpt
+          deleted
+          comments {
+            id
+            content
+            contentExcerpt
+            deleted
+          }
+        }
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+    }
+  `
+  beforeEach(async () => {
+    variables = { id: ' u343', resource: [] }
+
+    user = await Factory.build('user', {
+      name: 'My name should be deleted',
+      about: 'along with my about',
+      id: 'u343',
+    })
+  })
+
+  beforeEach(async () => {
+    const anotherUser = await Factory.build(
+      'user',
+      {
+        role: 'user',
+      },
+      {
+        email: 'user@example.org',
+        password: '1234',
+      },
+    )
+
+    authenticatedUser = await anotherUser.toJson()
+  })
+
+  it('a user has no authorization to delete another user accounts', async () => {
+    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+  })
+})
+
+describe('DeleteUser as moderator', () => {
+  const deleteUserMutation = gql`
+    mutation($id: ID!, $resource: [Deletable]) {
+      DeleteUser(id: $id, resource: $resource) {
+        id
+        name
+        about
+        deleted
+        contributions {
+          id
+          content
+          contentExcerpt
+          deleted
+          comments {
+            id
+            content
+            contentExcerpt
+            deleted
+          }
+        }
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+    }
+  `
+  beforeEach(async () => {
+    variables = { id: ' u343', resource: [] }
+
+    user = await Factory.build('user', {
+      name: 'My name should be deleted',
+      about: 'along with my about',
+      id: 'u343',
+    })
+  })
+
+  beforeEach(async () => {
+    const moderator = await Factory.build(
+      'user',
+      {
+        role: 'moderator',
+      },
+      {
+        email: 'moderator@example.org',
+        password: '1234',
+      },
+    )
+
+    authenticatedUser = await moderator.toJson()
+  })
+
+  it('moderator is not allowed to delete other user accounts', async () => {
+    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+  })
+})
+
+describe('DeleteUser as Admin', () => {
+  const deleteUserMutation = gql`
+    mutation($id: ID!, $resource: [Deletable]) {
+      DeleteUser(id: $id, resource: $resource) {
+        id
+        name
+        about
+        deleted
+        contributions {
+          id
+          content
+          contentExcerpt
+          deleted
+          comments {
+            id
+            content
+            contentExcerpt
+            deleted
+          }
+        }
+        comments {
+          id
+          content
+          contentExcerpt
+          deleted
+        }
+      }
+    }
+  `
+  beforeEach(async () => {
+    variables = { id: ' u343', resource: [] }
+
+    user = await Factory.build('user', {
+      name: 'My name should be deleted',
+      about: 'along with my about',
+      id: 'u343',
+    })
+  })
+
+  describe('authenticated as Admin', () => {
+    beforeEach(async () => {
+      const admin = await Factory.build(
+        'user',
+        {
+          role: 'admin',
+        },
+        {
+          email: 'admin@example.org',
+          password: '1234',
+        },
+      )
+      authenticatedUser = await admin.toJson()
+    })
+
+    describe('deleting a user account', () => {
+      beforeEach(() => {
+        variables = { ...variables, id: 'u343' }
+      })
+
+      describe('given posts and comments', () => {
+        beforeEach(async () => {
+          await Factory.build('category', {
+            id: 'cat9',
+            name: 'Democracy & Politics',
+            icon: 'university',
+          })
+          await Factory.build(
+            'post',
+            {
+              id: 'p139',
+              content: 'Post by user u343',
+            },
+            {
+              author: user,
+              categoryIds,
+            },
+          )
+          await Factory.build(
+            'comment',
+            {
+              id: 'c155',
+              content: 'Comment by user u343',
+            },
+            {
+              author: user,
+            },
+          )
+          await Factory.build(
+            'comment',
+            {
+              id: 'c156',
+              content: "A comment by someone else on user u343's post",
+            },
+            {
+              postId: 'p139',
+            },
+          )
+        })
+
+        it("deletes account, but doesn't delete posts or comments by default", async () => {
+          const expectedResponse = {
+            data: {
+              DeleteUser: {
+                id: 'u343',
+                name: 'UNAVAILABLE',
+                about: 'UNAVAILABLE',
+                deleted: true,
+                contributions: [
+                  {
+                    id: 'p139',
+                    content: 'Post by user u343',
+                    contentExcerpt: 'Post by user u343',
+                    deleted: false,
+                    comments: [
+                      {
+                        id: 'c156',
+                        content: "A comment by someone else on user u343's post",
+                        contentExcerpt: "A comment by someone else on user u343's post",
+                        deleted: false,
+                      },
+                    ],
+                  },
+                ],
+                comments: [
+                  {
+                    id: 'c155',
+                    content: 'Comment by user u343',
+                    contentExcerpt: 'Comment by user u343',
+                    deleted: false,
+                  },
+                ],
+              },
+            },
+            errors: undefined,
+          }
+          await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
+            expectedResponse,
+          )
+        })
+
+        describe('deletion of all post requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Post'] }
+          })
+
+          describe("marks user's posts as deleted", () => {
+            it('on request', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: 'UNAVAILABLE',
+                            contentExcerpt: 'UNAVAILABLE',
+                            deleted: true,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'Comment by user u343',
+                        contentExcerpt: 'Comment by user u343',
+                        deleted: false,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
+        })
+
+        describe('deletion of all comments requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Comment'] }
+          })
+
+          it('marks comments as deleted', async () => {
+            const expectedResponse = {
+              data: {
+                DeleteUser: {
+                  id: 'u343',
+                  name: 'UNAVAILABLE',
+                  about: 'UNAVAILABLE',
+                  deleted: true,
+                  contributions: [
+                    {
+                      id: 'p139',
+                      content: 'Post by user u343',
+                      contentExcerpt: 'Post by user u343',
+                      deleted: false,
+                      comments: [
+                        {
+                          id: 'c156',
+                          content: "A comment by someone else on user u343's post",
+                          contentExcerpt: "A comment by someone else on user u343's post",
+                          deleted: false,
+                        },
+                      ],
+                    },
+                  ],
+                  comments: [
+                    {
+                      id: 'c155',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                    },
+                  ],
+                },
+              },
+              errors: undefined,
+            }
+            await expect(
+              mutate({ mutation: deleteUserMutation, variables }),
+            ).resolves.toMatchObject(expectedResponse)
+          })
+        })
+
+        describe('deletion of all posts and comments requested', () => {
+          beforeEach(() => {
+            variables = { ...variables, resource: ['Post', 'Comment'] }
+          })
+
+          it('marks posts and comments as deleted', async () => {
+            const expectedResponse = {
+              data: {
+                DeleteUser: {
+                  id: 'u343',
+                  name: 'UNAVAILABLE',
+                  about: 'UNAVAILABLE',
+                  deleted: true,
+                  contributions: [
+                    {
+                      id: 'p139',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                      comments: [
+                        {
+                          id: 'c156',
+                          content: 'UNAVAILABLE',
+                          contentExcerpt: 'UNAVAILABLE',
+                          deleted: true,
+                        },
+                      ],
+                    },
+                  ],
+                  comments: [
+                    {
+                      id: 'c155',
+                      content: 'UNAVAILABLE',
+                      contentExcerpt: 'UNAVAILABLE',
+                      deleted: true,
+                    },
+                  ],
+                },
+              },
+              errors: undefined,
+            }
+            await expect(
+              mutate({ mutation: deleteUserMutation, variables }),
+            ).resolves.toMatchObject(expectedResponse)
+          })
+        })
+      })
+
+      describe('connected `EmailAddress` nodes', () => {
+        it('will be removed completely', async () => {
+          await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+          await mutate({ mutation: deleteUserMutation, variables })
+          await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
+        })
+      })
+
+      describe('connected `SocialMedia` nodes', () => {
+        beforeEach(async () => {
+          const socialMedia = await Factory.build('socialMedia')
+          await socialMedia.relateTo(user, 'ownedBy')
+        })
+
+        it('will be removed completely', async () => {
+          await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
+          await mutate({ mutation: deleteUserMutation, variables })
+          await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
+        })
+      })
+    })
+  })
+})
+
+describe('DeleteUser I myself', () => {
   const deleteUserMutation = gql`
     mutation($id: ID!, $resource: [Deletable]) {
       DeleteUser(id: $id, resource: $resource) {
@@ -568,456 +996,3 @@ describe('DeleteUser', () => {
     })
   })
 })
-
-
-
-describe('DeleteUser as another user', () => {
-  const deleteUserMutation = gql`
-  mutation($id: ID!, $resource: [Deletable]) {
-    DeleteUser(id: $id, resource: $resource) {
-      id
-      name
-      about
-      deleted
-      contributions {
-        id
-        content
-        contentExcerpt
-        deleted
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-      comments {
-        id
-        content
-        contentExcerpt
-        deleted
-      }
-    }
-  }
-`
-beforeEach(async () => {
-  variables = { id: ' u343', resource: [] }
-
-  user = await Factory.build('user', {
-    name: 'My name should be deleted',
-    about: 'along with my about',
-    id: 'u343',
-  })
- 
-})
-
-  beforeEach(async () => {
-    
-
-    const anotherUser = await Factory.build(
-      'user',
-      {
-        role: 'user',
-      },
-      {
-        email: 'user@example.org',
-        password: '1234',
-      },
-    )
-   
-    authenticatedUser = await anotherUser.toJson()
-  })
-
-  it('a user has no authorization to delete another user accounts', async () => {
-    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
-  })
-})
-
-
-
-
-describe('DeleteUser as moderator', () => {
-  const deleteUserMutation = gql`
-  mutation($id: ID!, $resource: [Deletable]) {
-    DeleteUser(id: $id, resource: $resource) {
-      id
-      name
-      about
-      deleted
-      contributions {
-        id
-        content
-        contentExcerpt
-        deleted
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-      comments {
-        id
-        content
-        contentExcerpt
-        deleted
-      }
-    }
-  }
-`
-beforeEach(async () => {
-  variables = { id: ' u343', resource: [] }
-
-  user = await Factory.build('user', {
-    name: 'My name should be deleted',
-    about: 'along with my about',
-    id: 'u343',
-  })
- 
-})
-
-beforeEach(async () => {
-      
-
-  const moderator = await Factory.build(
-    'user',
-    {
-      role: 'moderator',
-    },
-    {
-      email: 'moderator@example.org',
-      password: '1234',
-    },
-  )
- 
-
-  authenticatedUser = await moderator.toJson()
-})
-
-it('moderator is not allowed to delete other user accounts', async () => {
-  const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-  expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
-})
-
- 
-
-})
-
-
-
-
-
-
-describe('DeleteUser as Admin', () => {
-  const deleteUserMutation = gql`
-    mutation($id: ID!, $resource: [Deletable]) {
-      DeleteUser(id: $id, resource: $resource) {
-        id
-        name
-        about
-        deleted
-        contributions {
-          id
-          content
-          contentExcerpt
-          deleted
-          comments {
-            id
-            content
-            contentExcerpt
-            deleted
-          }
-        }
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-    }
-  `
-  beforeEach(async () => {
-    variables = { id: ' u343', resource: [] }
-
-    user = await Factory.build('user', {
-      name: 'My name should be deleted',
-      about: 'along with my about',
-      id: 'u343',
-    })
-   
-  })
-
-   
-  
-
-  describe('authenticated as Admin', () => {
-    beforeEach(async () => {
-      const admin = await Factory.build(
-        'user',
-        {
-          role: 'admin',
-        },
-        {
-          email: 'admin@example.org',
-          password: '1234',
-        },
-      )
-      authenticatedUser = await admin.toJson()
-    })
- 
-
-    describe('deleting a user account', () => {
-      beforeEach(() => {
-        variables = { ...variables, id: 'u343' }
-      })
-
-      describe('given posts and comments', () => {
-        beforeEach(async () => {
-          await Factory.build('category', {
-            id: 'cat9',
-            name: 'Democracy & Politics',
-            icon: 'university',
-          })
-          await Factory.build(
-            'post',
-            {
-              id: 'p139',
-              content: 'Post by user u343',
-            },
-            {
-              author: user,
-              categoryIds,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c155',
-              content: 'Comment by user u343',
-            },
-            {
-              author: user,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c156',
-              content: "A comment by someone else on user u343's post",
-            },
-            {
-              postId: 'p139',
-            },
-          )
-        })
-
-        it("deletes account, but doesn't delete posts or comments by default", async () => {
-          const expectedResponse = {
-            data: {
-              DeleteUser: {
-                id: 'u343',
-                name: 'UNAVAILABLE',
-                about: 'UNAVAILABLE',
-                deleted: true,
-                contributions: [
-                  {
-                    id: 'p139',
-                    content: 'Post by user u343',
-                    contentExcerpt: 'Post by user u343',
-                    deleted: false,
-                    comments: [
-                      {
-                        id: 'c156',
-                        content: "A comment by someone else on user u343's post",
-                        contentExcerpt: "A comment by someone else on user u343's post",
-                        deleted: false,
-                      },
-                    ],
-                  },
-                ],
-                comments: [
-                  {
-                    id: 'c155',
-                    content: 'Comment by user u343',
-                    contentExcerpt: 'Comment by user u343',
-                    deleted: false,
-                  },
-                ],
-              },
-            },
-            errors: undefined,
-          }
-          await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
-            expectedResponse,
-          )
-        })
-
-        describe('deletion of all post requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post'] }
-          })
-
-          describe("marks user's posts as deleted", () => {
-            it('posts on request', async () => {
-              const expectedResponse = {
-                data: {
-                  DeleteUser: {
-                    id: 'u343',
-                    name: 'UNAVAILABLE',
-                    about: 'UNAVAILABLE',
-                    deleted: true,
-                    contributions: [
-                      {
-                        id: 'p139',
-                        content: 'UNAVAILABLE',
-                        contentExcerpt: 'UNAVAILABLE',
-                        deleted: true,
-                        comments: [
-                          {
-                            id: 'c156',
-                            content: 'UNAVAILABLE',
-                            contentExcerpt: 'UNAVAILABLE',
-                            deleted: true,
-                          },
-                        ],
-                      },
-                    ],
-                    comments: [
-                      {
-                        id: 'c155',
-                        content: 'Comment by user u343',
-                        contentExcerpt: 'Comment by user u343',
-                        deleted: false,
-                      },
-                    ],
-                  },
-                },
-                errors: undefined,
-              }
-              await expect(
-                mutate({ mutation: deleteUserMutation, variables }),
-              ).resolves.toMatchObject(expectedResponse)
-            })
-          })
-        })
-
-        describe('deletion of all comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Comment'] }
-          })
-
-          it('marks comments as deleted', async () => {
-            const expectedResponse = {
-              data: {
-                DeleteUser: {
-                  id: 'u343',
-                  name: 'UNAVAILABLE',
-                  about: 'UNAVAILABLE',
-                  deleted: true,
-                  contributions: [
-                    {
-                      id: 'p139',
-                      content: 'Post by user u343',
-                      contentExcerpt: 'Post by user u343',
-                      deleted: false,
-                      comments: [
-                        {
-                          id: 'c156',
-                          content: "A comment by someone else on user u343's post",
-                          contentExcerpt: "A comment by someone else on user u343's post",
-                          deleted: false,
-                        },
-                      ],
-                    },
-                  ],
-                  comments: [
-                    {
-                      id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                    },
-                  ],
-                },
-              },
-              errors: undefined,
-            }
-            await expect(
-              mutate({ mutation: deleteUserMutation, variables }),
-            ).resolves.toMatchObject(expectedResponse)
-          })
-        })
-
-        describe('deletion of all post and comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post', 'Comment'] }
-          })
-
-          it('marks posts and comments as deleted', async () => {
-            const expectedResponse = {
-              data: {
-                DeleteUser: {
-                  id: 'u343',
-                  name: 'UNAVAILABLE',
-                  about: 'UNAVAILABLE',
-                  deleted: true,
-                  contributions: [
-                    {
-                      id: 'p139',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                      comments: [
-                        {
-                          id: 'c156',
-                          content: 'UNAVAILABLE',
-                          contentExcerpt: 'UNAVAILABLE',
-                          deleted: true,
-                        },
-                      ],
-                    },
-                  ],
-                  comments: [
-                    {
-                      id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                    },
-                  ],
-                },
-              },
-              errors: undefined,
-            }
-            await expect(
-              mutate({ mutation: deleteUserMutation, variables }),
-            ).resolves.toMatchObject(expectedResponse)
-          })
-        })
-      })
-
-      describe('connected `EmailAddress` nodes', () => {
-        it('will be removed completely', async () => {
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
-        })
-      })
-
-      describe('connected `SocialMedia` nodes', () => {
-        beforeEach(async () => {
-          const socialMedia = await Factory.build('socialMedia')
-          await socialMedia.relateTo(user, 'ownedBy')
-        })
-
-        it('will be removed completely', async () => {
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
-        })
-      })
-    })
-  })
-})

From b23328a2111e141e66498af7fbcbaf003be70fae Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 21 Feb 2020 05:20:21 +0100
Subject: [PATCH 020/106] docs(setup): changes undone and set in own branch

---
 backend/src/middleware/slugifyMiddleware.spec.js | 2 +-
 backend/src/models/User.spec.js                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index df011b0a5..e522136d6 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -153,7 +153,7 @@ describe('slugifyMiddleware', () => {
               \`\`\`
 
               Learn how to setup the database here:
-              https://docs.human-connection.org/human-connection/backend#database-indices-and-constraints
+              https://docs.human-connection.org/human-connection/neo4j
             `)
           }
         })
diff --git a/backend/src/models/User.spec.js b/backend/src/models/User.spec.js
index a45a629e5..f448cbf08 100644
--- a/backend/src/models/User.spec.js
+++ b/backend/src/models/User.spec.js
@@ -46,7 +46,7 @@ describe('slug', () => {
         \`\`\`
 
         Learn how to setup the database here:
-        https://docs.human-connection.org/human-connection/backend#database-indices-and-constraints
+        https://docs.human-connection.org/human-connection/neo4j
       `)
     }
   })

From 07ded7419f20d6e294af7e7ab0f71c3a7aea978e Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 21 Feb 2020 08:50:25 +0100
Subject: [PATCH 021/106] test: deleting a user is tested with a foreign user,
 a moderator, an admin

---
 backend/src/schema/resolvers/users.spec.js | 45 ++++++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index ebcd2e3cb..f1e549390 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -672,7 +672,7 @@ describe('DeleteUser as Admin', () => {
   })
 })
 
-describe('DeleteUser I myself', () => {
+describe('User deletes his account himself', () => {
   const deleteUserMutation = gql`
     mutation($id: ID!, $resource: [Deletable]) {
       DeleteUser(id: $id, resource: $resource) {
@@ -701,8 +701,9 @@ describe('DeleteUser I myself', () => {
       }
     }
   `
+
   beforeEach(async () => {
-    variables = { id: ' u343', resource: [] }
+    variables = { id: 'u343', resource: [] }
 
     user = await Factory.build('user', {
       name: 'My name should be deleted',
@@ -720,8 +721,44 @@ describe('DeleteUser I myself', () => {
     )
   })
 
-  describe('unauthenticated', () => {
-    it('throws authorization error', async () => {
+  describe('unauthenticated anotherUser', () => {
+    beforeEach(async () => {
+      const anotherUser = await Factory.build(
+        'user',
+        {
+          role: 'user',
+        },
+        {
+          email: 'user@example.org',
+          password: '1234',
+        },
+      )
+
+      authenticatedUser = await anotherUser.toJson()
+    })
+
+    it('a  another User has no authorization to delete this user accounts', async () => {
+      const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+  })
+  describe('unauthenticated anotherModerator', () => {
+    beforeEach(async () => {
+      const anotherModerator = await Factory.build(
+        'user',
+        {
+          role: 'moderator',
+        },
+        {
+          email: 'moderator@example.org',
+          password: '1234',
+        },
+      )
+
+      authenticatedUser = await anotherModerator.toJson()
+    })
+
+    it('a  Moderator has no authorization to delete this user accounts', async () => {
       const { errors } = await mutate({ mutation: deleteUserMutation, variables })
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })

From da165906e2ed12baddd902b43064103ab3adfa06 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 10 Mar 2020 18:16:09 +0100
Subject: [PATCH 022/106] DRY user.spec.js

---
 .../src/middleware/slugifyMiddleware.spec.js  |    2 +-
 backend/src/models/User.spec.js               |    2 +-
 backend/src/schema/resolvers/users.spec.js    | 1132 ++++++++---------
 3 files changed, 505 insertions(+), 631 deletions(-)

diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index e522136d6..df011b0a5 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -153,7 +153,7 @@ describe('slugifyMiddleware', () => {
               \`\`\`
 
               Learn how to setup the database here:
-              https://docs.human-connection.org/human-connection/neo4j
+              https://docs.human-connection.org/human-connection/backend#database-indices-and-constraints
             `)
           }
         })
diff --git a/backend/src/models/User.spec.js b/backend/src/models/User.spec.js
index f448cbf08..a45a629e5 100644
--- a/backend/src/models/User.spec.js
+++ b/backend/src/models/User.spec.js
@@ -46,7 +46,7 @@ describe('slug', () => {
         \`\`\`
 
         Learn how to setup the database here:
-        https://docs.human-connection.org/human-connection/neo4j
+        https://docs.human-connection.org/human-connection/backend#database-indices-and-constraints
       `)
     }
   })
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index f1e549390..892d2b4b4 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -244,7 +244,7 @@ describe('UpdateUser', () => {
   })
 })
 
-describe('DeleteUser as another user', () => {
+describe('DeleteUser', () => {
   const deleteUserMutation = gql`
     mutation($id: ID!, $resource: [Deletable]) {
       DeleteUser(id: $id, resource: $resource) {
@@ -273,455 +273,17 @@ describe('DeleteUser as another user', () => {
       }
     }
   `
-  beforeEach(async () => {
-    variables = { id: ' u343', resource: [] }
-
-    user = await Factory.build('user', {
-      name: 'My name should be deleted',
-      about: 'along with my about',
-      id: 'u343',
-    })
-  })
-
-  beforeEach(async () => {
-    const anotherUser = await Factory.build(
-      'user',
-      {
-        role: 'user',
-      },
-      {
-        email: 'user@example.org',
-        password: '1234',
-      },
-    )
-
-    authenticatedUser = await anotherUser.toJson()
-  })
-
-  it('a user has no authorization to delete another user accounts', async () => {
-    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
-  })
-})
-
-describe('DeleteUser as moderator', () => {
-  const deleteUserMutation = gql`
-    mutation($id: ID!, $resource: [Deletable]) {
-      DeleteUser(id: $id, resource: $resource) {
-        id
-        name
-        about
-        deleted
-        contributions {
-          id
-          content
-          contentExcerpt
-          deleted
-          comments {
-            id
-            content
-            contentExcerpt
-            deleted
-          }
-        }
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-    }
-  `
-  beforeEach(async () => {
-    variables = { id: ' u343', resource: [] }
-
-    user = await Factory.build('user', {
-      name: 'My name should be deleted',
-      about: 'along with my about',
-      id: 'u343',
-    })
-  })
-
-  beforeEach(async () => {
-    const moderator = await Factory.build(
-      'user',
-      {
-        role: 'moderator',
-      },
-      {
-        email: 'moderator@example.org',
-        password: '1234',
-      },
-    )
-
-    authenticatedUser = await moderator.toJson()
-  })
-
-  it('moderator is not allowed to delete other user accounts', async () => {
-    const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-    expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
-  })
-})
-
-describe('DeleteUser as Admin', () => {
-  const deleteUserMutation = gql`
-    mutation($id: ID!, $resource: [Deletable]) {
-      DeleteUser(id: $id, resource: $resource) {
-        id
-        name
-        about
-        deleted
-        contributions {
-          id
-          content
-          contentExcerpt
-          deleted
-          comments {
-            id
-            content
-            contentExcerpt
-            deleted
-          }
-        }
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-    }
-  `
-  beforeEach(async () => {
-    variables = { id: ' u343', resource: [] }
-
-    user = await Factory.build('user', {
-      name: 'My name should be deleted',
-      about: 'along with my about',
-      id: 'u343',
-    })
-  })
-
-  describe('authenticated as Admin', () => {
+  describe('as another user', () => {
     beforeEach(async () => {
-      const admin = await Factory.build(
-        'user',
-        {
-          role: 'admin',
-        },
-        {
-          email: 'admin@example.org',
-          password: '1234',
-        },
-      )
-      authenticatedUser = await admin.toJson()
-    })
+      variables = { id: ' u343', resource: [] }
 
-    describe('deleting a user account', () => {
-      beforeEach(() => {
-        variables = { ...variables, id: 'u343' }
-      })
-
-      describe('given posts and comments', () => {
-        beforeEach(async () => {
-          await Factory.build('category', {
-            id: 'cat9',
-            name: 'Democracy & Politics',
-            icon: 'university',
-          })
-          await Factory.build(
-            'post',
-            {
-              id: 'p139',
-              content: 'Post by user u343',
-            },
-            {
-              author: user,
-              categoryIds,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c155',
-              content: 'Comment by user u343',
-            },
-            {
-              author: user,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c156',
-              content: "A comment by someone else on user u343's post",
-            },
-            {
-              postId: 'p139',
-            },
-          )
-        })
-
-        it("deletes account, but doesn't delete posts or comments by default", async () => {
-          const expectedResponse = {
-            data: {
-              DeleteUser: {
-                id: 'u343',
-                name: 'UNAVAILABLE',
-                about: 'UNAVAILABLE',
-                deleted: true,
-                contributions: [
-                  {
-                    id: 'p139',
-                    content: 'Post by user u343',
-                    contentExcerpt: 'Post by user u343',
-                    deleted: false,
-                    comments: [
-                      {
-                        id: 'c156',
-                        content: "A comment by someone else on user u343's post",
-                        contentExcerpt: "A comment by someone else on user u343's post",
-                        deleted: false,
-                      },
-                    ],
-                  },
-                ],
-                comments: [
-                  {
-                    id: 'c155',
-                    content: 'Comment by user u343',
-                    contentExcerpt: 'Comment by user u343',
-                    deleted: false,
-                  },
-                ],
-              },
-            },
-            errors: undefined,
-          }
-          await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
-            expectedResponse,
-          )
-        })
-
-        describe('deletion of all post requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post'] }
-          })
-
-          describe("marks user's posts as deleted", () => {
-            it('on request', async () => {
-              const expectedResponse = {
-                data: {
-                  DeleteUser: {
-                    id: 'u343',
-                    name: 'UNAVAILABLE',
-                    about: 'UNAVAILABLE',
-                    deleted: true,
-                    contributions: [
-                      {
-                        id: 'p139',
-                        content: 'UNAVAILABLE',
-                        contentExcerpt: 'UNAVAILABLE',
-                        deleted: true,
-                        comments: [
-                          {
-                            id: 'c156',
-                            content: 'UNAVAILABLE',
-                            contentExcerpt: 'UNAVAILABLE',
-                            deleted: true,
-                          },
-                        ],
-                      },
-                    ],
-                    comments: [
-                      {
-                        id: 'c155',
-                        content: 'Comment by user u343',
-                        contentExcerpt: 'Comment by user u343',
-                        deleted: false,
-                      },
-                    ],
-                  },
-                },
-                errors: undefined,
-              }
-              await expect(
-                mutate({ mutation: deleteUserMutation, variables }),
-              ).resolves.toMatchObject(expectedResponse)
-            })
-          })
-        })
-
-        describe('deletion of all comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Comment'] }
-          })
-
-          it('marks comments as deleted', async () => {
-            const expectedResponse = {
-              data: {
-                DeleteUser: {
-                  id: 'u343',
-                  name: 'UNAVAILABLE',
-                  about: 'UNAVAILABLE',
-                  deleted: true,
-                  contributions: [
-                    {
-                      id: 'p139',
-                      content: 'Post by user u343',
-                      contentExcerpt: 'Post by user u343',
-                      deleted: false,
-                      comments: [
-                        {
-                          id: 'c156',
-                          content: "A comment by someone else on user u343's post",
-                          contentExcerpt: "A comment by someone else on user u343's post",
-                          deleted: false,
-                        },
-                      ],
-                    },
-                  ],
-                  comments: [
-                    {
-                      id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                    },
-                  ],
-                },
-              },
-              errors: undefined,
-            }
-            await expect(
-              mutate({ mutation: deleteUserMutation, variables }),
-            ).resolves.toMatchObject(expectedResponse)
-          })
-        })
-
-        describe('deletion of all posts and comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post', 'Comment'] }
-          })
-
-          it('marks posts and comments as deleted', async () => {
-            const expectedResponse = {
-              data: {
-                DeleteUser: {
-                  id: 'u343',
-                  name: 'UNAVAILABLE',
-                  about: 'UNAVAILABLE',
-                  deleted: true,
-                  contributions: [
-                    {
-                      id: 'p139',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                      comments: [
-                        {
-                          id: 'c156',
-                          content: 'UNAVAILABLE',
-                          contentExcerpt: 'UNAVAILABLE',
-                          deleted: true,
-                        },
-                      ],
-                    },
-                  ],
-                  comments: [
-                    {
-                      id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
-                    },
-                  ],
-                },
-              },
-              errors: undefined,
-            }
-            await expect(
-              mutate({ mutation: deleteUserMutation, variables }),
-            ).resolves.toMatchObject(expectedResponse)
-          })
-        })
-      })
-
-      describe('connected `EmailAddress` nodes', () => {
-        it('will be removed completely', async () => {
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
-        })
-      })
-
-      describe('connected `SocialMedia` nodes', () => {
-        beforeEach(async () => {
-          const socialMedia = await Factory.build('socialMedia')
-          await socialMedia.relateTo(user, 'ownedBy')
-        })
-
-        it('will be removed completely', async () => {
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
-        })
+      user = await Factory.build('user', {
+        name: 'My name should be deleted',
+        about: 'along with my about',
+        id: 'u343',
       })
     })
-  })
-})
 
-describe('User deletes his account himself', () => {
-  const deleteUserMutation = gql`
-    mutation($id: ID!, $resource: [Deletable]) {
-      DeleteUser(id: $id, resource: $resource) {
-        id
-        name
-        about
-        deleted
-        contributions {
-          id
-          content
-          contentExcerpt
-          deleted
-          comments {
-            id
-            content
-            contentExcerpt
-            deleted
-          }
-        }
-        comments {
-          id
-          content
-          contentExcerpt
-          deleted
-        }
-      }
-    }
-  `
-
-  beforeEach(async () => {
-    variables = { id: 'u343', resource: [] }
-
-    user = await Factory.build('user', {
-      name: 'My name should be deleted',
-      about: 'along with my about',
-      id: 'u343',
-    })
-    await Factory.build(
-      'user',
-      {
-        id: 'not-my-account',
-      },
-      {
-        email: 'friends-account@example.org',
-      },
-    )
-  })
-
-  describe('unauthenticated anotherUser', () => {
     beforeEach(async () => {
       const anotherUser = await Factory.build(
         'user',
@@ -737,14 +299,25 @@ describe('User deletes his account himself', () => {
       authenticatedUser = await anotherUser.toJson()
     })
 
-    it('a  another User has no authorization to delete this user accounts', async () => {
+    it("an ordinary user has no authorization to delete another user's account", async () => {
       const { errors } = await mutate({ mutation: deleteUserMutation, variables })
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
   })
-  describe('unauthenticated anotherModerator', () => {
+
+  describe('as moderator', () => {
     beforeEach(async () => {
-      const anotherModerator = await Factory.build(
+      variables = { id: ' u343', resource: [] }
+
+      user = await Factory.build('user', {
+        name: 'My name should be deleted',
+        about: 'along with my about',
+        id: 'u343',
+      })
+    })
+
+    beforeEach(async () => {
+      const moderator = await Factory.build(
         'user',
         {
           role: 'moderator',
@@ -755,172 +328,87 @@ describe('User deletes his account himself', () => {
         },
       )
 
-      authenticatedUser = await anotherModerator.toJson()
+      authenticatedUser = await moderator.toJson()
     })
 
-    it('a  Moderator has no authorization to delete this user accounts', async () => {
+    it('moderator is not allowed to delete other user accounts', async () => {
       const { errors } = await mutate({ mutation: deleteUserMutation, variables })
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
   })
 
-  describe('authenticated', () => {
+  describe('as admin', () => {
     beforeEach(async () => {
-      authenticatedUser = await user.toJson()
-    })
+      variables = { id: ' u343', resource: [] }
 
-    describe("attempting to delete another user's account", () => {
-      beforeEach(() => {
-        variables = { ...variables, id: 'not-my-account' }
-      })
-
-      it('throws an authorization error', async () => {
-        const { errors } = await mutate({ mutation: deleteUserMutation, variables })
-        expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+      user = await Factory.build('user', {
+        name: 'My name should be deleted',
+        about: 'along with my about',
+        id: 'u343',
       })
     })
 
-    describe('attempting to delete my own account', () => {
-      beforeEach(() => {
-        variables = { ...variables, id: 'u343' }
+    describe('authenticated as Admin', () => {
+      beforeEach(async () => {
+        const admin = await Factory.build(
+          'user',
+          {
+            role: 'admin',
+          },
+          {
+            email: 'admin@example.org',
+            password: '1234',
+          },
+        )
+        authenticatedUser = await admin.toJson()
       })
 
-      describe('given posts and comments', () => {
-        beforeEach(async () => {
-          await Factory.build('category', {
-            id: 'cat9',
-            name: 'Democracy & Politics',
-            icon: 'university',
-          })
-          await Factory.build(
-            'post',
-            {
-              id: 'p139',
-              content: 'Post by user u343',
-            },
-            {
-              author: user,
-              categoryIds,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c155',
-              content: 'Comment by user u343',
-            },
-            {
-              author: user,
-            },
-          )
-          await Factory.build(
-            'comment',
-            {
-              id: 'c156',
-              content: "A comment by someone else on user u343's post",
-            },
-            {
-              postId: 'p139',
-            },
-          )
+      describe('deleting a user account', () => {
+        beforeEach(() => {
+          variables = { ...variables, id: 'u343' }
         })
 
-        it("deletes my account, but doesn't delete posts or comments by default", async () => {
-          const expectedResponse = {
-            data: {
-              DeleteUser: {
-                id: 'u343',
-                name: 'UNAVAILABLE',
-                about: 'UNAVAILABLE',
-                deleted: true,
-                contributions: [
-                  {
-                    id: 'p139',
-                    content: 'Post by user u343',
-                    contentExcerpt: 'Post by user u343',
-                    deleted: false,
-                    comments: [
-                      {
-                        id: 'c156',
-                        content: "A comment by someone else on user u343's post",
-                        contentExcerpt: "A comment by someone else on user u343's post",
-                        deleted: false,
-                      },
-                    ],
-                  },
-                ],
-                comments: [
-                  {
-                    id: 'c155',
-                    content: 'Comment by user u343',
-                    contentExcerpt: 'Comment by user u343',
-                    deleted: false,
-                  },
-                ],
-              },
-            },
-            errors: undefined,
-          }
-          await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
-            expectedResponse,
-          )
-        })
-
-        describe('deletion of all post requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post'] }
-          })
-
-          describe("marks user's posts as deleted", () => {
-            it('posts on request', async () => {
-              const expectedResponse = {
-                data: {
-                  DeleteUser: {
-                    id: 'u343',
-                    name: 'UNAVAILABLE',
-                    about: 'UNAVAILABLE',
-                    deleted: true,
-                    contributions: [
-                      {
-                        id: 'p139',
-                        content: 'UNAVAILABLE',
-                        contentExcerpt: 'UNAVAILABLE',
-                        deleted: true,
-                        comments: [
-                          {
-                            id: 'c156',
-                            content: 'UNAVAILABLE',
-                            contentExcerpt: 'UNAVAILABLE',
-                            deleted: true,
-                          },
-                        ],
-                      },
-                    ],
-                    comments: [
-                      {
-                        id: 'c155',
-                        content: 'Comment by user u343',
-                        contentExcerpt: 'Comment by user u343',
-                        deleted: false,
-                      },
-                    ],
-                  },
-                },
-                errors: undefined,
-              }
-              await expect(
-                mutate({ mutation: deleteUserMutation, variables }),
-              ).resolves.toMatchObject(expectedResponse)
+        describe('given posts and comments', () => {
+          beforeEach(async () => {
+            await Factory.build('category', {
+              id: 'cat9',
+              name: 'Democracy & Politics',
+              icon: 'university',
             })
-          })
-        })
-
-        describe('deletion of all comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Comment'] }
+            await Factory.build(
+              'post',
+              {
+                id: 'p139',
+                content: 'Post by user u343',
+              },
+              {
+                author: user,
+                categoryIds,
+              },
+            )
+            await Factory.build(
+              'comment',
+              {
+                id: 'c155',
+                content: 'Comment by user u343',
+              },
+              {
+                author: user,
+              },
+            )
+            await Factory.build(
+              'comment',
+              {
+                id: 'c156',
+                content: "A comment by someone else on user u343's post",
+              },
+              {
+                postId: 'p139',
+              },
+            )
           })
 
-          it('marks comments as deleted', async () => {
+          it("deletes account, but doesn't delete posts or comments by default", async () => {
             const expectedResponse = {
               data: {
                 DeleteUser: {
@@ -947,9 +435,9 @@ describe('User deletes his account himself', () => {
                   comments: [
                     {
                       id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
+                      content: 'Comment by user u343',
+                      contentExcerpt: 'Comment by user u343',
+                      deleted: false,
                     },
                   ],
                 },
@@ -960,14 +448,257 @@ describe('User deletes his account himself', () => {
               mutate({ mutation: deleteUserMutation, variables }),
             ).resolves.toMatchObject(expectedResponse)
           })
-        })
 
-        describe('deletion of all post and comments requested', () => {
-          beforeEach(() => {
-            variables = { ...variables, resource: ['Post', 'Comment'] }
+          describe('deletion of all post requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Post'] }
+            })
+
+            describe("marks user's posts as deleted", () => {
+              it('on request', async () => {
+                const expectedResponse = {
+                  data: {
+                    DeleteUser: {
+                      id: 'u343',
+                      name: 'UNAVAILABLE',
+                      about: 'UNAVAILABLE',
+                      deleted: true,
+                      contributions: [
+                        {
+                          id: 'p139',
+                          content: 'UNAVAILABLE',
+                          contentExcerpt: 'UNAVAILABLE',
+                          deleted: true,
+                          comments: [
+                            {
+                              id: 'c156',
+                              content: 'UNAVAILABLE',
+                              contentExcerpt: 'UNAVAILABLE',
+                              deleted: true,
+                            },
+                          ],
+                        },
+                      ],
+                      comments: [
+                        {
+                          id: 'c155',
+                          content: 'Comment by user u343',
+                          contentExcerpt: 'Comment by user u343',
+                          deleted: false,
+                        },
+                      ],
+                    },
+                  },
+                  errors: undefined,
+                }
+                await expect(
+                  mutate({ mutation: deleteUserMutation, variables }),
+                ).resolves.toMatchObject(expectedResponse)
+              })
+            })
           })
 
-          it('marks posts and comments as deleted', async () => {
+          describe('deletion of all comments requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Comment'] }
+            })
+
+            it('marks comments as deleted', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'Post by user u343',
+                        contentExcerpt: 'Post by user u343',
+                        deleted: false,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: "A comment by someone else on user u343's post",
+                            contentExcerpt: "A comment by someone else on user u343's post",
+                            deleted: false,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
+
+          describe('deletion of all posts and comments requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Post', 'Comment'] }
+            })
+
+            it('marks posts and comments as deleted', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: 'UNAVAILABLE',
+                            contentExcerpt: 'UNAVAILABLE',
+                            deleted: true,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
+        })
+
+        describe('connected `EmailAddress` nodes', () => {
+          it('will be removed completely', async () => {
+            await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+            await mutate({ mutation: deleteUserMutation, variables })
+            await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
+          })
+        })
+
+        describe('connected `SocialMedia` nodes', () => {
+          beforeEach(async () => {
+            const socialMedia = await Factory.build('socialMedia')
+            await socialMedia.relateTo(user, 'ownedBy')
+          })
+
+          it('will be removed completely', async () => {
+            await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
+            await mutate({ mutation: deleteUserMutation, variables })
+            await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
+          })
+        })
+      })
+    })
+  })
+
+  describe('user deletes his own account', () => {
+    beforeEach(async () => {
+      variables = { id: 'u343', resource: [] }
+
+      user = await Factory.build('user', {
+        name: 'My name should be deleted',
+        about: 'along with my about',
+        id: 'u343',
+      })
+      await Factory.build(
+        'user',
+        {
+          id: 'not-my-account',
+        },
+        {
+          email: 'friends-account@example.org',
+        },
+      )
+    })
+
+    describe('authenticated', () => {
+      beforeEach(async () => {
+        authenticatedUser = await user.toJson()
+      })
+
+      describe("attempting to delete another user's account", () => {
+        beforeEach(() => {
+          variables = { ...variables, id: 'not-my-account' }
+        })
+
+        it('throws an authorization error', async () => {
+          const { errors } = await mutate({ mutation: deleteUserMutation, variables })
+          expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+        })
+      })
+
+      describe('attempting to delete my own account', () => {
+        beforeEach(() => {
+          variables = { ...variables, id: 'u343' }
+        })
+
+        describe('given posts and comments', () => {
+          beforeEach(async () => {
+            await Factory.build('category', {
+              id: 'cat9',
+              name: 'Democracy & Politics',
+              icon: 'university',
+            })
+            await Factory.build(
+              'post',
+              {
+                id: 'p139',
+                content: 'Post by user u343',
+              },
+              {
+                author: user,
+                categoryIds,
+              },
+            )
+            await Factory.build(
+              'comment',
+              {
+                id: 'c155',
+                content: 'Comment by user u343',
+              },
+              {
+                author: user,
+              },
+            )
+            await Factory.build(
+              'comment',
+              {
+                id: 'c156',
+                content: "A comment by someone else on user u343's post",
+              },
+              {
+                postId: 'p139',
+              },
+            )
+          })
+
+          it("deletes my account, but doesn't delete posts or comments by default", async () => {
             const expectedResponse = {
               data: {
                 DeleteUser: {
@@ -978,15 +709,15 @@ describe('User deletes his account himself', () => {
                   contributions: [
                     {
                       id: 'p139',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
+                      content: 'Post by user u343',
+                      contentExcerpt: 'Post by user u343',
+                      deleted: false,
                       comments: [
                         {
                           id: 'c156',
-                          content: 'UNAVAILABLE',
-                          contentExcerpt: 'UNAVAILABLE',
-                          deleted: true,
+                          content: "A comment by someone else on user u343's post",
+                          contentExcerpt: "A comment by someone else on user u343's post",
+                          deleted: false,
                         },
                       ],
                     },
@@ -994,9 +725,9 @@ describe('User deletes his account himself', () => {
                   comments: [
                     {
                       id: 'c155',
-                      content: 'UNAVAILABLE',
-                      contentExcerpt: 'UNAVAILABLE',
-                      deleted: true,
+                      content: 'Comment by user u343',
+                      contentExcerpt: 'Comment by user u343',
+                      deleted: false,
                     },
                   ],
                 },
@@ -1007,27 +738,170 @@ describe('User deletes his account himself', () => {
               mutate({ mutation: deleteUserMutation, variables }),
             ).resolves.toMatchObject(expectedResponse)
           })
-        })
-      })
 
-      describe('connected `EmailAddress` nodes', () => {
-        it('will be removed completely', async () => {
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
-        })
-      })
+          describe('deletion of all post requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Post'] }
+            })
 
-      describe('connected `SocialMedia` nodes', () => {
-        beforeEach(async () => {
-          const socialMedia = await Factory.build('socialMedia')
-          await socialMedia.relateTo(user, 'ownedBy')
+            describe("marks user's posts as deleted", () => {
+              it('posts on request', async () => {
+                const expectedResponse = {
+                  data: {
+                    DeleteUser: {
+                      id: 'u343',
+                      name: 'UNAVAILABLE',
+                      about: 'UNAVAILABLE',
+                      deleted: true,
+                      contributions: [
+                        {
+                          id: 'p139',
+                          content: 'UNAVAILABLE',
+                          contentExcerpt: 'UNAVAILABLE',
+                          deleted: true,
+                          comments: [
+                            {
+                              id: 'c156',
+                              content: 'UNAVAILABLE',
+                              contentExcerpt: 'UNAVAILABLE',
+                              deleted: true,
+                            },
+                          ],
+                        },
+                      ],
+                      comments: [
+                        {
+                          id: 'c155',
+                          content: 'Comment by user u343',
+                          contentExcerpt: 'Comment by user u343',
+                          deleted: false,
+                        },
+                      ],
+                    },
+                  },
+                  errors: undefined,
+                }
+                await expect(
+                  mutate({ mutation: deleteUserMutation, variables }),
+                ).resolves.toMatchObject(expectedResponse)
+              })
+            })
+          })
+
+          describe('deletion of all comments requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Comment'] }
+            })
+
+            it('marks comments as deleted', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'Post by user u343',
+                        contentExcerpt: 'Post by user u343',
+                        deleted: false,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: "A comment by someone else on user u343's post",
+                            contentExcerpt: "A comment by someone else on user u343's post",
+                            deleted: false,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
+
+          describe('deletion of all post and comments requested', () => {
+            beforeEach(() => {
+              variables = { ...variables, resource: ['Post', 'Comment'] }
+            })
+
+            it('marks posts and comments as deleted', async () => {
+              const expectedResponse = {
+                data: {
+                  DeleteUser: {
+                    id: 'u343',
+                    name: 'UNAVAILABLE',
+                    about: 'UNAVAILABLE',
+                    deleted: true,
+                    contributions: [
+                      {
+                        id: 'p139',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                        comments: [
+                          {
+                            id: 'c156',
+                            content: 'UNAVAILABLE',
+                            contentExcerpt: 'UNAVAILABLE',
+                            deleted: true,
+                          },
+                        ],
+                      },
+                    ],
+                    comments: [
+                      {
+                        id: 'c155',
+                        content: 'UNAVAILABLE',
+                        contentExcerpt: 'UNAVAILABLE',
+                        deleted: true,
+                      },
+                    ],
+                  },
+                },
+                errors: undefined,
+              }
+              await expect(
+                mutate({ mutation: deleteUserMutation, variables }),
+              ).resolves.toMatchObject(expectedResponse)
+            })
+          })
         })
 
-        it('will be removed completely', async () => {
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
-          await mutate({ mutation: deleteUserMutation, variables })
-          await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
+        describe('connected `EmailAddress` nodes', () => {
+          it('will be removed completely', async () => {
+            await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+            await mutate({ mutation: deleteUserMutation, variables })
+            await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
+          })
+        })
+
+        describe('connected `SocialMedia` nodes', () => {
+          beforeEach(async () => {
+            const socialMedia = await Factory.build('socialMedia')
+            await socialMedia.relateTo(user, 'ownedBy')
+          })
+
+          it('will be removed completely', async () => {
+            await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
+            await mutate({ mutation: deleteUserMutation, variables })
+            await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
+          })
         })
       })
     })

From f196c2a9f72625728fe255c9ac04a090751e885e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 04:18:57 +0000
Subject: [PATCH 023/106] build(deps-dev): bump eslint-plugin-jest in /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.8.1 to 23.8.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.8.1...v23.8.2)

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

diff --git a/backend/package.json b/backend/package.json
index 02734358b..cc4702d5b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -122,7 +122,7 @@
     "eslint-config-prettier": "~6.10.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.20.1",
-    "eslint-plugin-jest": "~23.8.1",
+    "eslint-plugin-jest": "~23.8.2",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6346bbc73..0f70afa14 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1162,7 +1162,7 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.11.1", "@metascraper/helpers@^5.11.6":
+"@metascraper/helpers@^5.11.6":
   version "5.11.6"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.11.6.tgz#2fef2f420f06f4f8903cc6f699ccb79195950a60"
   integrity sha512-DKCJMz5Q4wrBPZVfJdeNarmW2WHm3Y7D6M78KKA/D0mcXPikKLoiBxjyPtjc5tEE/5er+PYFijDBmyTT60M2bg==
@@ -3664,10 +3664,10 @@ eslint-plugin-import@~2.20.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-jest@~23.8.1:
-  version "23.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.1.tgz#247025e8a51b3a25a4cc41166369b0bfb4db83b7"
-  integrity sha512-OycLNqPo/2EfO6kTqnmsu1khz1gTIOxGl3ThIVwL5/oycDF4pm5uNDyvFelNLdpr4COUuM8PVi3963NEG1Efpw==
+eslint-plugin-jest@~23.8.2:
+  version "23.8.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
+  integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From 3526b3cd1342ccdab86e258a6c30934c3908a5eb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 04:19:24 +0000
Subject: [PATCH 024/106] build(deps): bump nodemailer from 6.4.4 to 6.4.5 in
 /backend

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.4 to 6.4.5.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.4...v6.4.5)

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

diff --git a/backend/package.json b/backend/package.json
index 02734358b..aa52b9121 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -92,7 +92,7 @@
     "neo4j-graphql-js": "^2.11.5",
     "neode": "^0.3.7",
     "node-fetch": "~2.6.0",
-    "nodemailer": "^6.4.4",
+    "nodemailer": "^6.4.5",
     "nodemailer-html-to-text": "^3.1.0",
     "npm-run-all": "~4.1.5",
     "request": "~2.88.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 6346bbc73..65803cd66 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1162,7 +1162,7 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.11.1", "@metascraper/helpers@^5.11.6":
+"@metascraper/helpers@^5.11.6":
   version "5.11.6"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.11.6.tgz#2fef2f420f06f4f8903cc6f699ccb79195950a60"
   integrity sha512-DKCJMz5Q4wrBPZVfJdeNarmW2WHm3Y7D6M78KKA/D0mcXPikKLoiBxjyPtjc5tEE/5er+PYFijDBmyTT60M2bg==
@@ -6691,10 +6691,10 @@ nodemailer-html-to-text@^3.1.0:
   dependencies:
     html-to-text "^5.1.1"
 
-nodemailer@^6.4.4:
-  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.4.tgz#f4bb26a833786e8908b3ac8afbf2d0382ac24feb"
-  integrity sha512-2GqGu5o3FBmDibczU3+LZh9lCEiKmNx7LvHl512p8Kj+Kn5FQVOICZv85MDFz/erK0BDd5EJp3nqQLpWCZD1Gg==
+nodemailer@^6.4.5:
+  version "6.4.5"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.5.tgz#45614c6454d1a947242105eeddae03df87e29916"
+  integrity sha512-NH7aNVQyZLAvGr2+EOto7znvz+qJ02Cb/xpou98ApUt5tEAUSVUxhvHvgV/8I5dhjKTYqUw0nasoKzLNBJKrDQ==
 
 nodemon@~2.0.2:
   version "2.0.2"

From e41310c00217267bb08fe4e0e31a9f49f66c2e7d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 04:19:29 +0000
Subject: [PATCH 025/106] build(deps-dev): bump async-validator from 3.2.3 to
 3.2.4 in /webapp

Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.3...v3.2.4)

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 91ace4ccf..9c599e0dd 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -108,7 +108,7 @@
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
     "@vue/test-utils": "~1.0.0-beta.31",
-    "async-validator": "^3.2.3",
+    "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
     "babel-jest": "~25.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 3a20945fc..59faf08e3 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4205,10 +4205,10 @@ async-retry@^1.2.1:
   dependencies:
     retry "0.12.0"
 
-async-validator@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.3.tgz#b38b72f9c08c1d28548df13bb260b6908448ca49"
-  integrity sha512-yMJ4i3x5qEGVgEMowZiBkx+rjDrsXf64BWdHENCtHLgyPiEE+2r8jvqMF1cghCgdGo4sWVLJ7MDwPQgGSPDCcw==
+async-validator@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.4.tgz#4e773a1d0d741016b455b7995b469a47cce0dbe0"
+  integrity sha512-mTgzMJixkrh+5t2gbYoua8MLy11GHkQqFE6tbhY5Aqc4jEDGsR4BWP+sVQiYDHtzTMB8WIwI/ypObTVPcTZInw==
 
 async@^2.1.4:
   version "2.6.2"

From 65be4cdc11b888ec0bed12311c7c5979e8d98f44 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 10:28:29 +0000
Subject: [PATCH 026/106] build(deps-dev): bump @vue/test-utils in /webapp

Bumps [@vue/test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/test-utils) from 1.0.0-beta.31 to 1.0.0-beta.32.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.32/packages/test-utils)

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

diff --git a/webapp/package.json b/webapp/package.json
index 9c599e0dd..fa6785e58 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -107,7 +107,7 @@
     "@vue/cli-shared-utils": "~4.2.3",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
-    "@vue/test-utils": "~1.0.0-beta.31",
+    "@vue/test-utils": "~1.0.0-beta.32",
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 59faf08e3..f837af1c3 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3089,10 +3089,10 @@
     "@types/cheerio" "^0.22.10"
     cheerio "^1.0.0-rc.2"
 
-"@vue/test-utils@~1.0.0-beta.31":
-  version "1.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.31.tgz#580d6e45f07452e497d69807d80986e713949b73"
-  integrity sha512-IlhSx5hyEVnbvDZ3P98R1jNmy88QAd/y66Upn4EcvxSD5D4hwOutl3dIdfmSTSXs4b9DIMDnEVjX7t00cvOnvg==
+"@vue/test-utils@~1.0.0-beta.32":
+  version "1.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.32.tgz#38c3947886236201a3f24b583c73598eb95ccc69"
+  integrity sha512-ywhe7PATMAk/ZGdsrcuQIliQusOyfe0OOHjKKCCERqgHh1g/kqPtmSMT5Jx4sErx53SYbNucr8QOK6/u5ianAw==
   dependencies:
     dom-event-types "^1.0.0"
     lodash "^4.17.15"

From 5f9b275e55e84d5c903ec7b351451b1a23498520 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Tue, 10 Mar 2020 17:44:51 +0100
Subject: [PATCH 027/106] add colors to 'not sorted' messages and hint to --fix
 feature

---
 scripts/translations/sort.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/translations/sort.sh b/scripts/translations/sort.sh
index 35496f27e..aa5737de8 100755
--- a/scripts/translations/sort.sh
+++ b/scripts/translations/sort.sh
@@ -3,6 +3,12 @@
 ROOT_DIR=$(dirname "$0")/../..
 tmp=$(mktemp)
 exit_code=0
+errors=0
+
+TEXT_RED="\e[31m"
+TEXT_BLUE="\e[34m"
+TEXT_RESET="\e[0m"
+TEXT_BOLD="\e[1m"
 
 for locale_file in $ROOT_DIR/webapp/locales/*.json
 do
@@ -16,9 +22,13 @@ do
       : # all good
     else
       exit_code=$?
-      echo "$(basename -- $locale_file) is not sorted by keys"
+      echo -e "${TEXT_BOLD}${TEXT_RED}>>> $(basename -- $locale_file) is not sorted by keys <<<${TEXT_RESET}"
+      errors=1
     fi
   fi
 done
 
+[ "$errors" = 1 ] && echo -e "${TEXT_BOLD}${TEXT_BLUE}Please run $0 --fix to sort your locale definitions!${TEXT_RESET}";
+
+
 exit $exit_code

From 3327f1dfb02a5d2e304f970bb5fee6c1f7c25cbb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:16:18 +0000
Subject: [PATCH 028/106] build(deps): bump graphql-shield from 7.0.14 to 7.1.0
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.14 to 7.1.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.14...v7.1.0)

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

diff --git a/backend/package.json b/backend/package.json
index 974108428..f5ad57f10 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.2.1",
-    "graphql-shield": "~7.0.14",
+    "graphql-shield": "~7.1.0",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.3",
     "ioredis": "^4.16.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e708e990b..81edcf6ba 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -795,14 +795,14 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.5.5":
+"@babel/runtime@^7.5.5":
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
   integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.8.4":
+"@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
   integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
@@ -4155,10 +4155,10 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
-fn-name@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+fn-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c"
+  integrity sha512-eNMNr5exLoavuAMhIUVsOKF79SWd/zG104ef6sxBTSw+cZc6BXdQXDvYcGvp0VbxVVSp1XDUNoz7mg1xMtSznA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -4505,14 +4505,14 @@ graphql-redis-subscriptions@^2.2.1:
   optionalDependencies:
     ioredis "^4.6.3"
 
-graphql-shield@~7.0.14:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.14.tgz#3cbbf2722f2e3393fed7f47d866a1324bc3ce76a"
-  integrity sha512-YVedaL+4pITisSGRqMVeGX8ydOLSTQlHQN6o0Jly7z2cSy1wOzGJIRpfofETJtGLhBnPHHy1otINzuAyjGJO/g==
+graphql-shield@~7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.1.0.tgz#7e96e0df87357dd97ec799f6f11cc5b80c0bedd0"
+  integrity sha512-XCYwieksKnxabjHnvK/zPxk6FE4coNp+FWJWrL/IVGlk/3I97ROWTobuUM/CXmpnrt+PYcTVn+0JeU38bN02Cw==
   dependencies:
     "@types/yup" "0.26.32"
     object-hash "^2.0.3"
-    yup "^0.28.1"
+    yup "^0.28.3"
 
 graphql-subscriptions@^1.0.0:
   version "1.1.0"
@@ -7367,10 +7367,10 @@ prop-types@^15.6.2:
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
-property-expr@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
-  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
+property-expr@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.2.tgz#fff2a43919135553a3bc2fdd94bdb841965b2330"
+  integrity sha512-bc/5ggaYZxNkFKj374aLbEDqVADdYaLcFo8XBkishUWbaAdjlphaBFns9TvRA2pUseVL/wMFmui9X3IdNDU37g==
 
 proxy-addr@~2.0.5:
   version "2.0.5"
@@ -8548,10 +8548,10 @@ symbol-tree@^3.2.2:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-synchronous-promise@^2.0.6:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
-  integrity sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==
+synchronous-promise@^2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.10.tgz#e64c6fd3afd25f423963353043f4a68ebd397fd8"
+  integrity sha512-6PC+JRGmNjiG3kJ56ZMNWDPL8hjyghF5cMXIFOKg+NiwwEZZIvxTWd0pinWKyD227odg9ygF8xVhhz7gb8Uq7A==
 
 table@^5.2.3:
   version "5.4.6"
@@ -9385,17 +9385,17 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^16.1.0"
 
-yup@^0.28.1:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.28.1.tgz#60c0725be7057ed7a9ae61561333809332a63d47"
-  integrity sha512-xSHMZA7UyecSG/CCTDCtnYZMjBrYDR/C7hu0fMsZ6UcS/ngko4qCVFbw+CAmNtHlbItKkvQ3YXITODeTj/dUkw==
+yup@^0.28.3:
+  version "0.28.3"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.28.3.tgz#1ca607405a8adf24a5ac51f54bd09d527555f0ba"
+  integrity sha512-amVkCgFWe5bGjrrUiODkbIzrSwtB8JpZrQYSrfj2YsbRdrV+tn9LquWdZDlfOx2HXyfEA8FGnlwidE/bFDxO7Q==
   dependencies:
-    "@babel/runtime" "^7.0.0"
-    fn-name "~2.0.1"
-    lodash "^4.17.11"
+    "@babel/runtime" "^7.8.7"
+    fn-name "~3.0.0"
+    lodash "^4.17.15"
     lodash-es "^4.17.11"
-    property-expr "^1.5.0"
-    synchronous-promise "^2.0.6"
+    property-expr "^2.0.0"
+    synchronous-promise "^2.0.10"
     toposort "^2.0.2"
 
 zen-observable-ts@^0.8.20:

From cc099efc0af985710bcbf7b03a6784d806549487 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:17:09 +0000
Subject: [PATCH 029/106] build(deps): bump @sentry/node from 5.13.1 to 5.14.0
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 974108428..ffd1fbb8b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "@sentry/node": "^5.13.1",
+    "@sentry/node": "^5.14.0",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e708e990b..66762b2ae 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1262,83 +1262,83 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/apm@5.13.1":
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.13.1.tgz#152a7a54b06f344112477cb376e8554860a6af86"
-  integrity sha512-be6M8/TOA/K7jQNZEm1YC0Y9+LdM0jyX5LMwy9NWwhneE6Iq8xvsU/pYZByj6+AAs0tIpiFd9QFxFKNUtKIRUQ==
+"@sentry/apm@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.0.tgz#1eddcffb1d497462484a228a39746f74719c6e16"
+  integrity sha512-uzdRr8WFb2kCsBpJyKprv5sTJCLshnc6+B5sYAjsamSMl9kwO0l5HebJjIHNICT0F0u+7iSGDYvfEDl0uuhPAA==
   dependencies:
-    "@sentry/browser" "5.13.0"
-    "@sentry/hub" "5.13.0"
-    "@sentry/minimal" "5.13.0"
-    "@sentry/types" "5.12.4"
-    "@sentry/utils" "5.13.0"
+    "@sentry/browser" "5.14.0"
+    "@sentry/hub" "5.14.0"
+    "@sentry/minimal" "5.14.0"
+    "@sentry/types" "5.14.0"
+    "@sentry/utils" "5.14.0"
     tslib "^1.9.3"
 
-"@sentry/browser@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.13.0.tgz#399b0a09d6603726d787b746bcc70659010bc50c"
-  integrity sha512-adiW9gG/gCrl6FQAA6Fk8osXMHxP3pYltszRK0mr55O7GcTC8RQNI3mEW/YuQV9IySUL8dFWQ0v8n0lfssHf/A==
+"@sentry/browser@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.0.tgz#01cb12d0c42dca184d17854245686eee2fe3f21f"
+  integrity sha512-C/gb4YpUIKEaBDulacgnTm55PNXbkLShPOtkGJstbxedhOLZq7J3q2wjeyhKzfWFBw4WewLanMv+Eisn/Bm8XQ==
   dependencies:
-    "@sentry/core" "5.13.0"
-    "@sentry/types" "5.12.4"
-    "@sentry/utils" "5.13.0"
+    "@sentry/core" "5.14.0"
+    "@sentry/types" "5.14.0"
+    "@sentry/utils" "5.14.0"
     tslib "^1.9.3"
 
-"@sentry/core@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.13.0.tgz#144beb2d48b53244774a7fd809f9b5b672920971"
-  integrity sha512-e0olbaHBmANO1RIBc7xynSkBZ6BsK7drycz0TawLUnx+0H3aEau3K9U2QVdbjwLNPdydcIS+UgYfTBtXfe0E+A==
+"@sentry/core@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.0.tgz#3a7b85dbed254c6ad1a4f12e5dd392df691dbcd0"
+  integrity sha512-wuO4IgJYh3XouwUGJtL5UQMbhB7qn2uGASxL4sAuHFh1Dc3aZPuATtKp3FEUPcHP8S9MtcQ5CDUyv1ZYqFqtFg==
   dependencies:
-    "@sentry/hub" "5.13.0"
-    "@sentry/minimal" "5.13.0"
-    "@sentry/types" "5.12.4"
-    "@sentry/utils" "5.13.0"
+    "@sentry/hub" "5.14.0"
+    "@sentry/minimal" "5.14.0"
+    "@sentry/types" "5.14.0"
+    "@sentry/utils" "5.14.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.13.0.tgz#f48e3e4e273f40316391cd6190e22ea69cb20c7e"
-  integrity sha512-MeytooJ5g91zxq4/LU1LHj7KxpggAEn1dybEsWG31QVy67J4a40zIGfYgGGIVAFSv0WVlk5Ei5C159LhgW59/w==
+"@sentry/hub@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.0.tgz#5ff08c5417e116314314d598a0999f069c260c10"
+  integrity sha512-3+8oqYmZW3v+YQJG4OZTHGShfwe6rHsyOT8/uc5KaBt8qF66nrPXasImuQcNUKLkJ7plMQcS+GmNr8B/s0AmYA==
   dependencies:
-    "@sentry/types" "5.12.4"
-    "@sentry/utils" "5.13.0"
+    "@sentry/types" "5.14.0"
+    "@sentry/utils" "5.14.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.13.0.tgz#ee906191e3c2a1f7d0925fbfa0a4e96261013764"
-  integrity sha512-6D2Mu4TrmJmGlvb+z1Pp6yI2fUmdY1RvwK0MqmBP+QJdrd0as7cpGuwFSXgUs6CLUflDzlpn3n6WcgGV8oEDYA==
+"@sentry/minimal@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.0.tgz#f12e2a95d9abd0fbe11546cfca87e15bc70af8c8"
+  integrity sha512-uEHMhOJiLLHsvF4eihlTdiOMtDHUPlPbXtOcTkPw0lmLC2FuHOMtnvZJb/MxIFVrsFhE7yRUMKda45NHF2Wm9w==
   dependencies:
-    "@sentry/hub" "5.13.0"
-    "@sentry/types" "5.12.4"
+    "@sentry/hub" "5.14.0"
+    "@sentry/types" "5.14.0"
     tslib "^1.9.3"
 
-"@sentry/node@^5.13.1":
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.13.1.tgz#41d2eec02bc718a0f5aa59698635242d585470f2"
-  integrity sha512-6/HaewN2kX0za3LncYwp6nlvm/6i0S0/D/HO7VDHMSpc8z/8/Em6xTZy7hLV3phosMoLIa5P3CRXvLVybBTrpg==
+"@sentry/node@^5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.0.tgz#6aef088f1e2063ae4d3daec4f05c543a7f4b6581"
+  integrity sha512-qhUhb1rc71ms6K6FKp4wuodGZmTRFHhBeejyvs2Ye5Z2IvANXVnvH4zz2OnQQoyp741nLpfzg3ef6BzLX4NJ5A==
   dependencies:
-    "@sentry/apm" "5.13.1"
-    "@sentry/core" "5.13.0"
-    "@sentry/hub" "5.13.0"
-    "@sentry/types" "5.12.4"
-    "@sentry/utils" "5.13.0"
+    "@sentry/apm" "5.14.0"
+    "@sentry/core" "5.14.0"
+    "@sentry/hub" "5.14.0"
+    "@sentry/types" "5.14.0"
+    "@sentry/utils" "5.14.0"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.12.4":
-  version "5.12.4"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.12.4.tgz#6e52639bc3b4e136e9a0da5385890f8f78bb7697"
-  integrity sha512-JoN3YIp7Z+uxUZArj2B6NcEoXFQDhd0kqO0QpfiHZyg4Dhx2/E2aHuVx0H6Fndk+60iEZSECaCBXe2MOPo4fqA==
+"@sentry/types@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.0.tgz#4681f07d58e6edbe2f995080f005ecc3d4cd22b6"
+  integrity sha512-XQxSUWAcpFH7m2vWzUAc8YhKCofNMtGNk555Nn5kplj83r+jBXdZwAfVqYBqy8Yw5SYSfof+2RN38u7IE8RerQ==
 
-"@sentry/utils@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.13.0.tgz#6463e53b6178dbbd3b90e671517cbca82744b055"
-  integrity sha512-BcmNQN+IfFbVWGnEwXHku69zqJc97sjBRYVxpStKMaO/4aLVIQcOJCMWxVJtVoSVAHQaigBZmFutWH7EJMRJxg==
+"@sentry/utils@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.0.tgz#2bc9a5bf32ca6a9d55570fc4d5bb51b92cff5913"
+  integrity sha512-GCZ0rTT6bK6P0G8+NapY7yZX8erjyi0Pfjgmd5srgY6PkxAgMSI6mXtwPNqnp5T7Z9L27CMe6UGsOiMc680Mjg==
   dependencies:
-    "@sentry/types" "5.12.4"
+    "@sentry/types" "5.14.0"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":

From 7777bd94ddc635c77b96328bf283838141815ad9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 12 Mar 2020 12:40:59 +0100
Subject: [PATCH 030/106] v0.4.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41998245c..8695f5fc2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Fullstack and API tests with cypress and cucumber for Human Connection",
   "author": "Human Connection gGmbh",
   "license": "MIT",

From f49a1134962c9398cce1ff6c938209804cc9d424 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 12 Mar 2020 12:42:11 +0100
Subject: [PATCH 031/106] chore: Update to v0.4.2

---
 CHANGELOG.md         | 27 +++++++++++++++++++++++++++
 backend/package.json |  2 +-
 webapp/package.json  |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22efb08dd..bcf2da9c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.4.2](https://github.com/Human-Connection/Human-Connection/compare/v0.4.1...v0.4.2)
+
+> 12 March 2020
+
+- build(deps): bump @sentry/node from 5.13.1 to 5.14.0 in /backend [`#3260`](https://github.com/Human-Connection/Human-Connection/pull/3260)
+- build(deps): bump graphql-shield from 7.0.14 to 7.1.0 in /backend [`#3259`](https://github.com/Human-Connection/Human-Connection/pull/3259)
+- feat: more prominent output of ./scripts/translations/sort.sh and hint to --fix feature of the script on errors [`#3251`](https://github.com/Human-Connection/Human-Connection/pull/3251)
+- build(deps): bump nodemailer from 6.4.4 to 6.4.5 in /backend [`#3254`](https://github.com/Human-Connection/Human-Connection/pull/3254)
+- build(deps-dev): bump @vue/test-utils from 1.0.0-beta.31 to 1.0.0-beta.32 in /webapp [`#3248`](https://github.com/Human-Connection/Human-Connection/pull/3248)
+- build(deps-dev): bump async-validator from 3.2.3 to 3.2.4 in /webapp [`#3255`](https://github.com/Human-Connection/Human-Connection/pull/3255)
+- build(deps-dev): bump eslint-plugin-jest from 23.8.1 to 23.8.2 in /backend [`#3253`](https://github.com/Human-Connection/Human-Connection/pull/3253)
+- feature: Delete_user_as_admin_through_API_only [`#3063`](https://github.com/Human-Connection/Human-Connection/pull/3063)
+- feat: zero bell to all notifications page [2823] [`#3219`](https://github.com/Human-Connection/Human-Connection/pull/3219)
+- fix: layout shift [2607] [`#3218`](https://github.com/Human-Connection/Human-Connection/pull/3218)
+- feat: Documentation for locales script [`#3242`](https://github.com/Human-Connection/Human-Connection/pull/3242)
+- build(deps): bump metascraper-audio from 5.11.1 to 5.11.6 in /backend [`#3235`](https://github.com/Human-Connection/Human-Connection/pull/3235)
+- build(deps): bump metascraper-video from 5.11.1 to 5.11.6 in /backend [`#3247`](https://github.com/Human-Connection/Human-Connection/pull/3247)
+- build(deps): bump metascraper-soundcloud from 5.11.5 to 5.11.6 in /backend [`#3246`](https://github.com/Human-Connection/Human-Connection/pull/3246)
+- build(deps): bump metascraper-lang from 5.11.1 to 5.11.6 in /backend [`#3234`](https://github.com/Human-Connection/Human-Connection/pull/3234)
+- build(deps): bump metascraper-description from 5.11.1 to 5.11.6 in /backend [`#3233`](https://github.com/Human-Connection/Human-Connection/pull/3233)
+- build(deps): bump cross-env from 7.0.1 to 7.0.2 in /backend [`#3245`](https://github.com/Human-Connection/Human-Connection/pull/3245)
+- build(deps): bump metascraper-title from 5.11.1 to 5.11.6 in /backend [`#3244`](https://github.com/Human-Connection/Human-Connection/pull/3244)
+- chore: Update to v0.4.1 [`#3243`](https://github.com/Human-Connection/Human-Connection/pull/3243)
+- DRY user.spec.js [`da16590`](https://github.com/Human-Connection/Human-Connection/commit/da165906e2ed12baddd902b43064103ab3adfa06)
+- test deleteuser as admin, moderator, another user and as I myself, fix lint [`3983612`](https://github.com/Human-Connection/Human-Connection/commit/3983612c56ac92473a192a318959e4c691a3e7b8)
+- feature: test delete user as admin [`84c1547`](https://github.com/Human-Connection/Human-Connection/commit/84c154798efac0cec4c13dfefae18a6a9542058a)
+
 #### [v0.4.1](https://github.com/Human-Connection/Human-Connection/compare/v0.4.0...v0.4.1)
 
 > 9 March 2020
diff --git a/backend/package.json b/backend/package.json
index 3903dfce4..d8bec6e57 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-backend",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
diff --git a/webapp/package.json b/webapp/package.json
index fa6785e58..12c6c3fdc 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-webapp",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Human Connection Frontend",
   "authors": [
     "Grzegorz Leoniec (appinteractive)",

From 358165e7798cf1c146e50f673e6168ac2e1c7ee6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:25:14 +0000
Subject: [PATCH 032/106] build(deps-dev): bump @vue/server-test-utils in
 /webapp

Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/server-test-utils) from 1.0.0-beta.31 to 1.0.0-beta.32.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/server-test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.32/packages/server-test-utils)

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

diff --git a/webapp/package.json b/webapp/package.json
index fa6785e58..a2532eb1f 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -106,7 +106,7 @@
     "@storybook/vue": "~5.3.14",
     "@vue/cli-shared-utils": "~4.2.3",
     "@vue/eslint-config-prettier": "~6.0.0",
-    "@vue/server-test-utils": "~1.0.0-beta.31",
+    "@vue/server-test-utils": "~1.0.0-beta.32",
     "@vue/test-utils": "~1.0.0-beta.32",
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f837af1c3..eed4bb391 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3081,10 +3081,10 @@
   dependencies:
     eslint-config-prettier "^6.0.0"
 
-"@vue/server-test-utils@~1.0.0-beta.31":
-  version "1.0.0-beta.31"
-  resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.0.0-beta.31.tgz#d91960ca2e3521d518c95d9a103b9011de967704"
-  integrity sha512-9X1wIwZNaNTts3pd+v7wgCycF9So2DAvagRTCwAqw/IcKTLF/ZL40jGL2DZKIiwSDGgaq4Teq/9IJ6UncG9C6Q==
+"@vue/server-test-utils@~1.0.0-beta.32":
+  version "1.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.0.0-beta.32.tgz#698424d5d76fea10ee3d2ec45f2416e31681f01e"
+  integrity sha512-1dxJyrO805pr4tyNckAwRojxby3g37IHpmBURInz4yccsiwHsOhSi1tR23HovOocqmu1/NttiI5rHtv9MtL9Ig==
   dependencies:
     "@types/cheerio" "^0.22.10"
     cheerio "^1.0.0-rc.2"

From 1a04b5d6a90add684dad37d81b12d1a460b39021 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:25:15 +0000
Subject: [PATCH 033/106] build(deps-dev): bump fuse.js from 3.4.6 to 3.6.1 in
 /webapp

Bumps [fuse.js](https://github.com/krisk/Fuse) from 3.4.6 to 3.6.1.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v3.4.6...v3.6.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 fa6785e58..7174c19c7 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -130,7 +130,7 @@
     "eslint-plugin-vue": "~6.2.2",
     "faker": "^4.1.0",
     "flush-promises": "^1.0.2",
-    "fuse.js": "^3.4.6",
+    "fuse.js": "^3.6.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "~25.1.0",
     "mutation-observer": "^1.0.3",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f837af1c3..a96209c05 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -8195,10 +8195,10 @@ functions-have-names@^1.1.1:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.1.1.tgz#79d35927f07b8e7103d819fed475b64ccf7225ea"
   integrity sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw==
 
-fuse.js@^3.4.6:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.6.tgz#545c3411fed88bf2e27c457cab6e73e7af697a45"
-  integrity sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==
+fuse.js@^3.4.6, fuse.js@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
+  integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==
 
 gauge@~2.7.3:
   version "2.7.4"

From a9872c0f6cbf54c666a9b62dfab71aafbb379b01 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:25:25 +0000
Subject: [PATCH 034/106] build(deps): bump @nuxtjs/sentry from 3.2.4 to 3.3.1
 in /webapp

Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.2.4 to 3.3.1.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.2.4...v3.3.1)

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

diff --git a/webapp/package.json b/webapp/package.json
index fa6785e58..85ad01d25 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -63,7 +63,7 @@
     "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
-    "@nuxtjs/sentry": "^3.2.4",
+    "@nuxtjs/sentry": "^3.3.1",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f837af1c3..d8683c2c9 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1731,14 +1731,14 @@
     jimp-compact "^0.8.0"
     workbox-cdn "^4.3.1"
 
-"@nuxtjs/sentry@^3.2.4":
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.2.4.tgz#736c4b62e76c788eefd6a27c879658541a130bab"
-  integrity sha512-asM9pt/bdHLoALIea2OVOB/2S8OUx4vLhzi30B747Z6o0WLxB9RVYMsGgzjBO7Q7CEdrqei4UNEgTfE1G7EKTg==
+"@nuxtjs/sentry@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.3.1.tgz#b3f21851103d5194b9da314a5eec7b154ed50cbe"
+  integrity sha512-o7aGlI7OvaRDT0SsV73Ye1r5sfylKwRGG8EyRClOrhi6dpMIuqcmzgILHIIcHpFkrm61D3sORc7d7rhlHtY6DA==
   dependencies:
-    "@sentry/browser" "^5.12.1"
-    "@sentry/integrations" "^5.12.0"
-    "@sentry/node" "^5.12.3"
+    "@sentry/browser" "^5.13.2"
+    "@sentry/integrations" "^5.13.2"
+    "@sentry/node" "^5.13.2"
     "@sentry/webpack-plugin" "^1.10.0"
     consola "^2.11.3"
     deepmerge "^4.2.2"
@@ -1999,26 +1999,26 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/apm@5.12.3":
-  version "5.12.3"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.12.3.tgz#23a5e9c771a8748f59426a1d0f8b1fbb9b72a717"
-  integrity sha512-OSGEeo4b1Gsu/TUcWMx9vmgSnQvR+zM+1Iwq5xFQAK2ET3Y4gBFqZ1iRt2hxlzr8KCQmQTQc1mao1X0tmidFQg==
+"@sentry/apm@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.1.tgz#99605c4cf933962aeda4a1b03e99256213e51d7d"
+  integrity sha512-vm5Ee0VPAZ5TmO3iKwLFwTAtDj0ZVJvawJCfBjUe5sn58GL60XapN5AsXICdsh4fbgtNJVZEtsawcL2JNVJvuQ==
   dependencies:
-    "@sentry/browser" "5.12.1"
-    "@sentry/hub" "5.12.0"
-    "@sentry/minimal" "5.12.0"
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/browser" "5.14.1"
+    "@sentry/hub" "5.14.1"
+    "@sentry/minimal" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/browser@5.12.1", "@sentry/browser@^5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.12.1.tgz#dc1f268595269fb7277f55eb625c7e92d76dc01b"
-  integrity sha512-Zl7VdppUxctyaoqMSEhnDJp2rrupx8n8N2n3PSooH74yhB2Z91nt84mouczprBsw3JU1iggGyUw9seRFzDI1hw==
+"@sentry/browser@5.14.1", "@sentry/browser@^5.13.2":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.1.tgz#ccd806d77b4eff1ae6ca1ec3a0839b9bbb5dd241"
+  integrity sha512-PiadrPcsPcCjHrfT8nxzVFi0WiekLYh2unGnkSFoIvS8dGv+fjIX0gqYPy7UHhCZZUsLCCiuWpoaSDWymkZGTA==
   dependencies:
-    "@sentry/core" "5.12.0"
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/core" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
 "@sentry/cli@^1.49.0":
@@ -2033,70 +2033,70 @@
     progress "2.0.0"
     proxy-from-env "^1.0.0"
 
-"@sentry/core@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.12.0.tgz#d6380c4ef7beee5f418ac1d0e5be86a2de2af449"
-  integrity sha512-wY4rsoX71QsGpcs9tF+OxKgDPKzIFMRvFiSRcJoPMfhFsTilQ/CBMn/c3bDtWQd9Bnr/ReQIL6NbnIjUsPHA4Q==
+"@sentry/core@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.1.tgz#21a7c14ca08b0f228023f9c6f399db1e35cd6438"
+  integrity sha512-UPwnS7P4xdjlC60ybzKZ/o1kYkVCublD0OUW9JfLJpIyiu3QEA3QUHjbambzvU47WHOSy9b4RYtQll44WMtdaw==
   dependencies:
-    "@sentry/hub" "5.12.0"
-    "@sentry/minimal" "5.12.0"
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/hub" "5.14.1"
+    "@sentry/minimal" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/hub@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.12.0.tgz#5e8c8f249f5bdbeb8cc4ec02c2ccc53a67f2cc02"
-  integrity sha512-3k7yE8BEVJsKx8mR4LcI4IN0O8pngmq44OcJ/fRUUBAPqsT38jsJdP2CaWhdlM1jiNUzUDB1ktBv6/lY+VgcoQ==
+"@sentry/hub@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.1.tgz#1a4515558705b2680a6e9f3cb8092555ed31324a"
+  integrity sha512-FTqeLcOWbww18WRQ8F3Z0DryQwD5DeuapXlinez7Y+HDZZAOm7HdPDEY5xjrUzi4V0n9BtgfJDp27UKJENWtYA==
   dependencies:
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/integrations@^5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.12.0.tgz#4d735abf2989049ef860e3eaad0883b63d8274e6"
-  integrity sha512-4G/TvCEP9M6xgY61r46UE4ruSgF42rZnvO0ZfIBI/240DNYMTpHLvjU3Xvrv3wDl3emCvy4QgAIceI/zj8nPjw==
+"@sentry/integrations@^5.13.2":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.14.1.tgz#fc01dcd9822cd352958bba3d0647455439348e64"
+  integrity sha512-FQUiW2PHnlq5AMm+F0Ms7Tig8DflbtKPRXshj7g0UqD3uGwibcQqqI3M7XKXQOBQPvF39Zvpv74QKkWPUO+OUg==
   dependencies:
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.12.0.tgz#2611e2aa520c1edb7999e6de51bd65ec66341757"
-  integrity sha512-fk73meyz4k4jCg9yzbma+WkggsfEIQWI2e2TWfYsRGcrV3RnlSrXyM4D91/A8Bjx10SNezHPUFHjasjlHXOkyA==
+"@sentry/minimal@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.1.tgz#3ec74503cd72772de56188f010a35d9bc956dc94"
+  integrity sha512-TC+i37rGBomu74xcSdPA4xeqSeWEvTHP5dx+LIJunntk4/mDi5/aC3HSMxRy3ifoJiUwZO+gyJJ7I/UMzvOMEw==
   dependencies:
-    "@sentry/hub" "5.12.0"
-    "@sentry/types" "5.12.0"
+    "@sentry/hub" "5.14.1"
+    "@sentry/types" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/node@^5.12.3":
-  version "5.12.3"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.12.3.tgz#4a4934b04c5163fc340312eaf0d152990aa7140f"
-  integrity sha512-QwqN+i6IC3/YrNq7kqxH7YiXtZYY8tBuJqFi84WbiMHF7MAqxMSPNQJGfX2GJuMHKHwn6IZdgSE8+FkfN9zGLQ==
+"@sentry/node@^5.13.2":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.1.tgz#ebac38bd5036d7feefa0b44569e731b59441ce27"
+  integrity sha512-bkOp6RRynt0C8J2yRF6RII9/dn03WFo5Yk/di7753VW1CUgjUOjtozirs0PYewlfXfaVHveixjN61Mcy4XwJ+g==
   dependencies:
-    "@sentry/apm" "5.12.3"
-    "@sentry/core" "5.12.0"
-    "@sentry/hub" "5.12.0"
-    "@sentry/types" "5.12.0"
-    "@sentry/utils" "5.12.0"
+    "@sentry/apm" "5.14.1"
+    "@sentry/core" "5.14.1"
+    "@sentry/hub" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.12.0.tgz#5367e53c74261beea01502e3f7b6f3d822682a31"
-  integrity sha512-aZbBouBLrKB8wXlztriIagZNmsB+wegk1Jkl6eprqRW/w24Sl/47tiwH8c5S4jYTxdAiJk+SAR10AAuYmIN3zg==
+"@sentry/types@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.1.tgz#564f9b703c06c2a97e756f60a3c873b977b2bbd2"
+  integrity sha512-Eht+qI68BxELKQRnaV6q1PxS9/E+YatUHjG80ov9/azLbIJElQhWUDzyyJCefDD/fEI37VQ2SrsQsVqS9W7ZOQ==
 
-"@sentry/utils@5.12.0":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.12.0.tgz#62967f934a3ee6d21472eac0219084e37225933e"
-  integrity sha512-fYUadGLbfTCbs4OG5hKCOtv2jrNE4/8LHNABy9DwNJ/t5DVtGqWAZBnxsC+FG6a3nVqCpxjFI9AHlYsJ2wsf7Q==
+"@sentry/utils@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.1.tgz#577a9dd7b5f4b3436e8e2847d058547eab2ed5c4"
+  integrity sha512-iCN5p+ArPVMkt09bRfYuldtKSTQEqRfNuoCxPFJKDfMyLO9YetIwRCwHluIRoJoEIFE4JTM2F4HfmTsxoTqw4g==
   dependencies:
-    "@sentry/types" "5.12.0"
+    "@sentry/types" "5.14.1"
     tslib "^1.9.3"
 
 "@sentry/webpack-plugin@^1.10.0":

From 9ec30bdd4f4d473fadb3a3af1de81aaee250f02a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:25:46 +0000
Subject: [PATCH 035/106] build(deps-dev): bump @babel/preset-env from 7.8.6 to
 7.8.7 in /webapp

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.6 to 7.8.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7)

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

diff --git a/webapp/package.json b/webapp/package.json
index fa6785e58..da46bea5a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -99,7 +99,7 @@
   "devDependencies": {
     "@babel/core": "~7.8.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "~7.8.6",
+    "@babel/preset-env": "~7.8.7",
     "@storybook/addon-a11y": "^5.3.14",
     "@storybook/addon-actions": "^5.3.14",
     "@storybook/addon-notes": "^5.3.14",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f837af1c3..b9671a116 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -138,22 +138,22 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-call-delegate@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab"
+  integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
     "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.8.7"
 
-"@babel/helper-compilation-targets@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz#015b85db69e3a34240d5c2b761fc53eb9695f09c"
-  integrity sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==
+"@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
     "@babel/compat-data" "^7.8.6"
-    browserslist "^4.8.5"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
@@ -727,12 +727,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3"
-  integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==
+"@babel/plugin-transform-parameters@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395"
+  integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
+    "@babel/helper-call-delegate" "^7.8.7"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -751,12 +751,12 @@
     "@babel/helper-annotate-as-pure" "^7.8.0"
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -820,13 +820,13 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.6", "@babel/preset-env@~7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.6.tgz#2a0773b08589ecba4995fc71b1965e4f531af40b"
-  integrity sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.6", "@babel/preset-env@~7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
+  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
   dependencies:
     "@babel/compat-data" "^7.8.6"
-    "@babel/helper-compilation-targets" "^7.8.6"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
@@ -866,9 +866,9 @@
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.4"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
@@ -876,7 +876,7 @@
     "@babel/plugin-transform-template-literals" "^7.8.3"
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.8.7"
     browserslist "^4.8.5"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -919,6 +919,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.8.4":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
+  integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
@@ -5037,14 +5044,14 @@ browserslist@4.5.4:
     electron-to-chromium "^1.3.122"
     node-releases "^1.1.13"
 
-browserslist@^4.0.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.3, browserslist@^4.8.5:
-  version "4.8.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz#96406f3f5f0755d272e27a66f4163ca821590a7e"
-  integrity sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==
+browserslist@^4.0.0, browserslist@^4.6.3, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.9.1:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
+  integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
   dependencies:
-    caniuse-lite "^1.0.30001023"
-    electron-to-chromium "^1.3.341"
-    node-releases "^1.1.47"
+    caniuse-lite "^1.0.30001030"
+    electron-to-chromium "^1.3.363"
+    node-releases "^1.1.50"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -5281,10 +5288,10 @@ caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001016:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz#3f04c1737500ffda78be9beb0b5c1e2070e15926"
   integrity sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA==
 
-caniuse-lite@^1.0.30001023:
-  version "1.0.30001023"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4"
-  integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA==
+caniuse-lite@^1.0.30001030:
+  version "1.0.30001035"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
+  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -6970,10 +6977,10 @@ electron-to-chromium@^1.3.122:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.211.tgz#0c39d17316bf342d1971fed68e754fa1775918f7"
   integrity sha512-GZAiK3oHrs0K+LwH+HD+bdjZ17v40oQQdXbbd3dgrwgbENvazrGpcuIADSAREWnxzo9gADB1evuizrbXsnoU2Q==
 
-electron-to-chromium@^1.3.341:
-  version "1.3.344"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.344.tgz#f1397a633c35e726730c24be1084cd25c3ee8148"
-  integrity sha512-tvbx2Wl8WBR+ym3u492D0L6/jH+8NoQXqe46+QhbWH3voVPauGuZYeb1QAXYoOAWuiP2dbSvlBx0kQ1F3hu/Mw==
+electron-to-chromium@^1.3.363:
+  version "1.3.376"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz#7cb7b5205564a06c8f8ecfbe832cbd47a1224bb1"
+  integrity sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -11524,10 +11531,10 @@ node-releases@^1.1.13:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.47:
-  version "1.1.47"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4"
-  integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==
+node-releases@^1.1.50:
+  version "1.1.51"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.51.tgz#70d0e054221343d2966006bfbd4d98622cc00bd0"
+  integrity sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==
   dependencies:
     semver "^6.3.0"
 
@@ -13145,7 +13152,7 @@ prismjs@^1.8.4, prismjs@~1.17.0:
   optionalDependencies:
     clipboard "^2.0.0"
 
-private@^0.1.6, private@^0.1.8:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -13975,12 +13982,18 @@ regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
   integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
 
-regenerator-transform@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
-  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
+regenerator-runtime@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
+
+regenerator-transform@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2"
+  integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"

From 1176e98c599e5705e3c5d00068c2eb10a077ebc6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2020 13:25:48 +0000
Subject: [PATCH 036/106] build(deps-dev): bump eslint-plugin-jest in /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.8.1 to 23.8.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.8.1...v23.8.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 fa6785e58..c7556cb21 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -122,7 +122,7 @@
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.3",
     "eslint-plugin-import": "~2.20.1",
-    "eslint-plugin-jest": "~23.8.1",
+    "eslint-plugin-jest": "~23.8.2",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index f837af1c3..9f6b4cbda 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7285,10 +7285,10 @@ eslint-plugin-import@~2.20.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-jest@~23.8.1:
-  version "23.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.1.tgz#247025e8a51b3a25a4cc41166369b0bfb4db83b7"
-  integrity sha512-OycLNqPo/2EfO6kTqnmsu1khz1gTIOxGl3ThIVwL5/oycDF4pm5uNDyvFelNLdpr4COUuM8PVi3963NEG1Efpw==
+eslint-plugin-jest@~23.8.2:
+  version "23.8.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
+  integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From d90e4c2aa821ff8acd4a0d4c0e0d98796c6caae2 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 24 Feb 2020 18:26:14 +0100
Subject: [PATCH 037/106] Refactor: replace named slots

---
 webapp/components/ContentMenu/ContentMenu.vue | 29 ++++++++++---------
 .../DropdownFilter/DropdownFilter.vue         |  6 ++--
 .../components/LocaleSwitch/LocaleSwitch.vue  |  6 ++--
 webapp/pages/admin/categories.vue             |  2 +-
 webapp/pages/admin/hashtags.vue               |  4 +--
 webapp/pages/admin/users.vue                  | 10 +++----
 6 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index c69a2fcbc..d31a8e952 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -12,20 +12,21 @@
         />
       </slot>
     </template>
-    <div slot="popover" slot-scope="{ toggleMenu }" class="content-menu-popover">
-      <ds-menu :routes="routes">
-        <ds-menu-item
-          slot="menuitem"
-          slot-scope="item"
-          :route="item.route"
-          :parents="item.parents"
-          @click.stop.prevent="openItem(item.route, toggleMenu)"
-        >
-          <base-icon :name="item.route.icon" />
-          {{ item.route.label }}
-        </ds-menu-item>
-      </ds-menu>
-    </div>
+    <template #popover="{ toggleMenu }">
+      <div class="content-menu-popover">
+        <ds-menu :routes="routes">
+          <ds-menu-item
+            #menuitem="item"
+            :route="item.route"
+            :parents="item.parents"
+            @click.stop.prevent="openItem(item.route, toggleMenu)"
+          >
+            <base-icon :name="item.route.icon" />
+            {{ item.route.label }}
+          </ds-menu-item>
+        </ds-menu>
+      </div>
+    </template>
   </dropdown>
 </template>
 
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index f7bcf507d..51b40fd80 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -14,14 +14,12 @@
       <base-icon class="dropdown-arrow" name="angle-down" />
     </a>
     <ds-menu
-      slot="popover"
-      slot-scope="{ toggleMenu }"
+      #popover="{ toggleMenu }"
       class="dropdown-menu-popover"
       :routes="filterOptions"
     >
       <ds-menu-item
-        slot="menuitem"
-        slot-scope="item"
+        #menuitem="item"
         class="dropdown-menu-item"
         :route="item.route"
         :parents="item.parents"
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index 5c0d901c9..e6519d14d 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -13,15 +13,13 @@
         <base-icon class="dropdown-arrow" name="angle-down" />
       </a>
       <ds-menu
-        slot="popover"
-        slot-scope="{ toggleMenu }"
+        #popover="{ toggleMenu }"
         class="locale-menu-popover"
         :matcher="matcher"
         :routes="routes"
       >
         <ds-menu-item
-          slot="menuitem"
-          slot-scope="item"
+          #menuitem="item"
           class="locale-menu-item"
           :route="item.route"
           :parents="item.parents"
diff --git a/webapp/pages/admin/categories.vue b/webapp/pages/admin/categories.vue
index 3c6069678..5e91a8687 100644
--- a/webapp/pages/admin/categories.vue
+++ b/webapp/pages/admin/categories.vue
@@ -2,7 +2,7 @@
   <base-card>
     <h2 class="title">{{ $t('admin.categories.name') }}</h2>
     <ds-table :data="Category" :fields="fields" condensed>
-      <template slot="icon" slot-scope="scope">
+      <template #icon="scope">
         <base-icon :name="scope.row.icon" />
       </template>
     </ds-table>
diff --git a/webapp/pages/admin/hashtags.vue b/webapp/pages/admin/hashtags.vue
index ea774aab1..3f2c1572d 100644
--- a/webapp/pages/admin/hashtags.vue
+++ b/webapp/pages/admin/hashtags.vue
@@ -2,8 +2,8 @@
   <base-card>
     <h2 class="title">{{ $t('admin.hashtags.name') }}</h2>
     <ds-table :data="Tag" :fields="fields" condensed>
-      <template slot="index" slot-scope="scope">{{ scope.index + 1 }}.</template>
-      <template slot="id" slot-scope="scope">
+      <template #index="scope">{{ scope.index + 1 }}.</template>
+      <template #id="scope">
         <nuxt-link :to="{ path: '/', query: { hashtag: encodeURI(scope.row.id) } }">
           <b>#{{ scope.row.id | truncate(20) }}</b>
         </nuxt-link>
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 4b8ca6ffe..3d9a4f660 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -19,8 +19,8 @@
     </base-card>
     <base-card v-if="User && User.length">
       <ds-table :data="User" :fields="fields" condensed>
-        <template slot="index" slot-scope="scope">{{ scope.row.index + 1 }}.</template>
-        <template slot="name" slot-scope="scope">
+        <template #index="scope">{{ scope.row.index + 1 }}.</template>
+        <template #name="scope">
           <nuxt-link
             :to="{
               name: 'profile-id-slug',
@@ -30,12 +30,12 @@
             <b>{{ scope.row.name | truncate(20) }}</b>
           </nuxt-link>
         </template>
-        <template slot="email" slot-scope="scope">
+        <template #email="scope">
           <a :href="`mailto:${scope.row.email}`">
             <b>{{ scope.row.email }}</b>
           </a>
         </template>
-        <template slot="slug" slot-scope="scope">
+        <template #slug="scope">
           <nuxt-link
             :to="{
               name: 'profile-id-slug',
@@ -45,7 +45,7 @@
             <b>{{ scope.row.slug | truncate(20) }}</b>
           </nuxt-link>
         </template>
-        <template slot="createdAt" slot-scope="scope">
+        <template #createdAt="scope">
           {{ scope.row.createdAt | dateTime }}
         </template>
       </ds-table>

From c3cf682fdfc33bb05121ca36d56a6667611fa50a Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 24 Feb 2020 19:10:45 +0100
Subject: [PATCH 038/106] Refactor: replace default slots

---
 webapp/components/CommentForm/CommentForm.vue |  2 +-
 webapp/components/ContentMenu/ContentMenu.vue |  2 +-
 .../ContributionForm/ContributionForm.vue     |  2 +-
 .../DropdownFilter/DropdownFilter.vue         | 26 +++++++++----------
 webapp/components/FilterPosts/FilterPosts.vue |  3 +--
 .../components/LocaleSwitch/LocaleSwitch.vue  | 22 ++++++++--------
 .../NotificationMenu/NotificationMenu.vue     |  2 +-
 webapp/components/Password/Change.vue         |  2 +-
 .../PasswordReset/ChangePassword.vue          |  2 +-
 webapp/pages/settings/index.vue               |  2 +-
 .../settings/my-email-address/enter-nonce.vue |  2 +-
 .../pages/settings/my-email-address/index.vue |  2 +-
 12 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 422530259..b193989d7 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" @submit="handleSubmit" class="comment-form">
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <base-card>
         <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
         <div class="buttons">
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index d31a8e952..43a2dc968 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <dropdown class="content-menu" :placement="placement" offset="5">
-    <template slot="default" slot-scope="{ toggleMenu }">
+    <template v-slot="{ toggleMenu }">
       <slot name="button" :toggleMenu="toggleMenu">
         <base-button
           data-test="content-menu-button"
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index cc0680524..e7aecd171 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -6,7 +6,7 @@
     :schema="formSchema"
     @submit="submit"
   >
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <base-card>
         <template #heroImage>
           <img
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 51b40fd80..793630a29 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -1,18 +1,18 @@
 <template>
   <dropdown offset="8">
-    <a
-      :v-model="selected"
-      slot="default"
-      slot-scope="{ toggleMenu }"
-      name="dropdown"
-      class="dropdown-filter"
-      href="#"
-      @click.prevent="toggleMenu()"
-    >
-      <base-icon name="filter" />
-      <label class="label" for="dropdown">{{ selected }}</label>
-      <base-icon class="dropdown-arrow" name="angle-down" />
-    </a>
+    <template v-slot="{ toggleMenu }">
+      <a
+        :v-model="selected"
+        name="dropdown"
+        class="dropdown-filter"
+        href="#"
+        @click.prevent="toggleMenu()"
+      >
+        <base-icon name="filter" />
+        <label class="label" for="dropdown">{{ selected }}</label>
+        <base-icon class="dropdown-arrow" name="angle-down" />
+      </a>
+    </template>
     <ds-menu
       #popover="{ toggleMenu }"
       class="dropdown-menu-popover"
diff --git a/webapp/components/FilterPosts/FilterPosts.vue b/webapp/components/FilterPosts/FilterPosts.vue
index 787751004..4df5113bc 100644
--- a/webapp/components/FilterPosts/FilterPosts.vue
+++ b/webapp/components/FilterPosts/FilterPosts.vue
@@ -1,11 +1,10 @@
 <template>
   <dropdown ref="menu" :placement="placement" :offset="offset">
     <base-button
-      slot="default"
+      v-slot="{ toggleMenu }"
       icon="filter"
       :filled="filterActive"
       :ghost="!filterActive"
-      slot-scope="{ toggleMenu }"
       @click.prevent="toggleMenu()"
     >
       <base-icon class="dropdown-arrow" name="angle-down" />
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index e6519d14d..689ccce8e 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -1,17 +1,17 @@
 <template>
   <client-only>
     <dropdown ref="menu" :placement="placement" :offset="offset">
-      <a
-        slot="default"
-        slot-scope="{ toggleMenu }"
-        class="locale-menu"
-        href="#"
-        @click.prevent="toggleMenu()"
-      >
-        <base-icon name="globe" />
-        <span class="label">{{ current.code.toUpperCase() }}</span>
-        <base-icon class="dropdown-arrow" name="angle-down" />
-      </a>
+      <template v-slot="{ toggleMenu }">
+        <a
+          class="locale-menu"
+          href="#"
+          @click.prevent="toggleMenu()"
+        >
+          <base-icon name="globe" />
+          <span class="label">{{ current.code.toUpperCase() }}</span>
+          <base-icon class="dropdown-arrow" name="angle-down" />
+        </a>
+      </template>
       <ds-menu
         #popover="{ toggleMenu }"
         class="locale-menu-popover"
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index fb047a0c3..bef0a89ca 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -7,7 +7,7 @@
     <base-button icon="bell" ghost circle />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
-    <template slot="default" slot-scope="{ toggleMenu }">
+    <template v-slot="{ toggleMenu }">
       <base-button @click="toggleMenu" ghost circle>
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
diff --git a/webapp/components/Password/Change.vue b/webapp/components/Password/Change.vue
index 547aab6a1..d58df66a3 100644
--- a/webapp/components/Password/Change.vue
+++ b/webapp/components/Password/Change.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="formData" :schema="formSchema" @submit="handleSubmit">
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <ds-input
         id="oldPassword"
         model="oldPassword"
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index ab3334c6d..c6a3f09b4 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -7,7 +7,7 @@
       @submit="handleSubmitPassword"
       class="change-password"
     >
-      <template slot-scope="{ errors }">
+      <template v-slot="{ errors }">
         <ds-input
           id="password"
           model="password"
diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue
index 1abd520e2..75568ab97 100644
--- a/webapp/pages/settings/index.vue
+++ b/webapp/pages/settings/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.data.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/enter-nonce.vue b/webapp/pages/settings/my-email-address/enter-nonce.vue
index dfa44a1e4..81fe9c68e 100644
--- a/webapp/pages/settings/my-email-address/enter-nonce.vue
+++ b/webapp/pages/settings/my-email-address/enter-nonce.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index 43b038a6b..b3dbe76ba 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -6,7 +6,7 @@
     <ds-text v-html="submitMessage" />
   </base-card>
   <ds-form v-else v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template v-slot="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input

From 5626cb277149d18e2730b1e9503d3695d8f263de Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 12 Mar 2020 19:51:42 +0100
Subject: [PATCH 039/106] Revert "Refactor: replace default slots"

  This reverts commit f1e308074bc33e6762431f90f335ed849776f4d9.

  Let's take this one at a time...
---
 webapp/components/CommentForm/CommentForm.vue |  2 +-
 webapp/components/ContentMenu/ContentMenu.vue |  2 +-
 .../ContributionForm/ContributionForm.vue     |  2 +-
 .../DropdownFilter/DropdownFilter.vue         | 26 +++++++++----------
 webapp/components/FilterPosts/FilterPosts.vue |  3 ++-
 .../components/LocaleSwitch/LocaleSwitch.vue  | 22 ++++++++--------
 .../NotificationMenu/NotificationMenu.vue     |  2 +-
 webapp/components/Password/Change.vue         |  2 +-
 .../PasswordReset/ChangePassword.vue          |  2 +-
 webapp/pages/settings/index.vue               |  2 +-
 .../settings/my-email-address/enter-nonce.vue |  2 +-
 .../pages/settings/my-email-address/index.vue |  2 +-
 12 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index b193989d7..422530259 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" @submit="handleSubmit" class="comment-form">
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <base-card>
         <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
         <div class="buttons">
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 43a2dc968..d31a8e952 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <dropdown class="content-menu" :placement="placement" offset="5">
-    <template v-slot="{ toggleMenu }">
+    <template slot="default" slot-scope="{ toggleMenu }">
       <slot name="button" :toggleMenu="toggleMenu">
         <base-button
           data-test="content-menu-button"
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index e7aecd171..cc0680524 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -6,7 +6,7 @@
     :schema="formSchema"
     @submit="submit"
   >
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <base-card>
         <template #heroImage>
           <img
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 793630a29..51b40fd80 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -1,18 +1,18 @@
 <template>
   <dropdown offset="8">
-    <template v-slot="{ toggleMenu }">
-      <a
-        :v-model="selected"
-        name="dropdown"
-        class="dropdown-filter"
-        href="#"
-        @click.prevent="toggleMenu()"
-      >
-        <base-icon name="filter" />
-        <label class="label" for="dropdown">{{ selected }}</label>
-        <base-icon class="dropdown-arrow" name="angle-down" />
-      </a>
-    </template>
+    <a
+      :v-model="selected"
+      slot="default"
+      slot-scope="{ toggleMenu }"
+      name="dropdown"
+      class="dropdown-filter"
+      href="#"
+      @click.prevent="toggleMenu()"
+    >
+      <base-icon name="filter" />
+      <label class="label" for="dropdown">{{ selected }}</label>
+      <base-icon class="dropdown-arrow" name="angle-down" />
+    </a>
     <ds-menu
       #popover="{ toggleMenu }"
       class="dropdown-menu-popover"
diff --git a/webapp/components/FilterPosts/FilterPosts.vue b/webapp/components/FilterPosts/FilterPosts.vue
index 4df5113bc..787751004 100644
--- a/webapp/components/FilterPosts/FilterPosts.vue
+++ b/webapp/components/FilterPosts/FilterPosts.vue
@@ -1,10 +1,11 @@
 <template>
   <dropdown ref="menu" :placement="placement" :offset="offset">
     <base-button
-      v-slot="{ toggleMenu }"
+      slot="default"
       icon="filter"
       :filled="filterActive"
       :ghost="!filterActive"
+      slot-scope="{ toggleMenu }"
       @click.prevent="toggleMenu()"
     >
       <base-icon class="dropdown-arrow" name="angle-down" />
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index 689ccce8e..e6519d14d 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -1,17 +1,17 @@
 <template>
   <client-only>
     <dropdown ref="menu" :placement="placement" :offset="offset">
-      <template v-slot="{ toggleMenu }">
-        <a
-          class="locale-menu"
-          href="#"
-          @click.prevent="toggleMenu()"
-        >
-          <base-icon name="globe" />
-          <span class="label">{{ current.code.toUpperCase() }}</span>
-          <base-icon class="dropdown-arrow" name="angle-down" />
-        </a>
-      </template>
+      <a
+        slot="default"
+        slot-scope="{ toggleMenu }"
+        class="locale-menu"
+        href="#"
+        @click.prevent="toggleMenu()"
+      >
+        <base-icon name="globe" />
+        <span class="label">{{ current.code.toUpperCase() }}</span>
+        <base-icon class="dropdown-arrow" name="angle-down" />
+      </a>
       <ds-menu
         #popover="{ toggleMenu }"
         class="locale-menu-popover"
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index bef0a89ca..fb047a0c3 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -7,7 +7,7 @@
     <base-button icon="bell" ghost circle />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
-    <template v-slot="{ toggleMenu }">
+    <template slot="default" slot-scope="{ toggleMenu }">
       <base-button @click="toggleMenu" ghost circle>
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
diff --git a/webapp/components/Password/Change.vue b/webapp/components/Password/Change.vue
index d58df66a3..547aab6a1 100644
--- a/webapp/components/Password/Change.vue
+++ b/webapp/components/Password/Change.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="formData" :schema="formSchema" @submit="handleSubmit">
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <ds-input
         id="oldPassword"
         model="oldPassword"
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index c6a3f09b4..ab3334c6d 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -7,7 +7,7 @@
       @submit="handleSubmitPassword"
       class="change-password"
     >
-      <template v-slot="{ errors }">
+      <template slot-scope="{ errors }">
         <ds-input
           id="password"
           model="password"
diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue
index 75568ab97..1abd520e2 100644
--- a/webapp/pages/settings/index.vue
+++ b/webapp/pages/settings/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.data.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/enter-nonce.vue b/webapp/pages/settings/my-email-address/enter-nonce.vue
index 81fe9c68e..dfa44a1e4 100644
--- a/webapp/pages/settings/my-email-address/enter-nonce.vue
+++ b/webapp/pages/settings/my-email-address/enter-nonce.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index b3dbe76ba..43b038a6b 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -6,7 +6,7 @@
     <ds-text v-html="submitMessage" />
   </base-card>
   <ds-form v-else v-model="form" :schema="formSchema" @submit="submit">
-    <template v-slot="{ errors }">
+    <template slot-scope="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input

From d465e9459690d7cb343b4a0c811cea7c2190bddc Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 12 Mar 2020 23:49:27 +0100
Subject: [PATCH 040/106] Refactor: use #shorthand for default v-slot
 attributes

---
 webapp/components/CommentForm/CommentForm.vue |  2 +-
 webapp/components/ContentMenu/ContentMenu.vue |  2 +-
 .../ContributionForm/ContributionForm.vue     |  2 +-
 .../DropdownFilter/DropdownFilter.vue         | 26 +++++++++----------
 webapp/components/FilterPosts/FilterPosts.vue | 20 +++++++-------
 .../components/LocaleSwitch/LocaleSwitch.vue  | 18 +++++--------
 .../NotificationMenu/NotificationMenu.vue     |  2 +-
 webapp/components/Password/Change.vue         |  2 +-
 .../PasswordReset/ChangePassword.vue          |  2 +-
 webapp/pages/settings/index.vue               |  2 +-
 .../settings/my-email-address/enter-nonce.vue |  2 +-
 .../pages/settings/my-email-address/index.vue |  2 +-
 12 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 422530259..55f675656 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" @submit="handleSubmit" class="comment-form">
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <base-card>
         <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
         <div class="buttons">
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index d31a8e952..1b9f24317 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <dropdown class="content-menu" :placement="placement" offset="5">
-    <template slot="default" slot-scope="{ toggleMenu }">
+    <template #default="{ toggleMenu }">
       <slot name="button" :toggleMenu="toggleMenu">
         <base-button
           data-test="content-menu-button"
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index cc0680524..4a163821b 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -6,7 +6,7 @@
     :schema="formSchema"
     @submit="submit"
   >
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <base-card>
         <template #heroImage>
           <img
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 51b40fd80..4abf6ab41 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -1,18 +1,18 @@
 <template>
   <dropdown offset="8">
-    <a
-      :v-model="selected"
-      slot="default"
-      slot-scope="{ toggleMenu }"
-      name="dropdown"
-      class="dropdown-filter"
-      href="#"
-      @click.prevent="toggleMenu()"
-    >
-      <base-icon name="filter" />
-      <label class="label" for="dropdown">{{ selected }}</label>
-      <base-icon class="dropdown-arrow" name="angle-down" />
-    </a>
+    <template #default="{ toggleMenu }">
+      <a
+        :v-model="selected"
+        name="dropdown"
+        class="dropdown-filter"
+        href="#"
+        @click.prevent="toggleMenu()"
+      >
+        <base-icon name="filter" />
+        <label class="label" for="dropdown">{{ selected }}</label>
+        <base-icon class="dropdown-arrow" name="angle-down" />
+      </a>
+    </template>
     <ds-menu
       #popover="{ toggleMenu }"
       class="dropdown-menu-popover"
diff --git a/webapp/components/FilterPosts/FilterPosts.vue b/webapp/components/FilterPosts/FilterPosts.vue
index 787751004..e70c066f1 100644
--- a/webapp/components/FilterPosts/FilterPosts.vue
+++ b/webapp/components/FilterPosts/FilterPosts.vue
@@ -1,15 +1,15 @@
 <template>
   <dropdown ref="menu" :placement="placement" :offset="offset">
-    <base-button
-      slot="default"
-      icon="filter"
-      :filled="filterActive"
-      :ghost="!filterActive"
-      slot-scope="{ toggleMenu }"
-      @click.prevent="toggleMenu()"
-    >
-      <base-icon class="dropdown-arrow" name="angle-down" />
-    </base-button>
+    <template #default="{ toggleMenu }">
+      <base-button
+        icon="filter"
+        :filled="filterActive"
+        :ghost="!filterActive"
+        @click.prevent="toggleMenu()"
+      >
+        <base-icon class="dropdown-arrow" name="angle-down" />
+      </base-button>
+    </template>
     <template slot="popover">
       <ds-container>
         <categories-filter-menu-items :chunk="chunk" />
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index e6519d14d..c38a600b1 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -1,17 +1,13 @@
 <template>
   <client-only>
     <dropdown ref="menu" :placement="placement" :offset="offset">
-      <a
-        slot="default"
-        slot-scope="{ toggleMenu }"
-        class="locale-menu"
-        href="#"
-        @click.prevent="toggleMenu()"
-      >
-        <base-icon name="globe" />
-        <span class="label">{{ current.code.toUpperCase() }}</span>
-        <base-icon class="dropdown-arrow" name="angle-down" />
-      </a>
+      <template #default="{ toggleMenu }">
+        <a class="locale-menu" href="#" @click.prevent="toggleMenu()">
+          <base-icon name="globe" />
+          <span class="label">{{ current.code.toUpperCase() }}</span>
+          <base-icon class="dropdown-arrow" name="angle-down" />
+        </a>
+      </template>
       <ds-menu
         #popover="{ toggleMenu }"
         class="locale-menu-popover"
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index fb047a0c3..072d9888c 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -7,7 +7,7 @@
     <base-button icon="bell" ghost circle />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
-    <template slot="default" slot-scope="{ toggleMenu }">
+    <template #default="{ toggleMenu }">
       <base-button @click="toggleMenu" ghost circle>
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
diff --git a/webapp/components/Password/Change.vue b/webapp/components/Password/Change.vue
index 547aab6a1..cd955973f 100644
--- a/webapp/components/Password/Change.vue
+++ b/webapp/components/Password/Change.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="formData" :schema="formSchema" @submit="handleSubmit">
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <ds-input
         id="oldPassword"
         model="oldPassword"
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index ab3334c6d..2873505c6 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -7,7 +7,7 @@
       @submit="handleSubmitPassword"
       class="change-password"
     >
-      <template slot-scope="{ errors }">
+      <template #default="{ errors }">
         <ds-input
           id="password"
           model="password"
diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue
index 1abd520e2..3eac46665 100644
--- a/webapp/pages/settings/index.vue
+++ b/webapp/pages/settings/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.data.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/enter-nonce.vue b/webapp/pages/settings/my-email-address/enter-nonce.vue
index dfa44a1e4..4faae6692 100644
--- a/webapp/pages/settings/my-email-address/enter-nonce.vue
+++ b/webapp/pages/settings/my-email-address/enter-nonce.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-form v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index 43b038a6b..ffb1a0cc5 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -6,7 +6,7 @@
     <ds-text v-html="submitMessage" />
   </base-card>
   <ds-form v-else v-model="form" :schema="formSchema" @submit="submit">
-    <template slot-scope="{ errors }">
+    <template #default="{ errors }">
       <base-card>
         <h2 class="title">{{ $t('settings.email.name') }}</h2>
         <ds-input

From 7df4432601df230fe3bcfce5df0e0befd384fd91 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 13 Mar 2020 00:09:33 +0100
Subject: [PATCH 041/106] Fix: named slot scopes

---
 webapp/components/ContentMenu/ContentMenu.vue | 19 ++++++------
 .../DropdownFilter/DropdownFilter.vue         | 29 +++++++++---------
 .../components/LocaleSwitch/LocaleSwitch.vue  | 30 +++++++++----------
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 1b9f24317..ba9c37c34 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -15,15 +15,16 @@
     <template #popover="{ toggleMenu }">
       <div class="content-menu-popover">
         <ds-menu :routes="routes">
-          <ds-menu-item
-            #menuitem="item"
-            :route="item.route"
-            :parents="item.parents"
-            @click.stop.prevent="openItem(item.route, toggleMenu)"
-          >
-            <base-icon :name="item.route.icon" />
-            {{ item.route.label }}
-          </ds-menu-item>
+          <template #menuitem="item">
+            <ds-menu-item
+              :route="item.route"
+              :parents="item.parents"
+              @click.stop.prevent="openItem(item.route, toggleMenu)"
+            >
+              <base-icon :name="item.route.icon" />
+              {{ item.route.label }}
+            </ds-menu-item>
+          </template>
         </ds-menu>
       </div>
     </template>
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 4abf6ab41..27d29e5e1 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -13,21 +13,20 @@
         <base-icon class="dropdown-arrow" name="angle-down" />
       </a>
     </template>
-    <ds-menu
-      #popover="{ toggleMenu }"
-      class="dropdown-menu-popover"
-      :routes="filterOptions"
-    >
-      <ds-menu-item
-        #menuitem="item"
-        class="dropdown-menu-item"
-        :route="item.route"
-        :parents="item.parents"
-        @click.stop.prevent="filter(item.route, toggleMenu)"
-      >
-        {{ item.route.label }}
-      </ds-menu-item>
-    </ds-menu>
+    <template #popover="{ toggleMenu }">
+      <ds-menu class="dropdown-menu-popover" :routes="filterOptions">
+        <template #menuitem="item">
+          <ds-menu-item
+            class="dropdown-menu-item"
+            :route="item.route"
+            :parents="item.parents"
+            @click.stop.prevent="filter(item.route, toggleMenu)"
+          >
+            {{ item.route.label }}
+          </ds-menu-item>
+        </template>
+      </ds-menu>
+    </template>
   </dropdown>
 </template>
 <script>
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index c38a600b1..fc87b7aa5 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -8,22 +8,20 @@
           <base-icon class="dropdown-arrow" name="angle-down" />
         </a>
       </template>
-      <ds-menu
-        #popover="{ toggleMenu }"
-        class="locale-menu-popover"
-        :matcher="matcher"
-        :routes="routes"
-      >
-        <ds-menu-item
-          #menuitem="item"
-          class="locale-menu-item"
-          :route="item.route"
-          :parents="item.parents"
-          @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
-        >
-          {{ item.route.name }}
-        </ds-menu-item>
-      </ds-menu>
+      <template #popover="{ toggleMenu }">
+        <ds-menu class="locale-menu-popover" :matcher="matcher" :routes="routes">
+          <template #menuitem="item">
+            <ds-menu-item
+              class="locale-menu-item"
+              :route="item.route"
+              :parents="item.parents"
+              @click.stop.prevent="changeLanguage(item.route.path, toggleMenu)"
+            >
+              {{ item.route.name }}
+            </ds-menu-item>
+          </template>
+        </ds-menu>
+      </template>
     </dropdown>
   </client-only>
 </template>

From 1d74d94eb39c8a2cc4fbd3d2866fe06584d034eb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:16:29 +0000
Subject: [PATCH 042/106] build(deps): bump @sentry/node from 5.14.0 to 5.14.1
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index d8bec6e57..d1fe73f7a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "@sentry/node": "^5.14.0",
+    "@sentry/node": "^5.14.1",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e7494a1d6..be6096663 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1262,83 +1262,83 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/apm@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.0.tgz#1eddcffb1d497462484a228a39746f74719c6e16"
-  integrity sha512-uzdRr8WFb2kCsBpJyKprv5sTJCLshnc6+B5sYAjsamSMl9kwO0l5HebJjIHNICT0F0u+7iSGDYvfEDl0uuhPAA==
+"@sentry/apm@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.1.tgz#99605c4cf933962aeda4a1b03e99256213e51d7d"
+  integrity sha512-vm5Ee0VPAZ5TmO3iKwLFwTAtDj0ZVJvawJCfBjUe5sn58GL60XapN5AsXICdsh4fbgtNJVZEtsawcL2JNVJvuQ==
   dependencies:
-    "@sentry/browser" "5.14.0"
-    "@sentry/hub" "5.14.0"
-    "@sentry/minimal" "5.14.0"
-    "@sentry/types" "5.14.0"
-    "@sentry/utils" "5.14.0"
+    "@sentry/browser" "5.14.1"
+    "@sentry/hub" "5.14.1"
+    "@sentry/minimal" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/browser@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.0.tgz#01cb12d0c42dca184d17854245686eee2fe3f21f"
-  integrity sha512-C/gb4YpUIKEaBDulacgnTm55PNXbkLShPOtkGJstbxedhOLZq7J3q2wjeyhKzfWFBw4WewLanMv+Eisn/Bm8XQ==
+"@sentry/browser@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.1.tgz#ccd806d77b4eff1ae6ca1ec3a0839b9bbb5dd241"
+  integrity sha512-PiadrPcsPcCjHrfT8nxzVFi0WiekLYh2unGnkSFoIvS8dGv+fjIX0gqYPy7UHhCZZUsLCCiuWpoaSDWymkZGTA==
   dependencies:
-    "@sentry/core" "5.14.0"
-    "@sentry/types" "5.14.0"
-    "@sentry/utils" "5.14.0"
+    "@sentry/core" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/core@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.0.tgz#3a7b85dbed254c6ad1a4f12e5dd392df691dbcd0"
-  integrity sha512-wuO4IgJYh3XouwUGJtL5UQMbhB7qn2uGASxL4sAuHFh1Dc3aZPuATtKp3FEUPcHP8S9MtcQ5CDUyv1ZYqFqtFg==
+"@sentry/core@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.1.tgz#21a7c14ca08b0f228023f9c6f399db1e35cd6438"
+  integrity sha512-UPwnS7P4xdjlC60ybzKZ/o1kYkVCublD0OUW9JfLJpIyiu3QEA3QUHjbambzvU47WHOSy9b4RYtQll44WMtdaw==
   dependencies:
-    "@sentry/hub" "5.14.0"
-    "@sentry/minimal" "5.14.0"
-    "@sentry/types" "5.14.0"
-    "@sentry/utils" "5.14.0"
+    "@sentry/hub" "5.14.1"
+    "@sentry/minimal" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/hub@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.0.tgz#5ff08c5417e116314314d598a0999f069c260c10"
-  integrity sha512-3+8oqYmZW3v+YQJG4OZTHGShfwe6rHsyOT8/uc5KaBt8qF66nrPXasImuQcNUKLkJ7plMQcS+GmNr8B/s0AmYA==
+"@sentry/hub@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.1.tgz#1a4515558705b2680a6e9f3cb8092555ed31324a"
+  integrity sha512-FTqeLcOWbww18WRQ8F3Z0DryQwD5DeuapXlinez7Y+HDZZAOm7HdPDEY5xjrUzi4V0n9BtgfJDp27UKJENWtYA==
   dependencies:
-    "@sentry/types" "5.14.0"
-    "@sentry/utils" "5.14.0"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.0.tgz#f12e2a95d9abd0fbe11546cfca87e15bc70af8c8"
-  integrity sha512-uEHMhOJiLLHsvF4eihlTdiOMtDHUPlPbXtOcTkPw0lmLC2FuHOMtnvZJb/MxIFVrsFhE7yRUMKda45NHF2Wm9w==
+"@sentry/minimal@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.1.tgz#3ec74503cd72772de56188f010a35d9bc956dc94"
+  integrity sha512-TC+i37rGBomu74xcSdPA4xeqSeWEvTHP5dx+LIJunntk4/mDi5/aC3HSMxRy3ifoJiUwZO+gyJJ7I/UMzvOMEw==
   dependencies:
-    "@sentry/hub" "5.14.0"
-    "@sentry/types" "5.14.0"
+    "@sentry/hub" "5.14.1"
+    "@sentry/types" "5.14.1"
     tslib "^1.9.3"
 
-"@sentry/node@^5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.0.tgz#6aef088f1e2063ae4d3daec4f05c543a7f4b6581"
-  integrity sha512-qhUhb1rc71ms6K6FKp4wuodGZmTRFHhBeejyvs2Ye5Z2IvANXVnvH4zz2OnQQoyp741nLpfzg3ef6BzLX4NJ5A==
+"@sentry/node@^5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.1.tgz#ebac38bd5036d7feefa0b44569e731b59441ce27"
+  integrity sha512-bkOp6RRynt0C8J2yRF6RII9/dn03WFo5Yk/di7753VW1CUgjUOjtozirs0PYewlfXfaVHveixjN61Mcy4XwJ+g==
   dependencies:
-    "@sentry/apm" "5.14.0"
-    "@sentry/core" "5.14.0"
-    "@sentry/hub" "5.14.0"
-    "@sentry/types" "5.14.0"
-    "@sentry/utils" "5.14.0"
+    "@sentry/apm" "5.14.1"
+    "@sentry/core" "5.14.1"
+    "@sentry/hub" "5.14.1"
+    "@sentry/types" "5.14.1"
+    "@sentry/utils" "5.14.1"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.0.tgz#4681f07d58e6edbe2f995080f005ecc3d4cd22b6"
-  integrity sha512-XQxSUWAcpFH7m2vWzUAc8YhKCofNMtGNk555Nn5kplj83r+jBXdZwAfVqYBqy8Yw5SYSfof+2RN38u7IE8RerQ==
+"@sentry/types@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.1.tgz#564f9b703c06c2a97e756f60a3c873b977b2bbd2"
+  integrity sha512-Eht+qI68BxELKQRnaV6q1PxS9/E+YatUHjG80ov9/azLbIJElQhWUDzyyJCefDD/fEI37VQ2SrsQsVqS9W7ZOQ==
 
-"@sentry/utils@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.0.tgz#2bc9a5bf32ca6a9d55570fc4d5bb51b92cff5913"
-  integrity sha512-GCZ0rTT6bK6P0G8+NapY7yZX8erjyi0Pfjgmd5srgY6PkxAgMSI6mXtwPNqnp5T7Z9L27CMe6UGsOiMc680Mjg==
+"@sentry/utils@5.14.1":
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.1.tgz#577a9dd7b5f4b3436e8e2847d058547eab2ed5c4"
+  integrity sha512-iCN5p+ArPVMkt09bRfYuldtKSTQEqRfNuoCxPFJKDfMyLO9YetIwRCwHluIRoJoEIFE4JTM2F4HfmTsxoTqw4g==
   dependencies:
-    "@sentry/types" "5.14.0"
+    "@sentry/types" "5.14.1"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":

From 602fc0722d6b420adfed38731bc7d0c4d649bfe2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:17:01 +0000
Subject: [PATCH 043/106] build(deps): bump sanitize-html from 1.22.0 to 1.22.1
 in /backend

Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/commits)

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

diff --git a/backend/package.json b/backend/package.json
index d8bec6e57..91f7f157d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -96,7 +96,7 @@
     "nodemailer-html-to-text": "^3.1.0",
     "npm-run-all": "~4.1.5",
     "request": "~2.88.2",
-    "sanitize-html": "~1.22.0",
+    "sanitize-html": "~1.22.1",
     "slug": "~2.1.1",
     "subscriptions-transport-ws": "^0.9.16",
     "trunc-html": "~1.1.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e7494a1d6..1eb297924 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6064,7 +6064,7 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
-lodash.mergewith@^4.6.1:
+lodash.mergewith@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
@@ -7895,10 +7895,10 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@~1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz#9df779c53cf5755adb2322943c21c1c1dffca7bf"
-  integrity sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A==
+sanitize-html@~1.22.1:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz#5b36c92ab27917ddd2775396815c2bc1a6268310"
+  integrity sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==
   dependencies:
     chalk "^2.4.1"
     htmlparser2 "^4.1.0"
@@ -7906,7 +7906,7 @@ sanitize-html@~1.22.0:
     lodash.escaperegexp "^4.1.2"
     lodash.isplainobject "^4.0.6"
     lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.1"
+    lodash.mergewith "^4.6.2"
     postcss "^7.0.27"
     srcset "^2.0.1"
     xtend "^4.0.1"

From 06c5411526a561e384fada57922eb659e37c5d13 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:17:32 +0000
Subject: [PATCH 044/106] build(deps): bump graphql-shield from 7.1.0 to 7.2.0
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.1.0...v7.2.0)

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

diff --git a/backend/package.json b/backend/package.json
index d8bec6e57..e5a8ae209 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.2.1",
-    "graphql-shield": "~7.1.0",
+    "graphql-shield": "~7.2.0",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.3",
     "ioredis": "^4.16.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e7494a1d6..99d539320 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4505,10 +4505,10 @@ graphql-redis-subscriptions@^2.2.1:
   optionalDependencies:
     ioredis "^4.6.3"
 
-graphql-shield@~7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.1.0.tgz#7e96e0df87357dd97ec799f6f11cc5b80c0bedd0"
-  integrity sha512-XCYwieksKnxabjHnvK/zPxk6FE4coNp+FWJWrL/IVGlk/3I97ROWTobuUM/CXmpnrt+PYcTVn+0JeU38bN02Cw==
+graphql-shield@~7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.2.0.tgz#81b26794370608ad78dfe3833473789fb471fbd8"
+  integrity sha512-eLdD+gUIKYu77XRcuHs5ewZhiBuRFeWFGxPnJa+g9AkxB7Yi5RSEjEJEx0Drg9GuNvDYpHeW7nPff4v35AT2aQ==
   dependencies:
     "@types/yup" "0.26.32"
     object-hash "^2.0.3"

From 8318d239aaa44e437357db1381f546140f885e90 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 13 Mar 2020 16:29:45 +0100
Subject: [PATCH 045/106] chore: Dockerfile/Travis node versions match

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f6fdffebf..532e2b766 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 dist: xenial
-language: generic
+language: node_js
+node_js: lts/*
 addons:
   apt:
     packages:

From 70f909bf48547957e607e3a778d6e431c5544b43 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 21:12:06 +0000
Subject: [PATCH 046/106] build(deps): [security] bump acorn from 6.1.1 to
 6.4.1

Bumps [acorn](https://github.com/acornjs/acorn) from 6.1.1 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.1.1...6.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 13dc50c56..a45181c2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1226,9 +1226,9 @@ acorn-walk@^6.1.0:
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
 acorn@^6.0.2:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 add-stream@^1.0.0:
   version "1.0.0"

From c2e8ea0634d78feb7e1a9a1717dc9cba9cea7909 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sat, 14 Mar 2020 01:02:12 +0100
Subject: [PATCH 047/106] Chore: update Vue styleguide

---
 webapp/vue.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp/vue.md b/webapp/vue.md
index 5116bd713..2485e99e6 100644
--- a/webapp/vue.md
+++ b/webapp/vue.md
@@ -3,6 +3,7 @@
 ## We use single-file components
 
 Each component lives in a single file, containing:
+
 - its `template` (the DOM structure)
 - its `script` (including `props`, `data` and `methods` among other things)
 - its `style` (defining the look of the component)
@@ -10,6 +11,7 @@ Each component lives in a single file, containing:
 See the [Vue.js docs](https://vuejs.org/v2/guide/single-file-components.html) for more details.
 
 Placed in the same folder are also:
+
 - the test file (e.g. `MyComponent.spec.js`)
 - the storybook file (e.g. `MyComponent.story.js`)
 
@@ -20,6 +22,7 @@ Vue.js allows us to define component props either as strings or as objects (with
 Also: only (and always!) define a `default` for props that are _not required_.
 
 Why?
+
 - it makes our code more robust – a warning will be shown when passing a wrong prop type
 - it clearly defines the component API and tells other developers how to use it
 
@@ -43,11 +46,14 @@ For more complex use cases see the [official Vue.js documentation](https://vuejs
 ## We use shorthands
 
 For better readability we prefer
+
 - `:something` over `v-bind:something`
 - `@click` over `v-on:click`
+- `#slotSame` over `v-slot:slotName`
+- `#default` over `v-slot`
 
-Read more in the [official Vue.js docs](https://vuejs.org/v2/guide/syntax.html#Shorthands)
+Read more in the [official Vue.js docs](https://vuejs.org/v2/guide/syntax.html#Shorthands) (for [slots](https://vuejs.org/v2/guide/components-slots.html#Named-Slots-Shorthand))
 
 ## Recommended reads
 
-The [Vue.js component style guide](https://pablohpsilva.github.io/vuejs-component-style-guide/#/?id=harness-your-component-props) offers a whole list of best-practices for writing Vue components. 
+The [Vue.js component style guide](https://pablohpsilva.github.io/vuejs-component-style-guide/#/?id=harness-your-component-props) offers a whole list of best-practices for writing Vue components.

From 18a260ec919fe7227020f5652b4e404c1657cde3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2020 14:02:50 +0000
Subject: [PATCH 048/106] build(deps): [security] bump acorn from 6.3.0 to
 6.4.1 in /backend

Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/yarn.lock b/backend/yarn.lock
index 3abbd461d..f46932e63 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1676,9 +1676,9 @@ acorn-walk@^6.0.1:
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
 acorn@^6.0.1:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
-  integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 acorn@^7.1.0:
   version "7.1.0"

From 3ceccb5422811d05a1190cb1480348e77f54489a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 04:15:22 +0000
Subject: [PATCH 049/106] build(deps-dev): bump date-fns from 2.10.0 to 2.11.0

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.10.0...v2.11.0)

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

diff --git a/package.json b/package.json
index 8695f5fc2..492c02b87 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "cypress-cucumber-preprocessor": "^2.0.1",
     "cypress-file-upload": "^3.5.3",
     "cypress-plugin-retries": "^1.5.2",
-    "date-fns": "^2.10.0",
+    "date-fns": "^2.11.0",
     "dotenv": "^8.2.0",
     "expect": "^25.1.0",
     "faker": "Marak/faker.js#master",
diff --git a/yarn.lock b/yarn.lock
index a45181c2d..e555f8504 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2727,10 +2727,10 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-fns@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.10.0.tgz#abd10604d8bafb0bcbd2ba2e9b0563b922ae4b6b"
-  integrity sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==
+date-fns@^2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.0.tgz#ec2b44977465b9dcb370021d5e6c019b19f36d06"
+  integrity sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==
 
 date-now@^0.1.4:
   version "0.1.4"

From 87a455db89581d72aecd8cc9f99ff0ab3366fdc2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 04:15:39 +0000
Subject: [PATCH 050/106] build(deps): bump @sentry/node from 5.14.1 to 5.14.2
 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 83e98b1c9..fe464dd8c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "@sentry/node": "^5.14.1",
+    "@sentry/node": "^5.14.2",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f46932e63..74243e1d9 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1262,83 +1262,83 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@sentry/apm@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.1.tgz#99605c4cf933962aeda4a1b03e99256213e51d7d"
-  integrity sha512-vm5Ee0VPAZ5TmO3iKwLFwTAtDj0ZVJvawJCfBjUe5sn58GL60XapN5AsXICdsh4fbgtNJVZEtsawcL2JNVJvuQ==
+"@sentry/apm@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.14.2.tgz#b05b91a8da6826fdd20532cb745c0f9ef5c55656"
+  integrity sha512-51yeQ04mKEsx2WiXbMlUSXhmG/D+YFiNJXxKuFopJkKkT02qr7B3QH0vHkS9OX2oniYoBTWZVCKYUAgJUSsIug==
   dependencies:
-    "@sentry/browser" "5.14.1"
-    "@sentry/hub" "5.14.1"
-    "@sentry/minimal" "5.14.1"
-    "@sentry/types" "5.14.1"
-    "@sentry/utils" "5.14.1"
+    "@sentry/browser" "5.14.2"
+    "@sentry/hub" "5.14.2"
+    "@sentry/minimal" "5.14.2"
+    "@sentry/types" "5.14.2"
+    "@sentry/utils" "5.14.2"
     tslib "^1.9.3"
 
-"@sentry/browser@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.1.tgz#ccd806d77b4eff1ae6ca1ec3a0839b9bbb5dd241"
-  integrity sha512-PiadrPcsPcCjHrfT8nxzVFi0WiekLYh2unGnkSFoIvS8dGv+fjIX0gqYPy7UHhCZZUsLCCiuWpoaSDWymkZGTA==
+"@sentry/browser@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.14.2.tgz#b0d1bf7bd771e64de0f9f801fa6625e47fced016"
+  integrity sha512-Vuuy2E5mt2VQKeHpFqtowZdKUe1Ui7J2KmgZQCduVilM7dFmprdXfv/mQ3Uv+73VIiCd22PpxojR3peDksb/Gg==
   dependencies:
-    "@sentry/core" "5.14.1"
-    "@sentry/types" "5.14.1"
-    "@sentry/utils" "5.14.1"
+    "@sentry/core" "5.14.2"
+    "@sentry/types" "5.14.2"
+    "@sentry/utils" "5.14.2"
     tslib "^1.9.3"
 
-"@sentry/core@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.1.tgz#21a7c14ca08b0f228023f9c6f399db1e35cd6438"
-  integrity sha512-UPwnS7P4xdjlC60ybzKZ/o1kYkVCublD0OUW9JfLJpIyiu3QEA3QUHjbambzvU47WHOSy9b4RYtQll44WMtdaw==
+"@sentry/core@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.14.2.tgz#950709a2281086c64f1ba60f2c3290dc81c19659"
+  integrity sha512-B2XjUMCmVu4H3s5hapgynhb28MSc+irt9wRI9j0Lbjx2cxsCUr/YFGL8GuEuYwf4zXNKnh2ke6t+I37OlSaGOg==
   dependencies:
-    "@sentry/hub" "5.14.1"
-    "@sentry/minimal" "5.14.1"
-    "@sentry/types" "5.14.1"
-    "@sentry/utils" "5.14.1"
+    "@sentry/hub" "5.14.2"
+    "@sentry/minimal" "5.14.2"
+    "@sentry/types" "5.14.2"
+    "@sentry/utils" "5.14.2"
     tslib "^1.9.3"
 
-"@sentry/hub@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.1.tgz#1a4515558705b2680a6e9f3cb8092555ed31324a"
-  integrity sha512-FTqeLcOWbww18WRQ8F3Z0DryQwD5DeuapXlinez7Y+HDZZAOm7HdPDEY5xjrUzi4V0n9BtgfJDp27UKJENWtYA==
+"@sentry/hub@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.14.2.tgz#24a0990a901d49f8a362dfd404cb7cd33e429d60"
+  integrity sha512-0ckTDnhCANkuY+VepMPz5vl/dkFQnWmzlJiCIxgM5fCgAF8dfNd9VhGn0qVQXnzKPGoW9zxs/uAmH3/XFqqmNA==
   dependencies:
-    "@sentry/types" "5.14.1"
-    "@sentry/utils" "5.14.1"
+    "@sentry/types" "5.14.2"
+    "@sentry/utils" "5.14.2"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.1.tgz#3ec74503cd72772de56188f010a35d9bc956dc94"
-  integrity sha512-TC+i37rGBomu74xcSdPA4xeqSeWEvTHP5dx+LIJunntk4/mDi5/aC3HSMxRy3ifoJiUwZO+gyJJ7I/UMzvOMEw==
+"@sentry/minimal@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.14.2.tgz#9fa39cc6432a05aae22e892a1be3cc314c3b77c4"
+  integrity sha512-uih9a8KwFCQrWaGb3UxkrSntxMRT4EIlud158ZKlrsLaCOE6i08unOR4xWqlrXlKPySq16H4wjbBFQ56ogOWdQ==
   dependencies:
-    "@sentry/hub" "5.14.1"
-    "@sentry/types" "5.14.1"
+    "@sentry/hub" "5.14.2"
+    "@sentry/types" "5.14.2"
     tslib "^1.9.3"
 
-"@sentry/node@^5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.1.tgz#ebac38bd5036d7feefa0b44569e731b59441ce27"
-  integrity sha512-bkOp6RRynt0C8J2yRF6RII9/dn03WFo5Yk/di7753VW1CUgjUOjtozirs0PYewlfXfaVHveixjN61Mcy4XwJ+g==
+"@sentry/node@^5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.14.2.tgz#18c25a0ca34b6ea4e3d917a819e97d086d8b1c2c"
+  integrity sha512-8s9JAKc/oid6lIFbYLtCLDwLhUpsgeU1WdNbs1eUJQSArb6WHS6EREVBuGr3RMfe+SkwEMg1rtPKnyj4C/WRig==
   dependencies:
-    "@sentry/apm" "5.14.1"
-    "@sentry/core" "5.14.1"
-    "@sentry/hub" "5.14.1"
-    "@sentry/types" "5.14.1"
-    "@sentry/utils" "5.14.1"
+    "@sentry/apm" "5.14.2"
+    "@sentry/core" "5.14.2"
+    "@sentry/hub" "5.14.2"
+    "@sentry/types" "5.14.2"
+    "@sentry/utils" "5.14.2"
     cookie "^0.3.1"
     https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.1.tgz#564f9b703c06c2a97e756f60a3c873b977b2bbd2"
-  integrity sha512-Eht+qI68BxELKQRnaV6q1PxS9/E+YatUHjG80ov9/azLbIJElQhWUDzyyJCefDD/fEI37VQ2SrsQsVqS9W7ZOQ==
+"@sentry/types@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.14.2.tgz#43c3723b2f5b31234892fbe6a28b293ad050faac"
+  integrity sha512-NtB/o+/whR/mJJf67Nvdab7E2+/THgAUY114FWFqDLHMaoiIVWy9J/yLKtQWymwuQslh7zpPxjA1AhqTJerVCg==
 
-"@sentry/utils@5.14.1":
-  version "5.14.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.1.tgz#577a9dd7b5f4b3436e8e2847d058547eab2ed5c4"
-  integrity sha512-iCN5p+ArPVMkt09bRfYuldtKSTQEqRfNuoCxPFJKDfMyLO9YetIwRCwHluIRoJoEIFE4JTM2F4HfmTsxoTqw4g==
+"@sentry/utils@5.14.2":
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.14.2.tgz#2e812f2788a00ca4e6e35acbeb86000792f53473"
+  integrity sha512-DV9/kw/O8o5xqvQYwITm0lBaBqS4RKicjguWYJQ/+F94P/SKxuXor7EE0iMDYvUGslvPz8TlgB7r+nb/YRl+Fg==
   dependencies:
-    "@sentry/types" "5.14.1"
+    "@sentry/types" "5.14.2"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":

From 355143030be7d333bd3e89a43f0cf61216ed10f6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 04:18:19 +0000
Subject: [PATCH 051/106] build(deps): bump mustache from 4.0.0 to 4.0.1 in
 /backend

Bumps [mustache](https://github.com/janl/mustache.js) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/janl/mustache.js/releases)
- [Changelog](https://github.com/janl/mustache.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janl/mustache.js/compare/v4.0.0...v4.0.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 83e98b1c9..0c2e2c431 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -87,7 +87,7 @@
     "metascraper-youtube": "^5.11.6",
     "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
-    "mustache": "^4.0.0",
+    "mustache": "^4.0.1",
     "neo4j-driver": "^4.0.1",
     "neo4j-graphql-js": "^2.11.5",
     "neode": "^0.3.7",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f46932e63..3b868cbb6 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6498,10 +6498,10 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mustache@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31"
-  integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==
+mustache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2"
+  integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==
 
 mute-stream@0.0.8:
   version "0.0.8"

From ae21e3860d510ea0230519dd6ccfaacfd6103069 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 04:20:50 +0000
Subject: [PATCH 052/106] build(deps-dev): bump @storybook/addon-notes in
 /webapp

Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.14 to 5.3.17.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.17/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.17/addons/notes)

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

diff --git a/webapp/package.json b/webapp/package.json
index 80aca7e4f..bf21873b7 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -102,7 +102,7 @@
     "@babel/preset-env": "~7.8.7",
     "@storybook/addon-a11y": "^5.3.14",
     "@storybook/addon-actions": "^5.3.14",
-    "@storybook/addon-notes": "^5.3.14",
+    "@storybook/addon-notes": "^5.3.17",
     "@storybook/vue": "~5.3.14",
     "@vue/cli-shared-utils": "~4.2.3",
     "@vue/eslint-config-prettier": "~6.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 9e74c1353..c9e0055c0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2162,18 +2162,18 @@
     react-inspector "^4.0.0"
     uuid "^3.3.2"
 
-"@storybook/addon-notes@^5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.14.tgz#590ca7618cea39d3ee15c1aaddaa2d24d5c0ab8e"
-  integrity sha512-0RMKwdPQILXV9VnbiWBwpqJZYx6m6F8CB1xZRPXump78lghs2dT1/3WYtas6INdZVzHnNR63U1TAoXaRHPjgrg==
+"@storybook/addon-notes@^5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.17.tgz#717ffc552e34d051ed8bf2ca61a6743a9628be24"
+  integrity sha512-Jmsgz3SXjn3j1YjK50ubJiN6N62Tl7W54WzKPMq9mvu/t8egYBDn0JjTkmn8QMbcXn4JL3Qs7W56uRFj0KewIg==
   dependencies:
-    "@storybook/addons" "5.3.14"
-    "@storybook/api" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/components" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/router" "5.3.14"
-    "@storybook/theming" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/api" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/components" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/router" "5.3.17"
+    "@storybook/theming" "5.3.17"
     core-js "^3.0.1"
     global "^4.3.2"
     markdown-to-jsx "^6.10.3"
@@ -2207,6 +2207,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.17.tgz#8efab65904040b0b8578eedc9a5772dbcbf6fa83"
+  integrity sha512-zg6O1bmffRsHXJOWAnSD2O3tPnVMoD8Yfu+a5zBVXDiUP1E/TGzgjjjYBUUCU3yQg1Ted5rIn4o6ql/rZNNlgA==
+  dependencies:
+    "@storybook/api" "5.3.17"
+    "@storybook/channels" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
@@ -2256,6 +2269,32 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.17.tgz#1c0dad3309afef6b0a5585cb59c65824fb4d2721"
+  integrity sha512-G40jtXFY10hQo6GSw5JeFYt41loD4+7s0uU18Rm6lfa/twOgp6vqqyDCWDvpRRxRBB5uDIKKHLt13X9gWe8tQQ==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/channels" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "5.3.17"
+    "@storybook/theming" "5.3.17"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.2.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.3.14":
   version "5.3.14"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.14.tgz#768c87411d98caf09fdd92539b9edaaed26d5965"
@@ -2281,6 +2320,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.17.tgz#74eccb10c2395499da6a290bcd0272d6d6c7c5b2"
+  integrity sha512-5hlBRbyk+YxC4KgecYG8wWwB2v1BzRJXhSlemFDOQk9wx37gVpne+rBydEtNFO4InmaZf6tKbBcpH0wBFLdWYA==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.3.14":
   version "5.3.14"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.14.tgz#5f4b199d2f2b193f9f5a856c5eb8be43a9113d12"
@@ -2318,6 +2364,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.17.tgz#bf9c7ef52da75a5c1f2c5d74724442224deea6e4"
+  integrity sha512-GYYvVGIOs+fq11LXXy7x2sr3hhC9LMI1jtIckjKV1dsY9MJ5g22M+Wl5Iw4nf6VMWsqcN9LSlYE+u/H+Q2uCHw==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
@@ -2370,6 +2423,33 @@
     simplebar-react "^1.0.0-alpha.6"
     ts-dedent "^1.1.0"
 
+"@storybook/components@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.17.tgz#287430fc9c5f59b1d3590b50b3c7688355b22639"
+  integrity sha512-M5oqbzcqFX4VDNI8siT3phT7rmFwChQ/xPwX9ygByBsZCoNuLMzafavfTOhZvxCPiliFbBxmxtK/ibCsSzuKZg==
+  dependencies:
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/theming" "5.3.17"
+    "@types/react-syntax-highlighter" "11.0.4"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^2.1.0"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^11.0.2"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+    ts-dedent "^1.1.0"
+
 "@storybook/core-events@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
@@ -2384,6 +2464,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.17.tgz#698ce0a36c29fe8fa04608f56ccca53aa1d31638"
+  integrity sha512-DOeX9fpeGW4o9Gocxa4VW9wAlAyfIVNDTzq0wVvvMBthTTo9u58NmndglEMDgDa2Cq6iAIPh7vz2bRJCNexzLw==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/core@5.3.14":
   version "5.3.14"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.14.tgz#510f204219695045f249733bf94018e52c7b1448"
@@ -2510,6 +2597,21 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/router@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.17.tgz#4db96b45f39b25a3f7a4e2899c36e7e9e4ba6108"
+  integrity sha512-ANsiehGRTVSremgTW0Vt47dQ4JA86a4/w/4G6QqHU8Cm4jO3cw/wAcCxlzfcgCXOUiq+SuyPTU43+0O5uBx33g==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@storybook/csf" "0.0.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/theming@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
@@ -2546,6 +2648,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
+"@storybook/theming@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.17.tgz#cf6278c4857229c7167faf04d5b2206bc5ee04e1"
+  integrity sha512-4JeOZnDDHtb4LOt5sXe/s1Jhbb2UPsr8zL9NWmKJmTsgnyTvBipNHOmFYDUsIacB5K4GXSqm+cZ7Z4AkUgWCDw==
+  dependencies:
+    "@emotion/core" "^10.0.20"
+    "@emotion/styled" "^10.0.17"
+    "@storybook/client-logger" "5.3.17"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.19"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+    ts-dedent "^1.1.0"
+
 "@storybook/ui@5.3.14":
   version "5.3.14"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.14.tgz#f3c49241d615bb20cb6facef84b4c432a85d814b"
@@ -2895,6 +3015,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-syntax-highlighter@11.0.4":
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
+  integrity sha512-9GfTo3a0PHwQeTVoqs0g5bS28KkSY48pp5659wA+Dp4MqceDEa8EHBqrllJvvtyusszyJhViUEap0FDvlk/9Zg==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-textarea-autosize@^4.3.3":
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.4.tgz#9a93f751c91ad5e86387bce75e3b7e11ed195813"

From 6356c0e5b72032f67292b9e26c04fed5740ad054 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:03:23 +0000
Subject: [PATCH 053/106] build(deps): bump @hapi/joi from 17.1.0 to 17.1.1 in
 /backend

Bumps [@hapi/joi](https://github.com/hapijs/joi) from 17.1.0 to 17.1.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Commits](https://github.com/hapijs/joi/compare/v17.1.0...v17.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 fe464dd8c..6dbea750b 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -37,7 +37,7 @@
     ]
   },
   "dependencies": {
-    "@hapi/joi": "^17.1.0",
+    "@hapi/joi": "^17.1.1",
     "@sentry/node": "^5.14.2",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 74243e1d9..9f6887275 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -887,10 +887,10 @@
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
   integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==
 
-"@hapi/address@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.0.tgz#36affb4509b5a6adc628bcc394450f2a7d51d111"
-  integrity sha512-GDDpkCdSUfkQCznmWUHh9dDN85BWf/V8TFKQ2JLuHdGB4Yy3YTEGBzZxoBNxfNBEvreSR/o+ZxBBSNNEVzY+lQ==
+"@hapi/address@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz#267301ddf7bc453718377a6fb3832a2f04a721dd"
+  integrity sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw==
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
@@ -924,12 +924,12 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/joi@^17.1.0":
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.0.tgz#cc4000b6c928a6a39b9bef092151b6bdee10ce55"
-  integrity sha512-ob67RcPlwRWxBzLCnWvcwx5qbwf88I3ykD7gcJLWOTRfLLgosK7r6aeChz4thA3XRvuBfI0KB1tPVl2EQFlPXw==
+"@hapi/joi@^17.1.0", "@hapi/joi@^17.1.1":
+  version "17.1.1"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz#9cc8d7e2c2213d1e46708c6260184b447c661350"
+  integrity sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==
   dependencies:
-    "@hapi/address" "^4.0.0"
+    "@hapi/address" "^4.0.1"
     "@hapi/formula" "^2.0.0"
     "@hapi/hoek" "^9.0.0"
     "@hapi/pinpoint" "^2.0.0"

From 419d18710600ebbfefd04a28b2b038cdf77f989d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:03:24 +0000
Subject: [PATCH 054/106] build(deps): bump date-fns from 2.10.0 to 2.11.0 in
 /backend

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.10.0...v2.11.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 fe464dd8c..0e72d986e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -50,7 +50,7 @@
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
     "cross-env": "~7.0.2",
-    "date-fns": "2.10.0",
+    "date-fns": "2.11.0",
     "debug": "~4.1.1",
     "dotenv": "~8.2.0",
     "express": "^4.17.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 74243e1d9..023d7a3ae 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3127,10 +3127,10 @@ data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.10.0.tgz#abd10604d8bafb0bcbd2ba2e9b0563b922ae4b6b"
-  integrity sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==
+date-fns@2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.0.tgz#ec2b44977465b9dcb370021d5e6c019b19f36d06"
+  integrity sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==
 
 dateformat@^2.0.0:
   version "2.2.0"

From 0c03b0a286253a99bdee02adb1e891eae1b3654a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:03:43 +0000
Subject: [PATCH 055/106] build(deps): bump neo4j-driver from 4.0.1 to 4.0.2 in
 /backend

Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/4.0.1...4.0.2)

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

diff --git a/backend/package.json b/backend/package.json
index 0ed492419..359c28cd0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -88,7 +88,7 @@
     "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
     "mustache": "^4.0.1",
-    "neo4j-driver": "^4.0.1",
+    "neo4j-driver": "^4.0.2",
     "neo4j-graphql-js": "^2.11.5",
     "neode": "^0.3.7",
     "node-fetch": "~2.6.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e3c0a2c40..d64478f33 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -795,14 +795,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.5.5":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
-  integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
   integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
@@ -6572,10 +6565,10 @@ neo4j-driver@^1.7.6:
     text-encoding-utf-8 "^1.0.2"
     uri-js "^4.2.2"
 
-neo4j-driver@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.0.1.tgz#b25ffde0f16602e94c46d097e16a8bacbd773d5a"
-  integrity sha512-SqBhXyyyayVs5gV/6BrgdKbcmU5AsYQXkFAiYO74XAE8XPLJ1HVR/Hu4wjonAX7+70DsalkWEiFN1c6UaCVzlQ==
+neo4j-driver@^4.0.1, neo4j-driver@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.0.2.tgz#78de3b91e91572bcbd9d2e02554322fe1ab399ea"
+  integrity sha512-xQN4BZZsweaNNac7FDYAV6f/JybghwY3lk4fwblS8V5KQ+DBMPe4Pthh672mp+wEYZGyzPalq5CfpcBrWaZ4Gw==
   dependencies:
     "@babel/runtime" "^7.5.5"
     rxjs "^6.5.2"

From 22fbb8075cc047eb2b713cd8009c97223daa42a8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:03:47 +0000
Subject: [PATCH 056/106] build(deps-dev): bump neo4j-driver from 4.0.1 to
 4.0.2

Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/4.0.1...4.0.2)

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

diff --git a/package.json b/package.json
index 492c02b87..a0e5e3992 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "import": "^0.0.6",
     "jsonwebtoken": "^8.5.1",
     "mock-socket": "^9.0.3",
-    "neo4j-driver": "^4.0.1",
+    "neo4j-driver": "^4.0.2",
     "neode": "^0.3.7",
     "npm-run-all": "^4.1.5",
     "rosie": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index e555f8504..c3b6c34ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -928,14 +928,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.5.5":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
-  integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.8.4":
+"@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
   integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
@@ -4998,10 +4991,10 @@ neo4j-driver@^1.7.6:
     text-encoding-utf-8 "^1.0.2"
     uri-js "^4.2.2"
 
-neo4j-driver@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.0.1.tgz#b25ffde0f16602e94c46d097e16a8bacbd773d5a"
-  integrity sha512-SqBhXyyyayVs5gV/6BrgdKbcmU5AsYQXkFAiYO74XAE8XPLJ1HVR/Hu4wjonAX7+70DsalkWEiFN1c6UaCVzlQ==
+neo4j-driver@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.0.2.tgz#78de3b91e91572bcbd9d2e02554322fe1ab399ea"
+  integrity sha512-xQN4BZZsweaNNac7FDYAV6f/JybghwY3lk4fwblS8V5KQ+DBMPe4Pthh672mp+wEYZGyzPalq5CfpcBrWaZ4Gw==
   dependencies:
     "@babel/runtime" "^7.5.5"
     rxjs "^6.5.2"

From e9d0051f97e6e8367497db1fb3bcdc0ce4845717 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:07:11 +0000
Subject: [PATCH 057/106] build(deps): bump date-fns from 2.10.0 to 2.11.0 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.10.0...v2.11.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 bf21873b7..17b9885b4 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -71,7 +71,7 @@
     "cookie-universal-nuxt": "~2.1.2",
     "cropperjs": "^1.5.5",
     "cross-env": "~7.0.2",
-    "date-fns": "2.10.0",
+    "date-fns": "2.11.0",
     "express": "~4.17.1",
     "graphql": "~14.6.0",
     "jsonwebtoken": "~8.5.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c9e0055c0..8605038bd 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6657,10 +6657,10 @@ data-urls@^1.0.0, data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.10.0.tgz#abd10604d8bafb0bcbd2ba2e9b0563b922ae4b6b"
-  integrity sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==
+date-fns@2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.0.tgz#ec2b44977465b9dcb370021d5e6c019b19f36d06"
+  integrity sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==
 
 date-fns@^1.27.2:
   version "1.30.1"

From 843fe8cfa7882c15ed23da5bb8a93506494bcee2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:07:51 +0000
Subject: [PATCH 058/106] build(deps-dev): bump @storybook/addon-actions in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index bf21873b7..777456a8e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -101,7 +101,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.7",
     "@storybook/addon-a11y": "^5.3.14",
-    "@storybook/addon-actions": "^5.3.14",
+    "@storybook/addon-actions": "^5.3.17",
     "@storybook/addon-notes": "^5.3.17",
     "@storybook/vue": "~5.3.14",
     "@vue/cli-shared-utils": "~4.2.3",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c9e0055c0..07539dee7 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2142,17 +2142,17 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.14.tgz#aacc4d2703fc200a4565bfaa9f5870ed70a6fe32"
-  integrity sha512-4lKrTMzw/r6VQiBY24v72WC3jibW7pc9BIJgtPpTmTUQWTxPnkmxDfT81pV4BjS1GFH9VCnU6f5fWK+5lrQlsw==
+"@storybook/addon-actions@^5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.17.tgz#ec7ae8fa25ef211c2a3302b6ac1d271a6247f767"
+  integrity sha512-06HQSBqWFyXcqV418Uv3oMHomNy9g3uCt0FHrqY3BAc7PldY1X0tW65oy//uBueaRaYKdhtRrrjfXRaPQWmDbA==
   dependencies:
-    "@storybook/addons" "5.3.14"
-    "@storybook/api" "5.3.14"
-    "@storybook/client-api" "5.3.14"
-    "@storybook/components" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/theming" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/api" "5.3.17"
+    "@storybook/client-api" "5.3.17"
+    "@storybook/components" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/theming" "5.3.17"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -2306,6 +2306,17 @@
     global "^4.3.2"
     telejson "^3.2.0"
 
+"@storybook/channel-postmessage@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.17.tgz#807b6316cd0e52d9f27363d5092ad1cd896b694c"
+  integrity sha512-1aSQNeO2+roPRgMFjW3AWTO3uS93lbCMUTYCBdi20md4bQ9SutJy33rynCQcWuMj1prCQ2Ekz4BGhdcIQVKlzg==
+  dependencies:
+    "@storybook/channels" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.2.0"
+
 "@storybook/channels@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
@@ -2350,6 +2361,29 @@
     ts-dedent "^1.1.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.17.tgz#fc1d247caf267ebcc6ddf957fca7e02ae752d99e"
+  integrity sha512-oe55FPTGVL2k+j45eCN3oE7ePkE4VpgUQ/dhJbjU0R2L+HyRyBhd0wnMYj1f5E8uVNbtjFYAtbjjgcf1R1imeg==
+  dependencies:
+    "@storybook/addons" "5.3.17"
+    "@storybook/channel-postmessage" "5.3.17"
+    "@storybook/channels" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/csf" "0.0.1"
+    "@types/webpack-env" "^1.15.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    ts-dedent "^1.1.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"

From 40b8e25753e7f0182c486f35598f642383a8aac8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 11:57:18 +0000
Subject: [PATCH 059/106] build(deps): [security] bump acorn from 5.7.3 to
 5.7.4 in /webapp

Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/yarn.lock | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 8605038bd..6b7cf3661 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3453,16 +3453,11 @@ acorn-walk@^6.0.1, acorn-walk@^6.1.1:
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
 acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.7:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
-
-acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"
   integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==

From 512ef672bfbc4d72ed152485667519bbe4373320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 16 Mar 2020 15:32:19 +0100
Subject: [PATCH 060/106] feat: Introduce graphql image type (#3043)

* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
---
 CHANGELOG.md                                  |  27 -
 backend/package.json                          |   8 +-
 backend/src/activitypub/ActivityPub.js        |   2 +-
 backend/src/db/factories.js                   |  42 +-
 ...42-refactor_all_images_to_separate_type.js | 101 +++
 ...213230248-add_unique_index_to_image_url.js |  53 ++
 backend/src/db/seed.js                        | 101 +--
 backend/src/jwt/decode.js                     |   4 +-
 backend/src/jwt/decode.spec.js                |   8 +-
 .../softDelete/softDeleteMiddleware.spec.js   |  47 +-
 backend/src/models/Image.js                   |   7 +
 backend/src/models/Post.js                    |   9 +-
 backend/src/models/User.js                    |   8 +-
 backend/src/models/index.js                   |   1 +
 .../src/schema/resolvers/fileUpload/index.js  |  28 -
 .../src/schema/resolvers/fileUpload/spec.js   |  59 --
 backend/src/schema/resolvers/images.js        |   8 +
 backend/src/schema/resolvers/images/images.js | 121 +++
 .../schema/resolvers/images/images.spec.js    | 344 ++++++++
 backend/src/schema/resolvers/posts.js         |  50 +-
 backend/src/schema/resolvers/posts.spec.js    | 781 ++++++++++--------
 backend/src/schema/resolvers/registration.js  |  56 +-
 .../src/schema/resolvers/user_management.js   |   2 +-
 .../schema/resolvers/user_management.spec.js  |  12 +-
 backend/src/schema/resolvers/users.js         |  77 +-
 backend/src/schema/resolvers/users.spec.js    |  51 +-
 .../schema/resolvers/users/location.spec.js   | 107 +--
 .../src/schema/types/type/EmailAddress.gql    |   6 +-
 backend/src/schema/types/type/Image.gql       |  18 +
 backend/src/schema/types/type/Post.gql        |  19 +-
 backend/src/schema/types/type/User.gql        |  13 +-
 backend/yarn.lock                             |  16 +-
 cypress/integration/common/post.js            |   6 +-
 cypress/integration/common/steps.js           |   1 -
 cypress/integration/post/DeleteImage.feature  |   2 +-
 package.json                                  |   2 +-
 scripts/translations/sort.sh                  |  12 +-
 webapp/components/Badges.spec.js              |  29 +-
 .../CommentCard/CommentCard.story.js          |   6 +-
 .../ContributionForm/ContributionForm.spec.js |  28 +-
 .../ContributionForm/ContributionForm.vue     |  40 +-
 .../components/PostTeaser/PostTeaser.story.js |   6 +-
 webapp/components/PostTeaser/PostTeaser.vue   |   6 +-
 webapp/components/Upload/index.vue            |  12 +-
 webapp/components/Upload/spec.js              |   4 +-
 .../components/UserTeaser/UserTeaser.story.js |  10 +-
 .../generic/UserAvatar/UserAvatar.spec.js     |   8 +-
 .../SearchableInput/SearchableInput.story.js  |  24 +-
 webapp/graphql/CommentMutations.js            |  12 +-
 webapp/graphql/CommentQuery.js                |   4 +-
 webapp/graphql/Fragments.js                   |  12 +-
 webapp/graphql/PostMutations.js               |  28 +-
 webapp/graphql/User.js                        |  12 +-
 webapp/graphql/settings/BlockedUsers.js       |   4 +-
 webapp/graphql/settings/MutedUsers.js         |   4 +-
 webapp/package.json                           |  14 +-
 webapp/pages/index.vue                        |   2 +-
 webapp/pages/post/_id/_slug/index.vue         |   5 +-
 webapp/pages/profile/_id/_slug.vue            |   2 +-
 webapp/pages/settings/blocked-users.spec.js   |   2 +-
 webapp/pages/settings/muted-users.spec.js     |   2 +-
 webapp/plugins/vue-filters.js                 |   3 +-
 webapp/store/auth.test.js                     |   8 +-
 webapp/yarn.lock                              |  12 +-
 64 files changed, 1572 insertions(+), 936 deletions(-)
 create mode 100644 backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js
 create mode 100644 backend/src/db/migrations/20200213230248-add_unique_index_to_image_url.js
 create mode 100644 backend/src/models/Image.js
 delete mode 100644 backend/src/schema/resolvers/fileUpload/index.js
 delete mode 100644 backend/src/schema/resolvers/fileUpload/spec.js
 create mode 100644 backend/src/schema/resolvers/images.js
 create mode 100644 backend/src/schema/resolvers/images/images.js
 create mode 100644 backend/src/schema/resolvers/images/images.spec.js
 create mode 100644 backend/src/schema/types/type/Image.gql

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf2da9c3..22efb08dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,33 +4,6 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v0.4.2](https://github.com/Human-Connection/Human-Connection/compare/v0.4.1...v0.4.2)
-
-> 12 March 2020
-
-- build(deps): bump @sentry/node from 5.13.1 to 5.14.0 in /backend [`#3260`](https://github.com/Human-Connection/Human-Connection/pull/3260)
-- build(deps): bump graphql-shield from 7.0.14 to 7.1.0 in /backend [`#3259`](https://github.com/Human-Connection/Human-Connection/pull/3259)
-- feat: more prominent output of ./scripts/translations/sort.sh and hint to --fix feature of the script on errors [`#3251`](https://github.com/Human-Connection/Human-Connection/pull/3251)
-- build(deps): bump nodemailer from 6.4.4 to 6.4.5 in /backend [`#3254`](https://github.com/Human-Connection/Human-Connection/pull/3254)
-- build(deps-dev): bump @vue/test-utils from 1.0.0-beta.31 to 1.0.0-beta.32 in /webapp [`#3248`](https://github.com/Human-Connection/Human-Connection/pull/3248)
-- build(deps-dev): bump async-validator from 3.2.3 to 3.2.4 in /webapp [`#3255`](https://github.com/Human-Connection/Human-Connection/pull/3255)
-- build(deps-dev): bump eslint-plugin-jest from 23.8.1 to 23.8.2 in /backend [`#3253`](https://github.com/Human-Connection/Human-Connection/pull/3253)
-- feature: Delete_user_as_admin_through_API_only [`#3063`](https://github.com/Human-Connection/Human-Connection/pull/3063)
-- feat: zero bell to all notifications page [2823] [`#3219`](https://github.com/Human-Connection/Human-Connection/pull/3219)
-- fix: layout shift [2607] [`#3218`](https://github.com/Human-Connection/Human-Connection/pull/3218)
-- feat: Documentation for locales script [`#3242`](https://github.com/Human-Connection/Human-Connection/pull/3242)
-- build(deps): bump metascraper-audio from 5.11.1 to 5.11.6 in /backend [`#3235`](https://github.com/Human-Connection/Human-Connection/pull/3235)
-- build(deps): bump metascraper-video from 5.11.1 to 5.11.6 in /backend [`#3247`](https://github.com/Human-Connection/Human-Connection/pull/3247)
-- build(deps): bump metascraper-soundcloud from 5.11.5 to 5.11.6 in /backend [`#3246`](https://github.com/Human-Connection/Human-Connection/pull/3246)
-- build(deps): bump metascraper-lang from 5.11.1 to 5.11.6 in /backend [`#3234`](https://github.com/Human-Connection/Human-Connection/pull/3234)
-- build(deps): bump metascraper-description from 5.11.1 to 5.11.6 in /backend [`#3233`](https://github.com/Human-Connection/Human-Connection/pull/3233)
-- build(deps): bump cross-env from 7.0.1 to 7.0.2 in /backend [`#3245`](https://github.com/Human-Connection/Human-Connection/pull/3245)
-- build(deps): bump metascraper-title from 5.11.1 to 5.11.6 in /backend [`#3244`](https://github.com/Human-Connection/Human-Connection/pull/3244)
-- chore: Update to v0.4.1 [`#3243`](https://github.com/Human-Connection/Human-Connection/pull/3243)
-- DRY user.spec.js [`da16590`](https://github.com/Human-Connection/Human-Connection/commit/da165906e2ed12baddd902b43064103ab3adfa06)
-- test deleteuser as admin, moderator, another user and as I myself, fix lint [`3983612`](https://github.com/Human-Connection/Human-Connection/commit/3983612c56ac92473a192a318959e4c691a3e7b8)
-- feature: test delete user as admin [`84c1547`](https://github.com/Human-Connection/Human-Connection/commit/84c154798efac0cec4c13dfefae18a6a9542058a)
-
 #### [v0.4.1](https://github.com/Human-Connection/Human-Connection/compare/v0.4.0...v0.4.1)
 
 > 9 March 2020
diff --git a/backend/package.json b/backend/package.json
index 95df11845..13d5161d5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-backend",
-  "version": "0.4.2",
+  "version": "0.4.1",
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.2.1",
-    "graphql-shield": "~7.2.0",
+    "graphql-shield": "~7.0.14",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.3",
     "ioredis": "^4.16.0",
@@ -92,11 +92,11 @@
     "neo4j-graphql-js": "^2.11.5",
     "neode": "^0.3.7",
     "node-fetch": "~2.6.0",
-    "nodemailer": "^6.4.5",
+    "nodemailer": "^6.4.4",
     "nodemailer-html-to-text": "^3.1.0",
     "npm-run-all": "~4.1.5",
     "request": "~2.88.2",
-    "sanitize-html": "~1.22.1",
+    "sanitize-html": "~1.22.0",
     "slug": "~2.1.1",
     "subscriptions-transport-ws": "^0.9.16",
     "trunc-html": "~1.1.2",
diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js
index 1794c2d3b..c4ad7f4b3 100644
--- a/backend/src/activitypub/ActivityPub.js
+++ b/backend/src/activitypub/ActivityPub.js
@@ -7,7 +7,7 @@ import request from 'request'
 import NitroDataSource from './NitroDataSource'
 import router from './routes'
 import Collections from './Collections'
-import uuid from 'uuid/v4'
+import { v4 as uuid } from 'uuid'
 import CONFIG from '../config'
 const debug = require('debug')('ea')
 
diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index 159a71a62..010ef67ad 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -4,9 +4,16 @@ import slugify from 'slug'
 import { hashSync } from 'bcryptjs'
 import { Factory } from 'rosie'
 import { getDriver, getNeode } from './neo4j'
+import CONFIG from '../config/index.js'
 
 const neode = getNeode()
 
+const uniqueImageUrl = imageUrl => {
+  const newUrl = new URL(imageUrl, CONFIG.CLIENT_URI)
+  newUrl.search = `random=${uuid()}`
+  return newUrl.toString()
+}
+
 export const cleanDatabase = async (options = {}) => {
   const { driver = getDriver() } = options
   const session = driver.session()
@@ -39,14 +46,23 @@ Factory.define('badge')
     return neode.create('Badge', buildObject)
   })
 
-Factory.define('userWithoutEmailAddress')
+Factory.define('image')
+  .attr('url', faker.image.unsplash.imageUrl)
+  .attr('aspectRatio', 1)
+  .attr('alt', faker.lorem.sentence)
+  .after((buildObject, options) => {
+    const { url: imageUrl } = buildObject
+    if (imageUrl) buildObject.url = uniqueImageUrl(imageUrl)
+    return neode.create('Image', buildObject)
+  })
+
+Factory.define('basicUser')
   .option('password', '1234')
   .attrs({
     id: uuid,
     name: faker.name.findName,
     password: '1234',
     role: 'user',
-    avatar: faker.internet.avatar,
     about: faker.lorem.paragraph,
     termsAndConditionsAgreedVersion: '0.0.1',
     termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
@@ -60,19 +76,29 @@ Factory.define('userWithoutEmailAddress')
   .attr('encryptedPassword', ['password'], password => {
     return hashSync(password, 10)
   })
+
+Factory.define('userWithoutEmailAddress')
+  .extend('basicUser')
   .after(async (buildObject, options) => {
     return neode.create('User', buildObject)
   })
 
 Factory.define('user')
-  .extend('userWithoutEmailAddress')
+  .extend('basicUser')
   .option('email', faker.internet.exampleEmail)
+  .option('avatar', () =>
+    Factory.build('image', {
+      url: faker.internet.avatar(),
+    }),
+  )
   .after(async (buildObject, options) => {
-    const [user, email] = await Promise.all([
-      buildObject,
+    const [user, email, avatar] = await Promise.all([
+      neode.create('User', buildObject),
       neode.create('EmailAddress', { email: options.email }),
+      options.avatar,
     ])
     await Promise.all([user.relateTo(email, 'primaryEmail'), email.relateTo(user, 'belongsTo')])
+    if (avatar) await user.relateTo(avatar, 'avatar')
     return user
   })
 
@@ -93,11 +119,11 @@ Factory.define('post')
     return Factory.build('user')
   })
   .option('pinnedBy', null)
+  .option('image', () => Factory.build('image'))
   .attrs({
     id: uuid,
     title: faker.lorem.sentence,
     content: faker.lorem.paragraphs,
-    image: faker.image.unsplash.imageUrl,
     visibility: 'public',
     deleted: false,
     imageBlurred: false,
@@ -117,9 +143,10 @@ Factory.define('post')
     return language || 'en'
   })
   .after(async (buildObject, options) => {
-    const [post, author, categories, tags] = await Promise.all([
+    const [post, author, image, categories, tags] = await Promise.all([
       neode.create('Post', buildObject),
       options.author,
+      options.image,
       options.categories,
       options.tags,
     ])
@@ -128,6 +155,7 @@ Factory.define('post')
       Promise.all(categories.map(c => c.relateTo(post, 'post'))),
       Promise.all(tags.map(t => t.relateTo(post, 'post'))),
     ])
+    if (image) await post.relateTo(image, 'image')
     if (buildObject.pinned) {
       const pinnedBy = await (options.pinnedBy || Factory.build('user', { role: 'admin' }))
       await pinnedBy.relateTo(post, 'pinned')
diff --git a/backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js b/backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js
new file mode 100644
index 000000000..634a0552e
--- /dev/null
+++ b/backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js
@@ -0,0 +1,101 @@
+/* eslint-disable no-console */
+import { getDriver } from '../../db/neo4j'
+
+export const description = `
+  Refactor all our image properties on posts and users to a dedicated type
+  "Image" which contains metadata and image file urls.
+`
+
+const printSummaries = summaries => {
+  console.log('=========================================')
+  summaries.forEach(stat => {
+    console.log(stat.query.text)
+    console.log(JSON.stringify(stat.counters, null, 2))
+  })
+  console.log('=========================================')
+}
+
+export async function up() {
+  const driver = getDriver()
+  const session = driver.session()
+  const writeTxResultPromise = session.writeTransaction(async txc => {
+    const runs = await Promise.all(
+      [
+        `
+      MATCH (post:Post)
+      WHERE post.image IS NOT NULL
+      CREATE (post)-[:HERO_IMAGE]->(image:Image)
+      SET
+        image.url         = post.image,
+        image.sensitive   = post.imageBlurred,
+        image.aspectRatio = post.imageAspectRatio
+      REMOVE
+        post.image,
+        post.imageBlurred,
+        post.imageAspectRatio
+    `,
+        `
+      MATCH (user:User)
+      WHERE user.avatar IS NOT NULL
+      CREATE (user)-[:AVATAR_IMAGE]->(avatar:Image)
+      SET avatar.url = user.avatar
+      REMOVE user.avatar
+    `,
+        `
+      MATCH (user:User)
+      WHERE user.coverImg IS NOT NULL
+      CREATE (user)-[:COVER_IMAGE]->(coverImage:Image)
+      SET coverImage.url = user.coverImg
+      REMOVE user.coverImg
+    `,
+      ].map(s => txc.run(s)),
+    )
+    return runs.map(({ summary }) => summary)
+  })
+
+  try {
+    const stats = await writeTxResultPromise
+    console.log('Created image nodes from all user avatars and post images.')
+    printSummaries(stats)
+  } finally {
+    session.close()
+  }
+}
+
+export async function down() {
+  const driver = getDriver()
+  const session = driver.session()
+  const writeTxResultPromise = session.writeTransaction(async txc => {
+    const runs = await Promise.all(
+      [
+        `
+      MATCH (post)-[:HERO_IMAGE]->(image:Image)
+      SET
+        post.image            = image.url,
+        post.imageBlurred     = image.sensitive,
+        post.imageAspectRatio = image.aspectRatio
+      DETACH DELETE image
+    `,
+        `
+      MATCH(user)-[:AVATAR_IMAGE]->(avatar:Image)
+      SET user.avatar = avatar.url
+      DETACH DELETE avatar
+    `,
+        `
+      MATCH(user)-[:COVER_IMAGE]->(coverImage:Image)
+      SET user.coverImg = coverImage.url
+      DETACH DELETE coverImage
+    `,
+      ].map(s => txc.run(s)),
+    )
+    return runs.map(({ summary }) => summary)
+  })
+
+  try {
+    const stats = await writeTxResultPromise
+    console.log('UNDO: Split images from users and posts.')
+    printSummaries(stats)
+  } finally {
+    session.close()
+  }
+}
diff --git a/backend/src/db/migrations/20200213230248-add_unique_index_to_image_url.js b/backend/src/db/migrations/20200213230248-add_unique_index_to_image_url.js
new file mode 100644
index 000000000..60d67432f
--- /dev/null
+++ b/backend/src/db/migrations/20200213230248-add_unique_index_to_image_url.js
@@ -0,0 +1,53 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description = `
+  We introduced a new node label 'Image' and we need a primary key for it. Best
+  would probably be the 'url' property which should be unique and would also
+  prevent us from overwriting existing images.
+`
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(`
+      CREATE CONSTRAINT ON ( image:Image ) ASSERT image.url IS UNIQUE
+    `)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(`
+    DROP CONSTRAINT ON ( image:Image ) ASSERT image.url IS UNIQUE
+    `)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}
diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index d1e430629..953f80b55 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -389,13 +389,15 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         {
           id: 'p0',
           language: sample(languages),
-          image: faker.image.unsplash.food(300, 169),
-          imageBlurred: true,
-          imageAspectRatio: 300 / 169,
         },
         {
           categoryIds: ['cat16'],
           author: peterLustig,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.food(300, 169),
+            sensitive: true,
+            aspectRatio: 300 / 169,
+          }),
         },
       ),
       Factory.build(
@@ -403,12 +405,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         {
           id: 'p1',
           language: sample(languages),
-          image: faker.image.unsplash.technology(300, 1500),
-          imageAspectRatio: 300 / 1500,
         },
         {
           categoryIds: ['cat1'],
           author: bobDerBaumeister,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.technology(300, 1500),
+            aspectRatio: 300 / 1500,
+          }),
         },
       ),
       Factory.build(
@@ -449,12 +453,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         {
           id: 'p6',
           language: sample(languages),
-          image: faker.image.unsplash.buildings(300, 857),
-          imageAspectRatio: 300 / 857,
         },
         {
           categoryIds: ['cat6'],
           author: peterLustig,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.buildings(300, 857),
+            aspectRatio: 300 / 857,
+          }),
         },
       ),
       Factory.build(
@@ -472,11 +478,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         'post',
         {
           id: 'p10',
-          imageBlurred: true,
         },
         {
           categoryIds: ['cat10'],
           author: dewey,
+          image: Factory.build('image', {
+            sensitive: true,
+          }),
         },
       ),
       Factory.build(
@@ -484,12 +492,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         {
           id: 'p11',
           language: sample(languages),
-          image: faker.image.unsplash.people(300, 901),
-          imageAspectRatio: 300 / 901,
         },
         {
           categoryIds: ['cat11'],
           author: louie,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.people(300, 901),
+            aspectRatio: 300 / 901,
+          }),
         },
       ),
       Factory.build(
@@ -508,12 +518,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         {
           id: 'p14',
           language: sample(languages),
-          image: faker.image.unsplash.objects(300, 200),
-          imageAspectRatio: 300 / 450,
         },
         {
           categoryIds: ['cat14'],
           author: jennyRostock,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.objects(300, 200),
+            aspectRatio: 300 / 450,
+          }),
         },
       ),
       Factory.build(
@@ -539,22 +551,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const hashtagAndMention1 =
       'The new physics of <a class="hashtag" data-hashtag-id="QuantenFlussTheorie" href="/?hashtag=QuantenFlussTheorie">#QuantenFlussTheorie</a> can explain <a class="hashtag" data-hashtag-id="QuantumGravity" href="/?hashtag=QuantumGravity">#QuantumGravity</a>! <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> got that already. ;-)'
     const createPostMutation = gql`
-      mutation(
-        $id: ID
-        $title: String!
-        $content: String!
-        $categoryIds: [ID]
-        $imageBlurred: Boolean
-        $imageAspectRatio: Float
-      ) {
-        CreatePost(
-          id: $id
-          title: $title
-          content: $content
-          categoryIds: $categoryIds
-          imageBlurred: $imageBlurred
-          imageAspectRatio: $imageAspectRatio
-        ) {
+      mutation($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) {
+        CreatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) {
           id
         }
       }
@@ -568,7 +566,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           title: `Nature Philosophy Yoga`,
           content: hashtag1,
           categoryIds: ['cat2'],
-          imageAspectRatio: 300 / 200,
         },
       }),
       mutate({
@@ -578,7 +575,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           title: 'This is post #7',
           content: `${mention1} ${faker.lorem.paragraph()}`,
           categoryIds: ['cat7'],
-          imageAspectRatio: 300 / 180,
         },
       }),
       mutate({
@@ -589,7 +585,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           title: `Quantum Flow Theory explains Quantum Gravity`,
           content: hashtagAndMention1,
           categoryIds: ['cat8'],
-          imageAspectRatio: 300 / 900,
         },
       }),
       mutate({
@@ -599,7 +594,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           title: 'This is post #12',
           content: `${mention2} ${faker.lorem.paragraph()}`,
           categoryIds: ['cat12'],
-          imageAspectRatio: 300 / 200,
         },
       }),
     ])
@@ -759,6 +753,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         },
       ),
     ])
+
     const trollingComment = comments[0]
 
     await Promise.all([
@@ -939,12 +934,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(30).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.objects(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: jennyRostock,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.objects(),
+            }),
           },
         ),
       ),
@@ -993,12 +989,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(21).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.buildings(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: peterLustig,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.buildings(),
+            }),
           },
         ),
       ),
@@ -1047,12 +1044,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(11).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.food(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: dewey,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.food(),
+            }),
           },
         ),
       ),
@@ -1101,12 +1099,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(16).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.technology(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: louie,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.technology(),
+            }),
           },
         ),
       ),
@@ -1155,12 +1154,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(45).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.people(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: bobDerBaumeister,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.people(),
+            }),
           },
         ),
       ),
@@ -1209,12 +1209,13 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(8).keys()].map(() =>
         Factory.build(
           'post',
-          {
-            image: faker.image.unsplash.nature(),
-          },
+          {},
           {
             categoryIds: ['cat1'],
             author: huey,
+            image: Factory.build('image', {
+              url: faker.image.unsplash.nature(),
+            }),
           },
         ),
       ),
diff --git a/backend/src/jwt/decode.js b/backend/src/jwt/decode.js
index 5433a8c76..8dbcb080d 100644
--- a/backend/src/jwt/decode.js
+++ b/backend/src/jwt/decode.js
@@ -15,10 +15,10 @@ export default async (driver, authorizationHeader) => {
 
   const writeTxResultPromise = session.writeTransaction(async transaction => {
     const updateUserLastActiveTransactionResponse = await transaction.run(
-      ` 
+      `
         MATCH (user:User {id: $id, deleted: false, disabled: false })
         SET user.lastActiveAt = toString(datetime())
-        RETURN user {.id, .slug, .name, .avatar, .email, .role, .disabled, .actorId}
+        RETURN user {.id, .slug, .name, .role, .disabled, .actorId}
         LIMIT 1
       `,
       { id },
diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js
index aa8ff0674..80dfe9733 100644
--- a/backend/src/jwt/decode.spec.js
+++ b/backend/src/jwt/decode.spec.js
@@ -69,23 +69,23 @@ describe('decode', () => {
           {
             role: 'user',
             name: 'Jenny Rostock',
-            avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/sasha_shestakov/128.jpg',
             id: 'u3',
             slug: 'jenny-rostock',
           },
           {
+            image: Factory.build('image', {
+              url: 'https://s3.amazonaws.com/uifaces/faces/twitter/sasha_shestakov/128.jpg',
+            }),
             email: 'user@example.org',
           },
         )
       })
 
-      it('returns user object except email', async () => {
+      it('returns user object without email', async () => {
         await expect(decode(driver, authorizationHeader)).resolves.toMatchObject({
           role: 'user',
           name: 'Jenny Rostock',
-          avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/sasha_shestakov/128.jpg',
           id: 'u3',
-          email: null,
           slug: 'jenny-rostock',
         })
       })
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index de5626d14..63569ddb0 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -28,14 +28,21 @@ beforeAll(async () => {
         password: '1234',
       },
     ),
-    Factory.build('user', {
-      id: 'u2',
-      role: 'user',
-      name: 'Offensive Name',
-      slug: 'offensive-name',
-      avatar: '/some/offensive/avatar.jpg',
-      about: 'This self description is very offensive',
-    }),
+    Factory.build(
+      'user',
+      {
+        id: 'u2',
+        role: 'user',
+        name: 'Offensive Name',
+        slug: 'offensive-name',
+        about: 'This self description is very offensive',
+      },
+      {
+        avatar: Factory.build('image', {
+          url: '/some/offensive/avatar.jpg',
+        }),
+      },
+    ),
     neode.create('Category', {
       id: 'cat9',
       name: 'Democracy & Politics',
@@ -96,10 +103,12 @@ beforeAll(async () => {
         title: 'Disabled post',
         content: 'This is an offensive post content',
         contentExcerpt: 'This is an offensive post content',
-        image: '/some/offensive/image.jpg',
         deleted: false,
       },
       {
+        image: Factory.build('image', {
+          url: '/some/offensive/image.jpg',
+        }),
         author: troll,
         categoryIds,
       },
@@ -213,7 +222,9 @@ describe('softDeleteMiddleware', () => {
               name
               slug
               about
-              avatar
+              avatar {
+                url
+              }
             }
           }
         }
@@ -229,7 +240,9 @@ describe('softDeleteMiddleware', () => {
               contributions {
                 title
                 slug
-                image
+                image {
+                  url
+                }
                 content
                 contentExcerpt
               }
@@ -253,7 +266,10 @@ describe('softDeleteMiddleware', () => {
         it('displays slug', () => expect(subject.slug).toEqual('offensive-name'))
         it('displays about', () =>
           expect(subject.about).toEqual('This self description is very offensive'))
-        it('displays avatar', () => expect(subject.avatar).toEqual('/some/offensive/avatar.jpg'))
+        it('displays avatar', () =>
+          expect(subject.avatar).toEqual({
+            url: expect.stringContaining('/some/offensive/avatar.jpg'),
+          }))
       })
 
       describe('Post', () => {
@@ -265,7 +281,10 @@ describe('softDeleteMiddleware', () => {
           expect(subject.content).toEqual('This is an offensive post content'))
         it('displays contentExcerpt', () =>
           expect(subject.contentExcerpt).toEqual('This is an offensive post content'))
-        it('displays image', () => expect(subject.image).toEqual('/some/offensive/image.jpg'))
+        it('displays image', () =>
+          expect(subject.image).toEqual({
+            url: expect.stringContaining('/some/offensive/image.jpg'),
+          }))
       })
 
       describe('Comment', () => {
@@ -288,7 +307,7 @@ describe('softDeleteMiddleware', () => {
         it('obfuscates name', () => expect(subject.name).toEqual('UNAVAILABLE'))
         it('obfuscates slug', () => expect(subject.slug).toEqual('UNAVAILABLE'))
         it('obfuscates about', () => expect(subject.about).toEqual('UNAVAILABLE'))
-        it('obfuscates avatar', () => expect(subject.avatar).toEqual('UNAVAILABLE'))
+        it('obfuscates avatar', () => expect(subject.avatar).toEqual(null))
       })
 
       describe('Post', () => {
diff --git a/backend/src/models/Image.js b/backend/src/models/Image.js
new file mode 100644
index 000000000..19824b493
--- /dev/null
+++ b/backend/src/models/Image.js
@@ -0,0 +1,7 @@
+export default {
+  url: { primary: true, type: 'string', uri: { allowRelative: true } },
+  alt: { type: 'string' },
+  sensitive: { type: 'boolean', default: false },
+  aspectRatio: { type: 'float', default: 1.0 },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+}
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index 15eedbf64..43f63ebd3 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -4,6 +4,12 @@ export default {
   id: { type: 'string', primary: true, default: uuid },
   activityId: { type: 'string', allow: [null] },
   objectId: { type: 'string', allow: [null] },
+  image: {
+    type: 'relationship',
+    relationship: 'HERO_IMAGE',
+    target: 'Image',
+    direction: 'out',
+  },
   author: {
     type: 'relationship',
     relationship: 'WROTE',
@@ -14,7 +20,6 @@ export default {
   slug: { type: 'string', allow: [null], unique: 'true' },
   content: { type: 'string', disallow: [null], min: 3 },
   contentExcerpt: { type: 'string', allow: [null] },
-  image: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
   notified: {
@@ -39,8 +44,6 @@ export default {
     default: () => new Date().toISOString(),
   },
   language: { type: 'string', allow: [null] },
-  imageBlurred: { type: 'boolean', default: false },
-  imageAspectRatio: { type: 'float', default: 1.0 },
   comments: {
     type: 'relationship',
     relationship: 'COMMENTS',
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index d79fb79b9..ae7e1ae8c 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -6,8 +6,12 @@ export default {
   name: { type: 'string', disallow: [null], min: 3 },
   slug: { type: 'string', unique: 'true', regex: /^[a-z0-9_-]+$/, lowercase: true },
   encryptedPassword: 'string',
-  avatar: { type: 'string', allow: [null] },
-  coverImg: { type: 'string', allow: [null] },
+  avatar: {
+    type: 'relationship',
+    relationship: 'AVATAR_IMAGE',
+    target: 'Image',
+    direction: 'out',
+  },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
   role: { type: 'string', default: 'user' },
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index dbb6a927e..c53ef89ab 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -1,6 +1,7 @@
 // NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
 // module that is not browser-compatible. Node's `fs` module is server-side only
 export default {
+  Image: require('./Image.js').default,
   Badge: require('./Badge.js').default,
   User: require('./User.js').default,
   EmailAddress: require('./EmailAddress.js').default,
diff --git a/backend/src/schema/resolvers/fileUpload/index.js b/backend/src/schema/resolvers/fileUpload/index.js
deleted file mode 100644
index 3c41a5d11..000000000
--- a/backend/src/schema/resolvers/fileUpload/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { createWriteStream } from 'fs'
-import path from 'path'
-import slug from 'slug'
-import { v4 as uuid } from 'uuid'
-
-const localFileUpload = async ({ createReadStream, uniqueFilename }) => {
-  await new Promise((resolve, reject) =>
-    createReadStream()
-      .pipe(createWriteStream(`public${uniqueFilename}`))
-      .on('finish', resolve)
-      .on('error', reject),
-  )
-  return uniqueFilename
-}
-
-export default async function fileUpload(params, { file, url }, uploadCallback = localFileUpload) {
-  const upload = params[file]
-  if (upload) {
-    const { createReadStream, filename } = await upload
-    const { name, ext } = path.parse(filename)
-    const uniqueFilename = `/uploads/${uuid()}-${slug(name)}${ext}`
-    const location = await uploadCallback({ createReadStream, uniqueFilename })
-    delete params[file]
-    params[url] = location
-  }
-
-  return params
-}
diff --git a/backend/src/schema/resolvers/fileUpload/spec.js b/backend/src/schema/resolvers/fileUpload/spec.js
deleted file mode 100644
index fee0bf81b..000000000
--- a/backend/src/schema/resolvers/fileUpload/spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import fileUpload from '.'
-
-const uuid = '[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}'
-
-describe('fileUpload', () => {
-  let params
-  let uploadCallback
-
-  beforeEach(() => {
-    params = {
-      uploadAttribute: {
-        filename: 'avatar.jpg',
-        mimetype: 'image/jpeg',
-        encoding: '7bit',
-        createReadStream: jest.fn(),
-      },
-    }
-    uploadCallback = jest.fn(({ uniqueFilename }) => uniqueFilename)
-  })
-
-  it('calls uploadCallback', async () => {
-    await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-    expect(uploadCallback).toHaveBeenCalled()
-  })
-
-  describe('file name', () => {
-    it('saves the upload url in params[url]', async () => {
-      await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-      expect(params.attribute).toMatch(new RegExp(`^/uploads/${uuid}-avatar.jpg`))
-    })
-
-    it('creates a url safe name', async () => {
-      params.uploadAttribute.filename = '/path/to/awkward?/ file-location/?foo- bar-avatar.jpg'
-      await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback)
-      expect(params.attribute).toMatch(new RegExp(`/uploads/${uuid}-foo-bar-avatar.jpg$`))
-    })
-
-    describe('in case of duplicates', () => {
-      it('creates unique names to avoid overwriting existing files', async () => {
-        const { attribute: first } = await fileUpload(
-          {
-            ...params,
-          },
-          { file: 'uploadAttribute', url: 'attribute' },
-          uploadCallback,
-        )
-
-        const { attribute: second } = await fileUpload(
-          {
-            ...params,
-          },
-          { file: 'uploadAttribute', url: 'attribute' },
-          uploadCallback,
-        )
-        expect(first).not.toEqual(second)
-      })
-    })
-  })
-})
diff --git a/backend/src/schema/resolvers/images.js b/backend/src/schema/resolvers/images.js
new file mode 100644
index 000000000..8b3f4a3e8
--- /dev/null
+++ b/backend/src/schema/resolvers/images.js
@@ -0,0 +1,8 @@
+import Resolver from './helpers/Resolver'
+export default {
+  Image: {
+    ...Resolver('Image', {
+      undefinedToNull: ['sensitive', 'alt', 'aspectRatio'],
+    }),
+  },
+}
diff --git a/backend/src/schema/resolvers/images/images.js b/backend/src/schema/resolvers/images/images.js
new file mode 100644
index 000000000..51bd16d7d
--- /dev/null
+++ b/backend/src/schema/resolvers/images/images.js
@@ -0,0 +1,121 @@
+import path from 'path'
+import { v4 as uuid } from 'uuid'
+import slug from 'slug'
+import { existsSync, unlinkSync, createWriteStream } from 'fs'
+import { getDriver } from '../../../db/neo4j'
+import { UserInputError } from 'apollo-server'
+
+// const widths = [34, 160, 320, 640, 1024]
+
+export async function deleteImage(resource, relationshipType, opts = {}) {
+  sanitizeRelationshipType(relationshipType)
+  const { transaction, deleteCallback } = opts
+  if (!transaction) return wrapTransaction(deleteImage, [resource, relationshipType], opts)
+  const txResult = await transaction.run(
+    `
+    MATCH (resource {id: $resource.id})-[rel:${relationshipType}]->(image:Image)
+    WITH image, image {.*} as imageProps
+    DETACH DELETE image
+    RETURN imageProps
+  `,
+    { resource },
+  )
+  const [image] = txResult.records.map(record => record.get('imageProps'))
+  // This behaviour differs from `mergeImage`. If you call `mergeImage`
+  // with metadata for an image that does not exist, it's an indicator
+  // of an error (so throw an error). If we bulk delete an image, it
+  // could very well be that there is no image for the resource.
+  if (image) deleteImageFile(image, deleteCallback)
+  return image
+}
+
+export async function mergeImage(resource, relationshipType, imageInput, opts = {}) {
+  if (typeof imageInput === 'undefined') return
+  if (imageInput === null) return deleteImage(resource, relationshipType, opts)
+  sanitizeRelationshipType(relationshipType)
+  const { transaction, uploadCallback, deleteCallback } = opts
+  if (!transaction)
+    return wrapTransaction(mergeImage, [resource, relationshipType, imageInput], opts)
+
+  let txResult
+  txResult = await transaction.run(
+    `
+    MATCH (resource {id: $resource.id})-[:${relationshipType}]->(image:Image)
+    RETURN image {.*}
+    `,
+    { resource },
+  )
+  const [existingImage] = txResult.records.map(record => record.get('image'))
+  const { upload } = imageInput
+  if (!(existingImage || upload)) throw new UserInputError('Cannot find image for given resource')
+  if (existingImage && upload) deleteImageFile(existingImage, deleteCallback)
+  const url = await uploadImageFile(upload, uploadCallback)
+  const { alt, sensitive, aspectRatio } = imageInput
+  const image = { alt, sensitive, aspectRatio, url }
+  txResult = await transaction.run(
+    `
+    MATCH (resource {id: $resource.id})
+    MERGE (resource)-[:${relationshipType}]->(image:Image)
+    ON CREATE SET image.createdAt = toString(datetime())
+    ON MATCH SET image.updatedAt = toString(datetime())
+    SET image += $image
+    RETURN image {.*}
+    `,
+    { resource, image },
+  )
+  const [mergedImage] = txResult.records.map(record => record.get('image'))
+  return mergedImage
+}
+
+const wrapTransaction = async (wrappedCallback, args, opts) => {
+  const session = getDriver().session()
+  try {
+    const result = await session.writeTransaction(async transaction => {
+      return wrappedCallback(...args, { ...opts, transaction })
+    })
+    return result
+  } finally {
+    session.close()
+  }
+}
+
+const deleteImageFile = (image, deleteCallback = localFileDelete) => {
+  const { url } = image
+  deleteCallback(url)
+  return url
+}
+
+const uploadImageFile = async (upload, uploadCallback = localFileUpload) => {
+  if (!upload) return undefined
+  const { createReadStream, filename, mimetype } = await upload
+  const { name, ext } = path.parse(filename)
+  const uniqueFilename = `${uuid()}-${slug(name)}${ext}`
+
+  return uploadCallback({
+    createReadStream,
+    destination: `/uploads/${uniqueFilename}`,
+    mimetype,
+  })
+}
+
+const sanitizeRelationshipType = relationshipType => {
+  // Cypher query language does not allow to parameterize relationship types
+  // See: https://github.com/neo4j/neo4j/issues/340
+  if (!['HERO_IMAGE', 'AVATAR_IMAGE'].includes(relationshipType)) {
+    throw new Error(`Unknown relationship type ${relationshipType}`)
+  }
+}
+
+const localFileUpload = ({ createReadStream, destination }) => {
+  return new Promise((resolve, reject) =>
+    createReadStream()
+      .pipe(createWriteStream(`public${destination}`))
+      .on('finish', () => resolve(destination))
+      .on('error', reject),
+  )
+}
+
+const localFileDelete = async url => {
+  const location = `public${url}`
+  if (existsSync(location)) unlinkSync(location)
+}
diff --git a/backend/src/schema/resolvers/images/images.spec.js b/backend/src/schema/resolvers/images/images.spec.js
new file mode 100644
index 000000000..228394b01
--- /dev/null
+++ b/backend/src/schema/resolvers/images/images.spec.js
@@ -0,0 +1,344 @@
+import { deleteImage, mergeImage } from './images'
+import { getNeode, getDriver } from '../../../db/neo4j'
+import Factory, { cleanDatabase } from '../../../db/factories'
+import { UserInputError } from 'apollo-server'
+
+const driver = getDriver()
+const neode = getNeode()
+const uuid = '[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}'
+let uploadCallback
+let deleteCallback
+
+beforeEach(async () => {
+  await cleanDatabase()
+  uploadCallback = jest.fn(({ destination }) => destination)
+  deleteCallback = jest.fn()
+})
+
+describe('deleteImage', () => {
+  describe('given a resource with an image', () => {
+    let user
+    beforeEach(async () => {
+      user = await Factory.build(
+        'user',
+        {},
+        {
+          avatar: Factory.build('image', {
+            url: '/some/avatar/url/',
+            alt: 'This is the avatar image of a user',
+          }),
+        },
+      )
+      user = await user.toJson()
+    })
+
+    it('soft deletes `Image` node', async () => {
+      await expect(neode.all('Image')).resolves.toHaveLength(1)
+      await deleteImage(user, 'AVATAR_IMAGE', { deleteCallback })
+      await expect(neode.all('Image')).resolves.toHaveLength(0)
+    })
+
+    it('calls deleteCallback', async () => {
+      user = await Factory.build('user')
+      user = await user.toJson()
+      await deleteImage(user, 'AVATAR_IMAGE', { deleteCallback })
+      expect(deleteCallback).toHaveBeenCalled()
+    })
+
+    describe('given a transaction parameter', () => {
+      it('executes cypher statements within the transaction', async () => {
+        const session = driver.session()
+        let someString
+        try {
+          someString = await session.writeTransaction(async transaction => {
+            await deleteImage(user, 'AVATAR_IMAGE', {
+              deleteCallback,
+              transaction,
+            })
+            const txResult = await transaction.run('RETURN "Hello" as result')
+            const [result] = txResult.records.map(record => record.get('result'))
+            return result
+          })
+        } finally {
+          session.close()
+        }
+        await expect(neode.all('Image')).resolves.toHaveLength(0)
+        await expect(someString).toEqual('Hello')
+      })
+
+      it('rolls back the transaction in case of errors', async done => {
+        await expect(neode.all('Image')).resolves.toHaveLength(1)
+        const session = driver.session()
+        try {
+          await session.writeTransaction(async transaction => {
+            await deleteImage(user, 'AVATAR_IMAGE', {
+              deleteCallback,
+              transaction,
+            })
+            throw new Error('Ouch!')
+          })
+        } catch (err) {
+          // nothing has been deleted
+          await expect(neode.all('Image')).resolves.toHaveLength(1)
+          // all good
+          done()
+        } finally {
+          session.close()
+        }
+      })
+    })
+  })
+})
+
+describe('mergeImage', () => {
+  let imageInput
+  let post
+  beforeEach(() => {
+    imageInput = {
+      alt: 'A description of the new image',
+    }
+  })
+
+  describe('on existing resource', () => {
+    beforeEach(async () => {
+      post = await Factory.build(
+        'post',
+        { id: 'p99' },
+        {
+          author: Factory.build('user', {}, { avatar: null }),
+          image: null,
+        },
+      )
+      post = await post.toJson()
+    })
+
+    describe('given image.upload', () => {
+      beforeEach(() => {
+        imageInput = {
+          ...imageInput,
+          upload: {
+            filename: 'image.jpg',
+            mimetype: 'image/jpeg',
+            encoding: '7bit',
+            createReadStream: () => ({
+              pipe: () => ({
+                on: (_, callback) => callback(),
+              }),
+            }),
+          },
+        }
+      })
+
+      it('returns new image', async () => {
+        await expect(
+          mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback }),
+        ).resolves.toMatchObject({
+          url: expect.any(String),
+          alt: 'A description of the new image',
+        })
+      })
+
+      it('calls upload callback', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        expect(uploadCallback).toHaveBeenCalled()
+      })
+
+      it('creates `:Image` node', async () => {
+        await expect(neode.all('Image')).resolves.toHaveLength(0)
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        await expect(neode.all('Image')).resolves.toHaveLength(1)
+      })
+
+      it('creates a url safe name', async () => {
+        imageInput.upload.filename = '/path/to/awkward?/ file-location/?foo- bar-avatar.jpg'
+        await expect(
+          mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback }),
+        ).resolves.toMatchObject({
+          url: expect.stringMatching(new RegExp(`^/uploads/${uuid}-foo-bar-avatar.jpg`)),
+        })
+      })
+
+      it.skip('automatically creates different image sizes', async () => {
+        await expect(
+          mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback }),
+        ).resolves.toEqual({
+          url: expect.any(String),
+          alt: expect.any(String),
+          urlW34: expect.stringMatching(new RegExp(`^/uploads/W34/${uuid}-image.jpg`)),
+          urlW160: expect.stringMatching(new RegExp(`^/uploads/W160/${uuid}-image.jpg`)),
+          urlW320: expect.stringMatching(new RegExp(`^/uploads/W320/${uuid}-image.jpg`)),
+          urlW640: expect.stringMatching(new RegExp(`^/uploads/W640/${uuid}-image.jpg`)),
+          urlW1024: expect.stringMatching(new RegExp(`^/uploads/W1024/${uuid}-image.jpg`)),
+        })
+      })
+
+      it('connects resource with image via given image type', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        const result = await neode.cypher(`
+          MATCH(p:Post {id: "p99"})-[:HERO_IMAGE]->(i:Image) RETURN i,p
+        `)
+        post = neode.hydrateFirst(result, 'p', neode.model('Post'))
+        const image = neode.hydrateFirst(result, 'i', neode.model('Image'))
+        expect(post).toBeTruthy()
+        expect(image).toBeTruthy()
+      })
+
+      it('whitelists relationship types', async () => {
+        await expect(
+          mergeImage(post, 'WHATEVER', imageInput, { uploadCallback, deleteCallback }),
+        ).rejects.toEqual(new Error('Unknown relationship type WHATEVER'))
+      })
+
+      it('sets metadata', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        const image = await neode.first('Image', {})
+        await expect(image.toJson()).resolves.toMatchObject({
+          alt: 'A description of the new image',
+          createdAt: expect.any(String),
+          url: expect.any(String),
+        })
+      })
+
+      describe('given a transaction parameter', () => {
+        it('executes cypher statements within the transaction', async () => {
+          const session = driver.session()
+          try {
+            await session.writeTransaction(async transaction => {
+              const image = await mergeImage(post, 'HERO_IMAGE', imageInput, {
+                uploadCallback,
+                deleteCallback,
+                transaction,
+              })
+              return transaction.run(
+                `
+                MATCH(image:Image {url: $image.url})
+                SET image.alt = 'This alt text gets overwritten'
+                RETURN image {.*}
+              `,
+                { image },
+              )
+            })
+          } finally {
+            session.close()
+          }
+          const image = await neode.first('Image', { alt: 'This alt text gets overwritten' })
+          await expect(image.toJson()).resolves.toMatchObject({
+            alt: 'This alt text gets overwritten',
+          })
+        })
+
+        it('rolls back the transaction in case of errors', async done => {
+          const session = driver.session()
+          try {
+            await session.writeTransaction(async transaction => {
+              const image = await mergeImage(post, 'HERO_IMAGE', imageInput, {
+                uploadCallback,
+                deleteCallback,
+                transaction,
+              })
+              return transaction.run('Ooops invalid cypher!', { image })
+            })
+          } catch (err) {
+            // nothing has been created
+            await expect(neode.all('Image')).resolves.toHaveLength(0)
+            // all good
+            done()
+          } finally {
+            session.close()
+          }
+        })
+      })
+
+      describe('if resource has an image already', () => {
+        beforeEach(async () => {
+          const [post, image] = await Promise.all([
+            neode.find('Post', 'p99'),
+            Factory.build('image'),
+          ])
+          await post.relateTo(image, 'image')
+        })
+
+        it('calls deleteCallback', async () => {
+          await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+          expect(deleteCallback).toHaveBeenCalled()
+        })
+
+        it('calls uploadCallback', async () => {
+          await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+          expect(uploadCallback).toHaveBeenCalled()
+        })
+
+        it('updates metadata of existing image node', async () => {
+          await expect(neode.all('Image')).resolves.toHaveLength(1)
+          await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+          await expect(neode.all('Image')).resolves.toHaveLength(1)
+          const image = await neode.first('Image', {})
+          await expect(image.toJson()).resolves.toMatchObject({
+            alt: 'A description of the new image',
+            createdAt: expect.any(String),
+            url: expect.any(String),
+            // TODO
+            // width:
+            // height:
+          })
+        })
+      })
+    })
+  })
+
+  describe('without image.upload', () => {
+    it('throws UserInputError', async () => {
+      post = await Factory.build('post', { id: 'p99' }, { image: null })
+      post = await post.toJson()
+      await expect(mergeImage(post, 'HERO_IMAGE', imageInput)).rejects.toEqual(
+        new UserInputError('Cannot find image for given resource'),
+      )
+    })
+
+    describe('if resource has an image already', () => {
+      beforeEach(async () => {
+        post = await Factory.build(
+          'post',
+          {
+            id: 'p99',
+          },
+          {
+            author: Factory.build(
+              'user',
+              {},
+              {
+                avatar: null,
+              },
+            ),
+            image: Factory.build('image', {
+              alt: 'This is the previous, not updated image',
+              url: '/some/original/url',
+            }),
+          },
+        )
+        post = await post.toJson()
+      })
+
+      it('does not call deleteCallback', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        expect(deleteCallback).not.toHaveBeenCalled()
+      })
+
+      it('does not call uploadCallback', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput, { uploadCallback, deleteCallback })
+        expect(uploadCallback).not.toHaveBeenCalled()
+      })
+
+      it('updates metadata', async () => {
+        await mergeImage(post, 'HERO_IMAGE', imageInput)
+        const images = await neode.all('Image')
+        expect(images).toHaveLength(1)
+        await expect(images.first().toJson()).resolves.toMatchObject({
+          createdAt: expect.any(String),
+          url: expect.any(String),
+          alt: 'A description of the new image',
+        })
+      })
+    })
+  })
+})
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 1d4c4bfaa..eb265e528 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { isEmpty } from 'lodash'
 import { UserInputError } from 'apollo-server'
-import fileUpload from './fileUpload'
+import { mergeImage, deleteImage } from './images/images'
 import Resolver from './helpers/Resolver'
 import { filterForMutedUsers } from './helpers/filterForMutedUsers'
 
@@ -77,14 +77,16 @@ export default {
   Mutation: {
     CreatePost: async (_parent, params, context, _resolveInfo) => {
       const { categoryIds } = params
+      const { image: imageInput } = params
       delete params.categoryIds
-      params = await fileUpload(params, { file: 'imageUpload', url: 'image' })
+      delete params.image
       params.id = params.id || uuid()
       const session = context.driver.session()
       const writeTxResultPromise = session.writeTransaction(async transaction => {
         const createPostTransactionResponse = await transaction.run(
           `
-            CREATE (post:Post {params})
+            CREATE (post:Post)
+            SET post += $params
             SET post.createdAt = toString(datetime())
             SET post.updatedAt = toString(datetime())
             WITH post
@@ -94,14 +96,18 @@ export default {
             UNWIND $categoryIds AS categoryId
             MATCH (category:Category {id: categoryId})
             MERGE (post)-[:CATEGORIZED]->(category)
-            RETURN post
+            RETURN post {.*}
           `,
           { userId: context.user.id, categoryIds, params },
         )
-        return createPostTransactionResponse.records.map(record => record.get('post').properties)
+        const [post] = createPostTransactionResponse.records.map(record => record.get('post'))
+        if (imageInput) {
+          await mergeImage(post, 'HERO_IMAGE', imageInput, { transaction })
+        }
+        return post
       })
       try {
-        const [post] = await writeTxResultPromise
+        const post = await writeTxResultPromise
         return post
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
@@ -113,8 +119,9 @@ export default {
     },
     UpdatePost: async (_parent, params, context, _resolveInfo) => {
       const { categoryIds } = params
+      const { image: imageInput } = params
       delete params.categoryIds
-      params = await fileUpload(params, { file: 'imageUpload', url: 'image' })
+      delete params.image
       const session = context.driver.session()
       let updatePostCypher = `
                                 MATCH (post:Post {id: $params.id})
@@ -142,7 +149,7 @@ export default {
         `
       }
 
-      updatePostCypher += `RETURN post`
+      updatePostCypher += `RETURN post {.*}`
       const updatePostVariables = { categoryIds, params }
       try {
         const writeTxResultPromise = session.writeTransaction(async transaction => {
@@ -150,9 +157,11 @@ export default {
             updatePostCypher,
             updatePostVariables,
           )
-          return updatePostTransactionResponse.records.map(record => record.get('post').properties)
+          const [post] = updatePostTransactionResponse.records.map(record => record.get('post'))
+          await mergeImage(post, 'HERO_IMAGE', imageInput, { transaction })
+          return post
         })
-        const [post] = await writeTxResultPromise
+        const post = await writeTxResultPromise
         return post
       } finally {
         session.close()
@@ -171,15 +180,16 @@ export default {
             SET post.contentExcerpt = 'UNAVAILABLE'
             SET post.title          = 'UNAVAILABLE'
             SET comment.deleted     = TRUE
-            REMOVE post.image
-            RETURN post
+            RETURN post {.*}
           `,
           { postId: args.id },
         )
-        return deletePostTransactionResponse.records.map(record => record.get('post').properties)
+        const [post] = deletePostTransactionResponse.records.map(record => record.get('post'))
+        await deleteImage(post, 'HERO_IMAGE', { transaction })
+        return post
       })
       try {
-        const [post] = await writeTxResultPromise
+        const post = await writeTxResultPromise
         return post
       } finally {
         session.close()
@@ -311,16 +321,7 @@ export default {
   },
   Post: {
     ...Resolver('Post', {
-      undefinedToNull: [
-        'activityId',
-        'objectId',
-        'image',
-        'language',
-        'pinnedAt',
-        'pinned',
-        'imageBlurred',
-        'imageAspectRatio',
-      ],
+      undefinedToNull: ['activityId', 'objectId', 'language', 'pinnedAt', 'pinned'],
       hasMany: {
         tags: '-[:TAGGED]->(related:Tag)',
         categories: '-[:CATEGORIZED]->(related:Category)',
@@ -331,6 +332,7 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         pinnedBy: '<-[:PINNED]-(related:User)',
+        image: '-[:HERO_IMAGE]->(related:Image)',
       },
       count: {
         commentsCount:
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 88a09843d..b24383fba 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -336,8 +336,14 @@ describe('CreatePost', () => {
 describe('UpdatePost', () => {
   let author, newlyCreatedPost
   const updatePostMutation = gql`
-    mutation($id: ID!, $title: String!, $content: String!, $categoryIds: [ID]) {
-      UpdatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) {
+    mutation($id: ID!, $title: String!, $content: String!, $categoryIds: [ID], $image: ImageInput) {
+      UpdatePost(
+        id: $id
+        title: $title
+        content: $content
+        categoryIds: $categoryIds
+        image: $image
+      ) {
         id
         title
         content
@@ -472,418 +478,471 @@ describe('UpdatePost', () => {
         )
       })
     })
+
+    describe('params.image', () => {
+      describe('is object', () => {
+        beforeEach(() => {
+          variables = { ...variables, image: { sensitive: true } }
+        })
+        it('updates the image', async () => {
+          await expect(neode.first('Image', { sensitive: true })).resolves.toBeFalsy()
+          await mutate({ mutation: updatePostMutation, variables })
+          await expect(neode.first('Image', { sensitive: true })).resolves.toBeTruthy()
+        })
+      })
+
+      describe('is null', () => {
+        beforeEach(() => {
+          variables = { ...variables, image: null }
+        })
+        it('deletes the image', async () => {
+          await expect(neode.all('Image')).resolves.toHaveLength(6)
+          await mutate({ mutation: updatePostMutation, variables })
+          await expect(neode.all('Image')).resolves.toHaveLength(5)
+        })
+      })
+
+      describe('is undefined', () => {
+        beforeEach(() => {
+          delete variables.image
+        })
+        it('keeps the image unchanged', async () => {
+          await expect(neode.first('Image', { sensitive: true })).resolves.toBeFalsy()
+          await mutate({ mutation: updatePostMutation, variables })
+          await expect(neode.first('Image', { sensitive: true })).resolves.toBeFalsy()
+        })
+      })
+    })
+  })
+})
+
+describe('pin posts', () => {
+  let author
+  const pinPostMutation = gql`
+    mutation($id: ID!) {
+      pinPost(id: $id) {
+        id
+        title
+        content
+        author {
+          name
+          slug
+        }
+        pinnedBy {
+          id
+          name
+          role
+        }
+        createdAt
+        updatedAt
+        pinnedAt
+        pinned
+      }
+    }
+  `
+  beforeEach(async () => {
+    author = await Factory.build('user', { slug: 'the-author' })
+    await Factory.build(
+      'post',
+      {
+        id: 'p9876',
+        title: 'Old title',
+        content: 'Old content',
+      },
+      {
+        author,
+        categoryIds,
+      },
+    )
+    variables = {
+      id: 'p9876',
+    }
   })
 
-  describe('pin posts', () => {
-    const pinPostMutation = gql`
-      mutation($id: ID!) {
-        pinPost(id: $id) {
-          id
-          title
-          content
-          author {
-            name
-            slug
-          }
-          pinnedBy {
-            id
-            name
-            role
-          }
-          createdAt
-          updatedAt
-          pinnedAt
-          pinned
-        }
-      }
-    `
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      authenticatedUser = null
+      await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { pinPost: null },
+      })
+    })
+  })
+
+  describe('ordinary users', () => {
+    it('throws authorization error', async () => {
+      await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { pinPost: null },
+      })
+    })
+  })
+
+  describe('moderators', () => {
+    let moderator
     beforeEach(async () => {
-      variables = { ...variables }
+      moderator = await user.update({ role: 'moderator', updatedAt: new Date().toISOString() })
+      authenticatedUser = await moderator.toJson()
     })
 
-    describe('unauthenticated', () => {
-      it('throws authorization error', async () => {
-        authenticatedUser = null
-        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { pinPost: null },
-        })
+    it('throws authorization error', async () => {
+      await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { pinPost: null },
       })
     })
+  })
 
-    describe('ordinary users', () => {
-      it('throws authorization error', async () => {
-        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { pinPost: null },
-        })
+  describe('admins', () => {
+    let admin
+    beforeEach(async () => {
+      admin = await user.update({
+        role: 'admin',
+        name: 'Admin',
+        updatedAt: new Date().toISOString(),
       })
+      authenticatedUser = await admin.toJson()
     })
 
-    describe('moderators', () => {
-      let moderator
+    describe('are allowed to pin posts', () => {
       beforeEach(async () => {
-        moderator = await user.update({ role: 'moderator', updatedAt: new Date().toISOString() })
-        authenticatedUser = await moderator.toJson()
+        await Factory.build(
+          'post',
+          {
+            id: 'created-and-pinned-by-same-admin',
+          },
+          {
+            author: admin,
+          },
+        )
+        variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
       })
 
-      it('throws authorization error', async () => {
-        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { pinPost: null },
-        })
-      })
-    })
-
-    describe('admins', () => {
-      let admin
-      beforeEach(async () => {
-        admin = await user.update({
-          role: 'admin',
-          name: 'Admin',
-          updatedAt: new Date().toISOString(),
-        })
-        authenticatedUser = await admin.toJson()
-      })
-
-      describe('are allowed to pin posts', () => {
-        beforeEach(async () => {
-          await Factory.build(
-            'post',
-            {
+      it('responds with the updated Post', async () => {
+        const expected = {
+          data: {
+            pinPost: {
               id: 'created-and-pinned-by-same-admin',
-            },
-            {
-              author: admin,
-            },
-          )
-          variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
-        })
-
-        it('responds with the updated Post', async () => {
-          const expected = {
-            data: {
-              pinPost: {
-                id: 'created-and-pinned-by-same-admin',
-                author: {
-                  name: 'Admin',
-                },
-                pinnedBy: {
-                  id: 'current-user',
-                  name: 'Admin',
-                  role: 'admin',
-                },
+              author: {
+                name: 'Admin',
+              },
+              pinnedBy: {
+                id: 'current-user',
+                name: 'Admin',
+                role: 'admin',
               },
             },
-            errors: undefined,
-          }
+          },
+          errors: undefined,
+        }
 
-          await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
-            expected,
-          )
-        })
-
-        it('sets createdAt date for PINNED', async () => {
-          const expected = {
-            data: {
-              pinPost: {
-                id: 'created-and-pinned-by-same-admin',
-                pinnedAt: expect.any(String),
-              },
-            },
-            errors: undefined,
-          }
-          await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
-            expected,
-          )
-        })
-
-        it('sets redundant `pinned` property for performant ordering', async () => {
-          variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
-          const expected = {
-            data: { pinPost: { pinned: true } },
-            errors: undefined,
-          }
-          await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
-            expected,
-          )
-        })
+        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
       })
 
-      describe('post created by another admin', () => {
-        let otherAdmin
-        beforeEach(async () => {
-          otherAdmin = await Factory.build('user', {
-            role: 'admin',
-            name: 'otherAdmin',
-          })
-          authenticatedUser = await otherAdmin.toJson()
-          await Factory.build(
-            'post',
-            {
+      it('sets createdAt date for PINNED', async () => {
+        const expected = {
+          data: {
+            pinPost: {
+              id: 'created-and-pinned-by-same-admin',
+              pinnedAt: expect.any(String),
+            },
+          },
+          errors: undefined,
+        }
+        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
+      })
+
+      it('sets redundant `pinned` property for performant ordering', async () => {
+        variables = { ...variables, id: 'created-and-pinned-by-same-admin' }
+        const expected = {
+          data: { pinPost: { pinned: true } },
+          errors: undefined,
+        }
+        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
+      })
+    })
+
+    describe('post created by another admin', () => {
+      let otherAdmin
+      beforeEach(async () => {
+        otherAdmin = await Factory.build('user', {
+          role: 'admin',
+          name: 'otherAdmin',
+        })
+        authenticatedUser = await otherAdmin.toJson()
+        await Factory.build(
+          'post',
+          {
+            id: 'created-by-one-admin-pinned-by-different-one',
+          },
+          {
+            author: otherAdmin,
+          },
+        )
+      })
+
+      it('responds with the updated Post', async () => {
+        authenticatedUser = await admin.toJson()
+        variables = { ...variables, id: 'created-by-one-admin-pinned-by-different-one' }
+        const expected = {
+          data: {
+            pinPost: {
               id: 'created-by-one-admin-pinned-by-different-one',
-            },
-            {
-              author: otherAdmin,
-            },
-          )
-        })
-
-        it('responds with the updated Post', async () => {
-          authenticatedUser = await admin.toJson()
-          variables = { ...variables, id: 'created-by-one-admin-pinned-by-different-one' }
-          const expected = {
-            data: {
-              pinPost: {
-                id: 'created-by-one-admin-pinned-by-different-one',
-                author: {
-                  name: 'otherAdmin',
-                },
-                pinnedBy: {
-                  id: 'current-user',
-                  name: 'Admin',
-                  role: 'admin',
-                },
+              author: {
+                name: 'otherAdmin',
+              },
+              pinnedBy: {
+                id: 'current-user',
+                name: 'Admin',
+                role: 'admin',
               },
             },
-            errors: undefined,
-          }
+          },
+          errors: undefined,
+        }
 
-          await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
-            expected,
-          )
-        })
+        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
       })
+    })
 
-      describe('post created by another user', () => {
-        it('responds with the updated Post', async () => {
-          const expected = {
-            data: {
-              pinPost: {
-                id: 'p9876',
-                author: {
-                  slug: 'the-author',
-                },
-                pinnedBy: {
-                  id: 'current-user',
-                  name: 'Admin',
-                  role: 'admin',
-                },
+    describe('post created by another user', () => {
+      it('responds with the updated Post', async () => {
+        const expected = {
+          data: {
+            pinPost: {
+              id: 'p9876',
+              author: {
+                slug: 'the-author',
+              },
+              pinnedBy: {
+                id: 'current-user',
+                name: 'Admin',
+                role: 'admin',
               },
             },
-            errors: undefined,
-          }
+          },
+          errors: undefined,
+        }
 
-          await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
-            expected,
-          )
+        await expect(mutate({ mutation: pinPostMutation, variables })).resolves.toMatchObject(
+          expected,
+        )
+      })
+    })
+
+    describe('pinned post already exists', () => {
+      let pinnedPost
+      beforeEach(async () => {
+        await Factory.build(
+          'post',
+          {
+            id: 'only-pinned-post',
+          },
+          {
+            author: admin,
+          },
+        )
+        await mutate({ mutation: pinPostMutation, variables })
+      })
+
+      it('removes previous `pinned` attribute', async () => {
+        const cypher = 'MATCH (post:Post) WHERE post.pinned IS NOT NULL RETURN post'
+        pinnedPost = await neode.cypher(cypher)
+        expect(pinnedPost.records).toHaveLength(1)
+        variables = { ...variables, id: 'only-pinned-post' }
+        await mutate({ mutation: pinPostMutation, variables })
+        pinnedPost = await neode.cypher(cypher)
+        expect(pinnedPost.records).toHaveLength(1)
+      })
+
+      it('removes previous PINNED relationship', async () => {
+        variables = { ...variables, id: 'only-pinned-post' }
+        await mutate({ mutation: pinPostMutation, variables })
+        pinnedPost = await neode.cypher(
+          `MATCH (:User)-[pinned:PINNED]->(post:Post) RETURN post, pinned`,
+        )
+        expect(pinnedPost.records).toHaveLength(1)
+      })
+    })
+
+    describe('PostOrdering', () => {
+      beforeEach(async () => {
+        await Factory.build('post', {
+          id: 'im-a-pinned-post',
+          createdAt: '2019-11-22T17:26:29.070Z',
+          pinned: true,
+        })
+        await Factory.build('post', {
+          id: 'i-was-created-before-pinned-post',
+          // fairly old, so this should be 3rd
+          createdAt: '2019-10-22T17:26:29.070Z',
         })
       })
 
-      describe('pinned post already exists', () => {
-        let pinnedPost
-        beforeEach(async () => {
-          await Factory.build(
-            'post',
-            {
-              id: 'only-pinned-post',
-            },
-            {
-              author: admin,
-            },
-          )
-          await mutate({ mutation: pinPostMutation, variables })
+      describe('order by `pinned_asc` and `createdAt_desc`', () => {
+        beforeEach(() => {
+          // this is the ordering in the frontend
+          variables = { orderBy: ['pinned_asc', 'createdAt_desc'] }
         })
 
-        it('removes previous `pinned` attribute', async () => {
-          const cypher = 'MATCH (post:Post) WHERE post.pinned IS NOT NULL RETURN post'
-          pinnedPost = await neode.cypher(cypher)
-          expect(pinnedPost.records).toHaveLength(1)
-          variables = { ...variables, id: 'only-pinned-post' }
-          await mutate({ mutation: pinPostMutation, variables })
-          pinnedPost = await neode.cypher(cypher)
-          expect(pinnedPost.records).toHaveLength(1)
-        })
-
-        it('removes previous PINNED relationship', async () => {
-          variables = { ...variables, id: 'only-pinned-post' }
-          await mutate({ mutation: pinPostMutation, variables })
-          pinnedPost = await neode.cypher(
-            `MATCH (:User)-[pinned:PINNED]->(post:Post) RETURN post, pinned`,
-          )
-          expect(pinnedPost.records).toHaveLength(1)
-        })
-      })
-
-      describe('PostOrdering', () => {
-        beforeEach(async () => {
-          await Factory.build('post', {
-            id: 'im-a-pinned-post',
-            createdAt: '2019-11-22T17:26:29.070Z',
-            pinned: true,
-          })
-          await Factory.build('post', {
-            id: 'i-was-created-before-pinned-post',
-            // fairly old, so this should be 3rd
-            createdAt: '2019-10-22T17:26:29.070Z',
-          })
-        })
-
-        describe('order by `pinned_asc` and `createdAt_desc`', () => {
-          beforeEach(() => {
-            // this is the ordering in the frontend
-            variables = { orderBy: ['pinned_asc', 'createdAt_desc'] }
-          })
-
-          it('pinned post appear first even when created before other posts', async () => {
-            const postOrderingQuery = gql`
-              query($orderBy: [_PostOrdering]) {
-                Post(orderBy: $orderBy) {
-                  id
-                  pinned
-                  createdAt
-                  pinnedAt
-                }
+        it('pinned post appear first even when created before other posts', async () => {
+          const postOrderingQuery = gql`
+            query($orderBy: [_PostOrdering]) {
+              Post(orderBy: $orderBy) {
+                id
+                pinned
+                createdAt
+                pinnedAt
               }
-            `
-            await expect(query({ query: postOrderingQuery, variables })).resolves.toMatchObject({
-              data: {
-                Post: [
-                  {
-                    id: 'im-a-pinned-post',
-                    pinned: true,
-                    createdAt: '2019-11-22T17:26:29.070Z',
-                    pinnedAt: expect.any(String),
-                  },
-                  {
-                    id: 'p9876',
-                    pinned: null,
-                    createdAt: expect.any(String),
-                    pinnedAt: null,
-                  },
-                  {
-                    id: 'i-was-created-before-pinned-post',
-                    pinned: null,
-                    createdAt: '2019-10-22T17:26:29.070Z',
-                    pinnedAt: null,
-                  },
-                ],
-              },
-              errors: undefined,
-            })
+            }
+          `
+          await expect(query({ query: postOrderingQuery, variables })).resolves.toMatchObject({
+            data: {
+              Post: [
+                {
+                  id: 'im-a-pinned-post',
+                  pinned: true,
+                  createdAt: '2019-11-22T17:26:29.070Z',
+                  pinnedAt: expect.any(String),
+                },
+                {
+                  id: 'p9876',
+                  pinned: null,
+                  createdAt: expect.any(String),
+                  pinnedAt: null,
+                },
+                {
+                  id: 'i-was-created-before-pinned-post',
+                  pinned: null,
+                  createdAt: '2019-10-22T17:26:29.070Z',
+                  pinnedAt: null,
+                },
+              ],
+            },
+            errors: undefined,
           })
         })
       })
     })
   })
+})
 
-  describe('unpin posts', () => {
-    const unpinPostMutation = gql`
-      mutation($id: ID!) {
-        unpinPost(id: $id) {
+describe('unpin posts', () => {
+  let pinnedPost
+  const unpinPostMutation = gql`
+    mutation($id: ID!) {
+      unpinPost(id: $id) {
+        id
+        title
+        content
+        author {
+          name
+          slug
+        }
+        pinnedBy {
           id
-          title
-          content
-          author {
-            name
-            slug
-          }
-          pinnedBy {
-            id
-            name
-            role
-          }
-          createdAt
-          updatedAt
-          pinned
-          pinnedAt
+          name
+          role
         }
+        createdAt
+        updatedAt
+        pinned
+        pinnedAt
       }
-    `
+    }
+  `
+  beforeEach(async () => {
+    pinnedPost = await Factory.build('post', { id: 'post-to-be-unpinned' })
+    variables = {
+      id: 'post-to-be-unpinned',
+    }
+  })
+
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      authenticatedUser = null
+      await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { unpinPost: null },
+      })
+    })
+  })
+
+  describe('users cannot unpin posts', () => {
+    it('throws authorization error', async () => {
+      await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { unpinPost: null },
+      })
+    })
+  })
+
+  describe('moderators cannot unpin posts', () => {
+    let moderator
     beforeEach(async () => {
-      variables = { ...variables }
+      moderator = await user.update({ role: 'moderator', updatedAt: new Date().toISOString() })
+      authenticatedUser = await moderator.toJson()
     })
 
-    describe('unauthenticated', () => {
-      it('throws authorization error', async () => {
-        authenticatedUser = null
-        await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { unpinPost: null },
-        })
+    it('throws authorization error', async () => {
+      await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
+        errors: [{ message: 'Not Authorised!' }],
+        data: { unpinPost: null },
       })
     })
+  })
 
-    describe('users cannot unpin posts', () => {
-      it('throws authorization error', async () => {
-        await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { unpinPost: null },
-        })
+  describe('admin can unpin posts', () => {
+    let admin
+    beforeEach(async () => {
+      admin = await user.update({
+        role: 'admin',
+        name: 'Admin',
+        updatedAt: new Date().toISOString(),
       })
+      authenticatedUser = await admin.toJson()
+      await admin.relateTo(pinnedPost, 'pinned', { createdAt: new Date().toISOString() })
     })
 
-    describe('moderators cannot unpin posts', () => {
-      let moderator
-      beforeEach(async () => {
-        moderator = await user.update({ role: 'moderator', updatedAt: new Date().toISOString() })
-        authenticatedUser = await moderator.toJson()
-      })
-
-      it('throws authorization error', async () => {
-        await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject({
-          errors: [{ message: 'Not Authorised!' }],
-          data: { unpinPost: null },
-        })
-      })
-    })
-
-    describe('admin can unpin posts', () => {
-      let admin, pinnedPost
-      beforeEach(async () => {
-        pinnedPost = await Factory.build('post', { id: 'post-to-be-unpinned' })
-        admin = await user.update({
-          role: 'admin',
-          name: 'Admin',
-          updatedAt: new Date().toISOString(),
-        })
-        authenticatedUser = await admin.toJson()
-        await admin.relateTo(pinnedPost, 'pinned', { createdAt: new Date().toISOString() })
-        variables = { ...variables, id: 'post-to-be-unpinned' }
-      })
-
-      it('responds with the unpinned Post', async () => {
-        authenticatedUser = await admin.toJson()
-        const expected = {
-          data: {
-            unpinPost: {
-              id: 'post-to-be-unpinned',
-              pinnedBy: null,
-              pinnedAt: null,
-            },
+    it('responds with the unpinned Post', async () => {
+      authenticatedUser = await admin.toJson()
+      const expected = {
+        data: {
+          unpinPost: {
+            id: 'post-to-be-unpinned',
+            pinnedBy: null,
+            pinnedAt: null,
           },
-          errors: undefined,
-        }
+        },
+        errors: undefined,
+      }
 
-        await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject(
-          expected,
-        )
-      })
+      await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject(
+        expected,
+      )
+    })
 
-      it('unsets `pinned` property', async () => {
-        const expected = {
-          data: {
-            unpinPost: {
-              id: 'post-to-be-unpinned',
-              pinned: null,
-            },
+    it('unsets `pinned` property', async () => {
+      const expected = {
+        data: {
+          unpinPost: {
+            id: 'post-to-be-unpinned',
+            pinned: null,
           },
-          errors: undefined,
-        }
-        await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject(
-          expected,
-        )
-      })
+        },
+        errors: undefined,
+      }
+      await expect(mutate({ mutation: unpinPostMutation, variables })).resolves.toMatchObject(
+        expected,
+      )
     })
   })
 })
@@ -897,7 +956,9 @@ describe('DeletePost', () => {
         deleted
         content
         contentExcerpt
-        image
+        image {
+          url
+        }
         comments {
           deleted
           content
@@ -915,9 +976,11 @@ describe('DeletePost', () => {
         id: 'p4711',
         title: 'I will be deleted',
         content: 'To be deleted',
-        image: 'path/to/some/image',
       },
       {
+        image: Factory.build('image', {
+          url: 'path/to/some/image',
+        }),
         author,
         categoryIds,
       },
diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js
index 1e7708395..921570e5d 100644
--- a/backend/src/schema/resolvers/registration.js
+++ b/backend/src/schema/resolvers/registration.js
@@ -1,11 +1,9 @@
 import { UserInputError } from 'apollo-server'
 import { getNeode } from '../../db/neo4j'
-import fileUpload from './fileUpload'
 import encryptPassword from '../../helpers/encryptPassword'
 import generateNonce from './helpers/generateNonce'
 import existingEmailAddress from './helpers/existingEmailAddress'
 import normalizeEmail from './helpers/normalizeEmail'
-import createOrUpdateLocations from './users/location'
 
 const neode = getNeode()
 
@@ -24,8 +22,6 @@ export default {
       }
     },
     SignupVerification: async (_parent, args, context) => {
-      const { driver } = context
-      const session = driver.session()
       const { termsAndConditionsAgreedVersion } = args
       const regEx = new RegExp(/^[0-9]+\.[0-9]+\.[0-9]+$/g)
       if (!regEx.test(termsAndConditionsAgreedVersion)) {
@@ -35,27 +31,39 @@ export default {
 
       let { nonce, email } = args
       email = normalizeEmail(email)
-      const result = await neode.cypher(
-        `
-      MATCH(email:EmailAddress {nonce: {nonce}, email: {email}})
-      WHERE NOT (email)-[:BELONGS_TO]->()
-      RETURN email
-      `,
-        { nonce, email },
-      )
-      const emailAddress = await neode.hydrateFirst(result, 'email', neode.model('EmailAddress'))
-      if (!emailAddress) throw new UserInputError('Invalid email or nonce')
-      args = await fileUpload(args, { file: 'avatarUpload', url: 'avatar' })
-      args = await encryptPassword(args)
+      delete args.nonce
+      delete args.email
+      args = encryptPassword(args)
+
+      const { driver } = context
+      const session = driver.session()
+      const writeTxResultPromise = session.writeTransaction(async transaction => {
+        const createUserTransactionResponse = await transaction.run(
+          `
+            MATCH(email:EmailAddress {nonce: $nonce, email: $email})
+            WHERE NOT (email)-[:BELONGS_TO]->()
+            CREATE (user:User)
+            MERGE(user)-[:PRIMARY_EMAIL]->(email)
+            MERGE(user)<-[:BELONGS_TO]-(email)
+            SET user += $args
+            SET user.id = randomUUID()
+            SET user.role = 'user'
+            SET user.createdAt = toString(datetime())
+            SET user.updatedAt = toString(datetime())
+            SET user.allowEmbedIframes = FALSE
+            SET user.showShoutsPublicly = FALSE
+            SET email.verifiedAt = toString(datetime())
+            RETURN user {.*}
+          `,
+          { args, nonce, email },
+        )
+        const [user] = createUserTransactionResponse.records.map(record => record.get('user'))
+        if (!user) throw new UserInputError('Invalid email or nonce')
+        return user
+      })
       try {
-        const user = await neode.create('User', args)
-        await Promise.all([
-          user.relateTo(emailAddress, 'primaryEmail'),
-          emailAddress.relateTo(user, 'belongsTo'),
-          emailAddress.update({ verifiedAt: new Date().toISOString() }),
-        ])
-        await createOrUpdateLocations(args.id, args.locationName, session)
-        return user.toJson()
+        const user = await writeTxResultPromise
+        return user
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
           throw new UserInputError('User with this slug already exists!')
diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index 2014b01b8..dd081321d 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -48,7 +48,7 @@ export default {
           const loginTransactionResponse = await transaction.run(
             `
               MATCH (user:User {deleted: false})-[:PRIMARY_EMAIL]->(e:EmailAddress {email: $userEmail})
-              RETURN user {.id, .slug, .name, .avatar, .encryptedPassword, .role, .disabled, email:e.email} as user LIMIT 1
+              RETURN user {.id, .slug, .name, .encryptedPassword, .role, .disabled, email:e.email} as user LIMIT 1
             `,
             { userEmail: email },
           )
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 1e295638d..399e2ace3 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -106,7 +106,9 @@ describe('currentUser', () => {
         id
         slug
         name
-        avatar
+        avatar {
+          url
+        }
         email
         role
       }
@@ -131,13 +133,15 @@ describe('currentUser', () => {
           {
             id: 'u3',
             // the `id` is the only thing that has to match the decoded JWT bearer token
-            avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
             name: 'Matilde Hermiston',
             slug: 'matilde-hermiston',
             role: 'user',
           },
           {
             email: 'test@example.org',
+            avatar: Factory.build('image', {
+              url: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+            }),
           },
         )
         const userBearerToken = encode({ id: 'u3' })
@@ -149,7 +153,9 @@ describe('currentUser', () => {
           data: {
             currentUser: {
               id: 'u3',
-              avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+              avatar: Factory.build('image', {
+                url: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+              }),
               email: 'test@example.org',
               name: 'Matilde Hermiston',
               slug: 'matilde-hermiston',
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index c29b021be..252265ac3 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -1,7 +1,7 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
-import fileUpload from './fileUpload'
 import { getNeode } from '../../db/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
+import { mergeImage, deleteImage } from './images/images'
 import Resolver from './helpers/Resolver'
 import log from './helpers/databaseLogger'
 import createOrUpdateLocations from './users/location'
@@ -140,6 +140,8 @@ export default {
     },
     UpdateUser: async (_parent, params, context, _resolveInfo) => {
       const { termsAndConditionsAgreedVersion } = params
+      const { avatar: avatarInput } = params
+      delete params.avatar
       if (termsAndConditionsAgreedVersion) {
         const regEx = new RegExp(/^[0-9]+\.[0-9]+\.[0-9]+$/g)
         if (!regEx.test(termsAndConditionsAgreedVersion)) {
@@ -147,7 +149,6 @@ export default {
         }
         params.termsAndConditionsAgreedAt = new Date().toISOString()
       }
-      params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar' })
       const session = context.driver.session()
 
       const writeTxResultPromise = session.writeTransaction(async transaction => {
@@ -156,14 +157,18 @@ export default {
             MATCH (user:User {id: $params.id})
             SET user += $params
             SET user.updatedAt = toString(datetime())
-            RETURN user
+            RETURN user {.*}
           `,
           { params },
         )
-        return updateUserTransactionResponse.records.map(record => record.get('user').properties)
+        const [user] = updateUserTransactionResponse.records.map(record => record.get('user'))
+        if (avatarInput) {
+          await mergeImage(user, 'AVATAR_IMAGE', avatarInput, { transaction })
+        }
+        return user
       })
       try {
-        const [user] = await writeTxResultPromise
+        const user = await writeTxResultPromise
         await createOrUpdateLocations(params.id, params.locationName, session)
         return user
       } catch (error) {
@@ -173,34 +178,38 @@ export default {
       }
     },
     DeleteUser: async (object, params, context, resolveInfo) => {
-      const { resource } = params
+      const { resource, id: userId } = params
       const session = context.driver.session()
-      const { id: userId } = params
-      try {
+
+      const deleteUserTxResultPromise = session.writeTransaction(async transaction => {
         if (resource && resource.length) {
-          await session.writeTransaction(transaction => {
-            resource.map(node => {
-              return transaction.run(
+          await Promise.all(
+            resource.map(async node => {
+              const txResult = await transaction.run(
                 `
-                    MATCH (resource:${node})<-[:WROTE]-(author:User {id: $userId})
-                    OPTIONAL MATCH (resource)<-[:COMMENTS]-(comment:Comment)
-                    SET resource.deleted = true
-                    SET resource.content = 'UNAVAILABLE'
-                    SET resource.contentExcerpt = 'UNAVAILABLE'
-                    SET comment.deleted = true
-                    RETURN author
-                  `,
+                MATCH (resource:${node})<-[:WROTE]-(author:User {id: $userId})
+                OPTIONAL MATCH (resource)<-[:COMMENTS]-(comment:Comment)
+                SET resource.deleted = true
+                SET resource.content = 'UNAVAILABLE'
+                SET resource.contentExcerpt = 'UNAVAILABLE'
+                SET comment.deleted = true
+                RETURN resource {.*}
+              `,
                 {
                   userId,
                 },
               )
-            })
-          })
+              return Promise.all(
+                txResult.records
+                  .map(record => record.get('resource'))
+                  .map(resource => deleteImage(resource, 'HERO_IMAGE', { transaction })),
+              )
+            }),
+          )
         }
 
-        const deleteUserTxResultPromise = session.writeTransaction(async transaction => {
-          const deleteUserTransactionResponse = await transaction.run(
-            `
+        const deleteUserTransactionResponse = await transaction.run(
+          `
               MATCH (user:User {id: $userId})
               SET user.deleted = true
               SET user.name = 'UNAVAILABLE'
@@ -211,14 +220,17 @@ export default {
               WITH user
               OPTIONAL MATCH (user)<-[:OWNED_BY]-(socialMedia:SocialMedia)
               DETACH DELETE socialMedia
-              RETURN user
+              RETURN user {.*}
             `,
-            { userId },
-          )
-          log(deleteUserTransactionResponse)
-          return deleteUserTransactionResponse.records.map(record => record.get('user').properties)
-        })
-        const [user] = await deleteUserTxResultPromise
+          { userId },
+        )
+        log(deleteUserTransactionResponse)
+        const [user] = deleteUserTransactionResponse.records.map(record => record.get('user'))
+        await deleteImage(user, 'AVATAR_IMAGE', { transaction })
+        return user
+      })
+      try {
+        const user = await deleteUserTxResultPromise
         return user
       } finally {
         session.close()
@@ -237,8 +249,6 @@ export default {
     ...Resolver('User', {
       undefinedToNull: [
         'actorId',
-        'avatar',
-        'coverImg',
         'deleted',
         'disabled',
         'locationName',
@@ -272,6 +282,7 @@ export default {
         badgesCount: '<-[:REWARDED]-(related:Badge)',
       },
       hasOne: {
+        avatar: '-[:AVATAR_IMAGE]->(related:Image)',
         invitedBy: '<-[:INVITED]-(related:User)',
         location: '-[:IS_IN]->(related:Location)',
       },
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 892d2b4b4..cb9012133 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -29,7 +29,7 @@ beforeAll(() => {
   mutate = createTestClient(server).mutate
 })
 
-afterEach(async () => {
+beforeEach(async () => {
   await cleanDatabase()
 })
 
@@ -495,6 +495,12 @@ describe('DeleteUser', () => {
                   mutate({ mutation: deleteUserMutation, variables }),
                 ).resolves.toMatchObject(expectedResponse)
               })
+
+              it('deletes user avatar and post hero images', async () => {
+                await expect(neode.all('Image')).resolves.toHaveLength(22)
+                await mutate({ mutation: deleteUserMutation, variables })
+                await expect(neode.all('Image')).resolves.toHaveLength(20)
+              })
             })
           })
 
@@ -785,6 +791,12 @@ describe('DeleteUser', () => {
                   mutate({ mutation: deleteUserMutation, variables }),
                 ).resolves.toMatchObject(expectedResponse)
               })
+
+              it('deletes user avatar and post hero images', async () => {
+                await expect(neode.all('Image')).resolves.toHaveLength(22)
+                await mutate({ mutation: deleteUserMutation, variables })
+                await expect(neode.all('Image')).resolves.toHaveLength(20)
+              })
             })
           })
 
@@ -834,7 +846,6 @@ describe('DeleteUser', () => {
               ).resolves.toMatchObject(expectedResponse)
             })
           })
-
           describe('deletion of all post and comments requested', () => {
             beforeEach(() => {
               variables = { ...variables, resource: ['Post', 'Comment'] }
@@ -882,27 +893,27 @@ describe('DeleteUser', () => {
             })
           })
         })
+      })
+    })
 
-        describe('connected `EmailAddress` nodes', () => {
-          it('will be removed completely', async () => {
-            await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
-            await mutate({ mutation: deleteUserMutation, variables })
-            await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
-          })
-        })
+    describe('connected `EmailAddress` nodes', () => {
+      it('will be removed completely', async () => {
+        await expect(neode.all('EmailAddress')).resolves.toHaveLength(2)
+        await mutate({ mutation: deleteUserMutation, variables })
+        await expect(neode.all('EmailAddress')).resolves.toHaveLength(1)
+      })
+    })
 
-        describe('connected `SocialMedia` nodes', () => {
-          beforeEach(async () => {
-            const socialMedia = await Factory.build('socialMedia')
-            await socialMedia.relateTo(user, 'ownedBy')
-          })
+    describe('connected `SocialMedia` nodes', () => {
+      beforeEach(async () => {
+        const socialMedia = await Factory.build('socialMedia')
+        await socialMedia.relateTo(user, 'ownedBy')
+      })
 
-          it('will be removed completely', async () => {
-            await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
-            await mutate({ mutation: deleteUserMutation, variables })
-            await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
-          })
-        })
+      it('will be removed completely', async () => {
+        await expect(neode.all('SocialMedia')).resolves.toHaveLength(1)
+        await mutate({ mutation: deleteUserMutation, variables })
+        await expect(neode.all('SocialMedia')).resolves.toHaveLength(0)
       })
     })
   })
diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index 04216dcb5..2e74e5c03 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -8,28 +8,6 @@ const neode = getNeode()
 const driver = getDriver()
 let authenticatedUser, mutate, variables
 
-const signupVerificationMutation = gql`
-  mutation(
-    $name: String!
-    $password: String!
-    $email: String!
-    $nonce: String!
-    $termsAndConditionsAgreedVersion: String!
-    $locationName: String
-  ) {
-    SignupVerification(
-      name: $name
-      password: $password
-      email: $email
-      nonce: $nonce
-      termsAndConditionsAgreedVersion: $termsAndConditionsAgreedVersion
-      locationName: $locationName
-    ) {
-      locationName
-    }
-  }
-`
-
 const updateUserMutation = gql`
   mutation($id: ID!, $name: String!, $locationName: String) {
     UpdateUser(id: $id, name: $name, locationName: $locationName) {
@@ -38,9 +16,10 @@ const updateUserMutation = gql`
   }
 `
 
-let newlyCreatedNodesWithLocales = [
+const newlyCreatedNodesWithLocales = [
   {
     city: {
+      lng: -74.5763,
       lat: 41.1534,
       nameES: 'Hamburg',
       nameFR: 'Hamburg',
@@ -54,7 +33,6 @@ let newlyCreatedNodesWithLocales = [
       name: 'Hamburg',
       namePL: 'Hamburg',
       id: 'place.5977106083398860',
-      lng: -74.5763,
     },
     state: {
       namePT: 'Nova Jérsia',
@@ -105,82 +83,12 @@ beforeEach(() => {
   authenticatedUser = null
 })
 
-afterEach(() => {
-  cleanDatabase()
-})
+afterEach(cleanDatabase)
 
 describe('userMiddleware', () => {
-  describe('SignupVerification', () => {
-    beforeEach(async () => {
-      variables = {
-        ...variables,
-        name: 'John Doe',
-        password: '123',
-        email: 'john@example.org',
-        nonce: '123456',
-        termsAndConditionsAgreedVersion: '0.1.0',
-        locationName: 'Hamburg, New Jersey, United States of America',
-      }
-      const args = {
-        email: 'john@example.org',
-        nonce: '123456',
-      }
-      await neode.model('EmailAddress').create(args)
-    })
-    it('creates a Location node with localised city/state/country names', async () => {
-      await mutate({ mutation: signupVerificationMutation, variables })
-      const locations = await neode.cypher(
-        `MATCH (city:Location)-[:IS_IN]->(state:Location)-[:IS_IN]->(country:Location) return city, state, country`,
-      )
-      expect(
-        locations.records.map(record => {
-          return {
-            city: record.get('city').properties,
-            state: record.get('state').properties,
-            country: record.get('country').properties,
-          }
-        }),
-      ).toEqual(newlyCreatedNodesWithLocales)
-    })
-  })
-
   describe('UpdateUser', () => {
     let user
     beforeEach(async () => {
-      newlyCreatedNodesWithLocales = [
-        {
-          city: {
-            lat: 53.55,
-            nameES: 'Hamburgo',
-            nameFR: 'Hambourg',
-            nameIT: 'Amburgo',
-            nameEN: 'Hamburg',
-            type: 'region',
-            namePT: 'Hamburgo',
-            nameRU: 'Гамбург',
-            nameDE: 'Hamburg',
-            nameNL: 'Hamburg',
-            namePL: 'Hamburg',
-            name: 'Hamburg',
-            id: 'region.10793468240398860',
-            lng: 10,
-          },
-          country: {
-            namePT: 'Alemanha',
-            nameRU: 'Германия',
-            nameDE: 'Deutschland',
-            nameNL: 'Duitsland',
-            nameES: 'Alemania',
-            name: 'Germany',
-            namePL: 'Niemcy',
-            nameFR: 'Allemagne',
-            nameIT: 'Germania',
-            id: 'country.10743216036480410',
-            nameEN: 'Germany',
-            type: 'country',
-          },
-        },
-      ]
       user = await Factory.build('user', {
         id: 'updating-user',
       })
@@ -192,17 +100,18 @@ describe('userMiddleware', () => {
         ...variables,
         id: 'updating-user',
         name: 'Updating user',
-        locationName: 'Hamburg, Germany',
+        locationName: 'Hamburg, New Jersey, United States of America',
       }
       await mutate({ mutation: updateUserMutation, variables })
       const locations = await neode.cypher(
-        `MATCH (city:Location)-[:IS_IN]->(country:Location) return city, country`,
+        `MATCH (city:Location)-[:IS_IN]->(state:Location)-[:IS_IN]->(country:Location) return city {.*}, state {.*}, country {.*}`,
       )
       expect(
         locations.records.map(record => {
           return {
-            city: record.get('city').properties,
-            country: record.get('country').properties,
+            city: record.get('city'),
+            state: record.get('state'),
+            country: record.get('country'),
           }
         }),
       ).toEqual(newlyCreatedNodesWithLocales)
diff --git a/backend/src/schema/types/type/EmailAddress.gql b/backend/src/schema/types/type/EmailAddress.gql
index 99e309602..e09ec9e63 100644
--- a/backend/src/schema/types/type/EmailAddress.gql
+++ b/backend/src/schema/types/type/EmailAddress.gql
@@ -9,14 +9,10 @@ type Mutation {
   SignupByInvitation(email: String!, token: String!): EmailAddress
   SignupVerification(
     nonce: String!
-    name: String!
     email: String!
+    name: String!
     password: String!
     slug: String
-    avatar: String
-    coverImg: String
-    avatarUpload: Upload
-    locationName: String
     about: String
     termsAndConditionsAgreedVersion: String!
     locale: String
diff --git a/backend/src/schema/types/type/Image.gql b/backend/src/schema/types/type/Image.gql
new file mode 100644
index 000000000..41cc11eef
--- /dev/null
+++ b/backend/src/schema/types/type/Image.gql
@@ -0,0 +1,18 @@
+type Image {
+  url: ID!,
+  # urlW34: String,
+  # urlW160: String,
+  # urlW320: String,
+  # urlW640: String,
+  # urlW1024: String,
+  alt: String,
+  sensitive: Boolean,
+  aspectRatio: Float,
+}
+
+input ImageInput {
+  alt: String,
+  upload: Upload,
+  sensitive: Boolean,
+  aspectRatio: Float,
+}
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 71fcb9605..01d8409ad 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -40,7 +40,6 @@ input _PostFilter {
   content_not_starts_with: String
   content_ends_with: String
   content_not_ends_with: String
-  image: String
   visibility: Visibility
   visibility_not: Visibility
   visibility_in: [Visibility!]
@@ -82,7 +81,6 @@ input _PostFilter {
   emotions_none: _PostEMOTEDFilter
   emotions_single: _PostEMOTEDFilter
   emotions_every: _PostEMOTEDFilter
-  imageBlurred: Boolean
 }
 
 enum _PostOrdering {
@@ -94,8 +92,6 @@ enum _PostOrdering {
   slug_desc
   content_asc
   content_desc
-  image_asc
-  image_desc
   visibility_asc
   visibility_desc
   createdAt_asc
@@ -118,9 +114,7 @@ type Post {
   slug: String!
   content: String!
   contentExcerpt: String
-  image: String
-  imageUpload: Upload
-  imageAspectRatio: Float
+  image: Image @relation(name: "HERO_IMAGE", direction: "OUT")
   visibility: Visibility
   deleted: Boolean
   disabled: Boolean
@@ -128,7 +122,6 @@ type Post {
   createdAt: String
   updatedAt: String
   language: String
-  imageBlurred: Boolean
   pinnedAt: String @cypher(
       statement: "MATCH (this)<-[pinned:PINNED]-(:User) WHERE NOT this.deleted = true AND NOT this.disabled = true RETURN pinned.createdAt"
     )
@@ -178,14 +171,11 @@ type Mutation {
     title: String!
     slug: String
     content: String!
-    image: String
-    imageUpload: Upload
+    image: ImageInput,
     visibility: Visibility
     language: String
     categoryIds: [ID]
     contentExcerpt: String
-    imageBlurred: Boolean
-    imageAspectRatio: Float
   ): Post
   UpdatePost(
     id: ID!
@@ -193,13 +183,10 @@ type Mutation {
     slug: String
     content: String!
     contentExcerpt: String
-    image: String
-    imageUpload: Upload
+    image: ImageInput,
     visibility: Visibility
     language: String
     categoryIds: [ID]
-    imageBlurred: Boolean
-    imageAspectRatio: Float
   ): Post
   DeletePost(id: ID!): Post
   AddPostEmotions(to: _PostInput!, data: _EMOTEDInput!): EMOTED
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 4c3555049..af525396b 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -5,10 +5,6 @@ enum _UserOrdering {
   name_desc
   slug_asc
   slug_desc
-  avatar_asc
-  avatar_desc
-  coverImg_asc
-  coverImg_desc
   role_asc
   role_desc
   locationName_asc
@@ -29,8 +25,7 @@ type User {
   name: String
   email: String! @cypher(statement: "MATCH (this)-[:PRIMARY_EMAIL]->(e:EmailAddress) RETURN e.email")
   slug: String!
-  avatar: String
-  coverImg: String
+  avatar: Image @relation(name: "AVATAR_IMAGE", direction: "OUT")
   deleted: Boolean
   disabled: Boolean
   role: UserGroup!
@@ -161,8 +156,6 @@ type Query {
   email: String # admins need to search for a user sometimes
   name: String
   slug: String
-  avatar: String
-  coverImg: String
   role: UserGroup
   locationName: String
   about: String
@@ -198,9 +191,7 @@ type Mutation {
   name: String
   email: String
   slug: String
-  avatar: String
-  coverImg: String
-  avatarUpload: Upload
+  avatar: ImageInput
   locationName: String
   about: String
   termsAndConditionsAgreedVersion: String
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 5b6e98b64..c938959ce 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4498,14 +4498,14 @@ graphql-redis-subscriptions@^2.2.1:
   optionalDependencies:
     ioredis "^4.6.3"
 
-graphql-shield@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.2.0.tgz#81b26794370608ad78dfe3833473789fb471fbd8"
-  integrity sha512-eLdD+gUIKYu77XRcuHs5ewZhiBuRFeWFGxPnJa+g9AkxB7Yi5RSEjEJEx0Drg9GuNvDYpHeW7nPff4v35AT2aQ==
+graphql-shield@~7.0.14:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.14.tgz#3cbbf2722f2e3393fed7f47d866a1324bc3ce76a"
+  integrity sha512-YVedaL+4pITisSGRqMVeGX8ydOLSTQlHQN6o0Jly7z2cSy1wOzGJIRpfofETJtGLhBnPHHy1otINzuAyjGJO/g==
   dependencies:
     "@types/yup" "0.26.32"
     object-hash "^2.0.3"
-    yup "^0.28.3"
+    yup "^0.28.1"
 
 graphql-subscriptions@^1.0.0:
   version "1.1.0"
@@ -6684,7 +6684,7 @@ nodemailer-html-to-text@^3.1.0:
   dependencies:
     html-to-text "^5.1.1"
 
-nodemailer@^6.4.5:
+nodemailer@^6.4.4:
   version "6.4.5"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.5.tgz#45614c6454d1a947242105eeddae03df87e29916"
   integrity sha512-NH7aNVQyZLAvGr2+EOto7znvz+qJ02Cb/xpou98ApUt5tEAUSVUxhvHvgV/8I5dhjKTYqUw0nasoKzLNBJKrDQ==
@@ -7888,7 +7888,7 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@~1.22.1:
+sanitize-html@~1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz#5b36c92ab27917ddd2775396815c2bc1a6268310"
   integrity sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==
@@ -9378,7 +9378,7 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^16.1.0"
 
-yup@^0.28.3:
+yup@^0.28.1:
   version "0.28.3"
   resolved "https://registry.yarnpkg.com/yup/-/yup-0.28.3.tgz#1ca607405a8adf24a5ac51f54bd09d527555f0ba"
   integrity sha512-amVkCgFWe5bGjrrUiODkbIzrSwtB8JpZrQYSrfj2YsbRdrV+tn9LquWdZDlfOx2HXyfEA8FGnlwidE/bFDxO7Q==
diff --git a/cypress/integration/common/post.js b/cypress/integration/common/post.js
index d0298c5a3..cba238a63 100644
--- a/cypress/integration/common/post.js
+++ b/cypress/integration/common/post.js
@@ -3,8 +3,6 @@ import locales from '../../../webapp/locales'
 import orderBy from 'lodash/orderBy'
 
 const languages = orderBy(locales, 'name')
-const narratorAvatar =
-  "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg";
 
 When("I type in a comment with {int} characters", size => {
   var c="";
@@ -32,9 +30,11 @@ Then("my comment should be successfully created", () => {
 Then("I should see my comment", () => {
   cy.get("article.comment-card p")
     .should("contain", "Human Connection rocks")
+    .get(".user-teaser span.slug")
+    .should("contain", "@peter-pan") // specific enough
     .get(".user-avatar img")
     .should("have.attr", "src")
-    .and("contain", narratorAvatar)
+    .and("contain", 'https://') // some url
     .get(".user-teaser > .info > .text")
     .should("contain", "today at");
 });
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 468ce578a..22a9d016e 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -24,7 +24,6 @@ const narratorParams = {
   id: 'id-of-peter-pan',
   name: "Peter Pan",
   slug: "peter-pan",
-  avatar: "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg",
   ...termsAndConditionsAgreedVersion,
 };
 
diff --git a/cypress/integration/post/DeleteImage.feature b/cypress/integration/post/DeleteImage.feature
index a3fa6f9b6..07bfe43b1 100644
--- a/cypress/integration/post/DeleteImage.feature
+++ b/cypress/integration/post/DeleteImage.feature
@@ -7,7 +7,7 @@ Feature: Delete Teaser Image
     Given I have a user account
     Given I am logged in
     Given we have the following posts in our database:
-      | authorId         | id | title              | content              | 
+      | authorId         | id | title              | content              |
       | id-of-peter-pan  | p1 | Post to be updated | successfully updated |
 
   Scenario: Delete existing image
diff --git a/package.json b/package.json
index a0e5e3992..9eecb709a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection",
-  "version": "0.4.2",
+  "version": "0.4.1",
   "description": "Fullstack and API tests with cypress and cucumber for Human Connection",
   "author": "Human Connection gGmbh",
   "license": "MIT",
diff --git a/scripts/translations/sort.sh b/scripts/translations/sort.sh
index aa5737de8..35496f27e 100755
--- a/scripts/translations/sort.sh
+++ b/scripts/translations/sort.sh
@@ -3,12 +3,6 @@
 ROOT_DIR=$(dirname "$0")/../..
 tmp=$(mktemp)
 exit_code=0
-errors=0
-
-TEXT_RED="\e[31m"
-TEXT_BLUE="\e[34m"
-TEXT_RESET="\e[0m"
-TEXT_BOLD="\e[1m"
 
 for locale_file in $ROOT_DIR/webapp/locales/*.json
 do
@@ -22,13 +16,9 @@ do
       : # all good
     else
       exit_code=$?
-      echo -e "${TEXT_BOLD}${TEXT_RED}>>> $(basename -- $locale_file) is not sorted by keys <<<${TEXT_RESET}"
-      errors=1
+      echo "$(basename -- $locale_file) is not sorted by keys"
     fi
   fi
 done
 
-[ "$errors" = 1 ] && echo -e "${TEXT_BOLD}${TEXT_BLUE}Please run $0 --fix to sort your locale definitions!${TEXT_RESET}";
-
-
 exit $exit_code
diff --git a/webapp/components/Badges.spec.js b/webapp/components/Badges.spec.js
index 5273fca21..f81eaafb1 100644
--- a/webapp/components/Badges.spec.js
+++ b/webapp/components/Badges.spec.js
@@ -2,20 +2,29 @@ import { shallowMount } from '@vue/test-utils'
 import Badges from './Badges.vue'
 
 describe('Badges.vue', () => {
-  let wrapper
+  let propsData
 
   beforeEach(() => {
-    wrapper = shallowMount(Badges, {})
+    propsData = {}
   })
 
-  it('renders', () => {
-    expect(wrapper.is('div')).toBe(true)
-  })
+  describe('shallowMount', () => {
+    const Wrapper = () => {
+      return shallowMount(Badges, { propsData })
+    }
 
-  it('has class "hc-badges"', () => {
-    expect(wrapper.contains('.hc-badges')).toBe(true)
-  })
+    it('has class "hc-badges"', () => {
+      expect(Wrapper().contains('.hc-badges')).toBe(true)
+    })
 
-  // TODO: add similar software tests for other components
-  // TODO: add more test cases in this file
+    describe('given a badge', () => {
+      beforeEach(() => {
+        propsData.badges = [{ id: '1', icon: '/path/to/some/icon' }]
+      })
+
+      it('proxies badge icon, which is just a URL without metadata', () => {
+        expect(Wrapper().contains('img[src="/api/path/to/some/icon"]')).toBe(true)
+      })
+    })
+  })
 })
diff --git a/webapp/components/CommentCard/CommentCard.story.js b/webapp/components/CommentCard/CommentCard.story.js
index 1749999f3..467a125d5 100644
--- a/webapp/components/CommentCard/CommentCard.story.js
+++ b/webapp/components/CommentCard/CommentCard.story.js
@@ -17,8 +17,10 @@ const comment = {
   disabled: false,
   author: {
     id: '1',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     slug: 'jenny-rostock',
     name: 'Rainer Unsinn',
     disabled: false,
diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index df95d82f9..585980cc2 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -70,7 +70,7 @@ describe('ContributionForm.vue', () => {
     },
     url: 'someUrlToImage',
   }
-  const image = '/uploads/1562010976466-avataaars'
+  const image = { sensitive: false, url: '/uploads/1562010976466-avataaars', aspectRatio: 1 }
   beforeEach(() => {
     mocks = {
       $t: jest.fn(),
@@ -199,10 +199,7 @@ describe('ContributionForm.vue', () => {
               language: 'en',
               id: null,
               categoryIds: ['cat12'],
-              imageUpload: null,
-              imageAspectRatio: null,
               image: null,
-              imageBlurred: false,
             },
           }
           postTitleInput = wrapper.find('.ds-input')
@@ -233,8 +230,16 @@ describe('ContributionForm.vue', () => {
         })
 
         it('supports adding a teaser image', async () => {
-          const spy = jest.spyOn(FileReader.prototype, 'readAsDataURL').mockImplementation(() => {})
-          expectedParams.variables.imageUpload = imageUpload
+          expectedParams.variables.image = {
+            aspectRatio: null,
+            sensitive: false,
+            upload: imageUpload,
+          }
+          const spy = jest
+            .spyOn(FileReader.prototype, 'readAsDataURL')
+            .mockImplementation(function() {
+              this.onload({ target: { result: 'someUrlToImage' } })
+            })
           wrapper.find(ImageUploader).vm.$emit('addHeroImage', imageUpload)
           await wrapper.find('form').trigger('submit')
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
@@ -317,7 +322,6 @@ describe('ContributionForm.vue', () => {
                 name: 'Democracy & Politics',
               },
             ],
-            imageAspectRatio: 1,
           },
         }
         wrapper = Wrapper()
@@ -354,10 +358,9 @@ describe('ContributionForm.vue', () => {
               language: propsData.contribution.language,
               id: propsData.contribution.id,
               categoryIds: ['cat12'],
-              image,
-              imageUpload: null,
-              imageAspectRatio: 1,
-              imageBlurred: false,
+              image: {
+                sensitive: false,
+              },
             },
           }
         })
@@ -383,8 +386,7 @@ describe('ContributionForm.vue', () => {
 
         it('supports deleting a teaser image', async () => {
           expectedParams.variables.image = null
-          expectedParams.variables.imageAspectRatio = null
-          propsData.contribution.image = '/uploads/someimage.png'
+          propsData.contribution.image = { url: '/uploads/someimage.png' }
           wrapper = Wrapper()
           wrapper.find('[data-test="delete-button"]').trigger('click')
           await wrapper.find('form').trigger('submit')
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 4a163821b..2afee0763 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -106,27 +106,20 @@ export default {
     },
   },
   data() {
-    const {
-      title,
-      content,
-      image,
-      imageAspectRatio,
-      imageBlurred,
-      language,
-      categories,
-    } = this.contribution
+    const { title, content, image, language, categories } = this.contribution
 
     const languageOptions = orderBy(locales, 'name').map(locale => {
       return { label: locale.name, value: locale.code }
     })
+    const { sensitive: imageBlurred = false, aspectRatio: imageAspectRatio = null } = image || {}
 
     return {
       formData: {
         title: title || '',
         content: content || '',
         image: image || null,
-        imageAspectRatio: imageAspectRatio || null,
-        imageBlurred: imageBlurred || false,
+        imageAspectRatio,
+        imageBlurred,
         language: languageOptions.find(option => option.value === language) || null,
         categoryIds: categories ? categories.map(category => category.id) : [],
       },
@@ -163,16 +156,28 @@ export default {
   },
   methods: {
     submit() {
+      let image = null
+      const { title, content, categoryIds } = this.formData
+      if (this.formData.image) {
+        image = {
+          sensitive: this.formData.imageBlurred,
+        }
+        if (this.imageUpload) {
+          image.upload = this.imageUpload
+          image.aspectRatio = this.formData.imageAspectRatio
+        }
+      }
       this.loading = true
       this.$apollo
         .mutate({
           mutation: this.contribution.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
           variables: {
-            ...this.formData,
+            title,
+            content,
+            categoryIds,
             id: this.contribution.id || null,
             language: this.formData.language.value,
-            image: this.imageUpload ? null : this.formData.image,
-            imageUpload: this.imageUpload,
+            image,
           },
         })
         .then(({ data }) => {
@@ -198,10 +203,13 @@ export default {
       if (file) {
         const reader = new FileReader()
         reader.onload = ({ target }) => {
-          this.formData.image = target.result
+          this.formData.image = {
+            ...this.formData.image,
+            url: target.result,
+          }
         }
-        this.imageUpload = file
         reader.readAsDataURL(file)
+        this.imageUpload = file
       }
     },
     addImageAspectRatio(aspectRatio) {
diff --git a/webapp/components/PostTeaser/PostTeaser.story.js b/webapp/components/PostTeaser/PostTeaser.story.js
index db3350c5b..5fecae4db 100644
--- a/webapp/components/PostTeaser/PostTeaser.story.js
+++ b/webapp/components/PostTeaser/PostTeaser.story.js
@@ -16,8 +16,10 @@ export const post = {
   image: null,
   author: {
     id: 'u3',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     slug: 'jenny-rostock',
     name: 'Rainer Unsinn',
     disabled: false,
diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue
index 851ee4f2c..1626f66a2 100644
--- a/webapp/components/PostTeaser/PostTeaser.vue
+++ b/webapp/components/PostTeaser/PostTeaser.vue
@@ -7,7 +7,7 @@
       :lang="post.language"
       :class="{
         'disabled-content': post.disabled,
-        '--blur-image': post.imageBlurred,
+        '--blur-image': post.image && post.image.sensitive,
       }"
       :highlight="isPinned"
     >
@@ -93,8 +93,10 @@ export default {
     },
   },
   mounted() {
+    const { image } = this.post
+    if (!image) return
     const width = this.$el.offsetWidth
-    const height = Math.min(width / this.post.imageAspectRatio, 2000)
+    const height = Math.min(width / image.aspectRatio, 2000)
     const imageElement = this.$el.querySelector('.hero-image')
     if (imageElement) {
       imageElement.style.height = `${height}px`
diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue
index c78b4649b..bb37df105 100644
--- a/webapp/components/Upload/index.vue
+++ b/webapp/components/Upload/index.vue
@@ -2,7 +2,7 @@
   <div>
     <vue-dropzone
       id="customdropzone"
-      :key="user.avatar"
+      :key="avatarUrl"
       ref="el"
       :use-custom-slot="true"
       :options="dropzoneOptions"
@@ -41,6 +41,12 @@ export default {
       hover: false,
     }
   },
+  computed: {
+    avatarUrl() {
+      const { avatar } = this.user
+      return avatar && avatar.url
+    },
+  },
   watch: {
     error() {
       const that = this
@@ -64,7 +70,9 @@ export default {
         .mutate({
           mutation: updateUserMutation(),
           variables: {
-            avatarUpload,
+            avatar: {
+              upload: avatarUpload,
+            },
             id: this.user.id,
           },
         })
diff --git a/webapp/components/Upload/spec.js b/webapp/components/Upload/spec.js
index e60429974..baf1a3b59 100644
--- a/webapp/components/Upload/spec.js
+++ b/webapp/components/Upload/spec.js
@@ -12,7 +12,7 @@ describe('Upload', () => {
       mutate: jest
         .fn()
         .mockResolvedValueOnce({
-          data: { UpdateUser: { id: 'upload1', avatar: '/upload/avatar.jpg' } },
+          data: { UpdateUser: { id: 'upload1', avatar: { url: '/upload/avatar.jpg' } } },
         })
         .mockRejectedValue({
           message: 'File upload unsuccessful! Whatcha gonna do?',
@@ -27,7 +27,7 @@ describe('Upload', () => {
 
   const propsData = {
     user: {
-      avatar: '/api/generic.jpg',
+      avatar: { url: '/api/generic.jpg' },
     },
   }
 
diff --git a/webapp/components/UserTeaser/UserTeaser.story.js b/webapp/components/UserTeaser/UserTeaser.story.js
index 73b34cb76..a872b1aa4 100644
--- a/webapp/components/UserTeaser/UserTeaser.story.js
+++ b/webapp/components/UserTeaser/UserTeaser.story.js
@@ -9,7 +9,9 @@ export const user = {
   id: 'u6',
   slug: 'louie',
   name: 'Louie',
-  avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/designervzm/128.jpg',
+  avatar: {
+    url: 'https://s3.amazonaws.com/uifaces/faces/twitter/designervzm/128.jpg',
+  },
   about:
     'Illum in et velit soluta voluptatem architecto consequuntur enim placeat. Eum excepturi est ratione rerum in voluptatum corporis. Illum consequatur minus. Modi incidunt velit.',
   disabled: false,
@@ -28,7 +30,9 @@ export const user = {
       id: 'u3',
       slug: 'jenny-rostock',
       name: 'Jenny Rostock',
-      avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/bowbrick/128.jpg',
+      avatar: {
+        url: 'https://s3.amazonaws.com/uifaces/faces/twitter/bowbrick/128.jpg',
+      },
       disabled: false,
       deleted: false,
       followedByCount: 2,
@@ -83,7 +87,7 @@ storiesOf('UserTeaser', module)
       <template #dateTime>
         - HEY! I'm edited
       </template>
-    </user>
+    </user-teaser>
     `,
   }))
   .add('anonymous', () => ({
diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
index 61f9977ef..6d12c5ce2 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
@@ -66,7 +66,9 @@ describe('UserAvatar.vue', () => {
         propsData = {
           user: {
             name: 'Not Anonymous',
-            avatar: '/avatar.jpg',
+            avatar: {
+              url: '/avatar.jpg',
+            },
           },
         }
         wrapper = Wrapper()
@@ -82,7 +84,9 @@ describe('UserAvatar.vue', () => {
         propsData = {
           user: {
             name: 'Not Anonymous',
-            avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/sawalazar/128.jpg',
+            avatar: {
+              url: 'https://s3.amazonaws.com/uifaces/faces/twitter/sawalazar/128.jpg',
+            },
           },
         }
         wrapper = Wrapper()
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.story.js b/webapp/components/generic/SearchableInput/SearchableInput.story.js
index 68feaadba..d969fa976 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.story.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.story.js
@@ -69,32 +69,40 @@ export const searchResults = [
   {
     id: 'u1',
     __typename: 'User',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     name: 'Peter Lustig',
     slug: 'peter-lustig',
   },
   {
     id: 'cdbca762-0632-4564-b646-415a0c42d8b8',
     __typename: 'User',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     name: 'Herbert Schultz',
     slug: 'herbert-schultz',
   },
   {
     id: 'u2',
     __typename: 'User',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     name: 'Bob der Baumeister',
     slug: 'bob-der-baumeister',
   },
   {
     id: '7b654f72-f4da-4315-8bed-39de0859754b',
     __typename: 'User',
-    avatar:
-      'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    avatar: {
+      url:
+        'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
+    },
     name: 'Tonya Mohr',
     slug: 'tonya-mohr',
   },
diff --git a/webapp/graphql/CommentMutations.js b/webapp/graphql/CommentMutations.js
index 133b61f18..5c9e1bc72 100644
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@@ -17,7 +17,9 @@ export default i18n => {
             id
             slug
             name
-            avatar
+            avatar {
+              url
+            }
             disabled
             deleted
             shoutedCount
@@ -47,7 +49,9 @@ export default i18n => {
             id
             slug
             name
-            avatar
+            avatar {
+              url
+            }
             disabled
             deleted
           }
@@ -67,7 +71,9 @@ export default i18n => {
             id
             slug
             name
-            avatar
+            avatar {
+              url
+            }
             disabled
             deleted
             shoutedCount
diff --git a/webapp/graphql/CommentQuery.js b/webapp/graphql/CommentQuery.js
index c2daaa943..8765dd141 100644
--- a/webapp/graphql/CommentQuery.js
+++ b/webapp/graphql/CommentQuery.js
@@ -12,7 +12,9 @@ export default app => {
           id
           slug
           name
-          avatar
+          avatar {
+            url
+          }
           disabled
           deleted
           shoutedCount
diff --git a/webapp/graphql/Fragments.js b/webapp/graphql/Fragments.js
index cb7af1624..67dca4228 100644
--- a/webapp/graphql/Fragments.js
+++ b/webapp/graphql/Fragments.js
@@ -5,7 +5,9 @@ export const userFragment = gql`
     id
     slug
     name
-    avatar
+    avatar {
+      url
+    }
     disabled
     deleted
   }
@@ -44,14 +46,16 @@ export const postFragment = gql`
     disabled
     deleted
     slug
-    image
     language
-    imageBlurred
+    image {
+      url
+      sensitive
+      aspectRatio
+    }
     author {
       ...user
     }
     pinnedAt
-    imageAspectRatio
     pinned
   }
 `
diff --git a/webapp/graphql/PostMutations.js b/webapp/graphql/PostMutations.js
index e754be037..9120b3e87 100644
--- a/webapp/graphql/PostMutations.js
+++ b/webapp/graphql/PostMutations.js
@@ -8,25 +8,23 @@ export default () => {
         $content: String!
         $language: String
         $categoryIds: [ID]
-        $imageUpload: Upload
-        $imageBlurred: Boolean
-        $imageAspectRatio: Float
+        $image: ImageInput
       ) {
         CreatePost(
           title: $title
           content: $content
           language: $language
           categoryIds: $categoryIds
-          imageUpload: $imageUpload
-          imageBlurred: $imageBlurred
-          imageAspectRatio: $imageAspectRatio
+          image: $image
         ) {
           title
           slug
           content
           contentExcerpt
           language
-          imageBlurred
+          image {
+            sensitive
+          }
         }
       }
     `,
@@ -36,22 +34,16 @@ export default () => {
         $title: String!
         $content: String!
         $language: String
-        $imageUpload: Upload
+        $image: ImageInput
         $categoryIds: [ID]
-        $image: String
-        $imageBlurred: Boolean
-        $imageAspectRatio: Float
       ) {
         UpdatePost(
           id: $id
           title: $title
           content: $content
           language: $language
-          imageUpload: $imageUpload
-          categoryIds: $categoryIds
           image: $image
-          imageBlurred: $imageBlurred
-          imageAspectRatio: $imageAspectRatio
+          categoryIds: $categoryIds
         ) {
           id
           title
@@ -59,13 +51,15 @@ export default () => {
           content
           contentExcerpt
           language
-          imageBlurred
+          image {
+            sensitive
+            aspectRatio
+          }
           pinnedBy {
             id
             name
             role
           }
-          imageAspectRatio
         }
       }
     `,
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 02f0909e3..70590813f 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -53,7 +53,9 @@ export const minimisedUserQuery = () => {
         id
         slug
         name
-        avatar
+        avatar {
+          url
+        }
       }
     }
   `
@@ -223,7 +225,7 @@ export const updateUserMutation = () => {
       $allowEmbedIframes: Boolean
       $showShoutsPublicly: Boolean
       $termsAndConditionsAgreedVersion: String
-      $avatarUpload: Upload
+      $avatar: ImageInput
     ) {
       UpdateUser(
         id: $id
@@ -234,7 +236,7 @@ export const updateUserMutation = () => {
         allowEmbedIframes: $allowEmbedIframes
         showShoutsPublicly: $showShoutsPublicly
         termsAndConditionsAgreedVersion: $termsAndConditionsAgreedVersion
-        avatarUpload: $avatarUpload
+        avatar: $avatar
       ) {
         id
         slug
@@ -245,7 +247,9 @@ export const updateUserMutation = () => {
         showShoutsPublicly
         locale
         termsAndConditionsAgreedVersion
-        avatar
+        avatar {
+          url
+        }
       }
     }
   `
diff --git a/webapp/graphql/settings/BlockedUsers.js b/webapp/graphql/settings/BlockedUsers.js
index 94f2121b1..be1765138 100644
--- a/webapp/graphql/settings/BlockedUsers.js
+++ b/webapp/graphql/settings/BlockedUsers.js
@@ -7,7 +7,9 @@ export const blockedUsers = () => {
         id
         name
         slug
-        avatar
+        avatar {
+          url
+        }
         about
         disabled
         deleted
diff --git a/webapp/graphql/settings/MutedUsers.js b/webapp/graphql/settings/MutedUsers.js
index 55ea34769..f498534e3 100644
--- a/webapp/graphql/settings/MutedUsers.js
+++ b/webapp/graphql/settings/MutedUsers.js
@@ -7,7 +7,9 @@ export const mutedUsers = () => {
         id
         name
         slug
-        avatar
+        avatar {
+          url
+        }
         about
         disabled
         deleted
diff --git a/webapp/package.json b/webapp/package.json
index d77256027..e2b7f74b3 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-webapp",
-  "version": "0.4.2",
+  "version": "0.4.1",
   "description": "Human Connection Frontend",
   "authors": [
     "Grzegorz Leoniec (appinteractive)",
@@ -63,7 +63,7 @@
     "@nuxtjs/axios": "~5.9.5",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
-    "@nuxtjs/sentry": "^3.3.1",
+    "@nuxtjs/sentry": "^3.2.4",
     "@nuxtjs/style-resources": "~1.0.0",
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
@@ -99,15 +99,15 @@
   "devDependencies": {
     "@babel/core": "~7.8.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "~7.8.7",
+    "@babel/preset-env": "~7.8.6",
     "@storybook/addon-a11y": "^5.3.14",
     "@storybook/addon-actions": "^5.3.17",
     "@storybook/addon-notes": "^5.3.17",
     "@storybook/vue": "~5.3.14",
     "@vue/cli-shared-utils": "~4.2.3",
     "@vue/eslint-config-prettier": "~6.0.0",
-    "@vue/server-test-utils": "~1.0.0-beta.32",
-    "@vue/test-utils": "~1.0.0-beta.32",
+    "@vue/server-test-utils": "~1.0.0-beta.31",
+    "@vue/test-utils": "~1.0.0-beta.31",
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
@@ -122,7 +122,7 @@
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.3",
     "eslint-plugin-import": "~2.20.1",
-    "eslint-plugin-jest": "~23.8.2",
+    "eslint-plugin-jest": "~23.8.1",
     "eslint-plugin-node": "~11.0.0",
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
@@ -130,7 +130,7 @@
     "eslint-plugin-vue": "~6.2.2",
     "faker": "^4.1.0",
     "flush-promises": "^1.0.2",
-    "fuse.js": "^3.6.1",
+    "fuse.js": "^3.4.6",
     "identity-obj-proxy": "^3.0.0",
     "jest": "~25.1.0",
     "mutation-observer": "^1.0.3",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 2f2f14c1e..8aef52c1d 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -24,7 +24,7 @@
         <masonry-grid-item
           v-for="post in posts"
           :key="post.id"
-          :imageAspectRatio="post.imageAspectRatio"
+          :imageAspectRatio="post.image && post.image.aspectRatio"
         >
           <post-teaser
             :post="post"
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index a0264444e..3bbc4d146 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -11,7 +11,7 @@
     >
       <template #heroImage v-if="post.image">
         <img :src="post.image | proxyApiUrl" class="image" />
-        <aside v-show="post.imageBlurred" class="blur-toggle">
+        <aside v-show="post.image && post.image.sensitive" class="blur-toggle">
           <img v-show="blurred" :src="post.image | proxyApiUrl" class="preview" />
           <base-button
             :icon="blurred ? 'eye' : 'eye-slash'"
@@ -235,8 +235,9 @@ export default {
       update({ Post }) {
         this.post = Post[0] || {}
         this.title = this.post.title
-        this.blurred = this.post.imageBlurred
+        const { image } = this.post
         this.postAuthor = this.post.author
+        this.blurred = image && image.sensitive
       },
       fetchPolicy: 'cache-and-network',
     },
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 92073e724..b7ba175cd 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -237,7 +237,7 @@
             <masonry-grid-item
               v-for="post in posts"
               :key="post.id"
-              :imageAspectRatio="post.imageAspectRatio"
+              :imageAspectRatio="post.image && post.image.aspectRatio"
             >
               <post-teaser
                 :post="post"
diff --git a/webapp/pages/settings/blocked-users.spec.js b/webapp/pages/settings/blocked-users.spec.js
index d5258770b..8c657392d 100644
--- a/webapp/pages/settings/blocked-users.spec.js
+++ b/webapp/pages/settings/blocked-users.spec.js
@@ -48,7 +48,7 @@ describe('blocked-users.vue', () => {
 
     describe('given a list of blocked users', () => {
       beforeEach(() => {
-        const blockedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe', avatar: '' }]
+        const blockedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe' }]
         wrapper.setData({ blockedUsers })
       })
 
diff --git a/webapp/pages/settings/muted-users.spec.js b/webapp/pages/settings/muted-users.spec.js
index c4ebcf4ea..b818fa521 100644
--- a/webapp/pages/settings/muted-users.spec.js
+++ b/webapp/pages/settings/muted-users.spec.js
@@ -48,7 +48,7 @@ describe('muted-users.vue', () => {
 
     describe('given a list of muted users', () => {
       beforeEach(() => {
-        const mutedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe', avatar: '' }]
+        const mutedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe' }]
         wrapper.setData({ mutedUsers })
       })
 
diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js
index 56fc6ca73..66c4ca248 100644
--- a/webapp/plugins/vue-filters.js
+++ b/webapp/plugins/vue-filters.js
@@ -81,7 +81,8 @@ export default ({ app = {} }) => {
 
       return contentExcerpt
     },
-    proxyApiUrl: url => {
+    proxyApiUrl: input => {
+      const url = input && (input.url || input)
       if (!url) return url
       return url.startsWith('/') ? url.replace('/', '/api/') : url
     },
diff --git a/webapp/store/auth.test.js b/webapp/store/auth.test.js
index 87b5295dc..325fcc40d 100644
--- a/webapp/store/auth.test.js
+++ b/webapp/store/auth.test.js
@@ -11,7 +11,9 @@ const currentUser = {
   name: 'Jenny Rostock',
   slug: 'jenny-rostock',
   email: 'user@example.org',
-  avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
+  avatar: {
+    url: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
+  },
   role: 'user',
   locale: 'de',
 }
@@ -125,7 +127,9 @@ describe('actions', () => {
                 name: 'Jenny Rostock',
                 slug: 'jenny-rostock',
                 email: 'user@example.org',
-                avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
+                avatar: {
+                  url: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
+                },
                 role: 'user',
                 locale: 'de',
               },
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 7065dd2f9..208290570 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -820,7 +820,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.6", "@babel/preset-env@~7.8.7":
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.6", "@babel/preset-env@~7.8.6":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
   integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
@@ -1738,7 +1738,7 @@
     jimp-compact "^0.8.0"
     workbox-cdn "^4.3.1"
 
-"@nuxtjs/sentry@^3.3.1":
+"@nuxtjs/sentry@^3.2.4":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.3.1.tgz#b3f21851103d5194b9da314a5eec7b154ed50cbe"
   integrity sha512-o7aGlI7OvaRDT0SsV73Ye1r5sfylKwRGG8EyRClOrhi6dpMIuqcmzgILHIIcHpFkrm61D3sORc7d7rhlHtY6DA==
@@ -3249,7 +3249,7 @@
   dependencies:
     eslint-config-prettier "^6.0.0"
 
-"@vue/server-test-utils@~1.0.0-beta.32":
+"@vue/server-test-utils@~1.0.0-beta.31":
   version "1.0.0-beta.32"
   resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.0.0-beta.32.tgz#698424d5d76fea10ee3d2ec45f2416e31681f01e"
   integrity sha512-1dxJyrO805pr4tyNckAwRojxby3g37IHpmBURInz4yccsiwHsOhSi1tR23HovOocqmu1/NttiI5rHtv9MtL9Ig==
@@ -3257,7 +3257,7 @@
     "@types/cheerio" "^0.22.10"
     cheerio "^1.0.0-rc.2"
 
-"@vue/test-utils@~1.0.0-beta.32":
+"@vue/test-utils@~1.0.0-beta.31":
   version "1.0.0-beta.32"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.32.tgz#38c3947886236201a3f24b583c73598eb95ccc69"
   integrity sha512-ywhe7PATMAk/ZGdsrcuQIliQusOyfe0OOHjKKCCERqgHh1g/kqPtmSMT5Jx4sErx53SYbNucr8QOK6/u5ianAw==
@@ -7453,7 +7453,7 @@ eslint-plugin-import@~2.20.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-jest@~23.8.2:
+eslint-plugin-jest@~23.8.1:
   version "23.8.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
   integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
@@ -8363,7 +8363,7 @@ functions-have-names@^1.1.1:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.1.1.tgz#79d35927f07b8e7103d819fed475b64ccf7225ea"
   integrity sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw==
 
-fuse.js@^3.4.6, fuse.js@^3.6.1:
+fuse.js@^3.4.6:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
   integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==

From b065272b3dbfac89eb0c4668a203fddc6d08b0b0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 04:16:52 +0000
Subject: [PATCH 061/106] build(deps-dev): bump cypress from 4.1.0 to 4.2.0

Bumps [cypress](https://github.com/cypress-io/cypress) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v4.1.0...v4.2.0)

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

diff --git a/package.json b/package.json
index 9eecb709a..1342db23a 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "codecov": "^3.6.5",
     "cross-env": "^6.0.3",
     "cucumber": "^6.0.5",
-    "cypress": "^4.1.0",
+    "cypress": "^4.2.0",
     "cypress-cucumber-preprocessor": "^2.0.1",
     "cypress-file-upload": "^3.5.3",
     "cypress-plugin-retries": "^1.5.2",
diff --git a/yarn.lock b/yarn.lock
index c3b6c34ad..307d9cd31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2001,7 +2001,7 @@ cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table3@^0.5.1:
+cli-table3@0.5.1, cli-table3@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
   integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
@@ -2648,10 +2648,10 @@ cypress-plugin-retries@^1.5.2:
   dependencies:
     chalk "^3.0.0"
 
-cypress@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.1.0.tgz#295f115d2e8a08fff2760ab49d94d876f5877aee"
-  integrity sha512-FFV8pS9iuriSX4M9rna6awJUhiqozZD1D5z5BprCUJoho1ctbcgpkEUIUnqxli2OwjQqVz07egO+iqoGL+tw7g==
+cypress@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.2.0.tgz#45673fb648b1a77b9a78d73e58b89ed05212d243"
+  integrity sha512-8LdreL91S/QiTCLYLNbIjLL8Ht4fJmu/4HGLxUI20Tc7JSfqEfCmXELrRfuPT0kjosJwJJZacdSji9XSRkPKUw==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
@@ -2661,6 +2661,7 @@ cypress@^4.1.0:
     cachedir "2.3.0"
     chalk "2.4.2"
     check-more-types "2.24.0"
+    cli-table3 "0.5.1"
     commander "4.1.0"
     common-tags "1.8.0"
     debug "4.1.1"
@@ -2676,12 +2677,12 @@ cypress@^4.1.0:
     listr "0.14.3"
     lodash "4.17.15"
     log-symbols "3.0.0"
-    minimist "1.2.0"
+    minimist "1.2.2"
     moment "2.24.0"
     ospath "1.2.2"
     pretty-bytes "5.3.0"
     ramda "0.26.1"
-    request "2.88.0"
+    request "github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
     request-progress "3.0.0"
     supports-color "7.1.0"
     tmp "0.1.0"
@@ -3627,7 +3628,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -4849,10 +4850,10 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+minimist@1.2.2, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
+  integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==
 
 minimist@~0.0.1:
   version "0.0.10"
@@ -5604,10 +5605,10 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-psl@^1.1.24:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+psl@^1.1.28:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -5634,12 +5635,12 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.3.2, punycode@^1.4.1:
+punycode@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -5905,10 +5906,10 @@ request-progress@3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+"request@github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16":
+  version "2.88.1"
+  uid b5af0d1fa47eec97ba980cde90a13e69a2afcd16
+  resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -5917,7 +5918,7 @@ request@2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -5927,7 +5928,7 @@ request@2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -6750,13 +6751,13 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
 trim-newlines@^1.0.0:
   version "1.0.0"

From 871aaed06d403c0bf5d2f2ca9cb3c6e943ca6700 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 18 Mar 2020 13:36:19 +0100
Subject: [PATCH 062/106] chore(ci): Disable yarn cache

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 532e2b766..70481b06a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 dist: xenial
 language: node_js
 node_js: lts/*
+cache:
+  yarn: false
+  npm: false
+
 addons:
   apt:
     packages:
@@ -8,11 +12,11 @@ addons:
   snaps:
     - docker
   firefox: "latest-esr"
-    
+
 install:
   - yarn global add wait-on
   # Install Codecov
-  - yarn install
+  - yarn install --frozen-lockfile
   - cp backend/.env.template backend/.env
 
 before_script:

From f9b6fb95ab9c576382be81ed41c6f577d0978d7a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 3 Mar 2020 21:06:23 +0100
Subject: [PATCH 063/106] spec for searches added

---
 backend/src/schema/resolvers/searches.js      |  16 +-
 backend/src/schema/resolvers/searches.spec.js | 194 ++++++++++++++++++
 2 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/schema/resolvers/searches.spec.js

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 994d19fa2..5e09b062d 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -48,7 +48,7 @@ export default {
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {
-          query: myQuery,
+          query: createPostQuery(query),
           limit,
           thisUserId,
         })
@@ -71,3 +71,17 @@ export default {
     },
   },
 }
+
+function createPostQuery(str) {
+  // match the whole text
+  // console.log('"' + escapeSpecialCharacters(normalizeWhitespace(str)) + '"')
+  return '"' + escapeSpecialCharacters(normalizeWhitespace(str)) + '"'
+}
+
+function normalizeWhitespace(str) {
+  return str.replace(/\s+/g, ' ')
+}
+
+function escapeSpecialCharacters(str) {
+  return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
+}
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
new file mode 100644
index 000000000..90cd2e013
--- /dev/null
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -0,0 +1,194 @@
+import Factory, { cleanDatabase } from '../../db/factories'
+import { gql } from '../../helpers/jest'
+import { getNeode, getDriver } from '../../db/neo4j'
+import createServer from '../../server'
+import { createTestClient } from 'apollo-server-testing'
+
+let query, authenticatedUser
+
+const driver = getDriver()
+const neode = getNeode()
+
+jest.setTimeout(30000)
+
+beforeAll(async () => {
+  await cleanDatabase()
+  const { server } = createServer({
+    context: () => {
+      return {
+        driver,
+        neode,
+        user: authenticatedUser,
+      }
+    },
+  })
+  query = createTestClient(server).query
+})
+
+afterAll(async () => {
+  await cleanDatabase()
+})
+
+const searchQuery = gql`
+  query($query: String!) {
+    findResources(query: $query, limit: 5) {
+      __typename
+      ... on Post {
+        id
+        title
+        content
+      }
+      ... on User {
+        id
+        slug
+        name
+      }
+    }
+  }
+`
+
+describe('resolvers', () => {
+  describe('searches', () => {
+    beforeAll(async () => {
+      const user = await Factory.build('user', {
+        id: 'a-user',
+        name: 'John Doe',
+        slug: 'john-doe',
+      })
+      await Factory.build('post', {
+        id: 'a-post',
+        title: 'Beitrag',
+        content: 'Ein erster Beitrag',
+      })
+      authenticatedUser = await user.toJson()
+    })
+    let variables
+
+    describe('basic searches', () => {
+      it('finds the post', async () => {
+        variables = { query: 'Beitrag' }
+        const res = await query({ query: searchQuery, variables })
+        // console.log(res)
+        expect(res.data.findResources).toHaveLength(1)
+      })
+
+      it('does not find the post', async () => {
+        variables = { query: 'Unfug' }
+        const res = await query({ query: searchQuery, variables })
+        expect(res.data.findResources).toHaveLength(0)
+      })
+
+      it('finds the user', async () => {
+        variables = { query: 'John' }
+        const res = await query({ query: searchQuery, variables })
+        // console.log(res)
+        expect(res.data.findResources).toHaveLength(1)
+      })
+
+      it('does not find the user', async () => {
+        variables = { query: 'Unfug' }
+        const res = await query({ query: searchQuery, variables })
+        expect(res.data.findResources).toHaveLength(0)
+      })
+    })
+
+    describe('more data added', () => {
+      beforeAll(async () => {
+        await Promise.all([
+          Factory.build('post', {
+            id: 'b-post',
+            title: 'Aufruf',
+            content: 'Jeder sollte seinen Beitrag leisten.',
+          }),
+          Factory.build('post', {
+            id: 'c-post',
+            title: 'Die binomischen Formeln',
+            content: `
+1. binomische Formel: (a + b)² = a² + 2ab + b²
+2. binomische Formel: (a - b)² = a² - 2ab + b²
+3. binomische Formel: (a + b)(a - b) = a² - b²
+`,
+          }),
+          Factory.build('post', {
+            id: 'd-post',
+            title: 'Der Panther',
+            content: `
+Sein Blick ist vom Vorübergehn der Stäbe
+so müd geworden, daß er nichts mehr hält.
+Ihm ist, als ob es tausend Stäbe gäbe
+und hinter tausend Stäben keine Welt.
+
+Der weiche Gang geschmeidig starker Schritte,
+der sich im allerkleinsten Kreise dreht,
+ist wie ein Tanz von Kraft um eine Mitte,
+in der betäubt ein großer Wille steht.
+
+Nur manchmal schiebt der Vorhang der Pupille
+sich lautlos auf –. Dann geht ein Bild hinein,
+geht durch der Glieder angespannte Stille –
+und hört im Herzen auf zu sein.
+`,
+          }),
+          Factory.build('post', {
+            id: 'e-post',
+            title: 'Typographie',
+            content: `
+Gelegentlich können sowohl der angeführte Text als auch der Begleitsatz mit Frage- oder Ausrufezeichen enden (§ 91):
+Gefällt dir der Roman „Quo vadis?“? Lass doch dieses ewige „Ich will nicht!“!
+`,
+          }),
+          Factory.build('post', {
+            id: 'f-post',
+            title: 'Typographie II',
+            content: `
+Der Gedankenstrich kann als Auslassungszeichen (Auslassungsstrich) eine längere Pause oder eine Ellipse darstellen: „Du willst doch wohl nicht etwa –“, „Mein Gott, woher nehm ich bloß –?“
+`,
+          }),
+          Factory.build('post', {
+            id: 'g-post',
+            title: 'AK-47',
+            content: `
+Vom AK-47 Typ I existiert eine Version mit unter die Waffe klappbarer Schulterstütze, das AKS-47 (russisch Автомат Калашникова складной образца 1947 года, transkr.: Avtomat Kalašnikova skladnoj obrazca 1947 goda, dt. Automat Kalaschnikow klappbar Modell 1947tes Jahr) genannt wird, seltener auch AK-47s. 
+`,
+          }),
+          Factory.build('user', {
+            id: 'b-user',
+            name: 'Johnannes der Täufer',
+            slug: 'johnannes-der-taufer',
+          }),
+          Factory.build('user', {
+            id: 'c-user',
+            name: 'Rainer Maria Rilke',
+            slug: 'rainer-maria-rilke',
+          }),
+          Factory.build('user', {
+            id: 'd-user',
+            name: 'Erich Maria Remarque',
+            slug: 'erich-maria-remarque',
+          }),
+          Factory.build('user', {
+            id: 'e-user',
+            name: 'Klaus Dieter',
+            slug: 'kd',
+          }),
+          Factory.build('user', {
+            id: 'f-user',
+            name: 'Sluggy',
+            slug: '_',
+          }),
+          Factory.build('user', {
+            id: 'g-user',
+            name: 'AKK',
+            slug: 'akk',
+          }),
+        ])
+      })
+
+      it('finds the AK-47', async () => {
+        variables = { query: 'AK-47' }
+        const res = await query({ query: searchQuery, variables })
+        expect(res.data.findResources).toHaveLength(1)
+      })
+    })
+  })
+})

From a6a2ac4fbeec4955fc5f8a1e348b05f750bbcc91 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 4 Mar 2020 04:00:29 +0100
Subject: [PATCH 064/106] search spec starts doing what it should

---
 backend/src/schema/resolvers/searches.js      |  36 ++-
 backend/src/schema/resolvers/searches.spec.js | 281 +++++++++++-------
 2 files changed, 202 insertions(+), 115 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 5e09b062d..f2fbfa668 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -1,22 +1,18 @@
 import log from './helpers/databaseLogger'
 
+// see http://lucene.apache.org/core/8_3_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package.description
+
 export default {
   Query: {
     findResources: async (_parent, args, context, _resolveInfo) => {
       const { query, limit } = args
       const { id: thisUserId } = context.user
-      // see http://lucene.apache.org/core/8_3_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package.description
-      const myQuery = query
-        .replace(/\s+/g, ' ')
-        .replace(/[[@#:*~\\$|^\]?/"'(){}+?!,.-;]/g, '')
-        .split(' ')
-        .map(s => (s.toLowerCase().match(/^(not|and|or)$/) ? '"' + s + '"' : s + '*'))
-        .join(' ')
+
       const postCypher = `
       CALL db.index.fulltext.queryNodes('post_fulltext_search', $query)
       YIELD node as resource, score
       MATCH (resource)<-[:WROTE]-(author:User)
-      WHERE score >= 0.5
+      WHERE score >= 0.2
       AND NOT (
         author.deleted = true OR author.disabled = true
         OR resource.deleted = true OR resource.disabled = true
@@ -53,7 +49,7 @@ export default {
           thisUserId,
         })
         const userTransactionResponse = transaction.run(userCypher, {
-          query: myQuery,
+          query: createUserQuery(query),
           limit,
           thisUserId,
         })
@@ -64,6 +60,8 @@ export default {
         const [postResults, userResults] = await searchResultPromise
         log(postResults)
         log(userResults)
+        // console.log(postResults.summary.query.parameters)
+        // console.log(userResults)
         return [...postResults.records, ...userResults.records].map(r => r.get('resource'))
       } finally {
         session.close()
@@ -72,16 +70,32 @@ export default {
   },
 }
 
+function createUserQuery(str) {
+  // match the whole text
+  const normalizedString = normalizeWhitespace(str)
+  const escapedString = escapeSpecialCharacters(normalizedString)
+  const result = normalizedString.includes(' ') ? quoteString(escapedString) : escapedString
+  // console.log('"' +  + '"')
+  return result
+}
+
 function createPostQuery(str) {
   // match the whole text
-  // console.log('"' + escapeSpecialCharacters(normalizeWhitespace(str)) + '"')
-  return '"' + escapeSpecialCharacters(normalizeWhitespace(str)) + '"'
+  const normalizedString = normalizeWhitespace(str)
+  const escapedString = escapeSpecialCharacters(normalizedString)
+  const result = normalizedString.includes(' ') ? quoteString(escapedString) : escapedString
+  // console.log('"' +  + '"')
+  return result
 }
 
 function normalizeWhitespace(str) {
   return str.replace(/\s+/g, ' ')
 }
 
+function quoteString(str) {
+  return '"' + str + '"'
+}
+
 function escapeSpecialCharacters(str) {
   return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
 }
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index 90cd2e013..4ae62ca2c 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -26,7 +26,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await cleanDatabase()
+  // await cleanDatabase()
 })
 
 const searchQuery = gql`
@@ -47,73 +47,149 @@ const searchQuery = gql`
   }
 `
 
+const nothingFound = { data: { findResources: [] } }
+
+const createExpectedObject = array => {
+  return { data: { findResources: array } }
+}
+
+const addPostToDB = post => {
+  return Factory.build('post', {
+    id: post.id,
+    title: post.title,
+    content: post.content,
+  })
+}
+
+const addUserToDB = user => {
+  return Factory.build('user', {
+    id: user.id,
+    name: user.name,
+    slug: user.slug,
+  })
+}
+
+const createDataObject = (obj, type) => {
+  return { __typename: type, ...obj }
+}
+
+const createPostObject = post => {
+  return createDataObject(post, 'Post')
+}
+
+const createUserObject = user => {
+  return createDataObject(user, 'User')
+}
+
+// see data at the end of the file
+
+let user
+
 describe('resolvers', () => {
   describe('searches', () => {
     beforeAll(async () => {
-      const user = await Factory.build('user', {
-        id: 'a-user',
-        name: 'John Doe',
-        slug: 'john-doe',
-      })
-      await Factory.build('post', {
-        id: 'a-post',
-        title: 'Beitrag',
-        content: 'Ein erster Beitrag',
-      })
+      user = await addUserToDB(aUser)
+      await addPostToDB(aPost)
       authenticatedUser = await user.toJson()
     })
+
     let variables
 
     describe('basic searches', () => {
       it('finds the post', async () => {
         variables = { query: 'Beitrag' }
-        const res = await query({ query: searchQuery, variables })
-        // console.log(res)
-        expect(res.data.findResources).toHaveLength(1)
+        const expected = createExpectedObject([aPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
       })
 
       it('does not find the post', async () => {
         variables = { query: 'Unfug' }
-        const res = await query({ query: searchQuery, variables })
-        expect(res.data.findResources).toHaveLength(0)
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(nothingFound)
       })
 
       it('finds the user', async () => {
         variables = { query: 'John' }
-        const res = await query({ query: searchQuery, variables })
-        // console.log(res)
-        expect(res.data.findResources).toHaveLength(1)
+        const expected = createExpectedObject([aUser])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
       })
 
       it('does not find the user', async () => {
         variables = { query: 'Unfug' }
-        const res = await query({ query: searchQuery, variables })
-        expect(res.data.findResources).toHaveLength(0)
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(nothingFound)
       })
     })
 
     describe('more data added', () => {
       beforeAll(async () => {
         await Promise.all([
-          Factory.build('post', {
-            id: 'b-post',
-            title: 'Aufruf',
-            content: 'Jeder sollte seinen Beitrag leisten.',
-          }),
-          Factory.build('post', {
-            id: 'c-post',
-            title: 'Die binomischen Formeln',
-            content: `
-1. binomische Formel: (a + b)² = a² + 2ab + b²
+          addPostToDB(bPost),
+          addPostToDB(cPost),
+          addPostToDB(dPost),
+          addPostToDB(ePost),
+          addPostToDB(fPost),
+          addPostToDB(gPost),
+          addUserToDB(bUser),
+          addUserToDB(cUser),
+          addUserToDB(dUser),
+          addUserToDB(eUser),
+          addUserToDB(fUser),
+          addUserToDB(gUser),
+        ])
+      })
+
+      it('finds the AK-47', async () => {
+        variables = { query: 'AK-47' }
+        const expected = createExpectedObject([gPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds more than one post', async () => {
+        variables = { query: 'Beitrag' }
+        const expected = createExpectedObject([aPost, bPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds more than one user by slug', async () => {
+        variables = { query: '-maria-' }
+        const expected = createExpectedObject([dUser, cUser])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds Russian text', async () => {
+        variables = { query: 'Калашникова' }
+        const expected = createExpectedObject([gPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+    })
+  })
+})
+
+// data section
+
+const aPost = createPostObject({
+  id: 'a-post',
+  title: 'Beitrag',
+  content: 'Ein erster Beitrag',
+})
+
+const bPost = createPostObject({
+  id: 'b-post',
+  title: 'Aufruf',
+  content: 'Jeder sollte seinen Beitrag leisten.',
+})
+
+const cPost = createPostObject({
+  id: 'c-post',
+  title: 'Die binomischen Formeln',
+  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
 2. binomische Formel: (a - b)² = a² - 2ab + b²
-3. binomische Formel: (a + b)(a - b) = a² - b²
-`,
-          }),
-          Factory.build('post', {
-            id: 'd-post',
-            title: 'Der Panther',
-            content: `
-Sein Blick ist vom Vorübergehn der Stäbe
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+})
+
+const dPost = createPostObject({
+  id: 'd-post',
+  title: 'Der Panther',
+  content: `Sein Blick ist vom Vorübergehn der Stäbe
 so müd geworden, daß er nichts mehr hält.
 Ihm ist, als ob es tausend Stäbe gäbe
 und hinter tausend Stäben keine Welt.
@@ -126,69 +202,66 @@ in der betäubt ein großer Wille steht.
 Nur manchmal schiebt der Vorhang der Pupille
 sich lautlos auf –. Dann geht ein Bild hinein,
 geht durch der Glieder angespannte Stille –
-und hört im Herzen auf zu sein.
-`,
-          }),
-          Factory.build('post', {
-            id: 'e-post',
-            title: 'Typographie',
-            content: `
-Gelegentlich können sowohl der angeführte Text als auch der Begleitsatz mit Frage- oder Ausrufezeichen enden (§ 91):
-Gefällt dir der Roman „Quo vadis?“? Lass doch dieses ewige „Ich will nicht!“!
-`,
-          }),
-          Factory.build('post', {
-            id: 'f-post',
-            title: 'Typographie II',
-            content: `
-Der Gedankenstrich kann als Auslassungszeichen (Auslassungsstrich) eine längere Pause oder eine Ellipse darstellen: „Du willst doch wohl nicht etwa –“, „Mein Gott, woher nehm ich bloß –?“
-`,
-          }),
-          Factory.build('post', {
-            id: 'g-post',
-            title: 'AK-47',
-            content: `
-Vom AK-47 Typ I existiert eine Version mit unter die Waffe klappbarer Schulterstütze, das AKS-47 (russisch Автомат Калашникова складной образца 1947 года, transkr.: Avtomat Kalašnikova skladnoj obrazca 1947 goda, dt. Automat Kalaschnikow klappbar Modell 1947tes Jahr) genannt wird, seltener auch AK-47s. 
-`,
-          }),
-          Factory.build('user', {
-            id: 'b-user',
-            name: 'Johnannes der Täufer',
-            slug: 'johnannes-der-taufer',
-          }),
-          Factory.build('user', {
-            id: 'c-user',
-            name: 'Rainer Maria Rilke',
-            slug: 'rainer-maria-rilke',
-          }),
-          Factory.build('user', {
-            id: 'd-user',
-            name: 'Erich Maria Remarque',
-            slug: 'erich-maria-remarque',
-          }),
-          Factory.build('user', {
-            id: 'e-user',
-            name: 'Klaus Dieter',
-            slug: 'kd',
-          }),
-          Factory.build('user', {
-            id: 'f-user',
-            name: 'Sluggy',
-            slug: '_',
-          }),
-          Factory.build('user', {
-            id: 'g-user',
-            name: 'AKK',
-            slug: 'akk',
-          }),
-        ])
-      })
-
-      it('finds the AK-47', async () => {
-        variables = { query: 'AK-47' }
-        const res = await query({ query: searchQuery, variables })
-        expect(res.data.findResources).toHaveLength(1)
-      })
-    })
-  })
+und hört im Herzen auf zu sein.`,
+})
+
+const ePost = createPostObject({
+  id: 'e-post',
+  title: 'Typographie',
+  content: `Gelegentlich können sowohl der angeführte Text als auch der Begleitsatz mit Frage- oder Ausrufezeichen enden (§ 91):
+Gefällt dir der Roman „Quo vadis?“? Lass doch dieses ewige „Ich will nicht!“!`,
+})
+
+const fPost = createPostObject({
+  id: 'f-post',
+  title: 'Typographie II',
+  content: `Der Gedankenstrich kann als Auslassungszeichen (Auslassungsstrich) eine längere Pause oder eine Ellipse darstellen: „Du willst doch wohl nicht etwa –“, „Mein Gott, woher nehm ich bloß –?“`,
+})
+
+const gPost = createPostObject({
+  id: 'g-post',
+  title: 'AK-47',
+  content: `Vom AK-47 Typ I existiert eine Version mit unter die Waffe klappbarer Schulterstütze, das AKS-47 (russisch Автомат Калашникова складной образца 1947 года, transkr.: Avtomat Kalašnikova skladnoj obrazca 1947 goda, dt. Automat Kalaschnikow klappbar Modell 1947tes Jahr) genannt wird, seltener auch AK-47s.`,
+})
+
+const aUser = createUserObject({
+  id: 'a-user',
+  name: 'John Doe',
+  slug: 'john-doe',
+})
+
+const bUser = createUserObject({
+  id: 'b-user',
+  name: 'Johnannes der Täufer',
+  slug: 'johnannes-der-taufer',
+})
+
+const cUser = createUserObject({
+  id: 'c-user',
+  name: 'Rainer Maria Rilke',
+  slug: 'rainer-maria-rilke',
+})
+
+const dUser = createUserObject({
+  id: 'd-user',
+  name: 'Erich Maria Remarque',
+  slug: 'erich-maria-remarque',
+})
+
+const eUser = createUserObject({
+  id: 'e-user',
+  name: 'Klaus Dieter',
+  slug: 'kd',
+})
+
+const fUser = createUserObject({
+  id: 'f-user',
+  name: 'Sluggy',
+  slug: '_',
+})
+
+const gUser = createUserObject({
+  id: 'g-user',
+  name: 'AKK',
+  slug: 'akk',
 })

From 9cb489dce13601b6c902e7b8859554af698599a5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 01:07:40 +0100
Subject: [PATCH 065/106] Specs are running and regex in searches.js is cleaned
 up Matching the whole text entered exactly is boosted by 8. Matching all the
 words entered exactly is boosted by 4. Matching some words ebtered exactly is
 boosted by 2. Glob matching is applied for words with more than three
 characters is not boosted. To Do: Deal with @ and # symbols. To Do: Find a
 way to match unicode, e.g. kyrillic letters.

---
 backend/src/schema/resolvers/searches.js      | 51 ++++++----
 backend/src/schema/resolvers/searches.spec.js | 94 +++++++++++++++----
 2 files changed, 107 insertions(+), 38 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index f2fbfa668..ce626f148 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -12,7 +12,7 @@ export default {
       CALL db.index.fulltext.queryNodes('post_fulltext_search', $query)
       YIELD node as resource, score
       MATCH (resource)<-[:WROTE]-(author:User)
-      WHERE score >= 0.2
+      WHERE score >= 0.0
       AND NOT (
         author.deleted = true OR author.disabled = true
         OR resource.deleted = true OR resource.disabled = true
@@ -35,7 +35,7 @@ export default {
       CALL db.index.fulltext.queryNodes('user_fulltext_search', $query)
       YIELD node as resource, score
       MATCH (resource)
-      WHERE score >= 0.5
+      WHERE score >= 0.0
       AND NOT (resource.deleted = true OR resource.disabled = true)
       RETURN resource {.*, __typename: labels(resource)[0]}
       LIMIT $limit
@@ -70,32 +70,47 @@ export default {
   },
 }
 
-function createUserQuery(str) {
-  // match the whole text
+const createUserQuery = str => {
+  return createPostQuery(str)
+}
+
+const createPostQuery = str => {
+  // match the whole text exactly
   const normalizedString = normalizeWhitespace(str)
   const escapedString = escapeSpecialCharacters(normalizedString)
-  const result = normalizedString.includes(' ') ? quoteString(escapedString) : escapedString
-  // console.log('"' +  + '"')
+  let result = quoteString(escapedString) + '^8'
+  // match each word exactly
+  if (escapedString.includes(' ')) {
+    result += ' OR ('
+    escapedString.split(' ').forEach((s, i) => {
+      result += i === 0 ? quoteString(s) : ' AND ' + quoteString(s)
+    })
+    result += ')^4'
+  }
+  // match at least one word exactly
+  if (escapedString.includes(' ')) {
+    escapedString.split(' ').forEach(s => {
+      result += ' OR ' + quoteString(s) + '^2'
+    })
+  }
+  // start globbing ...
+  escapedString.split(' ').forEach(s => {
+    if (s.length > 3)
+      // at least 4 letters. So AND, OR and NOT are never used unquoted
+      result += ' OR ' + s + '*'
+  })
+  // now we could become fuzzy using ~
   return result
 }
 
-function createPostQuery(str) {
-  // match the whole text
-  const normalizedString = normalizeWhitespace(str)
-  const escapedString = escapeSpecialCharacters(normalizedString)
-  const result = normalizedString.includes(' ') ? quoteString(escapedString) : escapedString
-  // console.log('"' +  + '"')
-  return result
-}
-
-function normalizeWhitespace(str) {
+const normalizeWhitespace = str => {
   return str.replace(/\s+/g, ' ')
 }
 
-function quoteString(str) {
+const quoteString = str => {
   return '"' + str + '"'
 }
 
-function escapeSpecialCharacters(str) {
+const escapeSpecialCharacters = str => {
   return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
 }
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index 4ae62ca2c..ce02c1984 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -3,6 +3,7 @@ import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
+import cloneDeep from 'lodash/cloneDeep'
 
 let query, authenticatedUser
 
@@ -49,8 +50,18 @@ const searchQuery = gql`
 
 const nothingFound = { data: { findResources: [] } }
 
+const addBrAfterNewlinw = array => {
+  return array.map(obj => {
+    const tmp = cloneDeep(obj)
+    if (tmp.__typename === 'Post') {
+      tmp.content = tmp.content.replace(/\n/g, '<br>\n')
+    }
+    return tmp
+  })
+}
+
 const createExpectedObject = array => {
-  return { data: { findResources: array } }
+  return { data: { findResources: addBrAfterNewlinw(array) } }
 }
 
 const addPostToDB = post => {
@@ -69,6 +80,14 @@ const addUserToDB = user => {
   })
 }
 
+const dumpToDB = array => {
+  const result = []
+  array.forEach(obj => {
+    obj.__typename === 'Post' ? result.push(addPostToDB(obj)) : result.push(addUserToDB(obj))
+  })
+  return result
+}
+
 const createDataObject = (obj, type) => {
   return { __typename: type, ...obj }
 }
@@ -97,7 +116,13 @@ describe('resolvers', () => {
 
     describe('basic searches', () => {
       it('finds the post', async () => {
-        variables = { query: 'Beitrag' }
+        variables = { query: 'beitrag' }
+        const expected = createExpectedObject([aPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds the post searching only with capital letters', async () => {
+        variables = { query: 'BEITRAG' }
         const expected = createExpectedObject([aPost])
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
       })
@@ -121,20 +146,22 @@ describe('resolvers', () => {
 
     describe('more data added', () => {
       beforeAll(async () => {
-        await Promise.all([
-          addPostToDB(bPost),
-          addPostToDB(cPost),
-          addPostToDB(dPost),
-          addPostToDB(ePost),
-          addPostToDB(fPost),
-          addPostToDB(gPost),
-          addUserToDB(bUser),
-          addUserToDB(cUser),
-          addUserToDB(dUser),
-          addUserToDB(eUser),
-          addUserToDB(fUser),
-          addUserToDB(gUser),
-        ])
+        await Promise.all(
+          dumpToDB([
+            bPost,
+            cPost,
+            dPost,
+            ePost,
+            fPost,
+            gPost,
+            bUser,
+            cUser,
+            dUser,
+            eUser,
+            fUser,
+            gUser,
+          ]),
+        )
       })
 
       it('finds the AK-47', async () => {
@@ -151,15 +178,44 @@ describe('resolvers', () => {
 
       it('finds more than one user by slug', async () => {
         variables = { query: '-maria-' }
-        const expected = createExpectedObject([dUser, cUser])
+        const expected = [cUser, dUser]
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+          data: {
+            findResources: expect.arrayContaining(expected),
+          },
+        })
+      })
+
+      it('finds the binomial formula', async () => {
+        variables = { query: '(a - b)² = a² - 2ab + b²' }
+        const expected = createExpectedObject([cPost])
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
       })
 
+      it('finds text over linebreak', async () => {
+        variables = { query: 'dreht, ist' }
+        const expected = createExpectedObject([dPost])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds single words with lower score', async () => {
+        variables = { query: 'der Panther' }
+        const expected = createExpectedObject([dPost, ePost, fPost, bUser])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      it('finds something that starts with the given text', async () => {
+        variables = { query: 'john' }
+        const expected = createExpectedObject([aUser, bUser])
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      })
+
+      /*
       it('finds Russian text', async () => {
         variables = { query: 'Калашникова' }
         const expected = createExpectedObject([gPost])
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
+      }) */
     })
   })
 })
@@ -193,12 +249,10 @@ const dPost = createPostObject({
 so müd geworden, daß er nichts mehr hält.
 Ihm ist, als ob es tausend Stäbe gäbe
 und hinter tausend Stäben keine Welt.
-
 Der weiche Gang geschmeidig starker Schritte,
 der sich im allerkleinsten Kreise dreht,
 ist wie ein Tanz von Kraft um eine Mitte,
 in der betäubt ein großer Wille steht.
-
 Nur manchmal schiebt der Vorhang der Pupille
 sich lautlos auf –. Dann geht ein Bild hinein,
 geht durch der Glieder angespannte Stille –

From 1060a2f6d0ac7451c7aa87cf8b956baad05fff9c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 02:11:34 +0100
Subject: [PATCH 066/106] cypress tests will pass

---
 backend/src/schema/resolvers/searches.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index ce626f148..7f11734a3 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -95,8 +95,9 @@ const createPostQuery = str => {
   }
   // start globbing ...
   escapedString.split(' ').forEach(s => {
-    if (s.length > 3)
+    if (!s.matches(/^(AND|OR|NOT)$/))
       // at least 4 letters. So AND, OR and NOT are never used unquoted
+      // but the related cypress test expects a search for just two chars.
       result += ' OR ' + s + '*'
   })
   // now we could become fuzzy using ~

From 57101b80bf770efb04d91e0f7190360f44a0b321 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 02:28:10 +0100
Subject: [PATCH 067/106] cypress tests will really pass

---
 backend/src/schema/resolvers/searches.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 7f11734a3..56913fb3e 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -95,10 +95,11 @@ const createPostQuery = str => {
   }
   // start globbing ...
   escapedString.split(' ').forEach(s => {
-    if (!s.matches(/^(AND|OR|NOT)$/))
+    if (!s.match(/^(AND|OR|NOT)$/i)) {
       // at least 4 letters. So AND, OR and NOT are never used unquoted
       // but the related cypress test expects a search for just two chars.
       result += ' OR ' + s + '*'
+    }
   })
   // now we could become fuzzy using ~
   return result

From 8f1b3b9f6b68ac234dc654a80fae1afed6f765d6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 12:12:51 +0100
Subject: [PATCH 068/106] cypress test data adjusted to new search mechanism

---
 backend/src/schema/resolvers/searches.js  | 3 +--
 cypress/integration/common/search.js      | 2 +-
 cypress/integration/search/Search.feature | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 56913fb3e..918f914cd 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -95,9 +95,8 @@ const createPostQuery = str => {
   }
   // start globbing ...
   escapedString.split(' ').forEach(s => {
-    if (!s.match(/^(AND|OR|NOT)$/i)) {
+    if (s.length > 3) {
       // at least 4 letters. So AND, OR and NOT are never used unquoted
-      // but the related cypress test expects a search for just two chars.
       result += ' OR ' + s + '*'
     }
   })
diff --git a/cypress/integration/common/search.js b/cypress/integration/common/search.js
index 1feece77e..282793547 100644
--- a/cypress/integration/common/search.js
+++ b/cypress/integration/common/search.js
@@ -43,7 +43,7 @@ Then("I should see the following users in the select dropdown:", table => {
   });
 });
 
-When("I type {string} and press Enter", value => {
+When("I type {PR} and press Enter", value => {
   cy.get(".searchable-input .ds-select input")
     .focus()
     .type(value)
diff --git a/cypress/integration/search/Search.feature b/cypress/integration/search/Search.feature
index e83f58477..a7bc99d18 100644
--- a/cypress/integration/search/Search.feature
+++ b/cypress/integration/search/Search.feature
@@ -7,7 +7,7 @@ Feature: Search
     Given I have a user account
     And we have the following posts in our database:
       | id | title                                         | content                                 |
-      | p1 | 101 Essays that will change the way you think | 101 Essays, of course!                  |
+      | p1 | 101 Essays that will change the way you think | 101 Essays, of course (PR)!             |
       | p2 | No searched for content                       | will be found in this post, I guarantee |
     And we have the following user accounts:
       | slug            | name            | id               |

From 4a2d2508542208d914948a58bdb59339ca28ea44 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 13:31:13 +0100
Subject: [PATCH 069/106] cypress test data adjusted to new search mechanism

---
 cypress/integration/common/search.js      | 2 +-
 cypress/integration/search/Search.feature | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/common/search.js b/cypress/integration/common/search.js
index 282793547..1feece77e 100644
--- a/cypress/integration/common/search.js
+++ b/cypress/integration/common/search.js
@@ -43,7 +43,7 @@ Then("I should see the following users in the select dropdown:", table => {
   });
 });
 
-When("I type {PR} and press Enter", value => {
+When("I type {string} and press Enter", value => {
   cy.get(".searchable-input .ds-select input")
     .focus()
     .type(value)
diff --git a/cypress/integration/search/Search.feature b/cypress/integration/search/Search.feature
index a7bc99d18..b77b45d8e 100644
--- a/cypress/integration/search/Search.feature
+++ b/cypress/integration/search/Search.feature
@@ -24,7 +24,7 @@ Feature: Search
       | 101 Essays that will change the way you think |
 
   Scenario: Press enter starts search
-    When I type "Es" and press Enter
+    When I type "PR" and press Enter
     Then I should have one item in the select dropdown
     Then I should see the following posts in the select dropdown:
       | title                                         |

From 5b5fc09053f2c102fd6e13abb55acf5e6d645769 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 14:34:14 +0100
Subject: [PATCH 070/106] fix typo

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

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index ce02c1984..c3a5d1dda 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -50,7 +50,7 @@ const searchQuery = gql`
 
 const nothingFound = { data: { findResources: [] } }
 
-const addBrAfterNewlinw = array => {
+const addBrAfterNewline = array => {
   return array.map(obj => {
     const tmp = cloneDeep(obj)
     if (tmp.__typename === 'Post') {
@@ -61,7 +61,7 @@ const addBrAfterNewlinw = array => {
 }
 
 const createExpectedObject = array => {
-  return { data: { findResources: addBrAfterNewlinw(array) } }
+  return { data: { findResources: addBrAfterNewline(array) } }
 }
 
 const addPostToDB = post => {

From 4f8d605b88efa4885cc4892943a10af1332f7acd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Mar 2020 20:41:10 +0100
Subject: [PATCH 071/106] ensure that every post has an author

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

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index c3a5d1dda..c72c1b256 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -65,11 +65,17 @@ const createExpectedObject = array => {
 }
 
 const addPostToDB = post => {
-  return Factory.build('post', {
-    id: post.id,
-    title: post.title,
-    content: post.content,
-  })
+  return Factory.build(
+    'post',
+    {
+      id: post.id,
+      title: post.title,
+      content: post.content,
+    },
+    {
+      authorId: 'a-user',
+    },
+  )
 }
 
 const addUserToDB = user => {

From a9c6356ffae8f6422a4843cde10b2ecafb3cd569 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 11 Mar 2020 00:38:21 +0100
Subject: [PATCH 072/106] clean db after test

---
 backend/src/schema/resolvers/searches.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index c72c1b256..b955110e1 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -27,7 +27,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  // await cleanDatabase()
+  await cleanDatabase()
 })
 
 const searchQuery = gql`

From 3d25ec5b4ed80dbb275e954f9faf19da88937754 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 11 Mar 2020 16:02:42 +0100
Subject: [PATCH 073/106] Start to refactor specs and implementation

@mogge this is just a rough guideline how to improve the quality of your tests.
Of course it needs to be continued.
---
 backend/src/schema/resolvers/searches.js      |  51 +----
 backend/src/schema/resolvers/searches.spec.js | 213 ++++++++++--------
 .../schema/resolvers/searches/queryString.js  |  41 ++++
 .../resolvers/searches/queryString.spec.js    |  10 +
 4 files changed, 177 insertions(+), 138 deletions(-)
 create mode 100644 backend/src/schema/resolvers/searches/queryString.js
 create mode 100644 backend/src/schema/resolvers/searches/queryString.spec.js

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 918f914cd..ba67bb2d0 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -1,4 +1,5 @@
 import log from './helpers/databaseLogger'
+import queryString from './searches/queryString'
 
 // see http://lucene.apache.org/core/8_3_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package.description
 
@@ -44,12 +45,12 @@ export default {
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {
-          query: createPostQuery(query),
+          query: queryString(query),
           limit,
           thisUserId,
         })
         const userTransactionResponse = transaction.run(userCypher, {
-          query: createUserQuery(query),
+          query: queryString(query),
           limit,
           thisUserId,
         })
@@ -69,49 +70,3 @@ export default {
     },
   },
 }
-
-const createUserQuery = str => {
-  return createPostQuery(str)
-}
-
-const createPostQuery = str => {
-  // match the whole text exactly
-  const normalizedString = normalizeWhitespace(str)
-  const escapedString = escapeSpecialCharacters(normalizedString)
-  let result = quoteString(escapedString) + '^8'
-  // match each word exactly
-  if (escapedString.includes(' ')) {
-    result += ' OR ('
-    escapedString.split(' ').forEach((s, i) => {
-      result += i === 0 ? quoteString(s) : ' AND ' + quoteString(s)
-    })
-    result += ')^4'
-  }
-  // match at least one word exactly
-  if (escapedString.includes(' ')) {
-    escapedString.split(' ').forEach(s => {
-      result += ' OR ' + quoteString(s) + '^2'
-    })
-  }
-  // start globbing ...
-  escapedString.split(' ').forEach(s => {
-    if (s.length > 3) {
-      // at least 4 letters. So AND, OR and NOT are never used unquoted
-      result += ' OR ' + s + '*'
-    }
-  })
-  // now we could become fuzzy using ~
-  return result
-}
-
-const normalizeWhitespace = str => {
-  return str.replace(/\s+/g, ' ')
-}
-
-const quoteString = str => {
-  return '"' + str + '"'
-}
-
-const escapeSpecialCharacters = str => {
-  return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
-}
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index b955110e1..b0b2b1e4a 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -48,8 +48,6 @@ const searchQuery = gql`
   }
 `
 
-const nothingFound = { data: { findResources: [] } }
-
 const addBrAfterNewline = array => {
   return array.map(obj => {
     const tmp = cloneDeep(obj)
@@ -112,116 +110,151 @@ let user
 
 describe('resolvers', () => {
   describe('searches', () => {
-    beforeAll(async () => {
-      user = await addUserToDB(aUser)
-      await addPostToDB(aPost)
-      authenticatedUser = await user.toJson()
-    })
-
     let variables
 
-    describe('basic searches', () => {
+    describe('given one post and one user', () => {
+      beforeAll(async () => {
+        user = await addUserToDB(aUser)
+        await addPostToDB(aPost)
+        authenticatedUser = await user.toJson()
+      })
+
       it('finds the post', async () => {
         variables = { query: 'beitrag' }
-        const expected = createExpectedObject([aPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
-
-      it('finds the post searching only with capital letters', async () => {
-        variables = { query: 'BEITRAG' }
-        const expected = createExpectedObject([aPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
-
-      it('does not find the post', async () => {
-        variables = { query: 'Unfug' }
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(nothingFound)
-      })
-
-      it('finds the user', async () => {
-        variables = { query: 'John' }
-        const expected = createExpectedObject([aUser])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
-
-      it('does not find the user', async () => {
-        variables = { query: 'Unfug' }
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(nothingFound)
-      })
-    })
-
-    describe('more data added', () => {
-      beforeAll(async () => {
-        await Promise.all(
-          dumpToDB([
-            bPost,
-            cPost,
-            dPost,
-            ePost,
-            fPost,
-            gPost,
-            bUser,
-            cUser,
-            dUser,
-            eUser,
-            fUser,
-            gUser,
-          ]),
-        )
-      })
-
-      it('finds the AK-47', async () => {
-        variables = { query: 'AK-47' }
-        const expected = createExpectedObject([gPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
-
-      it('finds more than one post', async () => {
-        variables = { query: 'Beitrag' }
-        const expected = createExpectedObject([aPost, bPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
-
-      it('finds more than one user by slug', async () => {
-        variables = { query: '-maria-' }
-        const expected = [cUser, dUser]
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
           data: {
-            findResources: expect.arrayContaining(expected),
+            findResources: [
+              {
+                __typename: 'Post',
+                id: 'a-post',
+                title: 'Beitrag',
+                content: 'Ein erster Beitrag',
+              },
+            ],
           },
         })
       })
 
-      it('finds the binomial formula', async () => {
-        variables = { query: '(a - b)² = a² - 2ab + b²' }
-        const expected = createExpectedObject([cPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      describe('casing', () => {
+        it('does not matter', async () => {
+          variables = { query: 'BEITRAG' }
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+            data: {
+              findResources: [
+                {
+                  __typename: 'Post',
+                  id: 'a-post',
+                  title: 'Beitrag',
+                  content: 'Ein erster Beitrag',
+                },
+              ],
+            },
+          })
+        })
       })
 
-      it('finds text over linebreak', async () => {
-        variables = { query: 'dreht, ist' }
-        const expected = createExpectedObject([dPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      describe('query contains first name of user', () => {
+        it('finds the user', async () => {
+          variables = { query: 'John' }
+          const expected = createExpectedObject([aUser])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
       })
 
-      it('finds single words with lower score', async () => {
-        variables = { query: 'der Panther' }
-        const expected = createExpectedObject([dPost, ePost, fPost, bUser])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+      describe('query consists of words not present in the corpus', () => {
+        it('returns empty search results', async () => {
+          await expect(
+            query({ query: searchQuery, variables: { query: 'Unfug' } }),
+          ).resolves.toMatchObject({ data: { findResources: [] } })
+        })
       })
 
-      it('finds something that starts with the given text', async () => {
-        variables = { query: 'john' }
-        const expected = createExpectedObject([aUser, bUser])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      })
+      describe('given more posts and users', () => {
+        beforeAll(async () => {
+          const factoryOptions = {
+            authorId: 'a-user',
+          }
+          await Promise.all([
+            Factory.build(
+              'post',
+              {
+                id: 'b-post',
+                title: 'Aufruf',
+                content: 'Jeder sollte seinen Beitrag leisten.',
+              },
+              factoryOptions,
+            ),
+            ...dumpToDB([
+              cPost,
+              dPost,
+              ePost,
+              fPost,
+              gPost,
+              bUser,
+              cUser,
+              dUser,
+              eUser,
+              fUser,
+              gUser,
+            ]),
+          ])
+        })
 
-      /*
+        describe('hyphens in query', () => {
+          it('will be treated as ordinary characters', async () => {
+            variables = { query: 'AK-47' }
+            const expected = createExpectedObject([gPost])
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+          })
+        })
+
+        it('finds more than one post', async () => {
+          variables = { query: 'Beitrag' }
+          const expected = createExpectedObject([aPost, bPost])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
+
+        it('finds more than one user by slug', async () => {
+          variables = { query: '-maria-' }
+          const expected = [cUser, dUser]
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+            data: {
+              findResources: expect.arrayContaining(expected),
+            },
+          })
+        })
+
+        it('finds the binomial formula', async () => {
+          variables = { query: '(a - b)² = a² - 2ab + b²' }
+          const expected = createExpectedObject([cPost])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
+
+        it('finds text over linebreak', async () => {
+          variables = { query: 'dreht, ist' }
+          const expected = createExpectedObject([dPost])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
+
+        it('finds single words with lower score', async () => {
+          variables = { query: 'der Panther' }
+          const expected = createExpectedObject([dPost, ePost, fPost, bUser])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
+
+        it('finds something that starts with the given text', async () => {
+          variables = { query: 'john' }
+          const expected = createExpectedObject([aUser, bUser])
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+        })
+
+        /*
       it('finds Russian text', async () => {
         variables = { query: 'Калашникова' }
         const expected = createExpectedObject([gPost])
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
       }) */
+      })
     })
   })
 })
diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
new file mode 100644
index 000000000..6735b54c0
--- /dev/null
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -0,0 +1,41 @@
+export default function queryString(str) {
+  // match the whole text exactly
+  const normalizedString = normalizeWhitespace(str)
+  const escapedString = escapeSpecialCharacters(normalizedString)
+  let result = quoteString(escapedString) + '^8'
+  // match each word exactly
+  if (escapedString.includes(' ')) {
+    result += ' OR ('
+    escapedString.split(' ').forEach((s, i) => {
+      result += i === 0 ? quoteString(s) : ' AND ' + quoteString(s)
+    })
+    result += ')^4'
+  }
+  // match at least one word exactly
+  if (escapedString.includes(' ')) {
+    escapedString.split(' ').forEach(s => {
+      result += ' OR ' + quoteString(s) + '^2'
+    })
+  }
+  // start globbing ...
+  escapedString.split(' ').forEach(s => {
+    if (s.length > 3) {
+      // at least 4 letters. So AND, OR and NOT are never used unquoted
+      result += ' OR ' + s + '*'
+    }
+  })
+  // now we could become fuzzy using ~
+  return result
+}
+
+const normalizeWhitespace = str => {
+  return str.replace(/\s+/g, ' ')
+}
+
+const escapeSpecialCharacters = str => {
+  return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
+}
+
+const quoteString = str => {
+  return '"' + str + '"'
+}
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
new file mode 100644
index 000000000..c5133b631
--- /dev/null
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -0,0 +1,10 @@
+import queryString from './queryString'
+
+describe('queryString', () => {
+  describe('exact match', () => {
+    it.skip('boosts score by factor 8', () => {
+      expect(queryString('a couple of words')).toContain('"a couple of words"^8')
+    })
+    it.todo('implement more cases here')
+  })
+})

From 46fca229ec35047eda9ac7809e7bc456785a6c70 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 13 Mar 2020 22:34:51 +0100
Subject: [PATCH 074/106] search specs refactored

---
 backend/src/schema/resolvers/searches.spec.js | 598 ++++++++++--------
 1 file changed, 325 insertions(+), 273 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index b0b2b1e4a..6ef6e48b0 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -3,15 +3,12 @@ import { gql } from '../../helpers/jest'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
-import cloneDeep from 'lodash/cloneDeep'
 
 let query, authenticatedUser
 
 const driver = getDriver()
 const neode = getNeode()
 
-jest.setTimeout(30000)
-
 beforeAll(async () => {
   await cleanDatabase()
   const { server } = createServer({
@@ -48,104 +45,34 @@ const searchQuery = gql`
   }
 `
 
-const addBrAfterNewline = array => {
-  return array.map(obj => {
-    const tmp = cloneDeep(obj)
-    if (tmp.__typename === 'Post') {
-      tmp.content = tmp.content.replace(/\n/g, '<br>\n')
-    }
-    return tmp
-  })
-}
-
-const createExpectedObject = array => {
-  return { data: { findResources: addBrAfterNewline(array) } }
-}
-
-const addPostToDB = post => {
-  return Factory.build(
-    'post',
-    {
-      id: post.id,
-      title: post.title,
-      content: post.content,
-    },
-    {
-      authorId: 'a-user',
-    },
-  )
-}
-
-const addUserToDB = user => {
-  return Factory.build('user', {
-    id: user.id,
-    name: user.name,
-    slug: user.slug,
-  })
-}
-
-const dumpToDB = array => {
-  const result = []
-  array.forEach(obj => {
-    obj.__typename === 'Post' ? result.push(addPostToDB(obj)) : result.push(addUserToDB(obj))
-  })
-  return result
-}
-
-const createDataObject = (obj, type) => {
-  return { __typename: type, ...obj }
-}
-
-const createPostObject = post => {
-  return createDataObject(post, 'Post')
-}
-
-const createUserObject = user => {
-  return createDataObject(user, 'User')
-}
-
-// see data at the end of the file
-
-let user
-
 describe('resolvers', () => {
   describe('searches', () => {
     let variables
 
-    describe('given one post and one user', () => {
+    describe('given one user', () => {
       beforeAll(async () => {
-        user = await addUserToDB(aUser)
-        await addPostToDB(aPost)
+        const user = await Factory.build('user', {
+          id: 'a-user',
+          name: 'John Doe',
+          slug: 'john-doe',
+        })
         authenticatedUser = await user.toJson()
       })
 
-      it('finds the post', async () => {
-        variables = { query: 'beitrag' }
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-          data: {
-            findResources: [
-              {
-                __typename: 'Post',
-                id: 'a-post',
-                title: 'Beitrag',
-                content: 'Ein erster Beitrag',
-              },
-            ],
-          },
-        })
-      })
+      const factoryOptions = {
+        authorId: 'a-user',
+      }
 
-      describe('casing', () => {
-        it('does not matter', async () => {
-          variables = { query: 'BEITRAG' }
+      describe('query contains first name of user', () => {
+        it('finds the user', async () => {
+          variables = { query: 'John' }
           await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
             data: {
               findResources: [
                 {
-                  __typename: 'Post',
-                  id: 'a-post',
-                  title: 'Beitrag',
-                  content: 'Ein erster Beitrag',
+                  id: 'a-user',
+                  name: 'John Doe',
+                  slug: 'john-doe',
                 },
               ],
             },
@@ -153,208 +80,333 @@ describe('resolvers', () => {
         })
       })
 
-      describe('query contains first name of user', () => {
-        it('finds the user', async () => {
-          variables = { query: 'John' }
-          const expected = createExpectedObject([aUser])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
-      })
-
-      describe('query consists of words not present in the corpus', () => {
-        it('returns empty search results', async () => {
-          await expect(
-            query({ query: searchQuery, variables: { query: 'Unfug' } }),
-          ).resolves.toMatchObject({ data: { findResources: [] } })
-        })
-      })
-
-      describe('given more posts and users', () => {
+      describe('adding one post', () => {
         beforeAll(async () => {
-          const factoryOptions = {
-            authorId: 'a-user',
-          }
-          await Promise.all([
-            Factory.build(
+          await Factory.build(
+            'post',
+            {
+              id: 'a-post',
+              title: 'Beitrag',
+              content: 'Ein erster Beitrag',
+            },
+            factoryOptions,
+          )
+        })
+
+        describe('query contains title of post', () => {
+          it('finds the post', async () => {
+            variables = { query: 'beitrag' }
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+              data: {
+                findResources: [
+                  {
+                    __typename: 'Post',
+                    id: 'a-post',
+                    title: 'Beitrag',
+                    content: 'Ein erster Beitrag',
+                  },
+                ],
+              },
+            })
+          })
+        })
+
+        describe('casing', () => {
+          it('does not matter', async () => {
+            variables = { query: 'BEITRAG' }
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+              data: {
+                findResources: [
+                  {
+                    __typename: 'Post',
+                    id: 'a-post',
+                    title: 'Beitrag',
+                    content: 'Ein erster Beitrag',
+                  },
+                ],
+              },
+            })
+          })
+        })
+
+        describe('query consists of words not present in the corpus', () => {
+          it('returns empty search results', async () => {
+            await expect(
+              query({ query: searchQuery, variables: { query: 'Unfug' } }),
+            ).resolves.toMatchObject({ data: { findResources: [] } })
+          })
+        })
+
+        describe('testing different post content', () => {
+          const addPost = post => {
+            return Factory.build(
               'post',
               {
-                id: 'b-post',
-                title: 'Aufruf',
-                content: 'Jeder sollte seinen Beitrag leisten.',
+                id: post.id,
+                title: post.title,
+                content: post.content,
               },
               factoryOptions,
-            ),
-            ...dumpToDB([
-              cPost,
-              dPost,
-              ePost,
-              fPost,
-              gPost,
-              bUser,
-              cUser,
-              dUser,
-              eUser,
-              fUser,
-              gUser,
-            ]),
-          ])
-        })
+            )
+          }
 
-        describe('hyphens in query', () => {
-          it('will be treated as ordinary characters', async () => {
-            variables = { query: 'AK-47' }
-            const expected = createExpectedObject([gPost])
-            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
+          describe('adding a post which content contains the title of the first post', () => {
+            describe('query contains the title of the first post', () => {
+              it('finds both posts', async () => {
+                await addPost({
+                  __typename: 'Post',
+                  id: 'b-post',
+                  title: 'Aufruf',
+                  content: 'Jeder sollte seinen Beitrag leisten.',
+                })
+                variables = { query: 'beitrag' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: expect.arrayContaining([
+                      {
+                        __typename: 'Post',
+                        id: 'a-post',
+                        title: 'Beitrag',
+                        content: 'Ein erster Beitrag',
+                      },
+                      {
+                        __typename: 'Post',
+                        id: 'b-post',
+                        title: 'Aufruf',
+                        content: 'Jeder sollte seinen Beitrag leisten.',
+                      },
+                    ]),
+                  },
+                })
+              })
+            })
+          })
+
+          describe('adding a post that contains a hyphen between two words and German quotation marks', () => {
+            describe('hyphens in query', () => {
+              it('will be treated as ordinary characters', async () => {
+                await addPost({
+                  id: 'g-post',
+                  title: 'Zusammengesetzte Wörter',
+                  content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                })
+                variables = { query: 'tee-ei' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'g-post',
+                        title: 'Zusammengesetzte Wörter',
+                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+
+            describe('German quotation marks in query', () => {
+              it('will be treated as ordinary characters', async () => {
+                variables = { query: '„teeei“' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'g-post',
+                        title: 'Zusammengesetzte Wörter',
+                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+          })
+
+          describe('adding a post that contains a simple mathematical exprssion and linebreaks', () => {
+            describe('query a part of the mathematical expression', () => {
+              it('finds that post', async () => {
+                await addPost({
+                  id: 'c-post',
+                  title: 'Die binomischen Formeln',
+                  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
+2. binomische Formel: (a - b)² = a² - 2ab + b²
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                })
+                variables = { query: '(a - b)²' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'c-post',
+                        title: 'Die binomischen Formeln',
+                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+
+            describe('query the same part of the mathematical expression without spaces', () => {
+              it('finds that post', async () => {
+                variables = { query: '(a-b)²' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'c-post',
+                        title: 'Die binomischen Formeln',
+                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+
+            describe('query the mathematical expression over linebreak', () => {
+              it('finds that post', async () => {
+                variables = { query: '+ b² 2.' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'c-post',
+                        title: 'Die binomischen Formeln',
+                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+          })
+
+          describe('adding a post that contains a poem', () => {
+            describe('query for more than one word, e.g. the title of the poem', () => {
+              it('finds the poem and another post that contains only one word but with lower score', async () => {
+                await addPost({
+                  id: 'd-post',
+                  title: 'Der Panther',
+                  content: `Sein Blick ist vom Vorübergehn der Stäbe
+so müd geworden, daß er nichts mehr hält.
+Ihm ist, als ob es tausend Stäbe gäbe
+und hinter tausend Stäben keine Welt.`,
+                })
+                variables = { query: 'der panther' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: [
+                      {
+                        __typename: 'Post',
+                        id: 'd-post',
+                        title: 'Der Panther',
+                        content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
+so müd geworden, daß er nichts mehr hält.<br>
+Ihm ist, als ob es tausend Stäbe gäbe<br>
+und hinter tausend Stäben keine Welt.`,
+                      },
+                      {
+                        __typename: 'Post',
+                        id: 'g-post',
+                        title: 'Zusammengesetzte Wörter',
+                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                      },
+                    ],
+                  },
+                })
+              })
+            })
+
+            describe('query for the first four letters of two longer words', () => {
+              it('finds the posts that contain words starting with these four letters', async () => {
+                variables = { query: 'Vorü Subs' }
+                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                  data: {
+                    findResources: expect.arrayContaining([
+                      {
+                        __typename: 'Post',
+                        id: 'd-post',
+                        title: 'Der Panther',
+                        content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
+so müd geworden, daß er nichts mehr hält.<br>
+Ihm ist, als ob es tausend Stäbe gäbe<br>
+und hinter tausend Stäben keine Welt.`,
+                      },
+                      {
+                        __typename: 'Post',
+                        id: 'g-post',
+                        title: 'Zusammengesetzte Wörter',
+                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                      },
+                    ]),
+                  },
+                })
+              })
+            })
           })
         })
 
-        it('finds more than one post', async () => {
-          variables = { query: 'Beitrag' }
-          const expected = createExpectedObject([aPost, bPost])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
+        describe('adding two users that have the same word in their slugs', () => {
+          beforeAll(async () => {
+            await Promise.all([
+              Factory.build('user', {
+                id: 'c-user',
+                name: 'Rainer Maria Rilke',
+                slug: 'rainer-maria-rilke',
+              }),
+              Factory.build('user', {
+                id: 'd-user',
+                name: 'Erich Maria Remarque',
+                slug: 'erich-maria-remarque',
+              }),
+            ])
+          })
 
-        it('finds more than one user by slug', async () => {
-          variables = { query: '-maria-' }
-          const expected = [cUser, dUser]
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-            data: {
-              findResources: expect.arrayContaining(expected),
-            },
+          describe('query the word that both slugs contain', () => {
+            it('finds both users', async () => {
+              variables = { query: '-maria-' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: expect.arrayContaining([
+                    {
+                      __typename: 'User',
+                      id: 'c-user',
+                      name: 'Rainer Maria Rilke',
+                      slug: 'rainer-maria-rilke',
+                    },
+                    {
+                      __typename: 'User',
+                      id: 'd-user',
+                      name: 'Erich Maria Remarque',
+                      slug: 'erich-maria-remarque',
+                    },
+                  ]),
+                },
+              })
+            })
           })
         })
+      })
 
-        it('finds the binomial formula', async () => {
-          variables = { query: '(a - b)² = a² - 2ab + b²' }
-          const expected = createExpectedObject([cPost])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
-
-        it('finds text over linebreak', async () => {
-          variables = { query: 'dreht, ist' }
-          const expected = createExpectedObject([dPost])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
-
-        it('finds single words with lower score', async () => {
-          variables = { query: 'der Panther' }
-          const expected = createExpectedObject([dPost, ePost, fPost, bUser])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
-
-        it('finds something that starts with the given text', async () => {
-          variables = { query: 'john' }
-          const expected = createExpectedObject([aUser, bUser])
-          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-        })
-
-        /*
+      /*
       it('finds Russian text', async () => {
         variables = { query: 'Калашникова' }
         const expected = createExpectedObject([gPost])
         await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-      }) */
-      })
+	}) */
     })
   })
 })
-
-// data section
-
-const aPost = createPostObject({
-  id: 'a-post',
-  title: 'Beitrag',
-  content: 'Ein erster Beitrag',
-})
-
-const bPost = createPostObject({
-  id: 'b-post',
-  title: 'Aufruf',
-  content: 'Jeder sollte seinen Beitrag leisten.',
-})
-
-const cPost = createPostObject({
-  id: 'c-post',
-  title: 'Die binomischen Formeln',
-  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
-2. binomische Formel: (a - b)² = a² - 2ab + b²
-3. binomische Formel: (a + b)(a - b) = a² - b²`,
-})
-
-const dPost = createPostObject({
-  id: 'd-post',
-  title: 'Der Panther',
-  content: `Sein Blick ist vom Vorübergehn der Stäbe
-so müd geworden, daß er nichts mehr hält.
-Ihm ist, als ob es tausend Stäbe gäbe
-und hinter tausend Stäben keine Welt.
-Der weiche Gang geschmeidig starker Schritte,
-der sich im allerkleinsten Kreise dreht,
-ist wie ein Tanz von Kraft um eine Mitte,
-in der betäubt ein großer Wille steht.
-Nur manchmal schiebt der Vorhang der Pupille
-sich lautlos auf –. Dann geht ein Bild hinein,
-geht durch der Glieder angespannte Stille –
-und hört im Herzen auf zu sein.`,
-})
-
-const ePost = createPostObject({
-  id: 'e-post',
-  title: 'Typographie',
-  content: `Gelegentlich können sowohl der angeführte Text als auch der Begleitsatz mit Frage- oder Ausrufezeichen enden (§ 91):
-Gefällt dir der Roman „Quo vadis?“? Lass doch dieses ewige „Ich will nicht!“!`,
-})
-
-const fPost = createPostObject({
-  id: 'f-post',
-  title: 'Typographie II',
-  content: `Der Gedankenstrich kann als Auslassungszeichen (Auslassungsstrich) eine längere Pause oder eine Ellipse darstellen: „Du willst doch wohl nicht etwa –“, „Mein Gott, woher nehm ich bloß –?“`,
-})
-
-const gPost = createPostObject({
-  id: 'g-post',
-  title: 'AK-47',
-  content: `Vom AK-47 Typ I existiert eine Version mit unter die Waffe klappbarer Schulterstütze, das AKS-47 (russisch Автомат Калашникова складной образца 1947 года, transkr.: Avtomat Kalašnikova skladnoj obrazca 1947 goda, dt. Automat Kalaschnikow klappbar Modell 1947tes Jahr) genannt wird, seltener auch AK-47s.`,
-})
-
-const aUser = createUserObject({
-  id: 'a-user',
-  name: 'John Doe',
-  slug: 'john-doe',
-})
-
-const bUser = createUserObject({
-  id: 'b-user',
-  name: 'Johnannes der Täufer',
-  slug: 'johnannes-der-taufer',
-})
-
-const cUser = createUserObject({
-  id: 'c-user',
-  name: 'Rainer Maria Rilke',
-  slug: 'rainer-maria-rilke',
-})
-
-const dUser = createUserObject({
-  id: 'd-user',
-  name: 'Erich Maria Remarque',
-  slug: 'erich-maria-remarque',
-})
-
-const eUser = createUserObject({
-  id: 'e-user',
-  name: 'Klaus Dieter',
-  slug: 'kd',
-})
-
-const fUser = createUserObject({
-  id: 'f-user',
-  name: 'Sluggy',
-  slug: '_',
-})
-
-const gUser = createUserObject({
-  id: 'g-user',
-  name: 'AKK',
-  slug: 'akk',
-})

From b2ea4df2947cf116673fa4d662cd34ad60ce8038 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 16 Mar 2020 01:36:16 +0100
Subject: [PATCH 075/106] refactored queryString, specs for queryString

---
 backend/src/schema/resolvers/searches.js      |  2 +-
 .../schema/resolvers/searches/queryString.js  | 75 +++++++++++--------
 .../resolvers/searches/queryString.spec.js    | 38 +++++++++-
 3 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index ba67bb2d0..5e062f45a 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -1,5 +1,5 @@
 import log from './helpers/databaseLogger'
-import queryString from './searches/queryString'
+import { queryString } from './searches/queryString'
 
 // see http://lucene.apache.org/core/8_3_1/queryparser/org/apache/lucene/queryparser/classic/package-summary.html#package.description
 
diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 6735b54c0..3e53bfec9 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -1,41 +1,50 @@
-export default function queryString(str) {
-  // match the whole text exactly
+export function queryString(str) {
   const normalizedString = normalizeWhitespace(str)
-  const escapedString = escapeSpecialCharacters(normalizedString)
-  let result = quoteString(escapedString) + '^8'
-  // match each word exactly
-  if (escapedString.includes(' ')) {
-    result += ' OR ('
-    escapedString.split(' ').forEach((s, i) => {
-      result += i === 0 ? quoteString(s) : ' AND ' + quoteString(s)
-    })
-    result += ')^4'
-  }
-  // match at least one word exactly
-  if (escapedString.includes(' ')) {
-    escapedString.split(' ').forEach(s => {
-      result += ' OR ' + quoteString(s) + '^2'
-    })
-  }
-  // start globbing ...
-  escapedString.split(' ').forEach(s => {
-    if (s.length > 3) {
-      // at least 4 letters. So AND, OR and NOT are never used unquoted
-      result += ' OR ' + s + '*'
+    const escapedString = escapeSpecialCharacters(normalizedString)
+    return `
+${matchWholeText(escapedString)}
+${matchEachWordExactly(escapedString)}
+${matchSomeWordsExactly(escapedString)}
+${matchBeginningOfWords(escapedString)}
+`
+}
+
+const matchWholeText = (str, boost = 8) => {
+    return `"${str}"^${boost}`
+}
+
+const matchEachWordExactly = (str, boost = 4) => {
+    if (str.includes(' ')) {
+	let tmp = str.split(' ').map((s, i) => i === 0 ? `"${s}"` : `AND "${s}"`).join(' ')
+	return `(${tmp})^${boost}`
+    } else {
+	return ''
     }
-  })
-  // now we could become fuzzy using ~
-  return result
 }
 
-const normalizeWhitespace = str => {
-  return str.replace(/\s+/g, ' ')
+const matchSomeWordsExactly = (str, boost = 2) => {
+    if (str.includes(' ')) {
+	return str.split(' ').map(s => `"${s}"^${boost}`).join(' ')
+    } else {
+	return ''
+    }    
 }
 
-const escapeSpecialCharacters = str => {
+const matchBeginningOfWords = str => {
+    return normalizeWhitespace(str.split(' ').map(s => {
+	if (s.length > 3) {
+	    // at least 4 letters. So AND, OR and NOT are never used unquoted
+	    return s + '*'
+	} else {
+	    return ''
+	}
+    }).join(' '))
+}
+
+export function normalizeWhitespace(str) {
+    return str.replace(/\s+/g, ' ').trim()
+}
+
+export function escapeSpecialCharacters(str) {
   return str.replace(/(["[\]&|\\{}+!()^~*?:/-])/g, '\\$1')
 }
-
-const quoteString = str => {
-  return '"' + str + '"'
-}
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
index c5133b631..e431df90f 100644
--- a/backend/src/schema/resolvers/searches/queryString.spec.js
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -1,10 +1,42 @@
-import queryString from './queryString'
+import { queryString, escapeSpecialCharacters, normalizeWhitespace } from './queryString'
 
 describe('queryString', () => {
+    describe('special characters', () => {
+	it('does escaping correctly', () => {
+	    expect(escapeSpecialCharacters('+ - && || ! ( ) { } [ ] ^ " ~ * ? : \\ / '))
+		.toEqual('\\+ \\- \\&\\& \\|\\| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ \\/ ')
+	})
+    })
+
+    describe('whitespace', () => {
+	it('is normalized correctly', () => {
+	    expect(normalizeWhitespace(' a \t \n b \n   '))
+		.toEqual('a b')
+	})
+    })
+    
   describe('exact match', () => {
-    it.skip('boosts score by factor 8', () => {
+    it('boosts score by factor 8', () => {
       expect(queryString('a couple of words')).toContain('"a couple of words"^8')
     })
-    it.todo('implement more cases here')
   })
+
+  describe('match all words exactly', () => {
+    it('boosts score by factor 4', () => {
+      expect(queryString('a couple of words')).toContain('("a" AND "couple" AND "of" AND "words")^4')
+    })
+  })
+
+  describe('match at least one word exactly', () => {
+    it('boosts score by factor 2', () => {
+      expect(queryString('a couple of words')).toContain('"a"^2 "couple"^2 "of"^2 "words"^2')
+    })
+  })
+
+ describe('globbing for longer words', () => {
+    it('globs words with more than three characters', () => {
+      expect(queryString('a couple of words')).toContain('couple* words*')
+    })
+  })
+
 })

From d47274fb8eed849791c6ee6010e8699cd1e6351f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 16 Mar 2020 01:50:36 +0100
Subject: [PATCH 076/106] linting

---
 backend/src/schema/resolvers/searches.spec.js | 97 ++++++++++---------
 .../schema/resolvers/searches/queryString.js  | 57 ++++++-----
 .../resolvers/searches/queryString.spec.js    | 29 +++---
 3 files changed, 98 insertions(+), 85 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index 6ef6e48b0..42ffd6f98 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -138,27 +138,55 @@ describe('resolvers', () => {
         })
 
         describe('testing different post content', () => {
-          const addPost = post => {
-            return Factory.build(
-              'post',
-              {
-                id: post.id,
-                title: post.title,
-                content: post.content,
-              },
-              factoryOptions,
-            )
-          }
-
-          describe('adding a post which content contains the title of the first post', () => {
-            describe('query contains the title of the first post', () => {
-              it('finds both posts', async () => {
-                await addPost({
-                  __typename: 'Post',
+          beforeAll(async () => {
+            return Promise.all([
+              Factory.build(
+                'post',
+                {
                   id: 'b-post',
                   title: 'Aufruf',
                   content: 'Jeder sollte seinen Beitrag leisten.',
-                })
+                },
+                factoryOptions,
+              ),
+              Factory.build(
+                'post',
+                {
+                  id: 'g-post',
+                  title: 'Zusammengesetzte Wörter',
+                  content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                },
+                factoryOptions,
+              ),
+              Factory.build(
+                'post',
+                {
+                  id: 'c-post',
+                  title: 'Die binomischen Formeln',
+                  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
+2. binomische Formel: (a - b)² = a² - 2ab + b²
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                },
+                factoryOptions,
+              ),
+              Factory.build(
+                'post',
+                {
+                  id: 'd-post',
+                  title: 'Der Panther',
+                  content: `Sein Blick ist vom Vorübergehn der Stäbe
+so müd geworden, daß er nichts mehr hält.
+Ihm ist, als ob es tausend Stäbe gäbe
+und hinter tausend Stäben keine Welt.`,
+                },
+                factoryOptions,
+              ),
+            ])
+          })
+
+          describe('a post which content contains the title of the first post', () => {
+            describe('query contains the title of the first post', () => {
+              it('finds both posts', async () => {
                 variables = { query: 'beitrag' }
                 await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                   data: {
@@ -182,14 +210,9 @@ describe('resolvers', () => {
             })
           })
 
-          describe('adding a post that contains a hyphen between two words and German quotation marks', () => {
+          describe('a post that contains a hyphen between two words and German quotation marks', () => {
             describe('hyphens in query', () => {
               it('will be treated as ordinary characters', async () => {
-                await addPost({
-                  id: 'g-post',
-                  title: 'Zusammengesetzte Wörter',
-                  content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                })
                 variables = { query: 'tee-ei' }
                 await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                   data: {
@@ -225,16 +248,9 @@ describe('resolvers', () => {
             })
           })
 
-          describe('adding a post that contains a simple mathematical exprssion and linebreaks', () => {
+          describe('a post that contains a simple mathematical exprssion and linebreaks', () => {
             describe('query a part of the mathematical expression', () => {
               it('finds that post', async () => {
-                await addPost({
-                  id: 'c-post',
-                  title: 'Die binomischen Formeln',
-                  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
-2. binomische Formel: (a - b)² = a² - 2ab + b²
-3. binomische Formel: (a + b)(a - b) = a² - b²`,
-                })
                 variables = { query: '(a - b)²' }
                 await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                   data: {
@@ -294,17 +310,9 @@ describe('resolvers', () => {
             })
           })
 
-          describe('adding a post that contains a poem', () => {
+          describe('a post that contains a poem', () => {
             describe('query for more than one word, e.g. the title of the poem', () => {
               it('finds the poem and another post that contains only one word but with lower score', async () => {
-                await addPost({
-                  id: 'd-post',
-                  title: 'Der Panther',
-                  content: `Sein Blick ist vom Vorübergehn der Stäbe
-so müd geworden, daß er nichts mehr hält.
-Ihm ist, als ob es tausend Stäbe gäbe
-und hinter tausend Stäben keine Welt.`,
-                })
                 variables = { query: 'der panther' }
                 await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                   data: {
@@ -400,13 +408,6 @@ und hinter tausend Stäben keine Welt.`,
           })
         })
       })
-
-      /*
-      it('finds Russian text', async () => {
-        variables = { query: 'Калашникова' }
-        const expected = createExpectedObject([gPost])
-        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject(expected)
-	}) */
     })
   })
 })
diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 3e53bfec9..e53405c8e 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -1,7 +1,7 @@
 export function queryString(str) {
   const normalizedString = normalizeWhitespace(str)
-    const escapedString = escapeSpecialCharacters(normalizedString)
-    return `
+  const escapedString = escapeSpecialCharacters(normalizedString)
+  return `
 ${matchWholeText(escapedString)}
 ${matchEachWordExactly(escapedString)}
 ${matchSomeWordsExactly(escapedString)}
@@ -10,39 +10,50 @@ ${matchBeginningOfWords(escapedString)}
 }
 
 const matchWholeText = (str, boost = 8) => {
-    return `"${str}"^${boost}`
+  return `"${str}"^${boost}`
 }
 
 const matchEachWordExactly = (str, boost = 4) => {
-    if (str.includes(' ')) {
-	let tmp = str.split(' ').map((s, i) => i === 0 ? `"${s}"` : `AND "${s}"`).join(' ')
-	return `(${tmp})^${boost}`
-    } else {
-	return ''
-    }
+  if (str.includes(' ')) {
+    const tmp = str
+      .split(' ')
+      .map((s, i) => (i === 0 ? `"${s}"` : `AND "${s}"`))
+      .join(' ')
+    return `(${tmp})^${boost}`
+  } else {
+    return ''
+  }
 }
 
 const matchSomeWordsExactly = (str, boost = 2) => {
-    if (str.includes(' ')) {
-	return str.split(' ').map(s => `"${s}"^${boost}`).join(' ')
-    } else {
-	return ''
-    }    
+  if (str.includes(' ')) {
+    return str
+      .split(' ')
+      .map(s => `"${s}"^${boost}`)
+      .join(' ')
+  } else {
+    return ''
+  }
 }
 
 const matchBeginningOfWords = str => {
-    return normalizeWhitespace(str.split(' ').map(s => {
-	if (s.length > 3) {
-	    // at least 4 letters. So AND, OR and NOT are never used unquoted
-	    return s + '*'
-	} else {
-	    return ''
-	}
-    }).join(' '))
+  return normalizeWhitespace(
+    str
+      .split(' ')
+      .map(s => {
+        if (s.length > 3) {
+          // at least 4 letters. So AND, OR and NOT are never used unquoted
+          return s + '*'
+        } else {
+          return ''
+        }
+      })
+      .join(' '),
+  )
 }
 
 export function normalizeWhitespace(str) {
-    return str.replace(/\s+/g, ' ').trim()
+  return str.replace(/\s+/g, ' ').trim()
 }
 
 export function escapeSpecialCharacters(str) {
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
index e431df90f..8f646ce25 100644
--- a/backend/src/schema/resolvers/searches/queryString.spec.js
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -1,20 +1,20 @@
 import { queryString, escapeSpecialCharacters, normalizeWhitespace } from './queryString'
 
 describe('queryString', () => {
-    describe('special characters', () => {
-	it('does escaping correctly', () => {
-	    expect(escapeSpecialCharacters('+ - && || ! ( ) { } [ ] ^ " ~ * ? : \\ / '))
-		.toEqual('\\+ \\- \\&\\& \\|\\| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ \\/ ')
-	})
+  describe('special characters', () => {
+    it('does escaping correctly', () => {
+      expect(escapeSpecialCharacters('+ - && || ! ( ) { } [ ] ^ " ~ * ? : \\ / ')).toEqual(
+        '\\+ \\- \\&\\& \\|\\| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ \\/ ',
+      )
     })
+  })
 
-    describe('whitespace', () => {
-	it('is normalized correctly', () => {
-	    expect(normalizeWhitespace(' a \t \n b \n   '))
-		.toEqual('a b')
-	})
+  describe('whitespace', () => {
+    it('is normalized correctly', () => {
+      expect(normalizeWhitespace(' a \t \n b \n   ')).toEqual('a b')
     })
-    
+  })
+
   describe('exact match', () => {
     it('boosts score by factor 8', () => {
       expect(queryString('a couple of words')).toContain('"a couple of words"^8')
@@ -23,7 +23,9 @@ describe('queryString', () => {
 
   describe('match all words exactly', () => {
     it('boosts score by factor 4', () => {
-      expect(queryString('a couple of words')).toContain('("a" AND "couple" AND "of" AND "words")^4')
+      expect(queryString('a couple of words')).toContain(
+        '("a" AND "couple" AND "of" AND "words")^4',
+      )
     })
   })
 
@@ -33,10 +35,9 @@ describe('queryString', () => {
     })
   })
 
- describe('globbing for longer words', () => {
+  describe('globbing for longer words', () => {
     it('globs words with more than three characters', () => {
       expect(queryString('a couple of words')).toContain('couple* words*')
     })
   })
-
 })

From 0a15d785a319b1aa6b5d8590e7bcaf4c3b98b348 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 16 Mar 2020 02:32:22 +0100
Subject: [PATCH 077/106] test that a post written by muted user is not
 included in the search results

---
 backend/src/schema/resolvers/searches.spec.js | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index 42ffd6f98..a04fbd802 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -44,6 +44,7 @@ const searchQuery = gql`
     }
   }
 `
+let user
 
 describe('resolvers', () => {
   describe('searches', () => {
@@ -51,7 +52,7 @@ describe('resolvers', () => {
 
     describe('given one user', () => {
       beforeAll(async () => {
-        const user = await Factory.build('user', {
+        user = await Factory.build('user', {
           id: 'a-user',
           name: 'John Doe',
           slug: 'john-doe',
@@ -407,6 +408,44 @@ und hinter tausend Stäben keine Welt.`,
             })
           })
         })
+
+        describe('adding a post, written by a user who is muted by the authenticated user', () => {
+          beforeAll(async () => {
+            const mutedUser = await Factory.build('user', {
+              id: 'muted-user',
+              name: 'Muted',
+              slug: 'muted',
+            })
+            await user.relateTo(mutedUser, 'muted')
+            await Factory.build(
+              'post',
+              {
+                id: 'muted-post',
+                title: 'Beleidigender Beitrag',
+                content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
+              },
+              { authorId: 'muted-user' },
+            )
+          })
+
+          describe('query for text in a post written by a muted user', () => {
+            it('does not include the post of the muted user in the results', async () => {
+              variables = { query: 'beitrag' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: expect.not.arrayContaining([
+                    {
+                      __typename: 'Post',
+                      id: 'muted-post',
+                      title: 'Beleidigender Beitrag',
+                      content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
+                    },
+                  ]),
+                },
+              })
+            })
+          })
+        })
       })
     })
   })

From 48564565a51eaeea44a6fefc8c0bffdcfb90d9df Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 16 Mar 2020 12:12:01 +0100
Subject: [PATCH 078/106] matchBeginningOfWords more compact

---
 .../schema/resolvers/searches/queryString.js   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index e53405c8e..38a25c6cf 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -37,19 +37,11 @@ const matchSomeWordsExactly = (str, boost = 2) => {
 }
 
 const matchBeginningOfWords = str => {
-  return normalizeWhitespace(
-    str
-      .split(' ')
-      .map(s => {
-        if (s.length > 3) {
-          // at least 4 letters. So AND, OR and NOT are never used unquoted
-          return s + '*'
-        } else {
-          return ''
-        }
-      })
-      .join(' '),
-  )
+  return str
+    .split(' ')
+    .filter(s => s.length > 3)
+    .map(s => s + '*')
+    .join(' ')
 }
 
 export function normalizeWhitespace(str) {

From 9c08db22dcd0ca1ad6e59be8fb0f287935b45537 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 17 Mar 2020 12:38:21 +0100
Subject: [PATCH 079/106] Changes requested by @mattwr18

---
 backend/src/schema/resolvers/searches.js      |   9 +-
 backend/src/schema/resolvers/searches.spec.js | 692 +++++++++---------
 .../schema/resolvers/searches/queryString.js  |  28 +-
 .../resolvers/searches/queryString.spec.js    |   2 +-
 4 files changed, 358 insertions(+), 373 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 5e062f45a..39fe952bb 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -41,16 +41,17 @@ export default {
       RETURN resource {.*, __typename: labels(resource)[0]}
       LIMIT $limit
       `
-
+      const myQuery = queryString(query)
+	
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {
-          query: queryString(query),
+          query: myQuery,
           limit,
           thisUserId,
         })
         const userTransactionResponse = transaction.run(userCypher, {
-          query: queryString(query),
+          query: myQuery,
           limit,
           thisUserId,
         })
@@ -61,8 +62,6 @@ export default {
         const [postResults, userResults] = await searchResultPromise
         log(postResults)
         log(userResults)
-        // console.log(postResults.summary.query.parameters)
-        // console.log(userResults)
         return [...postResults.records, ...userResults.records].map(r => r.get('resource'))
       } finally {
         session.close()
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index a04fbd802..c454833b8 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -4,7 +4,7 @@ import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 
-let query, authenticatedUser
+let query, authenticatedUser, user
 
 const driver = getDriver()
 const neode = getNeode()
@@ -44,36 +44,60 @@ const searchQuery = gql`
     }
   }
 `
-let user
+describe('resolvers/searches', () => {
+  let variables
 
-describe('resolvers', () => {
-  describe('searches', () => {
-    let variables
+  describe('given one user', () => {
+    beforeAll(async () => {
+      user = await Factory.build('user', {
+        id: 'a-user',
+        name: 'John Doe',
+        slug: 'john-doe',
+      })
+      authenticatedUser = await user.toJson()
+    })
 
-    describe('given one user', () => {
-      beforeAll(async () => {
-        user = await Factory.build('user', {
-          id: 'a-user',
-          name: 'John Doe',
-          slug: 'john-doe',
+    describe('query contains first name of user', () => {
+      it('finds the user', async () => {
+        variables = { query: 'John' }
+        await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+          data: {
+            findResources: [
+              {
+                id: 'a-user',
+                name: 'John Doe',
+                slug: 'john-doe',
+              },
+            ],
+          },
         })
-        authenticatedUser = await user.toJson()
+      })
+    })
+
+    describe('adding one post', () => {
+      beforeAll(async () => {
+        await Factory.build(
+          'post',
+          {
+            id: 'a-post',
+            title: 'Beitrag',
+            content: 'Ein erster Beitrag',
+          },
+          { authorId: 'a-user' },
+        )
       })
 
-      const factoryOptions = {
-        authorId: 'a-user',
-      }
-
-      describe('query contains first name of user', () => {
-        it('finds the user', async () => {
-          variables = { query: 'John' }
+      describe('query contains title of post', () => {
+        it('finds the post', async () => {
+          variables = { query: 'beitrag' }
           await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
             data: {
               findResources: [
                 {
-                  id: 'a-user',
-                  name: 'John Doe',
-                  slug: 'john-doe',
+                  __typename: 'Post',
+                  id: 'a-post',
+                  title: 'Beitrag',
+                  content: 'Ein erster Beitrag',
                 },
               ],
             },
@@ -81,326 +105,97 @@ describe('resolvers', () => {
         })
       })
 
-      describe('adding one post', () => {
-        beforeAll(async () => {
-          await Factory.build(
-            'post',
-            {
-              id: 'a-post',
-              title: 'Beitrag',
-              content: 'Ein erster Beitrag',
+      describe('casing', () => {
+        it('does not matter', async () => {
+          variables = { query: 'BEITRAG' }
+          await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+            data: {
+              findResources: [
+                {
+                  __typename: 'Post',
+                  id: 'a-post',
+                  title: 'Beitrag',
+                  content: 'Ein erster Beitrag',
+                },
+              ],
             },
-            factoryOptions,
-          )
+          })
         })
+      })
 
-        describe('query contains title of post', () => {
-          it('finds the post', async () => {
-            variables = { query: 'beitrag' }
-            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-              data: {
-                findResources: [
-                  {
-                    __typename: 'Post',
-                    id: 'a-post',
-                    title: 'Beitrag',
-                    content: 'Ein erster Beitrag',
-                  },
-                ],
+      describe('query consists of words not present in the corpus', () => {
+        it('returns empty search results', async () => {
+          await expect(
+            query({ query: searchQuery, variables: { query: 'Unfug' } }),
+          ).resolves.toMatchObject({ data: { findResources: [] } })
+        })
+      })
+
+      describe('testing different post content', () => {
+        beforeAll(async () => {
+          return Promise.all([
+            Factory.build(
+              'post',
+              {
+                id: 'b-post',
+                title: 'Aufruf',
+                content: 'Jeder sollte seinen Beitrag leisten.',
               },
-            })
-          })
-        })
-
-        describe('casing', () => {
-          it('does not matter', async () => {
-            variables = { query: 'BEITRAG' }
-            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-              data: {
-                findResources: [
-                  {
-                    __typename: 'Post',
-                    id: 'a-post',
-                    title: 'Beitrag',
-                    content: 'Ein erster Beitrag',
-                  },
-                ],
+              { authorId: 'a-user' },
+            ),
+            Factory.build(
+              'post',
+              {
+                id: 'g-post',
+                title: 'Zusammengesetzte Wörter',
+                content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
               },
-            })
-          })
-        })
-
-        describe('query consists of words not present in the corpus', () => {
-          it('returns empty search results', async () => {
-            await expect(
-              query({ query: searchQuery, variables: { query: 'Unfug' } }),
-            ).resolves.toMatchObject({ data: { findResources: [] } })
-          })
-        })
-
-        describe('testing different post content', () => {
-          beforeAll(async () => {
-            return Promise.all([
-              Factory.build(
-                'post',
-                {
-                  id: 'b-post',
-                  title: 'Aufruf',
-                  content: 'Jeder sollte seinen Beitrag leisten.',
-                },
-                factoryOptions,
-              ),
-              Factory.build(
-                'post',
-                {
-                  id: 'g-post',
-                  title: 'Zusammengesetzte Wörter',
-                  content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                },
-                factoryOptions,
-              ),
-              Factory.build(
-                'post',
-                {
-                  id: 'c-post',
-                  title: 'Die binomischen Formeln',
-                  content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
+              { authorId: 'a-user' },
+            ),
+            Factory.build(
+              'post',
+              {
+                id: 'c-post',
+                title: 'Die binomischen Formeln',
+                content: `1. binomische Formel: (a + b)² = a² + 2ab + b²
 2. binomische Formel: (a - b)² = a² - 2ab + b²
 3. binomische Formel: (a + b)(a - b) = a² - b²`,
-                },
-                factoryOptions,
-              ),
-              Factory.build(
-                'post',
-                {
-                  id: 'd-post',
-                  title: 'Der Panther',
-                  content: `Sein Blick ist vom Vorübergehn der Stäbe
+              },
+              { authorId: 'a-user' },
+            ),
+            Factory.build(
+              'post',
+              {
+                id: 'd-post',
+                title: 'Der Panther',
+                content: `Sein Blick ist vom Vorübergehn der Stäbe
 so müd geworden, daß er nichts mehr hält.
 Ihm ist, als ob es tausend Stäbe gäbe
 und hinter tausend Stäben keine Welt.`,
-                },
-                factoryOptions,
-              ),
-            ])
-          })
-
-          describe('a post which content contains the title of the first post', () => {
-            describe('query contains the title of the first post', () => {
-              it('finds both posts', async () => {
-                variables = { query: 'beitrag' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: expect.arrayContaining([
-                      {
-                        __typename: 'Post',
-                        id: 'a-post',
-                        title: 'Beitrag',
-                        content: 'Ein erster Beitrag',
-                      },
-                      {
-                        __typename: 'Post',
-                        id: 'b-post',
-                        title: 'Aufruf',
-                        content: 'Jeder sollte seinen Beitrag leisten.',
-                      },
-                    ]),
-                  },
-                })
-              })
-            })
-          })
-
-          describe('a post that contains a hyphen between two words and German quotation marks', () => {
-            describe('hyphens in query', () => {
-              it('will be treated as ordinary characters', async () => {
-                variables = { query: 'tee-ei' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'g-post',
-                        title: 'Zusammengesetzte Wörter',
-                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-
-            describe('German quotation marks in query', () => {
-              it('will be treated as ordinary characters', async () => {
-                variables = { query: '„teeei“' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'g-post',
-                        title: 'Zusammengesetzte Wörter',
-                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-          })
-
-          describe('a post that contains a simple mathematical exprssion and linebreaks', () => {
-            describe('query a part of the mathematical expression', () => {
-              it('finds that post', async () => {
-                variables = { query: '(a - b)²' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'c-post',
-                        title: 'Die binomischen Formeln',
-                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
-2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
-3. binomische Formel: (a + b)(a - b) = a² - b²`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-
-            describe('query the same part of the mathematical expression without spaces', () => {
-              it('finds that post', async () => {
-                variables = { query: '(a-b)²' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'c-post',
-                        title: 'Die binomischen Formeln',
-                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
-2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
-3. binomische Formel: (a + b)(a - b) = a² - b²`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-
-            describe('query the mathematical expression over linebreak', () => {
-              it('finds that post', async () => {
-                variables = { query: '+ b² 2.' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'c-post',
-                        title: 'Die binomischen Formeln',
-                        content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
-2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
-3. binomische Formel: (a + b)(a - b) = a² - b²`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-          })
-
-          describe('a post that contains a poem', () => {
-            describe('query for more than one word, e.g. the title of the poem', () => {
-              it('finds the poem and another post that contains only one word but with lower score', async () => {
-                variables = { query: 'der panther' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: [
-                      {
-                        __typename: 'Post',
-                        id: 'd-post',
-                        title: 'Der Panther',
-                        content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
-so müd geworden, daß er nichts mehr hält.<br>
-Ihm ist, als ob es tausend Stäbe gäbe<br>
-und hinter tausend Stäben keine Welt.`,
-                      },
-                      {
-                        __typename: 'Post',
-                        id: 'g-post',
-                        title: 'Zusammengesetzte Wörter',
-                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                      },
-                    ],
-                  },
-                })
-              })
-            })
-
-            describe('query for the first four letters of two longer words', () => {
-              it('finds the posts that contain words starting with these four letters', async () => {
-                variables = { query: 'Vorü Subs' }
-                await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
-                  data: {
-                    findResources: expect.arrayContaining([
-                      {
-                        __typename: 'Post',
-                        id: 'd-post',
-                        title: 'Der Panther',
-                        content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
-so müd geworden, daß er nichts mehr hält.<br>
-Ihm ist, als ob es tausend Stäbe gäbe<br>
-und hinter tausend Stäben keine Welt.`,
-                      },
-                      {
-                        __typename: 'Post',
-                        id: 'g-post',
-                        title: 'Zusammengesetzte Wörter',
-                        content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
-                      },
-                    ]),
-                  },
-                })
-              })
-            })
-          })
+              },
+              { authorId: 'a-user' },
+            ),
+          ])
         })
 
-        describe('adding two users that have the same word in their slugs', () => {
-          beforeAll(async () => {
-            await Promise.all([
-              Factory.build('user', {
-                id: 'c-user',
-                name: 'Rainer Maria Rilke',
-                slug: 'rainer-maria-rilke',
-              }),
-              Factory.build('user', {
-                id: 'd-user',
-                name: 'Erich Maria Remarque',
-                slug: 'erich-maria-remarque',
-              }),
-            ])
-          })
-
-          describe('query the word that both slugs contain', () => {
-            it('finds both users', async () => {
-              variables = { query: '-maria-' }
+        describe('a post which content contains the title of the first post', () => {
+          describe('query contains the title of the first post', () => {
+            it('finds both posts', async () => {
+              variables = { query: 'beitrag' }
               await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                 data: {
                   findResources: expect.arrayContaining([
                     {
-                      __typename: 'User',
-                      id: 'c-user',
-                      name: 'Rainer Maria Rilke',
-                      slug: 'rainer-maria-rilke',
+                      __typename: 'Post',
+                      id: 'a-post',
+                      title: 'Beitrag',
+                      content: 'Ein erster Beitrag',
                     },
                     {
-                      __typename: 'User',
-                      id: 'd-user',
-                      name: 'Erich Maria Remarque',
-                      slug: 'erich-maria-remarque',
+                      __typename: 'Post',
+                      id: 'b-post',
+                      title: 'Aufruf',
+                      content: 'Jeder sollte seinen Beitrag leisten.',
                     },
                   ]),
                 },
@@ -409,36 +204,154 @@ und hinter tausend Stäben keine Welt.`,
           })
         })
 
-        describe('adding a post, written by a user who is muted by the authenticated user', () => {
-          beforeAll(async () => {
-            const mutedUser = await Factory.build('user', {
-              id: 'muted-user',
-              name: 'Muted',
-              slug: 'muted',
-            })
-            await user.relateTo(mutedUser, 'muted')
-            await Factory.build(
-              'post',
-              {
-                id: 'muted-post',
-                title: 'Beleidigender Beitrag',
-                content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
-              },
-              { authorId: 'muted-user' },
-            )
-          })
-
-          describe('query for text in a post written by a muted user', () => {
-            it('does not include the post of the muted user in the results', async () => {
-              variables = { query: 'beitrag' }
+        describe('a post that contains a hyphen between two words and German quotation marks', () => {
+          describe('hyphens in query', () => {
+            it('will be treated as ordinary characters', async () => {
+              variables = { query: 'tee-ei' }
               await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
                 data: {
-                  findResources: expect.not.arrayContaining([
+                  findResources: [
                     {
                       __typename: 'Post',
-                      id: 'muted-post',
-                      title: 'Beleidigender Beitrag',
-                      content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
+                      id: 'g-post',
+                      title: 'Zusammengesetzte Wörter',
+                      content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+
+          describe('German quotation marks in query to test unicode characters (\u201E ... \u201C)', () => {
+            it('will be treated as ordinary characters', async () => {
+              variables = { query: '„teeei“' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: [
+                    {
+                      __typename: 'Post',
+                      id: 'g-post',
+                      title: 'Zusammengesetzte Wörter',
+                      content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+        })
+
+        describe('a post that contains a simple mathematical exprssion and line breaks', () => {
+          describe('query a part of the mathematical expression', () => {
+            it('finds that post', async () => {
+              variables = { query: '(a - b)²' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: [
+                    {
+                      __typename: 'Post',
+                      id: 'c-post',
+                      title: 'Die binomischen Formeln',
+                      content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+
+          describe('query the same part of the mathematical expression without spaces', () => {
+            it('finds that post', async () => {
+              variables = { query: '(a-b)²' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: [
+                    {
+                      __typename: 'Post',
+                      id: 'c-post',
+                      title: 'Die binomischen Formeln',
+                      content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+
+          describe('query the mathematical expression over line break', () => {
+            it('finds that post', async () => {
+              variables = { query: '+ b² 2.' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: [
+                    {
+                      __typename: 'Post',
+                      id: 'c-post',
+                      title: 'Die binomischen Formeln',
+                      content: `1. binomische Formel: (a + b)² = a² + 2ab + b²<br>
+2. binomische Formel: (a - b)² = a² - 2ab + b²<br>
+3. binomische Formel: (a + b)(a - b) = a² - b²`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+        })
+
+        describe('a post that contains a poem', () => {
+          describe('query for more than one word, e.g. the title of the poem', () => {
+            it('finds the poem and another post that contains only one word but with lower score', async () => {
+              variables = { query: 'der panther' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: [
+                    {
+                      __typename: 'Post',
+                      id: 'd-post',
+                      title: 'Der Panther',
+                      content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
+so müd geworden, daß er nichts mehr hält.<br>
+Ihm ist, als ob es tausend Stäbe gäbe<br>
+und hinter tausend Stäben keine Welt.`,
+                    },
+                    {
+                      __typename: 'Post',
+                      id: 'g-post',
+                      title: 'Zusammengesetzte Wörter',
+                      content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
+                    },
+                  ],
+                },
+              })
+            })
+          })
+
+          describe('query for the first four letters of two longer words', () => {
+            it('finds the posts that contain words starting with these four letters', async () => {
+              variables = { query: 'Vorü Subs' }
+              await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+                data: {
+                  findResources: expect.arrayContaining([
+                    {
+                      __typename: 'Post',
+                      id: 'd-post',
+                      title: 'Der Panther',
+                      content: `Sein Blick ist vom Vorübergehn der Stäbe<br>
+so müd geworden, daß er nichts mehr hält.<br>
+Ihm ist, als ob es tausend Stäbe gäbe<br>
+und hinter tausend Stäben keine Welt.`,
+                    },
+                    {
+                      __typename: 'Post',
+                      id: 'g-post',
+                      title: 'Zusammengesetzte Wörter',
+                      content: `Ein Bindestrich kann zwischen zwei Substantiven auch dann gesetzt werden, wenn drei gleichlautende Buchstaben aufeinandertreffen. Das ist etwa bei einem „Teeei“ der Fall, das so korrekt geschrieben ist. Möglich ist hier auch die Schreibweise mit Bindestrich: Tee-Ei.`,
                     },
                   ]),
                 },
@@ -447,6 +360,85 @@ und hinter tausend Stäben keine Welt.`,
           })
         })
       })
+
+      describe('adding two users that have the same word in their slugs', () => {
+        beforeAll(async () => {
+          await Promise.all([
+            Factory.build('user', {
+              id: 'c-user',
+              name: 'Rainer Maria Rilke',
+              slug: 'rainer-maria-rilke',
+            }),
+            Factory.build('user', {
+              id: 'd-user',
+              name: 'Erich Maria Remarque',
+              slug: 'erich-maria-remarque',
+            }),
+          ])
+        })
+
+        describe('query the word that both slugs contain', () => {
+          it('finds both users', async () => {
+            variables = { query: '-maria-' }
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+              data: {
+                findResources: expect.arrayContaining([
+                  {
+                    __typename: 'User',
+                    id: 'c-user',
+                    name: 'Rainer Maria Rilke',
+                    slug: 'rainer-maria-rilke',
+                  },
+                  {
+                    __typename: 'User',
+                    id: 'd-user',
+                    name: 'Erich Maria Remarque',
+                    slug: 'erich-maria-remarque',
+                  },
+                ]),
+              },
+            })
+          })
+        })
+      })
+
+      describe('adding a post, written by a user who is muted by the authenticated user', () => {
+        beforeAll(async () => {
+          const mutedUser = await Factory.build('user', {
+            id: 'muted-user',
+            name: 'Muted',
+            slug: 'muted',
+          })
+          await user.relateTo(mutedUser, 'muted')
+          await Factory.build(
+            'post',
+            {
+              id: 'muted-post',
+              title: 'Beleidigender Beitrag',
+              content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
+            },
+            { authorId: 'muted-user' },
+          )
+        })
+
+        describe('query for text in a post written by a muted user', () => {
+          it('does not include the post of the muted user in the results', async () => {
+            variables = { query: 'beitrag' }
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+              data: {
+                findResources: expect.not.arrayContaining([
+                  {
+                    __typename: 'Post',
+                    id: 'muted-post',
+                    title: 'Beleidigender Beitrag',
+                    content: 'Dieser Beitrag stammt von einem bleidigendem Nutzer.',
+                  },
+                ]),
+              },
+            })
+          })
+        })
+      })
     })
   })
 })
diff --git a/backend/src/schema/resolvers/searches/queryString.js b/backend/src/schema/resolvers/searches/queryString.js
index 38a25c6cf..c3500188c 100644
--- a/backend/src/schema/resolvers/searches/queryString.js
+++ b/backend/src/schema/resolvers/searches/queryString.js
@@ -14,26 +14,20 @@ const matchWholeText = (str, boost = 8) => {
 }
 
 const matchEachWordExactly = (str, boost = 4) => {
-  if (str.includes(' ')) {
-    const tmp = str
-      .split(' ')
-      .map((s, i) => (i === 0 ? `"${s}"` : `AND "${s}"`))
-      .join(' ')
-    return `(${tmp})^${boost}`
-  } else {
-    return ''
-  }
+  if (!str.includes(' ')) return ''
+  const tmp = str
+    .split(' ')
+    .map((s, i) => (i === 0 ? `"${s}"` : `AND "${s}"`))
+    .join(' ')
+  return `(${tmp})^${boost}`
 }
 
 const matchSomeWordsExactly = (str, boost = 2) => {
-  if (str.includes(' ')) {
-    return str
-      .split(' ')
-      .map(s => `"${s}"^${boost}`)
-      .join(' ')
-  } else {
-    return ''
-  }
+  if (!str.includes(' ')) return ''
+  return str
+    .split(' ')
+    .map(s => `"${s}"^${boost}`)
+    .join(' ')
 }
 
 const matchBeginningOfWords = str => {
diff --git a/backend/src/schema/resolvers/searches/queryString.spec.js b/backend/src/schema/resolvers/searches/queryString.spec.js
index 8f646ce25..23a746be1 100644
--- a/backend/src/schema/resolvers/searches/queryString.spec.js
+++ b/backend/src/schema/resolvers/searches/queryString.spec.js
@@ -10,7 +10,7 @@ describe('queryString', () => {
   })
 
   describe('whitespace', () => {
-    it('is normalized correctly', () => {
+    it('normalizes correctly', () => {
       expect(normalizeWhitespace(' a \t \n b \n   ')).toEqual('a b')
     })
   })

From 800e33e1be698f0a6cb9f1c9bea680eea474c29b Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 17 Mar 2020 13:05:37 +0100
Subject: [PATCH 080/106] chore: fix lint

---
 backend/src/schema/resolvers/searches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 39fe952bb..5c1e43952 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -42,7 +42,7 @@ export default {
       LIMIT $limit
       `
       const myQuery = queryString(query)
-	
+
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {

From 1d5cad77eb2a2805f8b913119fb9218b9962da4a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:47:14 +0000
Subject: [PATCH 081/106] build(deps): bump graphql-shield from 7.0.14 to 7.2.0
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.14 to 7.2.0.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.14...v7.2.0)

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

diff --git a/backend/package.json b/backend/package.json
index 13d5161d5..77417453f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.2.1",
-    "graphql-shield": "~7.0.14",
+    "graphql-shield": "~7.2.0",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.3",
     "ioredis": "^4.16.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index c938959ce..a514a60b4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -4498,14 +4498,14 @@ graphql-redis-subscriptions@^2.2.1:
   optionalDependencies:
     ioredis "^4.6.3"
 
-graphql-shield@~7.0.14:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.14.tgz#3cbbf2722f2e3393fed7f47d866a1324bc3ce76a"
-  integrity sha512-YVedaL+4pITisSGRqMVeGX8ydOLSTQlHQN6o0Jly7z2cSy1wOzGJIRpfofETJtGLhBnPHHy1otINzuAyjGJO/g==
+graphql-shield@~7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.2.0.tgz#81b26794370608ad78dfe3833473789fb471fbd8"
+  integrity sha512-eLdD+gUIKYu77XRcuHs5ewZhiBuRFeWFGxPnJa+g9AkxB7Yi5RSEjEJEx0Drg9GuNvDYpHeW7nPff4v35AT2aQ==
   dependencies:
     "@types/yup" "0.26.32"
     object-hash "^2.0.3"
-    yup "^0.28.1"
+    yup "^0.28.3"
 
 graphql-subscriptions@^1.0.0:
   version "1.1.0"
@@ -9378,7 +9378,7 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^16.1.0"
 
-yup@^0.28.1:
+yup@^0.28.3:
   version "0.28.3"
   resolved "https://registry.yarnpkg.com/yup/-/yup-0.28.3.tgz#1ca607405a8adf24a5ac51f54bd09d527555f0ba"
   integrity sha512-amVkCgFWe5bGjrrUiODkbIzrSwtB8JpZrQYSrfj2YsbRdrV+tn9LquWdZDlfOx2HXyfEA8FGnlwidE/bFDxO7Q==

From 8c0a63a58047a50c3d1cd5d16dc7bc6fe84bbd4e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:47:32 +0000
Subject: [PATCH 082/106] build(deps-dev): bump @storybook/vue from 5.3.14 to
 5.3.17 in /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index e2b7f74b3..7bf6f777f 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -103,7 +103,7 @@
     "@storybook/addon-a11y": "^5.3.14",
     "@storybook/addon-actions": "^5.3.17",
     "@storybook/addon-notes": "^5.3.17",
-    "@storybook/vue": "~5.3.14",
+    "@storybook/vue": "~5.3.17",
     "@vue/cli-shared-utils": "~4.2.3",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 24a8f39a3..ae44efd27 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2295,17 +2295,6 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.14.tgz#768c87411d98caf09fdd92539b9edaaed26d5965"
-  integrity sha512-XKHxMSwW3movfTDOashuYlVCX3Hp7+X+amXc/xhDDzbiYjy3/CVm3LlkkM6v451IVEdK6pue4ewqZQWJAYAAEQ==
-  dependencies:
-    "@storybook/channels" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    telejson "^3.2.0"
-
 "@storybook/channel-postmessage@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.17.tgz#807b6316cd0e52d9f27363d5092ad1cd896b694c"
@@ -2338,29 +2327,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.14.tgz#5f4b199d2f2b193f9f5a856c5eb8be43a9113d12"
-  integrity sha512-1qx1NIwto5F9N24Fb6VzKyDzeaZHtWTZ7afPrg56e1tUu7jbog7rELdRezk8+YAujveyMDJu4MxnOSP01sv7YQ==
-  dependencies:
-    "@storybook/addons" "5.3.14"
-    "@storybook/channel-postmessage" "5.3.14"
-    "@storybook/channels" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/csf" "0.0.1"
-    "@types/webpack-env" "^1.15.0"
-    core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
-    global "^4.3.2"
-    is-plain-object "^3.0.0"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    stable "^0.1.8"
-    ts-dedent "^1.1.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.17.tgz#fc1d247caf267ebcc6ddf957fca7e02ae752d99e"
@@ -2505,26 +2471,26 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.14.tgz#510f204219695045f249733bf94018e52c7b1448"
-  integrity sha512-Y57cchCRw1vvZe8OhMmgAkaHciGLm2eztdfzZMUmeHH8csBt/0RO5gYzOhWDGgdC2D9HSlaysZEDJ6sH3PChlw==
+"@storybook/core@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.17.tgz#abd09dc416f87c7954ef3615bc3f4898c93e2b45"
+  integrity sha512-H6G8ygjb4RSVSKPdWz6su3Nvzxm8CfrHuCyUo4DLC46mirXfYRrJV1HiwXriViqoZV4gFbpaNKTDzTl/QKFDAg==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.3.14"
-    "@storybook/channel-postmessage" "5.3.14"
-    "@storybook/client-api" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/core-events" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/channel-postmessage" "5.3.17"
+    "@storybook/client-api" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/core-events" "5.3.17"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "5.3.14"
-    "@storybook/router" "5.3.14"
-    "@storybook/theming" "5.3.14"
-    "@storybook/ui" "5.3.14"
+    "@storybook/node-logger" "5.3.17"
+    "@storybook/router" "5.3.17"
+    "@storybook/theming" "5.3.17"
+    "@storybook/ui" "5.3.17"
     airbnb-js-shims "^2.2.1"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.7.2"
@@ -2591,10 +2557,10 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.14.tgz#5e4e02585b37754bbebb8810ffb17c8ce706a1f8"
-  integrity sha512-/phRS49/hMZ5SU4EKUxX2kFepm9iw1cJBzggOz0GA1Yj4r9g1TA1H+OD7QvZvVTC3AESf/ZUJyaqnXEh/l+hpg==
+"@storybook/node-logger@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.17.tgz#f3ad5bf9dd74d8e1cdfb8d831d66a80c5039cf4c"
+  integrity sha512-onfcxl37BYZI1HGuPI9MelkyUWjn7NpfN8RUYdqG9P6WKiIY5xbpG0V6qod5jvIKIypK0NmfJTtneOu46L/oDg==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^3.0.0"
@@ -2700,20 +2666,20 @@
     resolve-from "^5.0.0"
     ts-dedent "^1.1.0"
 
-"@storybook/ui@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.14.tgz#f3c49241d615bb20cb6facef84b4c432a85d814b"
-  integrity sha512-4zQOxpcvbKqRevmFw3Er6AWr2MeEMQfnuYh4Vm5G5YpiTyM6PU0VTVRzKnkEbNBcgjClD7nwXSbkUJjW6MJ8SA==
+"@storybook/ui@5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.17.tgz#2d47617896a2d928fb79dc8a0e709cee9b57cc50"
+  integrity sha512-5S9r70QbtNKu8loa5pfO5lLX9coF/ZqesEKcanfvuSwqCSg/Z51UwFCuO6eNhVlpXzyZXi5d8qKbZlbf+uvDAA==
   dependencies:
     "@emotion/core" "^10.0.20"
-    "@storybook/addons" "5.3.14"
-    "@storybook/api" "5.3.14"
-    "@storybook/channels" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/components" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/router" "5.3.14"
-    "@storybook/theming" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/api" "5.3.17"
+    "@storybook/channels" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/components" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/router" "5.3.17"
+    "@storybook/theming" "5.3.17"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2740,13 +2706,13 @@
     telejson "^3.2.0"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.14.tgz#16a7329bfabcba2388f75c0a1dd57e2a24a6fd95"
-  integrity sha512-rPkUlrTnuw5QNNyu28gOtd/Ge6AZORTvXvq/Reg5j3tAQYqzivjnhNPlHTV5WgAye1Db37S7sPUCaexP2uGHRw==
+"@storybook/vue@~5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.17.tgz#2e056985a481a2c6443c47891083469ea286be4f"
+  integrity sha512-hbSmJ+6S8MnYhaRLGOPx3rxs3v6+NXVqDDwoXFtn9lO7iTggl74qNvQ+PV/6gX04TsJTb88jbv+RD5zkmhMIWg==
   dependencies:
-    "@storybook/addons" "5.3.14"
-    "@storybook/core" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/core" "5.3.17"
     "@types/webpack-env" "^1.15.0"
     core-js "^3.0.1"
     global "^4.3.2"
@@ -14133,12 +14099,7 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
-regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
   integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==

From a69c26bb25f19d4768d3a9315afc916ee8a32567 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:47:59 +0000
Subject: [PATCH 083/106] build(deps): bump cookie-universal-nuxt from 2.1.2 to
 2.1.3 in /webapp

Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.2...v2.1.3)

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

diff --git a/webapp/package.json b/webapp/package.json
index e2b7f74b3..509704b6a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -68,7 +68,7 @@
     "accounting": "~0.4.1",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
-    "cookie-universal-nuxt": "~2.1.2",
+    "cookie-universal-nuxt": "~2.1.3",
     "cropperjs": "^1.5.5",
     "cross-env": "~7.0.2",
     "date-fns": "2.11.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 24a8f39a3..733200abe 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6117,18 +6117,18 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie-universal-nuxt@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.2.tgz#790a6fc72e5f34b4cf7cf77d92bf2ee63e207901"
-  integrity sha512-UEE8uglIlTq+SYhOv6LhdZ/ByDk+f3mQPrUEkJFXU81Ck56ox5UR5CdHmeFtfpibpD8DvWHh4nnCHOpA22gRnQ==
+cookie-universal-nuxt@~2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.3.tgz#f850df248c7225646554ea4255c696e69060e0e2"
+  integrity sha512-oiEwBZ3JWfXZbpukxFLHp2K7bUKRpA3XpzxXnmwtLECKECWfrf3ze4V9G18bK05ULvSHo2Ao/mVrlx0/TPkuRQ==
   dependencies:
     "@types/cookie" "^0.3.3"
-    cookie-universal "^2.1.1"
+    cookie-universal "^2.1.3"
 
-cookie-universal@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.1.1.tgz#d9b8d27ceb5d7a6a57481eb5a3b58995cf1a1a40"
-  integrity sha512-WolLEtABR5E6NLIgpgP0LT53C85iJmxqTF3YAx4tCIWl0mkwivzjQaVbXDQbUxKz4HRwiYLW1D8vh1SJIAkl8A==
+cookie-universal@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.1.3.tgz#b5bb6fb32c7d1d631d5c94c58fae6e7709600044"
+  integrity sha512-9NTCd4DO0m+okpeCMejxWTGFIyPUL7qGye3HWfrgmQY67VET0xw9utYdscCmmrSerSDj2ntvqTQ86pw317al+g==
   dependencies:
     "@types/cookie" "^0.3.3"
     cookie "^0.4.0"

From 1003d5ad8ad8ecc519dc4d89f1a0d6fc46f63060 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:48:50 +0000
Subject: [PATCH 084/106] build(deps): bump nuxt from 2.11.0 to 2.12.0 in
 /webapp

Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.11.0...v2.12.0)

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

diff --git a/webapp/package.json b/webapp/package.json
index e2b7f74b3..4ce71dafa 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -77,7 +77,7 @@
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.2.0",
     "node-fetch": "^2.6.0",
-    "nuxt": "~2.11.0",
+    "nuxt": "~2.12.0",
     "nuxt-dropzone": "^1.0.4",
     "nuxt-env": "~0.1.0",
     "stack-utils": "^2.0.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 24a8f39a3..15f7c6173 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -75,7 +75,7 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@~7.8.7":
+"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.8.7", "@babel/core@~7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
   integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
@@ -170,6 +170,18 @@
     "@babel/helper-replace-supers" "^7.7.4"
     "@babel/helper-split-export-declaration" "^7.7.4"
 
+"@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.8.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0"
+  integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==
+  dependencies:
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+
 "@babel/helper-create-regexp-features-plugin@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
@@ -248,7 +260,7 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.4", "@babel/helper-module-imports@^7.8.3":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
   integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
@@ -407,7 +419,7 @@
     "@babel/helper-remap-async-to-generator" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.7.0", "@babel/plugin-proposal-class-properties@^7.7.4":
+"@babel/plugin-proposal-class-properties@^7.7.0":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
   integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
@@ -415,14 +427,22 @@
     "@babel/helper-create-class-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-decorators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b"
-  integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg==
+"@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
+  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-decorators" "^7.7.4"
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-proposal-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
+  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-decorators" "^7.8.3"
 
 "@babel/plugin-proposal-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -494,12 +514,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-decorators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b"
-  integrity sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A==
+"@babel/plugin-syntax-decorators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
+  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -765,13 +785,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61"
-  integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==
+"@babel/plugin-transform-runtime@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz#c0153bc0a5375ebc1f1591cb7eea223adea9f169"
+  integrity sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
     resolve "^1.8.1"
     semver "^5.5.1"
 
@@ -820,7 +840,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.7.6", "@babel/preset-env@~7.8.6":
+"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.8.7", "@babel/preset-env@~7.8.6":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
   integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
@@ -912,14 +932,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.7.6":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.7.tgz#194769ca8d6d7790ec23605af9ee3e42a0aa79cf"
-  integrity sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.8.4":
+"@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
   integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
@@ -1446,85 +1459,89 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@nuxt/babel-preset-app@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.11.0.tgz#e89fdb7ef5c08dce13532ccf63a7064399f67ab0"
-  integrity sha512-2Y9NQrhzx1zjELPk3msADtH4WFXFslU8nQnRkEHMmgKAYSCGOoV+D5ZBzlCcMy+4IoK7HBzr0tIn4rRNRwjTuQ==
+"@nuxt/babel-preset-app@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.12.0.tgz#1943b8eccb0f70cde4ffebe9cf43473ebe95ef12"
+  integrity sha512-DwYZkRsPcZ4rPe8O4Mlxs5YRyiW31M4vttItu521bnhzd/TR6u0+Hsdqadkf7wfDZAS2MlfSTLtdkmLpXbgWaw==
   dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/plugin-proposal-class-properties" "^7.7.4"
-    "@babel/plugin-proposal-decorators" "^7.7.4"
-    "@babel/plugin-transform-runtime" "^7.7.6"
-    "@babel/preset-env" "^7.7.6"
-    "@babel/runtime" "^7.7.6"
+    "@babel/core" "^7.8.7"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.8.3"
+    "@babel/preset-env" "^7.8.7"
+    "@babel/runtime" "^7.8.7"
     "@vue/babel-preset-jsx" "^1.1.2"
     core-js "^2.6.5"
 
-"@nuxt/builder@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.11.0.tgz#501fc60b9dae8956ffeb6ead890e708b631587aa"
-  integrity sha512-uIaY/MiNrgirneYn9goduh6eaRKJHovdXZ8cWESxFMolhenHaGRrjUeC8fKPFyS1mBjnweShg3bHAWjtLfFrIg==
+"@nuxt/builder@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.12.0.tgz#5cf425f22251d2aae1af3eb9f75fd5e9e0a750ad"
+  integrity sha512-lgBdnv3jkI4Lgbtduaumjy5P2w4YxUOIzrdRCWufwY6lNSmjerTn1HBXObZUe27KCYoG25hX8zTKDlFuYSzvuA==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.11.0"
-    "@nuxt/vue-app" "2.11.0"
+    "@nuxt/utils" "2.12.0"
+    "@nuxt/vue-app" "2.12.0"
+    "@nuxt/webpack" "2.12.0"
+    chalk "^3.0.0"
     chokidar "^3.3.1"
-    consola "^2.11.1"
+    consola "^2.11.3"
     fs-extra "^8.1.0"
     glob "^7.1.6"
     hash-sum "^2.0.0"
     ignore "^5.1.4"
     lodash "^4.17.15"
     pify "^4.0.1"
-    semver "^7.1.0"
-    serialize-javascript "^2.1.2"
+    semver "^7.1.3"
+    serialize-javascript "^3.0.0"
     upath "^1.2.0"
 
-"@nuxt/cli@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.11.0.tgz#0655547b449b50be41f012abedc30458412b9417"
-  integrity sha512-f7fOopxz3NGKdgZ92RUM1oT4Xr5oAVqLyqEPEoa60oKKRuy/rf8gZ5DLANKjyE5vpj2dwYM1pPrabCloF/33zw==
+"@nuxt/cli@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.12.0.tgz#10083ad03c0f2999d85fea3ed577f5d0faa728a8"
+  integrity sha512-MBrDlPeq0hLNFqXIBNkvjSeMGMI5iOLyKt2/jxqhOSJCNsJU0p3xVzm/UQ10/Fv8ZR7B0guv/W0U4iJMSnxqYQ==
   dependencies:
-    "@nuxt/config" "2.11.0"
-    "@nuxt/utils" "2.11.0"
+    "@nuxt/config" "2.12.0"
+    "@nuxt/utils" "2.12.0"
     boxen "^4.2.0"
-    chalk "^2.4.2"
-    consola "^2.11.1"
+    chalk "^3.0.0"
+    consola "^2.11.3"
     esm "^3.2.25"
     execa "^3.4.0"
     exit "^0.1.2"
     fs-extra "^8.1.0"
-    hable "^2.3.2"
-    minimist "^1.2.0"
+    hable "^3.0.0"
+    minimist "^1.2.5"
     opener "1.5.1"
     pretty-bytes "^5.3.0"
     std-env "^2.2.1"
     wrap-ansi "^6.2.0"
 
-"@nuxt/config@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.11.0.tgz#d2b850d8a1b2a2b41726f3f02f6c1e4d59d7bd7f"
-  integrity sha512-7pB5R3N2JjNdbQpCR87tw3aROm5e9yV+XXMYXgxbH6yDAweuf3Bji4VJCWrkkE8VgLSLdtGQ5O0v8cT6dvf0cw==
+"@nuxt/config@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.12.0.tgz#02a330b501aadbc2106b4d781505460619017b9d"
+  integrity sha512-DTg2QFzI5vLviJPgb6/MzzrpdoG/VQXsJh3sj3XAIecTJkssOj+cOGf3viAENbhxVtPVDd8tRGP8BI/Yap1VQw==
   dependencies:
-    "@nuxt/utils" "2.11.0"
-    consola "^2.11.1"
+    "@nuxt/utils" "2.12.0"
+    consola "^2.11.3"
+    esm "^3.2.25"
     std-env "^2.2.1"
 
-"@nuxt/core@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.11.0.tgz#aae08ffabd665ca24f921196df95b27937b05760"
-  integrity sha512-ZhmdLG7r7vfw/UrH9cChKUwxbEub/tUTLdNbjRBtId5Zxm1x0+hgV2GX3VNlk9fyUzzcmVKzYP8Asxhy+ZMAGg==
+"@nuxt/core@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.12.0.tgz#28da674102c714cd76a1f23593faaa84d02ab667"
+  integrity sha512-Hshv+topfJ4ToD7eMRRdGRMYsvomtian9nK5Rxmq54a8d0Pyc7d69J1Z2A09fvR1/ZeehpCbeqcOVia27PxwBA==
   dependencies:
-    "@nuxt/config" "2.11.0"
+    "@nuxt/config" "2.12.0"
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/server" "2.11.0"
-    "@nuxt/utils" "2.11.0"
-    "@nuxt/vue-renderer" "2.11.0"
-    consola "^2.11.1"
+    "@nuxt/server" "2.12.0"
+    "@nuxt/utils" "2.12.0"
+    "@nuxt/vue-renderer" "2.12.0"
+    consola "^2.11.3"
     debug "^4.1.1"
     esm "^3.2.25"
     fs-extra "^8.1.0"
-    hable "^2.3.2"
+    hable "^3.0.0"
     hash-sum "^2.0.0"
     std-env "^2.2.1"
 
@@ -1545,14 +1562,14 @@
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
-"@nuxt/generator@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.11.0.tgz#8e13130eb8060a6dc374450d37b643ce9d538ad3"
-  integrity sha512-gPgl2AsbSbeoxmaH4YoejkMR7JEsh4Fpy08zdvpWYE1ZA9Y309DbhIKegpf8UCm7BTAEvC7/R6Dv2ByS/czXug==
+"@nuxt/generator@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.12.0.tgz#6e152a5291ef373e57f9be58b906c4a896dbc800"
+  integrity sha512-6tJvXHcEcG3zb1dutetWNETeJFKwozEze1WN2qVpXf0urwCxL/AhdSRLp/fqFtliHNXoLfA2SkRimNlQJ39h9Q==
   dependencies:
-    "@nuxt/utils" "2.11.0"
-    chalk "^2.4.2"
-    consola "^2.11.1"
+    "@nuxt/utils" "2.12.0"
+    chalk "^3.0.0"
+    consola "^2.11.3"
     fs-extra "^8.1.0"
     html-minifier "^4.0.0"
 
@@ -1575,18 +1592,19 @@
     consola "^2.10.1"
     node-fetch "^2.6.0"
 
-"@nuxt/server@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.11.0.tgz#63dc8a1147dd9905f0da302bee682b6d14bdfdab"
-  integrity sha512-MsLRKEci3UtlFapLRVfg6sd6fbQ0floJ6Q/KQdon6B0tXyWJFL7eoMUpfKGUWyrY1+gAi+fXrcusT3zBPq9XvQ==
+"@nuxt/server@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.12.0.tgz#fb5a3834cd80d75e173ba262c1cb20c22cd3ba17"
+  integrity sha512-1t+/A46f4E2ZYmyVuCFtY37G1fRZFDjKQp/TT50hWXJIr3VnNU43K24sSkdVpyPr2F5TOHLkGvFw+9Kt07fnTg==
   dependencies:
-    "@nuxt/config" "2.11.0"
-    "@nuxt/utils" "2.11.0"
+    "@nuxt/config" "2.12.0"
+    "@nuxt/utils" "2.12.0"
+    "@nuxt/vue-renderer" "2.12.0"
     "@nuxtjs/youch" "^4.2.3"
-    chalk "^2.4.2"
+    chalk "^3.0.0"
     compression "^1.7.4"
     connect "^3.7.0"
-    consola "^2.11.1"
+    consola "^2.11.3"
     etag "^1.8.1"
     fresh "^0.5.2"
     fs-extra "^8.1.0"
@@ -1594,71 +1612,71 @@
     launch-editor-middleware "^2.2.1"
     on-headers "^1.0.2"
     pify "^4.0.1"
-    serve-placeholder "^1.2.1"
+    serve-placeholder "^1.2.2"
     serve-static "^1.14.1"
     server-destroy "^1.0.1"
 
-"@nuxt/utils@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.11.0.tgz#0185767fdb582b907d06a151d3e624a5ad7bede2"
-  integrity sha512-wnE+qMau0t9+zFWyovKM3mzTpTJl/umX0bn4pdCjK8dw6GZ1EfGmj83hRMW8SAawJooEB1R2xf7TWgohJ7feRQ==
+"@nuxt/utils@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.12.0.tgz#ebf069a40d3b2a80d3ad3535ee27b095e489933b"
+  integrity sha512-bJ0kHn7GnKbHYgINofknYiSISPIVkgKKkMSCKTlvm5mggGRhztTp2qrYbE4Tx5oNUO2c1odvh00XJH+doC17/g==
   dependencies:
-    consola "^2.11.1"
+    consola "^2.11.3"
     fs-extra "^8.1.0"
     hash-sum "^2.0.0"
     proper-lockfile "^4.1.1"
-    semver "^7.1.0"
-    serialize-javascript "^2.1.2"
+    semver "^7.1.3"
+    serialize-javascript "^3.0.0"
     signal-exit "^3.0.2"
-    ua-parser-js "^0.7.20"
+    ua-parser-js "^0.7.21"
 
-"@nuxt/vue-app@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.11.0.tgz#05aa5fd7cc69bcf6a763b89c51df3bd27b58869e"
-  integrity sha512-Eb1XB6LyqgjA0sbr2Ix5VCbq6+yJhEYetNe2TZ7wSeu3eWRSbE0bT5UpB6uvBGT6y95tQBNEJVGyLKvNAWAlkg==
+"@nuxt/vue-app@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.12.0.tgz#7ee77dd2c703dcc5a2f84920512d445476831ec2"
+  integrity sha512-skiplFupzxk2IynJAJ9evv52h4bfRRnfILucATyobIuzyXUccHmY1VqJRqk2QykL6jbQ3QumwqlfzpFkkhcvbg==
   dependencies:
     node-fetch "^2.6.0"
     unfetch "^4.1.0"
     vue "^2.6.11"
     vue-client-only "^2.0.0"
-    vue-meta "^2.3.1"
+    vue-meta "^2.3.3"
     vue-no-ssr "^1.1.1"
-    vue-router "^3.1.3"
+    vue-router "^3.1.6"
     vue-template-compiler "^2.6.11"
-    vuex "^3.1.2"
+    vuex "^3.1.3"
 
-"@nuxt/vue-renderer@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.11.0.tgz#ada3aec1ad3eafc6b796b0631243d1b45e2ae2a6"
-  integrity sha512-Xqh3X0JOcwauXQwmOTNHVCwxfvZM0OjB86wUtu+B6molHEZK7XmtD/OUnsQSxcVSH5n+I2H2X2Yhg9H8gUsqBg==
+"@nuxt/vue-renderer@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.12.0.tgz#4d0590686229648cf214d4bf693ed2120a190acb"
+  integrity sha512-6Vlr1n+9Igcmwvo2z2xF8JSwZ+f0HgCERiUK1ne101QADVFDJyGryCbNzS2X6naFziJErqPrwcfwbowXlPg2pg==
   dependencies:
     "@nuxt/devalue" "^1.2.4"
-    "@nuxt/utils" "2.11.0"
-    consola "^2.11.1"
+    "@nuxt/utils" "2.12.0"
+    consola "^2.11.3"
     fs-extra "^8.1.0"
     lru-cache "^5.1.1"
     vue "^2.6.11"
-    vue-meta "^2.3.1"
+    vue-meta "^2.3.3"
     vue-server-renderer "^2.6.11"
 
-"@nuxt/webpack@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.11.0.tgz#16d6349e6df10c7671c58ea5948e5f369aeeee84"
-  integrity sha512-QRU53bDcdzGhqZf5nfMzyI+n6uftqYUTTtCcF/1c03l258GaJ6m5Ky2UAcPRxK4OdO1PqJ/yaT2lonYOQYUrsg==
+"@nuxt/webpack@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.12.0.tgz#10c003f3539d52938021bae43592500af5fad006"
+  integrity sha512-Rc+CvuwMn1k+fSWxXU5mMTf9xvNUCrXXFlImHGel0+OCiYpJk3UksovY+B8+ljJNi8ALXraIKPtLa1UIIqq3ZQ==
   dependencies:
-    "@babel/core" "^7.7.5"
-    "@nuxt/babel-preset-app" "2.11.0"
+    "@babel/core" "^7.8.7"
+    "@nuxt/babel-preset-app" "2.12.0"
     "@nuxt/friendly-errors-webpack-plugin" "^2.5.0"
-    "@nuxt/utils" "2.11.0"
+    "@nuxt/utils" "2.12.0"
     babel-loader "^8.0.6"
     cache-loader "^4.1.0"
-    caniuse-lite "^1.0.30001016"
-    chalk "^2.4.2"
-    consola "^2.11.1"
-    css-loader "^3.3.2"
+    caniuse-lite "^1.0.30001035"
+    chalk "^3.0.0"
+    consola "^2.11.3"
+    css-loader "^3.4.2"
     cssnano "^4.1.10"
     eventsource-polyfill "^0.9.6"
-    extract-css-chunks-webpack-plugin "^4.7.1"
+    extract-css-chunks-webpack-plugin "^4.7.4"
     file-loader "^4.3.0"
     glob "^7.1.6"
     hard-source-webpack-plugin "^0.13.1"
@@ -1667,22 +1685,22 @@
     memory-fs "^0.4.1"
     optimize-css-assets-webpack-plugin "^5.0.3"
     pify "^4.0.1"
-    postcss "^7.0.25"
+    postcss "^7.0.27"
     postcss-import "^12.0.1"
     postcss-import-resolver "^2.0.0"
     postcss-loader "^3.0.0"
     postcss-preset-env "^6.7.0"
     postcss-url "^8.0.0"
-    semver "^7.1.0"
+    semver "^7.1.3"
     std-env "^2.2.1"
-    style-resources-loader "^1.3.2"
-    terser-webpack-plugin "^2.3.0"
+    style-resources-loader "^1.3.3"
+    terser-webpack-plugin "^2.3.5"
     thread-loader "^2.1.3"
     time-fix-plugin "^2.0.6"
     url-loader "^2.3.0"
-    vue-loader "^15.8.3"
-    webpack "^4.41.3"
-    webpack-bundle-analyzer "^3.6.0"
+    vue-loader "^15.9.0"
+    webpack "^4.42.0"
+    webpack-bundle-analyzer "^3.6.1"
     webpack-dev-middleware "^3.7.2"
     webpack-hot-middleware "^2.25.0"
     webpack-node-externals "^1.7.2"
@@ -3481,17 +3499,22 @@ acorn-jsx@^5.1.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn-walk@^6.0.1, acorn-walk@^6.1.1:
+acorn-walk@^6.0.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
+acorn-walk@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+
 acorn@^5.5.3:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"
   integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==
@@ -3501,6 +3524,11 @@ acorn@^7.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
   integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
 
+acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+
 address@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
@@ -3579,6 +3607,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -4309,6 +4347,16 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
+assert@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+  dependencies:
+    es6-object-assign "^1.1.0"
+    is-nan "^1.2.1"
+    object-is "^1.0.1"
+    util "^0.12.0"
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -5439,12 +5487,12 @@ caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
   integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
 
-caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001016:
+caniuse-lite@^1.0.30001012:
   version "1.0.30001020"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz#3f04c1737500ffda78be9beb0b5c1e2070e15926"
   integrity sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA==
 
-caniuse-lite@^1.0.30001030:
+caniuse-lite@^1.0.30001030, caniuse-lite@^1.0.30001035:
   version "1.0.30001035"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
   integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
@@ -6051,7 +6099,7 @@ connect@^3.7.0:
     parseurl "~1.3.3"
     utils-merge "1.0.1"
 
-consola@^2.10.0, consola@^2.10.1, consola@^2.11.1, consola@^2.11.3, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.9.0:
+consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.4.0, consola@^2.5.6, consola@^2.6.0, consola@^2.9.0:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.11.3.tgz#f7315836224c143ac5094b47fd4c816c2cd1560e"
   integrity sha512-aoW0YIIAmeftGR8GSpw6CGQluNdkWMWh3yEFjH/hmynTYnMtibXszii3lxCXmk8YxJtI3FAK5aTiquA5VH68Gw==
@@ -6423,7 +6471,7 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.0.0, css-loader@^3.3.2, css-loader@~3.4.2:
+css-loader@^3.0.0, css-loader@^3.4.2, css-loader@~3.4.2:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202"
   integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==
@@ -6759,7 +6807,7 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@^4.0.0, deepmerge@^4.1.1, deepmerge@^4.2.2:
+deepmerge@^4.1.1, deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -6800,11 +6848,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defu@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-0.0.1.tgz#74dc4d64e401d7f95c6755fe98bc5cd688833a8f"
-  integrity sha512-Pz9yznbSzVTNA67lcfqVnktROx2BrrBBcmQqGrfe0zdiN5pl5GQogLA4uaP3U1pR1LHIZpEYTAh2sn+v4rH1dA==
-
 defu@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defu/-/defu-1.0.0.tgz#43acb09dfcf81866fa3b0fc047ece18e5c30df71"
@@ -7327,6 +7370,11 @@ es5-shim@^4.5.13:
   resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.13.tgz#5d88062de049f8969f83783f4a4884395f21d28b"
   integrity sha512-xi6hh6gsvDE0MaW4Vp1lgNEBpVcCXRWfPXj5egDvtgLz4L9MEvNwYEMdJH+JJinWkwa8c3c3o5HduV7dB/e1Hw==
 
+es6-object-assign@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
+
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -7820,15 +7868,15 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-css-chunks-webpack-plugin@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-4.7.1.tgz#8bfb94463a8d31c80d88b9c419507c472d810657"
-  integrity sha512-dpcOJA3wQk4rbgbOGRXyK3Gjl+/Ng8miD162/0uol31Ld4PLnQqIMbKV6ju/gi+uwfZIQcBW3KW1pmfU0epmDg==
+extract-css-chunks-webpack-plugin@^4.7.4:
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-4.7.4.tgz#db6465ca18d1fe8a89bad3dc72803127638fb477"
+  integrity sha512-Q0iLfJnS+MT8L/KbiPxFeTLi06dBzJaAphXJg00rIlcyjSqNx5yI0/V8ODGWCcwUO1V7W2z3dpjC+8eBKBoQrA==
   dependencies:
     loader-utils "^1.1.0"
     normalize-url "1.9.1"
     schema-utils "^1.0.0"
-    webpack-external-import "^0.3.0-beta.0"
+    webpack-external-import "^1.1.0-beta.3"
     webpack-sources "^1.1.0"
 
 extract-files@^5.0.1:
@@ -7873,6 +7921,11 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
 fast-diff@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
@@ -8754,10 +8807,10 @@ gzip-size@^5.0.0:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
-hable@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/hable/-/hable-2.3.2.tgz#7867ffec0b67e63136937613d9a0bc646ac9d7fe"
-  integrity sha512-qJ9WoXl/15LNlG1KeAuBjCNGStUb+MCQ5biPxOmwRyESH8CSWwZB4xEnzCduuQ3I/mlgui28t8/oMAGT1Rpb2g==
+hable@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/hable/-/hable-3.0.0.tgz#6de089b2df946635cf8134b9e4859f1b62de255f"
+  integrity sha512-7+G0/2/COR8pwteYFqHIVYfQpuEiO2HXwJrhCBJVgrNrl9O5eaUoJVDGXUJX+0RpGncNVTuestexjk1afj01wQ==
 
 har-schema@^2.0.0:
   version "2.0.0"
@@ -9469,6 +9522,11 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -9650,6 +9708,11 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+  integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
+
 is-glob@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -9691,6 +9754,13 @@ is-lower-case@^1.1.0:
   dependencies:
     lower-case "^1.1.0"
 
+is-nan@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz#85d1f5482f7051c2019f5673ccebdb06f3b0db03"
+  integrity sha512-z7bbREymOqt2CCaZVly8aC4ML3Xhfi0ekuOnjO2L8vKdl+CttdVoGZQhd4adMFAsxQ5VeRVwORs4tU8RH+HFtQ==
+  dependencies:
+    define-properties "^1.1.3"
+
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -10804,10 +10874,10 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loadjs@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-3.6.1.tgz#1e756ccd4f4c5ed4988085b330e1b4ad9b6a8340"
-  integrity sha512-AZEBw2GWdJk2IzBgQ+Wohoao5j+t0rajqK8dJu8jQqgYxDTxhmCt0ayMo/vCa0ZAMvZxnJcam6uLICfnVd8KAw==
+loadjs@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6"
+  integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -11358,6 +11428,11 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -11881,18 +11956,18 @@ nuxt-env@~0.1.0:
   resolved "https://registry.yarnpkg.com/nuxt-env/-/nuxt-env-0.1.0.tgz#8ac50b9ff45391ad3044ea932cbd05f06a585f87"
   integrity sha512-7mTao3qG0zfN0hahk3O6SuDy0KEwYmNojammWQsMwhqMn3aUjX4nMYnWDa0pua+2/rwAY9oG53jQtLgJdG7f9w==
 
-nuxt@~2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.11.0.tgz#654664fe1a95af2014fd55c38ba2c732bfa5edc5"
-  integrity sha512-Y7lastjYWIOppja0FaWozPfkvlmJ8uZSqWx0VbK7l5djbHls5jgUGag0iu6GsNNwCFTKpoAtptNHiWOsyMxStA==
+nuxt@~2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.12.0.tgz#b81794edc023352bd100532e5192f0d1b49ec67b"
+  integrity sha512-odEBOWQ6QSYhal7R9hZxHidm1kpTc2PoDL3w8a541PRSyzZFfVnWla7fRXOyMANbzfO8U7wpwq++eia8vnBr0A==
   dependencies:
-    "@nuxt/builder" "2.11.0"
-    "@nuxt/cli" "2.11.0"
-    "@nuxt/core" "2.11.0"
-    "@nuxt/generator" "2.11.0"
+    "@nuxt/builder" "2.12.0"
+    "@nuxt/cli" "2.12.0"
+    "@nuxt/core" "2.12.0"
+    "@nuxt/generator" "2.12.0"
     "@nuxt/loading-screen" "^1.2.0"
     "@nuxt/opencollective" "^0.3.0"
-    "@nuxt/webpack" "2.11.0"
+    "@nuxt/webpack" "2.12.0"
 
 nwsapi@^2.0.7:
   version "2.1.4"
@@ -11933,6 +12008,11 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
+object-is@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
+  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -12179,6 +12259,13 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
+  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -12552,6 +12639,13 @@ pkg-up@2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -13228,7 +13322,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.25, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.26"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
   integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
@@ -13237,6 +13331,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.1
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.27:
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
+  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -14594,6 +14697,14 @@ schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+schema-utils@^2.6.4:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
+  integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
+  dependencies:
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -14629,11 +14740,16 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.0, semver@^7.1.1:
+semver@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.1.tgz#29104598a197d6cbe4733eeecbe968f7b43a9667"
   integrity sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==
 
+semver@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
+  integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -14671,6 +14787,11 @@ serialize-javascript@^2.1.0, serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
+serialize-javascript@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e"
+  integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==
+
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
@@ -14682,12 +14803,12 @@ serve-favicon@^2.5.0:
     parseurl "~1.3.2"
     safe-buffer "5.1.1"
 
-serve-placeholder@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/serve-placeholder/-/serve-placeholder-1.2.1.tgz#3659fca99b0f15fb3bdf0a72917a6d1848786e9c"
-  integrity sha512-qyVsP+xA/Sh4cWB/QJzz0tTD52AWIXqxAs/ceEu4HwDnAWXWIYuhwesr1/KPD1GWdE9y7xN8eUI9nW8hfpUniA==
+serve-placeholder@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/serve-placeholder/-/serve-placeholder-1.2.2.tgz#034960945b5950f873b2be4e4ea3a4653b9e33e5"
+  integrity sha512-4zczakjRPVbX5XBcJqUoyiwiMEXWPBj0rEexQkiQitKEkj36szAmw5DgcgOpWiXtRTU7aqJ47hjnYJg+2FSj5g==
   dependencies:
-    defu "^0.0.1"
+    defu "^1.0.0"
 
 serve-static@1.14.1, serve-static@^1.14.1:
   version "1.14.1"
@@ -15468,7 +15589,7 @@ style-loader@~0.23.1:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
 
-style-resources-loader@^1.3.2, style-resources-loader@~1.3.3:
+style-resources-loader@^1.3.3, style-resources-loader@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.3.3.tgz#e4b3ab93e7c3d1606e86f9549522a0b5c4ad6812"
   integrity sha512-vDD2HyG6On8H9gWUN9O9q1eXR/JnXpCkNvpusvgFsRQ9JZGF9drzvwKEigR9vqlmUbXO2t/vIIabpYMmis0eAQ==
@@ -15716,7 +15837,7 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^2.1.2, terser-webpack-plugin@^2.3.0:
+terser-webpack-plugin@^2.1.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.2.tgz#6d3d1b0590c8f729bfbaeb7fb2528b8b62db4c74"
   integrity sha512-SmvB/6gtEPv+CJ88MH5zDOsZdKXPS/Uzv2//e90+wM1IHFUhsguPKEILgzqrM1nQ4acRXN/SV4Obr55SXC+0oA==
@@ -15730,6 +15851,21 @@ terser-webpack-plugin@^2.1.2, terser-webpack-plugin@^2.3.0:
     terser "^4.4.3"
     webpack-sources "^1.4.3"
 
+terser-webpack-plugin@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz#5ad971acce5c517440ba873ea4f09687de2f4a81"
+  integrity sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==
+  dependencies:
+    cacache "^13.0.1"
+    find-cache-dir "^3.2.0"
+    jest-worker "^25.1.0"
+    p-limit "^2.2.2"
+    schema-utils "^2.6.4"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.4.3"
+    webpack-sources "^1.4.3"
+
 terser@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391"
@@ -16192,11 +16328,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.20:
+ua-parser-js@^0.7.18:
   version "0.7.20"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
   integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
 
+ua-parser-js@^0.7.21:
+  version "0.7.21"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
+  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
+
 uc.micro@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -16468,6 +16609,16 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
+util@^0.12.0:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.2.tgz#54adb634c9e7c748707af2bf5a8c7ab640cbba2b"
+  integrity sha512-XE+MkWQvglYa+IOfBt5UFG93EmncEMP23UqpgDvVZVFBPxwmkK10QRp6pgU4xICPnWRf/t0zPv4noYSUq9gqUQ==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    safe-buffer "^5.1.2"
+
 utila@^0.4.0, utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -16676,7 +16827,7 @@ vue-jest@~3.0.5:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.8.3:
+vue-loader@^15.9.0:
   version "15.9.0"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998"
   integrity sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==
@@ -16687,12 +16838,12 @@ vue-loader@^15.8.3:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-meta@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.1.tgz#32a1c2634f49433f30e7e7a028aa5e5743f84f6a"
-  integrity sha512-hnZvDNvLh+PefJLfYkZhG6cSBNKikgQyiEK8lI/P2qscM1DC/qHHOfdACPQ/VDnlaWU9VlcobCTNyVtssTR4XQ==
+vue-meta@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.3.3.tgz#2a097f62817204b0da78be4d62aee0cb566eaee0"
+  integrity sha512-FmeekLkd5+BI7NFBnU4bEnTpVZqmu3q8ztW4R4U3GBQljgDM7QAuwMXs8/aJP0U1tjtxobX8T6HcyZXimGj1DQ==
   dependencies:
-    deepmerge "^4.0.0"
+    deepmerge "^4.2.2"
 
 vue-no-ssr@^1.1.1:
   version "1.1.1"
@@ -16704,10 +16855,10 @@ vue-resize@^0.4.5:
   resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.5.tgz#4777a23042e3c05620d9cbda01c0b3cc5e32dcea"
   integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==
 
-vue-router@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
-  integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==
+vue-router@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89"
+  integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==
 
 vue-scrollto@^2.17.1:
   version "2.17.1"
@@ -16789,10 +16940,10 @@ vuex-i18n@~1.13.1:
   resolved "https://registry.yarnpkg.com/vuex-i18n/-/vuex-i18n-1.13.1.tgz#f9f6bf5de44f85929ff684170ed9bb5724cbba88"
   integrity sha512-VTy5QAyMI6BJwpRfN5qncWQT0ohKiAYK+iTRW4JxgV9dkNoPMuKKDqExbOm1fzpitdrIoIipC3Zqr5fJ706VQg==
 
-vuex@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.2.tgz#a2863f4005aa73f2587e55c3fadf3f01f69c7d4d"
-  integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==
+vuex@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.3.tgz#f2ad73e3fb73691698b38c93f66e58e267947180"
+  integrity sha512-k8vZqNMSNMgKelVZAPYw5MNb2xWSmVgCKtYKAptvm9YtZiOXnRXFWu//Y9zQNORTrm3dNj1n/WaZZI26tIX6Mw==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -16857,13 +17008,13 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-bundle-analyzer@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
-  integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==
+webpack-bundle-analyzer@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b"
+  integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw==
   dependencies:
-    acorn "^6.0.7"
-    acorn-walk "^6.1.1"
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
     bfj "^6.1.1"
     chalk "^2.4.1"
     commander "^2.18.0"
@@ -16897,14 +17048,16 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-external-import@^0.3.0-beta.0:
-  version "0.3.0-beta.0"
-  resolved "https://registry.yarnpkg.com/webpack-external-import/-/webpack-external-import-0.3.0-beta.0.tgz#bceccdafb9572931ee93ffa84e39eea9f6d15dca"
-  integrity sha512-58uSxZEi1Y2HGktQficlwSVHcvml1p6fpXrFEMEgi8nR/eLWlHcoYyILGRzZFSq8jfFqhAbHlm4fcnAIVA5Epg==
+webpack-external-import@^1.1.0-beta.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/webpack-external-import/-/webpack-external-import-1.1.3.tgz#9782c1df397f5847c02be6507eadbf16be9991b6"
+  integrity sha512-vK2h9WZEukZzPT4T2GYTkaH4Ow7ZpJkH4279lHKyrMc1BhS98LHezahX8qansDOvkNwyaSVmLF+ltX1G1Y5t1Q==
   dependencies:
+    assert "^2.0.0"
     dimport "^1.0.0"
     fs-extra "^8.1.0"
-    loadjs "^3.6.1"
+    loadjs "^4.2.0"
+    pkg-up "^3.1.0"
 
 webpack-hot-middleware@^2.25.0:
   version "2.25.0"
@@ -16960,7 +17113,7 @@ webpack-virtual-modules@^0.2.0:
   dependencies:
     debug "^3.0.0"
 
-webpack@^4.33.0, webpack@^4.38.0, webpack@^4.41.3:
+webpack@^4.33.0, webpack@^4.38.0:
   version "4.41.5"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c"
   integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==
@@ -16989,6 +17142,35 @@ webpack@^4.33.0, webpack@^4.38.0, webpack@^4.41.3:
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 
+webpack@^4.42.0:
+  version "4.42.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8"
+  integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
 webpackbar@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-4.0.0.tgz#ee7a87f16077505b5720551af413c8ecd5b1f780"

From 83039ec1123382bb2966435063f832d5bfa357f4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 23:29:07 +0000
Subject: [PATCH 085/106] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 28fc6000b..046b0c30b 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/core": "~7.8.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "~7.8.6",
-    "@storybook/addon-a11y": "^5.3.14",
+    "@storybook/addon-a11y": "^5.3.17",
     "@storybook/addon-actions": "^5.3.17",
     "@storybook/addon-notes": "^5.3.17",
     "@storybook/vue": "~5.3.17",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 3bf45cfc6..52550afd2 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2138,17 +2138,17 @@
   dependencies:
     type-detect "4.0.8"
 
-"@storybook/addon-a11y@^5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.14.tgz#e08575caf4694c10ceef49fcc886e642c1fb176a"
-  integrity sha512-/+Z9Xn6+2Ko2WJRcSN7Zkr0N83mlQDcomHJfpu6bn+fpzE8jeOWMjC4OX1VfD5TUhK1flFDF97Sf2gM8s6KtDg==
+"@storybook/addon-a11y@^5.3.17":
+  version "5.3.17"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.17.tgz#b84534a5a0c91bc273917f3b8d34b068e9d250a5"
+  integrity sha512-r4GI++IIjxa3UW5BmsVdU24MK2cyiNIzdcgWsTTCA2lSnb3AzPy7Yi1FaAClAjQmBbJSRIJkkyoZZle3btTAPg==
   dependencies:
-    "@storybook/addons" "5.3.14"
-    "@storybook/api" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/components" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/theming" "5.3.14"
+    "@storybook/addons" "5.3.17"
+    "@storybook/api" "5.3.17"
+    "@storybook/client-logger" "5.3.17"
+    "@storybook/components" "5.3.17"
+    "@storybook/core-events" "5.3.17"
+    "@storybook/theming" "5.3.17"
     axe-core "^3.3.2"
     core-js "^3.0.1"
     global "^4.3.2"
@@ -2212,19 +2212,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.14.tgz#ff96c2c46a617f777c3660395017d2aef5319f19"
-  integrity sha512-zoN1MYlArdThp93i+Ogil/pihyx8n7nkrdSO0j9HUh6jUsGeFFEluPQZdRFte9NIoY6ZWSWwuEMDgrv2Pw9r2Q==
-  dependencies:
-    "@storybook/api" "5.3.14"
-    "@storybook/channels" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.17.tgz#8efab65904040b0b8578eedc9a5772dbcbf6fa83"
@@ -2261,32 +2248,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.14.tgz#8c2bb226a4a5de7974ee2ccce36986b72f462f1b"
-  integrity sha512-ANWRMTLEoAfu0IsXqbxmbTpxS8xTByZgLj20tH96bxgH1rJo9KAZnJ8A9kGYr+zklU8QnYvVIgmV3HESXII9zg==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/channels" "5.3.14"
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/core-events" "5.3.14"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "5.3.14"
-    "@storybook/theming" "5.3.14"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.17.tgz#1c0dad3309afef6b0a5585cb59c65824fb4d2721"
@@ -2331,13 +2292,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.14.tgz#9969e27761a80afb495bc1475f0173f9b6ef5a76"
-  integrity sha512-k9QBf9Kwe+iGmdEK/kW5xprqem2SPfBVwET6LWvJkWOl9UQ9VoMuCHgV55p0tzjcugaqWWKoF9+FRMWxWRfsQg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.17.tgz#74eccb10c2395499da6a290bcd0272d6d6c7c5b2"
@@ -2375,13 +2329,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.14.tgz#85068f1b665a52163191eb5976f1581bce6df0e4"
-  integrity sha512-YCHEsOvo6zPb4udlyAwqr5W0Kv9mAEQmcX73w9IDvAxbjR00T7empW7qmbjvviftKB/5MEgDdiYbj64ccs3aqg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.17.tgz#bf9c7ef52da75a5c1f2c5d74724442224deea6e4"
@@ -2414,33 +2361,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/components@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.14.tgz#0f2f90113674e14ee74d5d16d6b3b1220cb0fa16"
-  integrity sha512-AsjkIFBrrqcBDLxGdmUHiauZo5gOL65eXx8WA7/yJDF8s45VVZX5Z0buOnjFyEhGVus02gwTov8da2irjL862A==
-  dependencies:
-    "@storybook/client-logger" "5.3.14"
-    "@storybook/theming" "5.3.14"
-    "@types/react-syntax-highlighter" "11.0.2"
-    "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
-
 "@storybook/components@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.17.tgz#287430fc9c5f59b1d3590b50b3c7688355b22639"
@@ -2475,13 +2395,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.14.tgz#d476eea7032670db1a84bef7e5baadb04c2de529"
-  integrity sha512-VCPLKqRugsOSx/smMJiJOvRgAzTrMpsbRuFw48kBGkQMP9TEV82Qe/341dv+f4GllPyBZyANG0p0m5+w7ZCURQ==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.17.tgz#698ce0a36c29fe8fa04608f56ccca53aa1d31638"
@@ -2600,21 +2513,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.14.tgz#6535267624da5f54971c37e497df1c161f65be8f"
-  integrity sha512-O0KwQFncdBeq+O2Aq8UAFBVWjWmP5rtqoacUOFSGkXgObOnyniEraLiPH7rPtq2dAlSpgYI9+srQAZfo52Hz2A==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/router@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.17.tgz#4db96b45f39b25a3f7a4e2899c36e7e9e4ba6108"
@@ -2648,24 +2546,6 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/theming@5.3.14":
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.14.tgz#4923739ad0d7d673b7844f27da8a3c6cf118790f"
-  integrity sha512-raqXC3yJycEt1CrCAfnBYUA6pyJI80E9M26EeQl3UfytJOL6euprOi+D17QvxqBn7jmmf9ZDw5XRkvJhQ17Y7Q==
-  dependencies:
-    "@emotion/core" "^10.0.20"
-    "@emotion/styled" "^10.0.17"
-    "@storybook/client-logger" "5.3.14"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
-
 "@storybook/theming@5.3.17":
   version "5.3.17"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.17.tgz#cf6278c4857229c7167faf04d5b2206bc5ee04e1"
@@ -3026,13 +2906,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-syntax-highlighter@11.0.2":
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.2.tgz#a2e3ff657d7c47813f80ca930f3d959c31ec51e3"
-  integrity sha512-iMNcixH8330f2dq0RY+VOXCP8JFehgmOhLOtnO85Ty+qu0fHXJNEqWx5VuFv8v0aEq0U/N9d/k1yvA+c6PEmPw==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-syntax-highlighter@11.0.4":
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"

From bb399079c9164c613e24a604150832cbec8102d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2020 23:31:19 +0000
Subject: [PATCH 086/106] build(deps-dev): bump cross-env from 6.0.3 to 7.0.2

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

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

diff --git a/package.json b/package.json
index 1342db23a..363c5f6a2 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "auto-changelog": "^1.16.2",
     "bcryptjs": "^2.4.3",
     "codecov": "^3.6.5",
-    "cross-env": "^6.0.3",
+    "cross-env": "^7.0.2",
     "cucumber": "^6.0.5",
     "cypress": "^4.2.0",
     "cypress-cucumber-preprocessor": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 307d9cd31..b5654a418 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2459,12 +2459,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+cross-env@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
+  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.1"
 
 cross-fetch@2.2.2:
   version "2.2.2"
@@ -2485,14 +2485,14 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.0.tgz#21ef9470443262f33dba80b2705a91db959b2e03"
-  integrity sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==
+cross-spawn@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
+  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
   dependencies:
     path-key "^3.1.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
 crypto-browserify@^3.0.0:
   version "3.12.0"
@@ -6134,11 +6134,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shell-quote@^1.4.2, shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
@@ -7044,6 +7056,13 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"

From bc67ade3b6ed1fcbcae2619146262e1e1cb1d325 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Mar 2020 04:19:12 +0000
Subject: [PATCH 087/106] build(deps): bump graphql-shield from 7.2.0 to 7.2.1
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.2.0...v7.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.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 77417453f..b2fee47b9 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -61,7 +61,7 @@
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
     "graphql-redis-subscriptions": "^2.2.1",
-    "graphql-shield": "~7.2.0",
+    "graphql-shield": "~7.2.1",
     "graphql-tag": "~2.10.3",
     "helmet": "~3.21.3",
     "ioredis": "^4.16.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a514a60b4..8db891303 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1587,10 +1587,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yup@0.26.32":
-  version "0.26.32"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.32.tgz#bd356fb405f3d641eff963854edf7ad854a8e829"
-  integrity sha512-55WFAq8lNYXdRzSP1cenMFFXtPRe7PWsqn5y9ibqKHOQZ/cSLErkcnB1LE89M7W2TSXVDFtx+T7eFePkGoB+xw==
+"@types/yup@0.26.33":
+  version "0.26.33"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.33.tgz#301faab47b952a4a5f9a06246942cc7cbd09cd95"
+  integrity sha512-QzgcNfDtRIph8CjfoWiu+MJiOUp25Yo7FthuOHLVbtCTyonjOo2YRsFzKo3csDWbTXlw5NedOFH0Nje7yipCrA==
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
@@ -4498,12 +4498,12 @@ graphql-redis-subscriptions@^2.2.1:
   optionalDependencies:
     ioredis "^4.6.3"
 
-graphql-shield@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.2.0.tgz#81b26794370608ad78dfe3833473789fb471fbd8"
-  integrity sha512-eLdD+gUIKYu77XRcuHs5ewZhiBuRFeWFGxPnJa+g9AkxB7Yi5RSEjEJEx0Drg9GuNvDYpHeW7nPff4v35AT2aQ==
+graphql-shield@~7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.2.1.tgz#baca0c31a19593ede41a4bb4d476f9edd1d0eb78"
+  integrity sha512-EEoVYvXuqAGXGH1i9Aot4MJIUlRABVycwKRGaBreabys7yTd+0zGwudKB9yZiW3SEMIjHkz3a0r/ILhYzq0uiw==
   dependencies:
-    "@types/yup" "0.26.32"
+    "@types/yup" "0.26.33"
     object-hash "^2.0.3"
     yup "^0.28.3"
 

From e236838523a7dc991f8e301b3580734c4e611933 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 7 Feb 2020 09:36:00 +0100
Subject: [PATCH 088/106] migration added for index for fulltext tag search

---
 .../20200207080200-fulltext_index_for_tags.js | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js

diff --git a/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js
new file mode 100644
index 000000000..0a92c90c3
--- /dev/null
+++ b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js
@@ -0,0 +1,49 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description =
+  'This migration adds a fulltext index for the tags in order to search for Hasthags.'
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    await transaction.run(`
+      CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])
+    `)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Implement your migration here.
+    await transaction.run(`
+      CALL db.index.fulltext.drop("tag_fulltext_search")
+    `)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+  } finally {
+    session.close()
+  }
+}

From 16ad565ec8c3ff83d6b363861ada7ea0a29d3ce9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 11 Feb 2020 09:27:28 +0100
Subject: [PATCH 089/106] partially working, index page does not update when
 route is changed

---
 .../generic/SearchTag/SearchTag.vue           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 webapp/components/generic/SearchTag/SearchTag.vue

diff --git a/webapp/components/generic/SearchTag/SearchTag.vue b/webapp/components/generic/SearchTag/SearchTag.vue
new file mode 100644
index 000000000..d8cfc0b31
--- /dev/null
+++ b/webapp/components/generic/SearchTag/SearchTag.vue
@@ -0,0 +1,23 @@
+<template>
+  <ds-flex class="search-tag">
+    <ds-flex-item class="search-tag-label">
+      <ds-text>#{{ option.id }}</ds-text>
+    </ds-flex-item>
+  </ds-flex>
+</template>
+<script>
+ export default {
+     name: 'SearchTag',
+     props: {
+	 option: { type: Object, required: true },
+     },
+ }
+</script>
+<style lang="scss">
+ .search-tag {
+     width: 100%;
+ }
+ .search-tag-label {
+     color: $text-color-primary;
+ }
+</style>

From 014be6e7f885a84668739a7697a53de5797fd61c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 11 Feb 2020 09:27:41 +0100
Subject: [PATCH 090/106] partially working, index page does not update when
 route is changed

---
 backend/src/schema/resolvers/searches.js      | 27 +++++++++++++--
 backend/src/schema/types/type/Search.gql      |  2 +-
 webapp/components/Hashtag/Hashtag.vue         |  2 +-
 .../generic/SearchTag/SearchTag.vue           | 24 ++++++-------
 .../SearchableInput/SearchableInput.vue       | 34 ++++++++++++++++---
 webapp/graphql/Search.js                      |  3 ++
 webapp/locales/de.json                        | 29 ++++++++++++++++
 webapp/locales/en.json                        | 10 ++++++
 8 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index 5c1e43952..d4a2bf02a 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -43,6 +43,16 @@ export default {
       `
       const myQuery = queryString(query)
 
+      const tagCypher = `
+      CALL db.index.fulltext.queryNodes('tag_fulltext_search', $query)
+      YIELD node as resource, score
+      MATCH (resource)
+      WHERE score >= 0.5
+      AND NOT (resource.deleted = true OR resource.disabled = true)
+      RETURN resource {.*, __typename: labels(resource)[0]}
+      LIMIT $limit
+      `
+
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {
@@ -55,14 +65,25 @@ export default {
           limit,
           thisUserId,
         })
-        return Promise.all([postTransactionResponse, userTransactionResponse])
+        const tagTransactionResponse = transaction.run(tagCypher, {
+          query: myQuery,
+          limit,
+        })
+        return Promise.all([
+          postTransactionResponse,
+          userTransactionResponse,
+          tagTransactionResponse,
+        ])
       })
 
       try {
-        const [postResults, userResults] = await searchResultPromise
+        const [postResults, userResults, tagResults] = await searchResultPromise
         log(postResults)
         log(userResults)
-        return [...postResults.records, ...userResults.records].map(r => r.get('resource'))
+        log(tagResults)
+        return [...postResults.records, ...userResults.records, ...tagResults.records].map(r =>
+          r.get('resource'),
+        )
       } finally {
         session.close()
       }
diff --git a/backend/src/schema/types/type/Search.gql b/backend/src/schema/types/type/Search.gql
index 2c22fa61f..1ce38001d 100644
--- a/backend/src/schema/types/type/Search.gql
+++ b/backend/src/schema/types/type/Search.gql
@@ -1,4 +1,4 @@
-union SearchResult = Post | User
+union SearchResult = Post | User | Tag
 
 type Query {
   findResources(query: String!, limit: Int = 5): [SearchResult]!
diff --git a/webapp/components/Hashtag/Hashtag.vue b/webapp/components/Hashtag/Hashtag.vue
index 35762c81c..44e5319f0 100644
--- a/webapp/components/Hashtag/Hashtag.vue
+++ b/webapp/components/Hashtag/Hashtag.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-tag>
+  <ds-tag class="hc-hashtag">
     <nuxt-link :to="hashtagUrl">#{{ id }}</nuxt-link>
   </ds-tag>
 </template>
diff --git a/webapp/components/generic/SearchTag/SearchTag.vue b/webapp/components/generic/SearchTag/SearchTag.vue
index d8cfc0b31..a94431eea 100644
--- a/webapp/components/generic/SearchTag/SearchTag.vue
+++ b/webapp/components/generic/SearchTag/SearchTag.vue
@@ -6,18 +6,18 @@
   </ds-flex>
 </template>
 <script>
- export default {
-     name: 'SearchTag',
-     props: {
-	 option: { type: Object, required: true },
-     },
- }
+export default {
+  name: 'SearchTag',
+  props: {
+    option: { type: Object, required: true },
+  },
+}
 </script>
 <style lang="scss">
- .search-tag {
-     width: 100%;
- }
- .search-tag-label {
-     color: $text-color-primary;
- }
+.search-tag {
+  width: 100%;
+}
+.search-tag-label {
+  color: $text-color-primary;
+}
 </style>
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 3260ff082..654deaad4 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -35,6 +35,12 @@
         >
           <search-post :option="option" />
         </p>
+        <p
+          v-if="option.__typename === 'Tag'"
+          :class="{ 'option-with-heading': isFirstOfType(option) }"
+        >
+          <hc-hashtag :id="option.id" />
+        </p>
       </template>
     </ds-select>
     <base-button v-if="isActive" icon="close" circle ghost size="small" @click="clear" />
@@ -45,6 +51,7 @@
 import { isEmpty } from 'lodash'
 import SearchHeading from '~/components/generic/SearchHeading/SearchHeading.vue'
 import SearchPost from '~/components/generic/SearchPost/SearchPost.vue'
+import HcHashtag from '~/components/Hashtag/Hashtag.vue'
 import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
 export default {
@@ -52,6 +59,7 @@ export default {
   components: {
     SearchHeading,
     SearchPost,
+    HcHashtag,
     UserTeaser,
   },
   props: {
@@ -77,6 +85,16 @@ export default {
       return !isEmpty(this.previousSearchTerm)
     },
   },
+  watch: {
+    $route(to, from) {
+      console.log('to', to)
+      console.log('from', from)
+      // console.log(this.finalFilters)
+      if (to.query.hashtag) {
+        this.hashtag = to.query.hashtag
+      }
+    },
+  },
   methods: {
     isFirstOfType(option) {
       return (
@@ -138,12 +156,20 @@ export default {
     isPost(item) {
       return item.__typename === 'Post'
     },
+    isTag(item) {
+      return item.__typename === 'Tag'
+    },
     goToResource(item) {
       this.$nextTick(() => {
-        this.$router.push({
-          name: this.isPost(item) ? 'post-id-slug' : 'profile-id-slug',
-          params: { id: item.id, slug: item.slug },
-        })
+        if (!this.isTag(item)) {
+          this.$router.push({
+            name: this.isPost(item) ? 'post-id-slug' : 'profile-id-slug',
+            params: { id: item.id, slug: item.slug },
+          })
+        } else {
+          console.log('HIT¡')
+          this.$router.push('?hashtag=' + item.id)
+        }
       })
     },
   },
diff --git a/webapp/graphql/Search.js b/webapp/graphql/Search.js
index 9b142b429..ab34b58b6 100644
--- a/webapp/graphql/Search.js
+++ b/webapp/graphql/Search.js
@@ -19,6 +19,9 @@ export const findResourcesQuery = gql`
       ... on User {
         ...user
       }
+      ... on Tag {
+        id
+      }
     }
   }
 `
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 524ee58fa..8f38c2352 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -558,6 +558,35 @@
       "message": "Bist Du sicher, dass Du den Kommentar von „<b>{name}</b>“ melden möchtest?",
       "title": "Kommentar melden",
       "type": "Kommentar"
+        "content": {
+            "unavailable-placeholder": "… dieser Kommentar ist nicht mehr verfügbar"
+        },
+        "menu": {
+            "edit": "Kommentar bearbeiten",
+            "delete": "Kommentar löschen"
+        },
+        "show": {
+            "more": "mehr anzeigen",
+            "less": "weniger anzeigen"
+        },
+        "edited": "bearbeitet"
+    },
+    "followButton": {
+        "follow": "Folgen",
+        "following": "Folge Ich"
+    },
+    "shoutButton": {
+        "shouted": "empfohlen"
+    },
+    "search": {
+        "placeholder": "Suchen",
+        "hint": "Wonach suchst Du?",
+        "failed": "Nichts gefunden",
+        "heading": {
+          "Post": "Beiträge",
+          "User": "Benutzer",
+          "Tag": "Hashtags"
+        }
     },
     "contribution": {
       "error": "Du hast den Beitrag bereits gemeldet!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e6b8def5a..642d0c228 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -549,6 +549,16 @@
       "message": "Do you really want to release the user \"<b>{name}</b>\"?",
       "title": "Release User",
       "type": "User"
+    "empty": "Sorry, you don't have any notifications at the moment."
+  },
+  "search": {
+    "placeholder": "Search",
+    "hint": "What are you searching for?",
+    "failed": "Nothing found",
+    "heading": {
+      "Post": "Posts",
+      "User": "Users",
+      "Tag": "Hashtags"
     }
   },
   "report": {

From 07fbe92fa81ab3828904545d9d58cd67e02238d3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 13:26:08 +0100
Subject: [PATCH 091/106] fixed locales after mistakes in rebase

---
 webapp/locales/de.json | 30 +-----------------------------
 webapp/locales/en.json | 11 +----------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 8f38c2352..a2ab2246f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -558,35 +558,6 @@
       "message": "Bist Du sicher, dass Du den Kommentar von „<b>{name}</b>“ melden möchtest?",
       "title": "Kommentar melden",
       "type": "Kommentar"
-        "content": {
-            "unavailable-placeholder": "… dieser Kommentar ist nicht mehr verfügbar"
-        },
-        "menu": {
-            "edit": "Kommentar bearbeiten",
-            "delete": "Kommentar löschen"
-        },
-        "show": {
-            "more": "mehr anzeigen",
-            "less": "weniger anzeigen"
-        },
-        "edited": "bearbeitet"
-    },
-    "followButton": {
-        "follow": "Folgen",
-        "following": "Folge Ich"
-    },
-    "shoutButton": {
-        "shouted": "empfohlen"
-    },
-    "search": {
-        "placeholder": "Suchen",
-        "hint": "Wonach suchst Du?",
-        "failed": "Nichts gefunden",
-        "heading": {
-          "Post": "Beiträge",
-          "User": "Benutzer",
-          "Tag": "Hashtags"
-        }
     },
     "contribution": {
       "error": "Du hast den Beitrag bereits gemeldet!",
@@ -628,6 +599,7 @@
     "failed": "Nichts gefunden",
     "heading": {
       "Post": "Beiträge",
+      "Tag": "Hashtags",
       "User": "Benutzer"
     },
     "hint": "Wonach suchst Du?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 642d0c228..eb19dfbe7 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -549,16 +549,6 @@
       "message": "Do you really want to release the user \"<b>{name}</b>\"?",
       "title": "Release User",
       "type": "User"
-    "empty": "Sorry, you don't have any notifications at the moment."
-  },
-  "search": {
-    "placeholder": "Search",
-    "hint": "What are you searching for?",
-    "failed": "Nothing found",
-    "heading": {
-      "Post": "Posts",
-      "User": "Users",
-      "Tag": "Hashtags"
     }
   },
   "report": {
@@ -609,6 +599,7 @@
     "failed": "Nothing found",
     "heading": {
       "Post": "Posts",
+      "Tag": "Hashtags",
       "User": "Users"
     },
     "hint": "What are you searching for?",

From 1c43d5fe6f44c7b11168af8bd765b8d785a6641a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 14:19:13 +0100
Subject: [PATCH 092/106] Search for Hashtags works due watching route in
 pages/index.vue

---
 backend/src/db/migrate/template.js            |   1 +
 .../20200207080200-fulltext_index_for_tags.js |   2 +
 backend/src/schema/resolvers/searches.js      |   6 +-
 .../generic/SearchTag/SearchTag.vue           |  23 --
 .../SearchableInput/SearchableInput.vue       |  11 -
 webapp/pages/index.vue                        | 306 +++++++++---------
 6 files changed, 162 insertions(+), 187 deletions(-)
 delete mode 100644 webapp/components/generic/SearchTag/SearchTag.vue

diff --git a/backend/src/db/migrate/template.js b/backend/src/db/migrate/template.js
index 9adb0786d..72bfc9b1b 100644
--- a/backend/src/db/migrate/template.js
+++ b/backend/src/db/migrate/template.js
@@ -40,6 +40,7 @@ export async function down(next) {
     await transaction.rollback()
     // eslint-disable-next-line no-console
     console.log('rolled back')
+    throw new Error(error)
   } finally {
     session.close()
   }
diff --git a/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js
index 0a92c90c3..5064a8b17 100644
--- a/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js
+++ b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js
@@ -20,6 +20,7 @@ export async function up(next) {
     await transaction.rollback()
     // eslint-disable-next-line no-console
     console.log('rolled back')
+    throw new Error(error)
   } finally {
     session.close()
   }
@@ -43,6 +44,7 @@ export async function down(next) {
     await transaction.rollback()
     // eslint-disable-next-line no-console
     console.log('rolled back')
+    throw new Error(error)
   } finally {
     session.close()
   }
diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js
index d4a2bf02a..3471c783b 100644
--- a/backend/src/schema/resolvers/searches.js
+++ b/backend/src/schema/resolvers/searches.js
@@ -41,18 +41,18 @@ export default {
       RETURN resource {.*, __typename: labels(resource)[0]}
       LIMIT $limit
       `
-      const myQuery = queryString(query)
-
       const tagCypher = `
       CALL db.index.fulltext.queryNodes('tag_fulltext_search', $query)
       YIELD node as resource, score
       MATCH (resource)
-      WHERE score >= 0.5
+      WHERE score >= 0.0
       AND NOT (resource.deleted = true OR resource.disabled = true)
       RETURN resource {.*, __typename: labels(resource)[0]}
       LIMIT $limit
       `
 
+      const myQuery = queryString(query)
+
       const session = context.driver.session()
       const searchResultPromise = session.readTransaction(async transaction => {
         const postTransactionResponse = transaction.run(postCypher, {
diff --git a/webapp/components/generic/SearchTag/SearchTag.vue b/webapp/components/generic/SearchTag/SearchTag.vue
deleted file mode 100644
index a94431eea..000000000
--- a/webapp/components/generic/SearchTag/SearchTag.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <ds-flex class="search-tag">
-    <ds-flex-item class="search-tag-label">
-      <ds-text>#{{ option.id }}</ds-text>
-    </ds-flex-item>
-  </ds-flex>
-</template>
-<script>
-export default {
-  name: 'SearchTag',
-  props: {
-    option: { type: Object, required: true },
-  },
-}
-</script>
-<style lang="scss">
-.search-tag {
-  width: 100%;
-}
-.search-tag-label {
-  color: $text-color-primary;
-}
-</style>
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 654deaad4..b0050b429 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -85,16 +85,6 @@ export default {
       return !isEmpty(this.previousSearchTerm)
     },
   },
-  watch: {
-    $route(to, from) {
-      console.log('to', to)
-      console.log('from', from)
-      // console.log(this.finalFilters)
-      if (to.query.hashtag) {
-        this.hashtag = to.query.hashtag
-      }
-    },
-  },
   methods: {
     isFirstOfType(option) {
       return (
@@ -167,7 +157,6 @@ export default {
             params: { id: item.id, slug: item.slug },
           })
         } else {
-          console.log('HIT¡')
           this.$router.push('?hashtag=' + item.id)
         }
       })
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 8aef52c1d..d73c993ec 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -64,158 +64,164 @@
 </template>
 
 <script>
-// import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
-import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
-import HcEmpty from '~/components/Empty/Empty'
-import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
-import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
-import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
-import { mapGetters, mapMutations } from 'vuex'
-import { filterPosts } from '~/graphql/PostQuery.js'
-import PostMutations from '~/graphql/PostMutations'
-import UpdateQuery from '~/components/utils/UpdateQuery'
+ // import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
+ import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
+ import HcEmpty from '~/components/Empty/Empty'
+ import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
+ import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
+ import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
+ import { mapGetters, mapMutations } from 'vuex'
+ import { filterPosts } from '~/graphql/PostQuery.js'
+ import PostMutations from '~/graphql/PostMutations'
+ import UpdateQuery from '~/components/utils/UpdateQuery'
 
-export default {
-  components: {
-    // DonationInfo,
-    FilterMenu,
-    PostTeaser,
-    HcEmpty,
-    MasonryGrid,
-    MasonryGridItem,
-  },
-  data() {
-    const { hashtag = null } = this.$route.query
-    return {
-      posts: [],
-      hasMore: true,
-      // Initialize your apollo data
-      offset: 0,
-      pageSize: 12,
-      hashtag,
-    }
-  },
-  computed: {
-    ...mapGetters({
-      postsFilter: 'posts/filter',
-      orderOptions: 'posts/orderOptions',
-      orderBy: 'posts/orderBy',
-      selectedOrder: 'posts/selectedOrder',
-      sortingIcon: 'posts/orderIcon',
-    }),
-    selected: {
-      get() {
-        return this.selectedOrder(this)
-      },
-      set({ value }) {
-        this.offset = 0
-        this.posts = []
-        this.selectOrder(value)
-      },
-    },
-    sortingOptions() {
-      return this.orderOptions(this)
-    },
-    finalFilters() {
-      let filter = this.postsFilter
-      if (this.hashtag) {
-        filter = {
-          ...filter,
-          tags_some: { id: this.hashtag },
-        }
-      }
-      return filter
-    },
-    hasResults() {
-      return this.$apollo.loading || (this.posts && this.posts.length > 0)
-    },
-  },
-  methods: {
-    ...mapMutations({
-      selectOrder: 'posts/SELECT_ORDER',
-    }),
-    clearSearch() {
-      this.$router.push({ path: '/' })
-      this.hashtag = null
-    },
-    href(post) {
-      return this.$router.resolve({
-        name: 'post-id-slug',
-        params: { id: post.id, slug: post.slug },
-      }).href
-    },
-    showMoreContributions($state) {
-      const { Post: PostQuery } = this.$apollo.queries
-      if (!PostQuery) return // seems this can be undefined on subpages
+ export default {
+     components: {
+	 // DonationInfo,
+	 FilterMenu,
+	 PostTeaser,
+	 HcEmpty,
+	 MasonryGrid,
+	 MasonryGridItem,
+     },
+     data() {
+	 const { hashtag = null } = this.$route.query
+	 console.log(this.$route.query)
+	 return {
+	     posts: [],
+	     hasMore: true,
+	     // Initialize your apollo data
+	     offset: 0,
+	     pageSize: 12,
+	     hashtag,
+	 }
+     },
+     computed: {
+	 ...mapGetters({
+	     postsFilter: 'posts/filter',
+	     orderOptions: 'posts/orderOptions',
+	     orderBy: 'posts/orderBy',
+	     selectedOrder: 'posts/selectedOrder',
+	     sortingIcon: 'posts/orderIcon',
+	 }),
+	 selected: {
+	     get() {
+		 return this.selectedOrder(this)
+	     },
+	     set({ value }) {
+		 this.offset = 0
+		 this.posts = []
+		 this.selectOrder(value)
+	     },
+	 },
+	 sortingOptions() {
+	     return this.orderOptions(this)
+	 },
+	 finalFilters() {
+	     let filter = this.postsFilter
+	     if (this.hashtag) {
+		 filter = {
+		     ...filter,
+		     tags_some: { id: this.hashtag },
+		 }
+	     }
+	     return filter
+	 },
+	 hasResults() {
+	     return this.$apollo.loading || (this.posts && this.posts.length > 0)
+	 },
+     },
+     watch: {
+	 '$route.query.hashtag'() {
+	     this.hashtag = this.$route.query.hashtag
+	 },
+     },
+     methods: {
+	 ...mapMutations({
+	     selectOrder: 'posts/SELECT_ORDER',
+	 }),
+	 clearSearch() {
+	     this.$router.push({ path: '/' })
+	     this.hashtag = null
+	 },
+	 href(post) {
+	     return this.$router.resolve({
+		 name: 'post-id-slug',
+		 params: { id: post.id, slug: post.slug },
+	     }).href
+	 },
+	 showMoreContributions($state) {
+	     const { Post: PostQuery } = this.$apollo.queries
+	     if (!PostQuery) return // seems this can be undefined on subpages
 
-      this.offset += this.pageSize
-      PostQuery.fetchMore({
-        variables: {
-          offset: this.offset,
-          filter: this.finalFilters,
-          first: this.pageSize,
-          orderBy: ['pinned_asc', this.orderBy],
-        },
-        updateQuery: UpdateQuery(this, { $state, pageKey: 'Post' }),
-      })
-    },
-    deletePost(deletedPost) {
-      this.posts = this.posts.filter(post => {
-        return post.id !== deletedPost.id
-      })
-    },
-    resetPostList() {
-      this.offset = 0
-      this.posts = []
-      this.hasMore = true
-    },
-    pinPost(post) {
-      this.$apollo
-        .mutate({
-          mutation: PostMutations().pinPost,
-          variables: { id: post.id },
-        })
-        .then(() => {
-          this.$toast.success(this.$t('post.menu.pinnedSuccessfully'))
-          this.resetPostList()
-          this.$apollo.queries.Post.refetch()
-        })
-        .catch(error => this.$toast.error(error.message))
-    },
-    unpinPost(post) {
-      this.$apollo
-        .mutate({
-          mutation: PostMutations().unpinPost,
-          variables: { id: post.id },
-        })
-        .then(() => {
-          this.$toast.success(this.$t('post.menu.unpinnedSuccessfully'))
-          this.resetPostList()
-          this.$apollo.queries.Post.refetch()
-        })
-        .catch(error => this.$toast.error(error.message))
-    },
-  },
-  apollo: {
-    Post: {
-      query() {
-        return filterPosts(this.$i18n)
-      },
-      variables() {
-        return {
-          filter: this.finalFilters,
-          first: this.pageSize,
-          orderBy: ['pinned_asc', this.orderBy],
-          offset: 0,
-        }
-      },
-      update({ Post }) {
-        this.posts = Post
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
-}
+	     this.offset += this.pageSize
+	     PostQuery.fetchMore({
+		 variables: {
+		     offset: this.offset,
+		     filter: this.finalFilters,
+		     first: this.pageSize,
+		     orderBy: ['pinned_asc', this.orderBy],
+		 },
+		 updateQuery: UpdateQuery(this, { $state, pageKey: 'Post' }),
+	     })
+	 },
+	 deletePost(deletedPost) {
+	     this.posts = this.posts.filter(post => {
+		 return post.id !== deletedPost.id
+	     })
+	 },
+	 resetPostList() {
+	     this.offset = 0
+	     this.posts = []
+	     this.hasMore = true
+	 },
+	 pinPost(post) {
+	     this.$apollo
+		 .mutate({
+		     mutation: PostMutations().pinPost,
+		     variables: { id: post.id },
+		 })
+		 .then(() => {
+		     this.$toast.success(this.$t('post.menu.pinnedSuccessfully'))
+		     this.resetPostList()
+		     this.$apollo.queries.Post.refetch()
+		 })
+		 .catch(error => this.$toast.error(error.message))
+	 },
+	 unpinPost(post) {
+	     this.$apollo
+		 .mutate({
+		     mutation: PostMutations().unpinPost,
+		     variables: { id: post.id },
+		 })
+		 .then(() => {
+		     this.$toast.success(this.$t('post.menu.unpinnedSuccessfully'))
+		     this.resetPostList()
+		     this.$apollo.queries.Post.refetch()
+		 })
+		 .catch(error => this.$toast.error(error.message))
+	 },
+     },
+     apollo: {
+	 Post: {
+	     query() {
+		 return filterPosts(this.$i18n)
+	     },
+	     variables() {
+		 return {
+		     filter: this.finalFilters,
+		     first: this.pageSize,
+		     orderBy: ['pinned_asc', this.orderBy],
+		     offset: 0,
+		 }
+	     },
+	     update({ Post }) {
+		 this.posts = Post
+	     },
+	     fetchPolicy: 'cache-and-network',
+	 },
+     },
+ }
 </script>
 
 <style lang="scss">

From e7d0e1b61ebf010c4c14a25c18a6b157ac2f0a1c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 14:30:32 +0100
Subject: [PATCH 093/106] removed console statement

---
 webapp/pages/index.vue | 311 ++++++++++++++++++++---------------------
 1 file changed, 155 insertions(+), 156 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d73c993ec..5e33cda5d 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -64,164 +64,163 @@
 </template>
 
 <script>
- // import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
- import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
- import HcEmpty from '~/components/Empty/Empty'
- import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
- import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
- import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
- import { mapGetters, mapMutations } from 'vuex'
- import { filterPosts } from '~/graphql/PostQuery.js'
- import PostMutations from '~/graphql/PostMutations'
- import UpdateQuery from '~/components/utils/UpdateQuery'
+// import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
+import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
+import HcEmpty from '~/components/Empty/Empty'
+import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
+import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
+import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
+import { mapGetters, mapMutations } from 'vuex'
+import { filterPosts } from '~/graphql/PostQuery.js'
+import PostMutations from '~/graphql/PostMutations'
+import UpdateQuery from '~/components/utils/UpdateQuery'
 
- export default {
-     components: {
-	 // DonationInfo,
-	 FilterMenu,
-	 PostTeaser,
-	 HcEmpty,
-	 MasonryGrid,
-	 MasonryGridItem,
-     },
-     data() {
-	 const { hashtag = null } = this.$route.query
-	 console.log(this.$route.query)
-	 return {
-	     posts: [],
-	     hasMore: true,
-	     // Initialize your apollo data
-	     offset: 0,
-	     pageSize: 12,
-	     hashtag,
-	 }
-     },
-     computed: {
-	 ...mapGetters({
-	     postsFilter: 'posts/filter',
-	     orderOptions: 'posts/orderOptions',
-	     orderBy: 'posts/orderBy',
-	     selectedOrder: 'posts/selectedOrder',
-	     sortingIcon: 'posts/orderIcon',
-	 }),
-	 selected: {
-	     get() {
-		 return this.selectedOrder(this)
-	     },
-	     set({ value }) {
-		 this.offset = 0
-		 this.posts = []
-		 this.selectOrder(value)
-	     },
-	 },
-	 sortingOptions() {
-	     return this.orderOptions(this)
-	 },
-	 finalFilters() {
-	     let filter = this.postsFilter
-	     if (this.hashtag) {
-		 filter = {
-		     ...filter,
-		     tags_some: { id: this.hashtag },
-		 }
-	     }
-	     return filter
-	 },
-	 hasResults() {
-	     return this.$apollo.loading || (this.posts && this.posts.length > 0)
-	 },
-     },
-     watch: {
-	 '$route.query.hashtag'() {
-	     this.hashtag = this.$route.query.hashtag
-	 },
-     },
-     methods: {
-	 ...mapMutations({
-	     selectOrder: 'posts/SELECT_ORDER',
-	 }),
-	 clearSearch() {
-	     this.$router.push({ path: '/' })
-	     this.hashtag = null
-	 },
-	 href(post) {
-	     return this.$router.resolve({
-		 name: 'post-id-slug',
-		 params: { id: post.id, slug: post.slug },
-	     }).href
-	 },
-	 showMoreContributions($state) {
-	     const { Post: PostQuery } = this.$apollo.queries
-	     if (!PostQuery) return // seems this can be undefined on subpages
+export default {
+  components: {
+    // DonationInfo,
+    FilterMenu,
+    PostTeaser,
+    HcEmpty,
+    MasonryGrid,
+    MasonryGridItem,
+  },
+  data() {
+    const { hashtag = null } = this.$route.query
+    return {
+      posts: [],
+      hasMore: true,
+      // Initialize your apollo data
+      offset: 0,
+      pageSize: 12,
+      hashtag,
+    }
+  },
+  computed: {
+    ...mapGetters({
+      postsFilter: 'posts/filter',
+      orderOptions: 'posts/orderOptions',
+      orderBy: 'posts/orderBy',
+      selectedOrder: 'posts/selectedOrder',
+      sortingIcon: 'posts/orderIcon',
+    }),
+    selected: {
+      get() {
+        return this.selectedOrder(this)
+      },
+      set({ value }) {
+        this.offset = 0
+        this.posts = []
+        this.selectOrder(value)
+      },
+    },
+    sortingOptions() {
+      return this.orderOptions(this)
+    },
+    finalFilters() {
+      let filter = this.postsFilter
+      if (this.hashtag) {
+        filter = {
+          ...filter,
+          tags_some: { id: this.hashtag },
+        }
+      }
+      return filter
+    },
+    hasResults() {
+      return this.$apollo.loading || (this.posts && this.posts.length > 0)
+    },
+  },
+  watch: {
+    '$route.query.hashtag'() {
+      this.hashtag = this.$route.query.hashtag ? this.$route.query.hashtag : null
+    },
+  },
+  methods: {
+    ...mapMutations({
+      selectOrder: 'posts/SELECT_ORDER',
+    }),
+    clearSearch() {
+      this.$router.push({ path: '/' })
+      this.hashtag = null
+    },
+    href(post) {
+      return this.$router.resolve({
+        name: 'post-id-slug',
+        params: { id: post.id, slug: post.slug },
+      }).href
+    },
+    showMoreContributions($state) {
+      const { Post: PostQuery } = this.$apollo.queries
+      if (!PostQuery) return // seems this can be undefined on subpages
 
-	     this.offset += this.pageSize
-	     PostQuery.fetchMore({
-		 variables: {
-		     offset: this.offset,
-		     filter: this.finalFilters,
-		     first: this.pageSize,
-		     orderBy: ['pinned_asc', this.orderBy],
-		 },
-		 updateQuery: UpdateQuery(this, { $state, pageKey: 'Post' }),
-	     })
-	 },
-	 deletePost(deletedPost) {
-	     this.posts = this.posts.filter(post => {
-		 return post.id !== deletedPost.id
-	     })
-	 },
-	 resetPostList() {
-	     this.offset = 0
-	     this.posts = []
-	     this.hasMore = true
-	 },
-	 pinPost(post) {
-	     this.$apollo
-		 .mutate({
-		     mutation: PostMutations().pinPost,
-		     variables: { id: post.id },
-		 })
-		 .then(() => {
-		     this.$toast.success(this.$t('post.menu.pinnedSuccessfully'))
-		     this.resetPostList()
-		     this.$apollo.queries.Post.refetch()
-		 })
-		 .catch(error => this.$toast.error(error.message))
-	 },
-	 unpinPost(post) {
-	     this.$apollo
-		 .mutate({
-		     mutation: PostMutations().unpinPost,
-		     variables: { id: post.id },
-		 })
-		 .then(() => {
-		     this.$toast.success(this.$t('post.menu.unpinnedSuccessfully'))
-		     this.resetPostList()
-		     this.$apollo.queries.Post.refetch()
-		 })
-		 .catch(error => this.$toast.error(error.message))
-	 },
-     },
-     apollo: {
-	 Post: {
-	     query() {
-		 return filterPosts(this.$i18n)
-	     },
-	     variables() {
-		 return {
-		     filter: this.finalFilters,
-		     first: this.pageSize,
-		     orderBy: ['pinned_asc', this.orderBy],
-		     offset: 0,
-		 }
-	     },
-	     update({ Post }) {
-		 this.posts = Post
-	     },
-	     fetchPolicy: 'cache-and-network',
-	 },
-     },
- }
+      this.offset += this.pageSize
+      PostQuery.fetchMore({
+        variables: {
+          offset: this.offset,
+          filter: this.finalFilters,
+          first: this.pageSize,
+          orderBy: ['pinned_asc', this.orderBy],
+        },
+        updateQuery: UpdateQuery(this, { $state, pageKey: 'Post' }),
+      })
+    },
+    deletePost(deletedPost) {
+      this.posts = this.posts.filter(post => {
+        return post.id !== deletedPost.id
+      })
+    },
+    resetPostList() {
+      this.offset = 0
+      this.posts = []
+      this.hasMore = true
+    },
+    pinPost(post) {
+      this.$apollo
+        .mutate({
+          mutation: PostMutations().pinPost,
+          variables: { id: post.id },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('post.menu.pinnedSuccessfully'))
+          this.resetPostList()
+          this.$apollo.queries.Post.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+    unpinPost(post) {
+      this.$apollo
+        .mutate({
+          mutation: PostMutations().unpinPost,
+          variables: { id: post.id },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('post.menu.unpinnedSuccessfully'))
+          this.resetPostList()
+          this.$apollo.queries.Post.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+  },
+  apollo: {
+    Post: {
+      query() {
+        return filterPosts(this.$i18n)
+      },
+      variables() {
+        return {
+          filter: this.finalFilters,
+          first: this.pageSize,
+          orderBy: ['pinned_asc', this.orderBy],
+          offset: 0,
+        }
+      },
+      update({ Post }) {
+        this.posts = Post
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
+}
 </script>
 
 <style lang="scss">

From 7024ea0b3021066277942bf1f2d2f0d909d91537 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 15:09:43 +0100
Subject: [PATCH 094/106] specs for Search for Hashtags

---
 .../generic/SearchableInput/SearchableInput.spec.js    | 10 ++++++++++
 .../generic/SearchableInput/SearchableInput.story.js   |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/webapp/components/generic/SearchableInput/SearchableInput.spec.js b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
index c685ae3e6..4a095304b 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.spec.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.spec.js
@@ -106,6 +106,16 @@ describe('SearchableInput.vue', () => {
           params: { id: 'u2', slug: 'bob-der-baumeister' },
         })
       })
+
+      it('pushes hashtag query params', async () => {
+        select.element.value = 'Hash'
+        select.trigger('input')
+        const tags = wrapper.findAll('.hc-hashtag')
+        const tag = tags.filter(item => item.text().match(/#Hashtag/))
+        tag.trigger('click')
+        await Vue.nextTick()
+        expect(mocks.$router.push).toHaveBeenCalledWith('?hashtag=Hashtag')
+      })
     })
   })
 })
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.story.js b/webapp/components/generic/SearchableInput/SearchableInput.story.js
index d969fa976..4b5c42e3b 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.story.js
+++ b/webapp/components/generic/SearchableInput/SearchableInput.story.js
@@ -106,6 +106,10 @@ export const searchResults = [
     name: 'Tonya Mohr',
     slug: 'tonya-mohr',
   },
+  {
+    id: 'Hashtag',
+    __typename: 'Tag',
+  },
 ]
 
 storiesOf('Search Field', module)

From 4e3705f607cad331b6a2eddb6b39071298d264fc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 15:10:52 +0100
Subject: [PATCH 095/106] specs for Search for Hashtags

---
 backend/src/schema/resolvers/searches.spec.js | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index c454833b8..081d71e55 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -41,6 +41,9 @@ const searchQuery = gql`
         slug
         name
       }
+      ... on Tag {
+        id
+      }
     }
   }
 `
@@ -439,6 +442,28 @@ und hinter tausend Stäben keine Welt.`,
           })
         })
       })
+
+      describe('adding a tag', () => {
+        beforeAll(async () => {
+          await Factory.build('tag', { id: 'myHashtag' })
+        })
+
+        describe('query the first four characters of the tag', () => {
+          it('finds the tag', async () => {
+            variables = { query: 'myha' }
+            await expect(query({ query: searchQuery, variables })).resolves.toMatchObject({
+              data: {
+                findResources: [
+                  {
+                    __typename: 'Tag',
+                    id: 'myHashtag',
+                  },
+                ],
+              },
+            })
+          })
+        })
+      })
     })
   })
 })

From 7d29400ef9bd9d957c7b3bb74b78698631393f10 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 15:44:30 +0100
Subject: [PATCH 096/106] tag fulltext index added to store

---
 backend/src/db/migrate/store.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js
index 8bc73b511..02e048c07 100644
--- a/backend/src/db/migrate/store.js
+++ b/backend/src/db/migrate/store.js
@@ -12,6 +12,7 @@ class Store {
         [
           'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])',
           'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])',
+          'CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])',
         ].map(statement => txc.run(statement)),
       )
     })

From fa7f1bb1119bbd35cd6dfe1e94c4596e1d143bfc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Mar 2020 20:16:25 +0100
Subject: [PATCH 097/106] use watchQuery to watch query in URL instead of watch

---
 webapp/pages/index.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5e33cda5d..e9e6bed54 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -130,11 +130,7 @@ export default {
       return this.$apollo.loading || (this.posts && this.posts.length > 0)
     },
   },
-  watch: {
-    '$route.query.hashtag'() {
-      this.hashtag = this.$route.query.hashtag ? this.$route.query.hashtag : null
-    },
-  },
+  watchQuery: ['hashtag'],
   methods: {
     ...mapMutations({
       selectOrder: 'posts/SELECT_ORDER',

From 42c8754e88d36c64b456aab9a2ed938e68f68eb2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 04:17:19 +0000
Subject: [PATCH 098/106] build(deps): bump validator from 12.2.0 to 13.0.0 in
 /backend

Bumps [validator](https://github.com/chriso/validator.js) from 12.2.0 to 13.0.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.2.0...13.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 77417453f..81a09541c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -101,7 +101,7 @@
     "subscriptions-transport-ws": "^0.9.16",
     "trunc-html": "~1.1.2",
     "uuid": "~7.0.2",
-    "validator": "^12.2.0",
+    "validator": "^13.0.0",
     "wait-on": "~4.0.1",
     "xregexp": "^4.3.0"
   },
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a514a60b4..4fb566f15 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -9103,10 +9103,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
-  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
+validator@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.0.0.tgz#0fb6c6bb5218ea23d368a8347e6d0f5a70e3bcab"
+  integrity sha512-anYx5fURbgF04lQV18nEQWZ/3wHGnxiKdG4aL8J+jEDsm98n/sU/bey+tYk6tnGJzm7ioh5FoqrAiQ6m03IgaA==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"

From 4e32ab7e6c4c6252b574c7bfa352a61a5e45affe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 04:17:58 +0000
Subject: [PATCH 099/106] build(deps): bump metascraper-soundcloud in /backend

Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.11.6 to 5.11.7.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

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

diff --git a/backend/package.json b/backend/package.json
index 77417453f..c192e82eb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -80,7 +80,7 @@
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.11.6",
     "metascraper-publisher": "^5.11.6",
-    "metascraper-soundcloud": "^5.11.6",
+    "metascraper-soundcloud": "^5.11.7",
     "metascraper-title": "^5.11.6",
     "metascraper-url": "^5.11.6",
     "metascraper-video": "^5.11.6",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a514a60b4..b39438dd8 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6289,13 +6289,13 @@ metascraper-publisher@^5.11.6:
   dependencies:
     "@metascraper/helpers" "^5.11.6"
 
-metascraper-soundcloud@^5.11.6:
-  version "5.11.6"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.11.6.tgz#01699553a37d5e02f73cd5b15792986f761e94e9"
-  integrity sha512-KR/KNK5pWthgwuixqyfL13uSwr+mUanzhC6LEYSL7kHYTtYl0mwG7P64Ab+OdloLMwRkekITK6EaD3T8Omj2tw==
+metascraper-soundcloud@^5.11.7:
+  version "5.11.7"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.11.7.tgz#bfada9cd3189dc223f04e2219bc4e146d75ec1da"
+  integrity sha512-GPMxSHb1fayrTovLCxBd2HmzHs6eJFgEm37294NBsvzdsb5TwcjyDCd7O9CIARY4Bcw7yL60k1WathSdeAUqgA==
   dependencies:
     "@metascraper/helpers" "^5.11.6"
-    tldts "~5.6.10"
+    tldts "~5.6.12"
 
 metascraper-title@^5.11.6:
   version "5.11.6"
@@ -8660,17 +8660,17 @@ tlds@^1.187.0, tlds@^1.203.0:
   resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
   integrity sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==
 
-tldts-core@^5.6.10:
-  version "5.6.10"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.10.tgz#509a93c2bfd79da5a456f06ef099a19fa00bc2c9"
-  integrity sha512-bbz6I/200adIZgrUcnCD2RiOWkOeyDSuRSyueYN6XFs/Jwoser30nQwEqFaXeKCRsUl4IobnOGWbvUC5ihcxCA==
+tldts-core@^5.6.12:
+  version "5.6.12"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.12.tgz#5774086a65cf9d5fbf0c828dffe2c830dcbe8c17"
+  integrity sha512-QdqPwO8aBWpLb3SixPijbbWhQyVeDTZJe8UQe9IdiH6F8NCOWl89EGftTeiz/RH74LTY5CWLwh6vcPj7lhqH8A==
 
-tldts@~5.6.10:
-  version "5.6.10"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.6.10.tgz#b9a07d7ed14c7a2b7bcf48ac1f6908d5b06d28e1"
-  integrity sha512-YM/3+cMeulrAqGQE8EhU7Ugmw5PAqTUJJq51XTVzsh0S9VxEwFZRkJSn7B4OY/tgQIMu8GXzPMd9fIoiOxsRYA==
+tldts@~5.6.12:
+  version "5.6.12"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.6.12.tgz#ae7096e70fda948753bac9f2731da4663d01b45c"
+  integrity sha512-jq3re1oUJpCTGCj3PbBgBQum2Lvsrkt/D9Tj/HB8e6ET+xi7yIBYzcXddJYwNBC7Vit3XQz4Jj8nGIeuOlRFQA==
   dependencies:
-    tldts-core "^5.6.10"
+    tldts-core "^5.6.12"
 
 tmp@^0.0.33:
   version "0.0.33"

From 25d2aa81c4b6bc6e07710f7f25d980060bdd0244 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 09:44:50 +0000
Subject: [PATCH 100/106] build(deps): bump validator from 12.2.0 to 13.0.0 in
 /webapp

Bumps [validator](https://github.com/chriso/validator.js) from 12.2.0 to 13.0.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.2.0...13.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 046b0c30b..32de66110 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -86,7 +86,7 @@
     "tiptap-extensions": "~1.28.6",
     "trunc-html": "^1.1.2",
     "v-tooltip": "~2.0.3",
-    "validator": "^12.2.0",
+    "validator": "^13.0.0",
     "vue-count-to": "~1.0.13",
     "vue-infinite-loading": "^2.4.5",
     "vue-izitoast": "^1.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 52550afd2..85158a640 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -16499,10 +16499,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
-  integrity sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==
+validator@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.0.0.tgz#0fb6c6bb5218ea23d368a8347e6d0f5a70e3bcab"
+  integrity sha512-anYx5fURbgF04lQV18nEQWZ/3wHGnxiKdG4aL8J+jEDsm98n/sU/bey+tYk6tnGJzm7ioh5FoqrAiQ6m03IgaA==
 
 vary@^1, vary@^1.1.2, vary@~1.1.2:
   version "1.1.2"

From b08b2da0a101f0ae0ffa398a5b381c7e55fbed71 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 20 Mar 2020 12:33:00 +0100
Subject: [PATCH 101/106] chore: upgrade to v0.5.0

---
 CHANGELOG.md         | 72 ++++++++++++++++++++++++++++++++++++++++++++
 backend/package.json |  2 +-
 package.json         |  2 +-
 webapp/package.json  |  2 +-
 4 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22efb08dd..1590f24a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,78 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.5.0](https://github.com/Human-Connection/Human-Connection/compare/v0.4.2...v0.5.0)
+
+> 20 March 2020
+
+- feat: Search for Hashtags [`#3297`](https://github.com/Human-Connection/Human-Connection/pull/3297)
+- build(deps): bump metascraper-soundcloud from 5.11.6 to 5.11.7 in /backend [`#3300`](https://github.com/Human-Connection/Human-Connection/pull/3300)
+- build(deps): bump validator from 12.2.0 to 13.0.0 in /backend [`#3299`](https://github.com/Human-Connection/Human-Connection/pull/3299)
+- build(deps-dev): bump @storybook/addon-a11y from 5.3.14 to 5.3.17 in /webapp [`#3283`](https://github.com/Human-Connection/Human-Connection/pull/3283)
+- build(deps-dev): bump cross-env from 6.0.3 to 7.0.2 [`#3294`](https://github.com/Human-Connection/Human-Connection/pull/3294)
+- build(deps-dev): bump @storybook/vue from 5.3.14 to 5.3.17 in /webapp [`#3285`](https://github.com/Human-Connection/Human-Connection/pull/3285)
+- build(deps): bump graphql-shield from 7.0.14 to 7.2.0 in /backend [`#3288`](https://github.com/Human-Connection/Human-Connection/pull/3288)
+- build(deps): bump nuxt from 2.11.0 to 2.12.0 in /webapp [`#3291`](https://github.com/Human-Connection/Human-Connection/pull/3291)
+- build(deps): bump cookie-universal-nuxt from 2.1.2 to 2.1.3 in /webapp [`#3289`](https://github.com/Human-Connection/Human-Connection/pull/3289)
+- feat: Specs For Searches [`#3199`](https://github.com/Human-Connection/Human-Connection/pull/3199)
+- chore(ci): Follow cypress docs to cache libraries [`#3292`](https://github.com/Human-Connection/Human-Connection/pull/3292)
+- build(deps-dev): bump cypress from 4.1.0 to 4.2.0 [`#3287`](https://github.com/Human-Connection/Human-Connection/pull/3287)
+- build(deps): [security] bump acorn from 5.7.3 to 5.7.4 in /webapp [`#3268`](https://github.com/Human-Connection/Human-Connection/pull/3268)
+- feat: Introduce graphql image type [`#3043`](https://github.com/Human-Connection/Human-Connection/pull/3043)
+- build(deps-dev): bump @storybook/addon-actions from 5.3.14 to 5.3.17 in /webapp [`#3284`](https://github.com/Human-Connection/Human-Connection/pull/3284)
+- build(deps): bump date-fns from 2.10.0 to 2.11.0 in /webapp [`#3281`](https://github.com/Human-Connection/Human-Connection/pull/3281)
+- chore: Dockerfile/Travis node versions match [`#3267`](https://github.com/Human-Connection/Human-Connection/pull/3267)
+- build(deps): bump date-fns from 2.10.0 to 2.11.0 in /backend [`#3278`](https://github.com/Human-Connection/Human-Connection/pull/3278)
+- build(deps): bump @hapi/joi from 17.1.0 to 17.1.1 in /backend [`#3277`](https://github.com/Human-Connection/Human-Connection/pull/3277)
+- build(deps): bump neo4j-driver from 4.0.1 to 4.0.2 in /backend [`#3276`](https://github.com/Human-Connection/Human-Connection/pull/3276)
+- build(deps-dev): bump neo4j-driver from 4.0.1 to 4.0.2 [`#3275`](https://github.com/Human-Connection/Human-Connection/pull/3275)
+- refactor: deprecated slot syntax [2117] [`#3258`](https://github.com/Human-Connection/Human-Connection/pull/3258)
+- build(deps-dev): bump @storybook/addon-notes from 5.3.14 to 5.3.17 in /webapp [`#3282`](https://github.com/Human-Connection/Human-Connection/pull/3282)
+- build(deps): bump mustache from 4.0.0 to 4.0.1 in /backend [`#3280`](https://github.com/Human-Connection/Human-Connection/pull/3280)
+- build(deps): bump @sentry/node from 5.14.1 to 5.14.2 in /backend [`#3274`](https://github.com/Human-Connection/Human-Connection/pull/3274)
+- build(deps-dev): bump date-fns from 2.10.0 to 2.11.0 [`#3273`](https://github.com/Human-Connection/Human-Connection/pull/3273)
+- build(deps): [security] bump acorn from 6.3.0 to 6.4.1 in /backend [`#3270`](https://github.com/Human-Connection/Human-Connection/pull/3270)
+- build(deps): [security] bump acorn from 6.1.1 to 6.4.1 [`#3269`](https://github.com/Human-Connection/Human-Connection/pull/3269)
+- build(deps): bump graphql-shield from 7.1.0 to 7.2.0 in /backend [`#3265`](https://github.com/Human-Connection/Human-Connection/pull/3265)
+- build(deps): bump sanitize-html from 1.22.0 to 1.22.1 in /backend [`#3264`](https://github.com/Human-Connection/Human-Connection/pull/3264)
+- build(deps): bump @sentry/node from 5.14.0 to 5.14.1 in /backend [`#3263`](https://github.com/Human-Connection/Human-Connection/pull/3263)
+- build(deps-dev): bump @vue/server-test-utils from 1.0.0-beta.31 to 1.0.0-beta.32 in /webapp [`#3249`](https://github.com/Human-Connection/Human-Connection/pull/3249)
+- build(deps-dev): bump @babel/preset-env from 7.8.6 to 7.8.7 in /webapp [`#3215`](https://github.com/Human-Connection/Human-Connection/pull/3215)
+- build(deps-dev): bump fuse.js from 3.4.6 to 3.6.1 in /webapp [`#3239`](https://github.com/Human-Connection/Human-Connection/pull/3239)
+- build(deps): bump @nuxtjs/sentry from 3.2.4 to 3.3.1 in /webapp [`#3237`](https://github.com/Human-Connection/Human-Connection/pull/3237)
+- build(deps-dev): bump eslint-plugin-jest from 23.8.1 to 23.8.2 in /webapp [`#3228`](https://github.com/Human-Connection/Human-Connection/pull/3228)
+- chore: Update to version 0.4.2 [`#3261`](https://github.com/Human-Connection/Human-Connection/pull/3261)
+- Changes requested by @mattwr18 [`9c08db2`](https://github.com/Human-Connection/Human-Connection/commit/9c08db22dcd0ca1ad6e59be8fb0f287935b45537)
+- search specs refactored [`46fca22`](https://github.com/Human-Connection/Human-Connection/commit/46fca229ec35047eda9ac7809e7bc456785a6c70)
+- Search for Hashtags works due watching route in pages/index.vue [`1c43d5f`](https://github.com/Human-Connection/Human-Connection/commit/1c43d5fe6f44c7b11168af8bd765b8d785a6641a)
+
+#### [v0.4.2](https://github.com/Human-Connection/Human-Connection/compare/v0.4.1...v0.4.2)
+
+> 12 March 2020
+
+- build(deps): bump @sentry/node from 5.13.1 to 5.14.0 in /backend [`#3260`](https://github.com/Human-Connection/Human-Connection/pull/3260)
+- build(deps): bump graphql-shield from 7.0.14 to 7.1.0 in /backend [`#3259`](https://github.com/Human-Connection/Human-Connection/pull/3259)
+- feat: more prominent output of ./scripts/translations/sort.sh and hint to --fix feature of the script on errors [`#3251`](https://github.com/Human-Connection/Human-Connection/pull/3251)
+- build(deps): bump nodemailer from 6.4.4 to 6.4.5 in /backend [`#3254`](https://github.com/Human-Connection/Human-Connection/pull/3254)
+- build(deps-dev): bump @vue/test-utils from 1.0.0-beta.31 to 1.0.0-beta.32 in /webapp [`#3248`](https://github.com/Human-Connection/Human-Connection/pull/3248)
+- build(deps-dev): bump async-validator from 3.2.3 to 3.2.4 in /webapp [`#3255`](https://github.com/Human-Connection/Human-Connection/pull/3255)
+- build(deps-dev): bump eslint-plugin-jest from 23.8.1 to 23.8.2 in /backend [`#3253`](https://github.com/Human-Connection/Human-Connection/pull/3253)
+- feature: Delete_user_as_admin_through_API_only [`#3063`](https://github.com/Human-Connection/Human-Connection/pull/3063)
+- feat: zero bell to all notifications page [2823] [`#3219`](https://github.com/Human-Connection/Human-Connection/pull/3219)
+- fix: layout shift [2607] [`#3218`](https://github.com/Human-Connection/Human-Connection/pull/3218)
+- feat: Documentation for locales script [`#3242`](https://github.com/Human-Connection/Human-Connection/pull/3242)
+- build(deps): bump metascraper-audio from 5.11.1 to 5.11.6 in /backend [`#3235`](https://github.com/Human-Connection/Human-Connection/pull/3235)
+- build(deps): bump metascraper-video from 5.11.1 to 5.11.6 in /backend [`#3247`](https://github.com/Human-Connection/Human-Connection/pull/3247)
+- build(deps): bump metascraper-soundcloud from 5.11.5 to 5.11.6 in /backend [`#3246`](https://github.com/Human-Connection/Human-Connection/pull/3246)
+- build(deps): bump metascraper-lang from 5.11.1 to 5.11.6 in /backend [`#3234`](https://github.com/Human-Connection/Human-Connection/pull/3234)
+- build(deps): bump metascraper-description from 5.11.1 to 5.11.6 in /backend [`#3233`](https://github.com/Human-Connection/Human-Connection/pull/3233)
+- build(deps): bump cross-env from 7.0.1 to 7.0.2 in /backend [`#3245`](https://github.com/Human-Connection/Human-Connection/pull/3245)
+- build(deps): bump metascraper-title from 5.11.1 to 5.11.6 in /backend [`#3244`](https://github.com/Human-Connection/Human-Connection/pull/3244)
+- chore: Update to v0.4.1 [`#3243`](https://github.com/Human-Connection/Human-Connection/pull/3243)
+- DRY user.spec.js [`da16590`](https://github.com/Human-Connection/Human-Connection/commit/da165906e2ed12baddd902b43064103ab3adfa06)
+- test deleteuser as admin, moderator, another user and as I myself, fix lint [`3983612`](https://github.com/Human-Connection/Human-Connection/commit/3983612c56ac92473a192a318959e4c691a3e7b8)
+- feature: test delete user as admin [`84c1547`](https://github.com/Human-Connection/Human-Connection/commit/84c154798efac0cec4c13dfefae18a6a9542058a)
+
 #### [v0.4.1](https://github.com/Human-Connection/Human-Connection/compare/v0.4.0...v0.4.1)
 
 > 9 March 2020
diff --git a/backend/package.json b/backend/package.json
index c68f8aa1c..188c6838d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-backend",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 363c5f6a2..fd1f3d5a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Fullstack and API tests with cypress and cucumber for Human Connection",
   "author": "Human Connection gGmbh",
   "license": "MIT",
diff --git a/webapp/package.json b/webapp/package.json
index 046b0c30b..20f0d7e49 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "human-connection-webapp",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Human Connection Frontend",
   "authors": [
     "Grzegorz Leoniec (appinteractive)",

From ed7b739d9871d9a72ebb31c1fd5c507edfa12ea3 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 20 Mar 2020 19:11:30 +0100
Subject: [PATCH 102/106] fix(migration): Avoid unique constraint violation

---
 ...20200315-refactor_all_images_to_separate_type.js} | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename backend/src/db/migrations/{20200125010142-refactor_all_images_to_separate_type.js => 20200320200315-refactor_all_images_to_separate_type.js} (89%)

diff --git a/backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js b/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
similarity index 89%
rename from backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js
rename to backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
index 634a0552e..d87a19827 100644
--- a/backend/src/db/migrations/20200125010142-refactor_all_images_to_separate_type.js
+++ b/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
@@ -24,9 +24,9 @@ export async function up() {
         `
       MATCH (post:Post)
       WHERE post.image IS NOT NULL
-      CREATE (post)-[:HERO_IMAGE]->(image:Image)
+      MERGE(image:Image {url: post.image})
+      CREATE (post)-[:HERO_IMAGE]->(image)
       SET
-        image.url         = post.image,
         image.sensitive   = post.imageBlurred,
         image.aspectRatio = post.imageAspectRatio
       REMOVE
@@ -37,15 +37,15 @@ export async function up() {
         `
       MATCH (user:User)
       WHERE user.avatar IS NOT NULL
-      CREATE (user)-[:AVATAR_IMAGE]->(avatar:Image)
-      SET avatar.url = user.avatar
+      MERGE(avatar:Image {url: user.avatar})
+      CREATE (user)-[:AVATAR_IMAGE]->(avatar)
       REMOVE user.avatar
     `,
         `
       MATCH (user:User)
       WHERE user.coverImg IS NOT NULL
-      CREATE (user)-[:COVER_IMAGE]->(coverImage:Image)
-      SET coverImage.url = user.coverImg
+      MERGE(coverImage:Image {url: user.coverImg})
+      CREATE (user)-[:COVER_IMAGE]->(coverImage)
       REMOVE user.coverImg
     `,
       ].map(s => txc.run(s)),

From e0e026a8b8c15347cd3adf0c160e267c2a51fa00 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 23 Mar 2020 18:46:28 +0100
Subject: [PATCH 103/106] fix(migration): return null for Image.url

---
 ...15-refactor_all_images_to_separate_type.js |  6 +--
 ...emove_deleted_users_obsolete_attributes.js | 44 ++++++++++++++++++
 ...emove_deleted_posts_obsolete_attributes.js | 46 +++++++++++++++++++
 backend/src/schema/resolvers/images.js        |  2 +-
 backend/src/schema/resolvers/users.js         |  8 ++++
 backend/src/schema/types/type/Image.gql       |  2 +-
 webapp/graphql/PostMutations.js               |  2 +
 7 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/db/migrations/20200323140300-remove_deleted_users_obsolete_attributes.js
 create mode 100644 backend/src/db/migrations/20200323160336-remove_deleted_posts_obsolete_attributes.js

diff --git a/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js b/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
index d87a19827..9a0a5c30d 100644
--- a/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
+++ b/backend/src/db/migrations/20200320200315-refactor_all_images_to_separate_type.js
@@ -23,7 +23,7 @@ export async function up() {
       [
         `
       MATCH (post:Post)
-      WHERE post.image IS NOT NULL
+      WHERE post.image IS NOT NULL AND post.deleted = FALSE
       MERGE(image:Image {url: post.image})
       CREATE (post)-[:HERO_IMAGE]->(image)
       SET
@@ -36,14 +36,14 @@ export async function up() {
     `,
         `
       MATCH (user:User)
-      WHERE user.avatar IS NOT NULL
+      WHERE user.avatar IS NOT NULL AND user.deleted = FALSE
       MERGE(avatar:Image {url: user.avatar})
       CREATE (user)-[:AVATAR_IMAGE]->(avatar)
       REMOVE user.avatar
     `,
         `
       MATCH (user:User)
-      WHERE user.coverImg IS NOT NULL
+      WHERE user.coverImg IS NOT NULL AND user.deleted = FALSE
       MERGE(coverImage:Image {url: user.coverImg})
       CREATE (user)-[:COVER_IMAGE]->(coverImage)
       REMOVE user.coverImg
diff --git a/backend/src/db/migrations/20200323140300-remove_deleted_users_obsolete_attributes.js b/backend/src/db/migrations/20200323140300-remove_deleted_users_obsolete_attributes.js
new file mode 100644
index 000000000..8b2134dc5
--- /dev/null
+++ b/backend/src/db/migrations/20200323140300-remove_deleted_users_obsolete_attributes.js
@@ -0,0 +1,44 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description =
+  'We should not maintain obsolete attributes for users who have been deleted.'
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  const updateDeletedUserAttributes = await transaction.run(`
+    MATCH (user:User)
+    WHERE user.deleted = TRUE
+    SET user.createdAt = 'UNAVAILABLE'
+    SET user.updatedAt = 'UNAVAILABLE'
+    SET user.lastActiveAt = 'UNAVAILABLE'
+    SET user.termsAndConditionsAgreedVersion = 'UNAVAILABLE'
+    SET user.avatar = null
+    SET user.coverImg = null
+    RETURN user {.*};
+  `)
+  try {
+    // Implement your migration here.
+    const users = await updateDeletedUserAttributes.records.map(record => record.get('user'))
+    // eslint-disable-next-line no-console
+    console.log(users)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  // eslint-disable-next-line no-console
+  console.log('Irreversible migration')
+  next()
+}
diff --git a/backend/src/db/migrations/20200323160336-remove_deleted_posts_obsolete_attributes.js b/backend/src/db/migrations/20200323160336-remove_deleted_posts_obsolete_attributes.js
new file mode 100644
index 000000000..07abf9aeb
--- /dev/null
+++ b/backend/src/db/migrations/20200323160336-remove_deleted_posts_obsolete_attributes.js
@@ -0,0 +1,46 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description =
+  'We should not maintain obsolete attributes for posts which have been deleted.'
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+  const updateDeletedPostsAttributes = await transaction.run(`
+    MATCH (post:Post)
+    WHERE post.deleted = TRUE
+    SET post.language = 'UNAVAILABLE'
+    SET post.createdAt = 'UNAVAILABLE'
+    SET post.updatedAt = 'UNAVAILABLE'
+    SET post.content = 'UNAVAILABLE'
+    SET post.title = 'UNAVAILABLE'
+    SET post.visibility = 'UNAVAILABLE'
+    SET post.contentExcerpt = 'UNAVAILABLE'
+    SET post.image = null
+    RETURN post {.*};
+  `)
+  try {
+    // Implement your migration here.
+    const posts = await updateDeletedPostsAttributes.records.map(record => record.get('post'))
+    // eslint-disable-next-line no-console
+    console.log(posts)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  // eslint-disable-next-line no-console
+  console.log('Irreversible migration')
+  next()
+}
diff --git a/backend/src/schema/resolvers/images.js b/backend/src/schema/resolvers/images.js
index 8b3f4a3e8..1f025eda6 100644
--- a/backend/src/schema/resolvers/images.js
+++ b/backend/src/schema/resolvers/images.js
@@ -2,7 +2,7 @@ import Resolver from './helpers/Resolver'
 export default {
   Image: {
     ...Resolver('Image', {
-      undefinedToNull: ['sensitive', 'alt', 'aspectRatio'],
+      undefinedToNull: ['sensitive', 'alt', 'aspectRatio', 'url'],
     }),
   },
 }
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 252265ac3..b2f752143 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -192,6 +192,9 @@ export default {
                 SET resource.deleted = true
                 SET resource.content = 'UNAVAILABLE'
                 SET resource.contentExcerpt = 'UNAVAILABLE'
+                SET resource.language = 'UNAVAILABLE'
+                SET resource.createdAt = 'UNAVAILABLE'
+                SET resource.updatedAt = 'UNAVAILABLE'
                 SET comment.deleted = true
                 RETURN resource {.*}
               `,
@@ -214,6 +217,11 @@ export default {
               SET user.deleted = true
               SET user.name = 'UNAVAILABLE'
               SET user.about = 'UNAVAILABLE'
+              SET user.lastActiveAt = 'UNAVAILABLE'
+              SET user.createdAt = 'UNAVAILABLE'
+              SET user.updatedAt = 'UNAVAILABLE'
+              SET user.termsAndConditionsAgreedVersion = 'UNAVAILABLE'
+              SET user.encryptedPassword = null
               WITH user
               OPTIONAL MATCH (user)<-[:BELONGS_TO]-(email:EmailAddress)
               DETACH DELETE email
diff --git a/backend/src/schema/types/type/Image.gql b/backend/src/schema/types/type/Image.gql
index 41cc11eef..d4d9cf1b4 100644
--- a/backend/src/schema/types/type/Image.gql
+++ b/backend/src/schema/types/type/Image.gql
@@ -1,5 +1,5 @@
 type Image {
-  url: ID!,
+  url: ID,
   # urlW34: String,
   # urlW160: String,
   # urlW320: String,
diff --git a/webapp/graphql/PostMutations.js b/webapp/graphql/PostMutations.js
index 9120b3e87..602256e01 100644
--- a/webapp/graphql/PostMutations.js
+++ b/webapp/graphql/PostMutations.js
@@ -23,6 +23,7 @@ export default () => {
           contentExcerpt
           language
           image {
+            url
             sensitive
           }
         }
@@ -52,6 +53,7 @@ export default () => {
           contentExcerpt
           language
           image {
+            url
             sensitive
             aspectRatio
           }

From 698c85b26229c95a683274750341fd22a16a319a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 23 Mar 2020 19:16:10 +0100
Subject: [PATCH 104/106] fix(backend): Obfuscate avatar/image fix test

- Then Image.url can be non-nullable because we return null if the
  resource is deleted.
---
 backend/src/middleware/softDelete/softDeleteMiddleware.js | 4 ++--
 backend/src/schema/resolvers/images.js                    | 2 +-
 backend/src/schema/types/type/Image.gql                   | 2 +-
 backend/src/schema/types/type/Post.gql                    | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.js b/backend/src/middleware/softDelete/softDeleteMiddleware.js
index 8be8c3d39..2e1f60251 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.js
@@ -17,10 +17,10 @@ const obfuscate = async (resolve, root, args, context, info) => {
     root.contentExcerpt = 'UNAVAILABLE'
     root.title = 'UNAVAILABLE'
     root.slug = 'UNAVAILABLE'
-    root.avatar = 'UNAVAILABLE'
+    root.avatar = null
     root.about = 'UNAVAILABLE'
     root.name = 'UNAVAILABLE'
-    root.image = null // avoid unecessary 500 errors
+    root.image = null
   }
   return resolve(root, args, context, info)
 }
diff --git a/backend/src/schema/resolvers/images.js b/backend/src/schema/resolvers/images.js
index 1f025eda6..8b3f4a3e8 100644
--- a/backend/src/schema/resolvers/images.js
+++ b/backend/src/schema/resolvers/images.js
@@ -2,7 +2,7 @@ import Resolver from './helpers/Resolver'
 export default {
   Image: {
     ...Resolver('Image', {
-      undefinedToNull: ['sensitive', 'alt', 'aspectRatio', 'url'],
+      undefinedToNull: ['sensitive', 'alt', 'aspectRatio'],
     }),
   },
 }
diff --git a/backend/src/schema/types/type/Image.gql b/backend/src/schema/types/type/Image.gql
index d4d9cf1b4..41cc11eef 100644
--- a/backend/src/schema/types/type/Image.gql
+++ b/backend/src/schema/types/type/Image.gql
@@ -1,5 +1,5 @@
 type Image {
-  url: ID,
+  url: ID!,
   # urlW34: String,
   # urlW160: String,
   # urlW320: String,
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 01d8409ad..dc6a00a41 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -201,7 +201,6 @@ type Query {
     title: String
     slug: String
     content: String
-    image: String
     visibility: Visibility
     pinned: Boolean
     createdAt: String

From 2c997b2d0ad4a717482debf844db36088cbfb547 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 23 Mar 2020 20:43:31 +0100
Subject: [PATCH 105/106] fix(build): make locations spec more resilient

---
 .../schema/resolvers/users/location.spec.js   | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index 2e74e5c03..617951f01 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -19,48 +19,48 @@ const updateUserMutation = gql`
 const newlyCreatedNodesWithLocales = [
   {
     city: {
-      lng: -74.5763,
-      lat: 41.1534,
+      id: expect.stringContaining('place'),
+      type: 'place',
+      name: 'Hamburg',
+      nameEN: 'Hamburg',
+      nameDE: 'Hamburg',
+      namePT: 'Hamburg',
       nameES: 'Hamburg',
       nameFR: 'Hamburg',
       nameIT: 'Hamburg',
-      nameEN: 'Hamburg',
-      type: 'place',
-      namePT: 'Hamburg',
       nameRU: 'Хамбург',
-      nameDE: 'Hamburg',
       nameNL: 'Hamburg',
-      name: 'Hamburg',
       namePL: 'Hamburg',
-      id: 'place.5977106083398860',
+      lng: -74.5763,
+      lat: 41.1534,
     },
     state: {
-      namePT: 'Nova Jérsia',
-      nameRU: 'Нью-Джерси',
-      nameDE: 'New Jersey',
-      nameNL: 'New Jersey',
-      nameES: 'Nueva Jersey',
+      id: expect.stringContaining('region'),
+      type: 'region',
       name: 'New Jersey',
-      namePL: 'New Jersey',
+      nameEN: 'New Jersey',
+      nameDE: 'New Jersey',
+      namePT: 'Nova Jérsia',
+      nameES: 'Nueva Jersey',
       nameFR: 'New Jersey',
       nameIT: 'New Jersey',
-      id: 'region.14919479731700330',
-      nameEN: 'New Jersey',
-      type: 'region',
+      nameRU: 'Нью-Джерси',
+      nameNL: 'New Jersey',
+      namePL: 'New Jersey',
     },
     country: {
-      namePT: 'Estados Unidos',
-      nameRU: 'Соединённые Штаты Америки',
-      nameDE: 'Vereinigte Staaten',
-      nameNL: 'Verenigde Staten van Amerika',
-      nameES: 'Estados Unidos',
-      namePL: 'Stany Zjednoczone',
+      id: expect.stringContaining('country'),
+      type: 'country',
       name: 'United States of America',
+      nameEN: 'United States of America',
+      nameDE: 'Vereinigte Staaten',
+      namePT: 'Estados Unidos',
+      nameES: 'Estados Unidos',
       nameFR: 'États-Unis',
       nameIT: "Stati Uniti d'America",
-      id: 'country.9053006287256050',
-      nameEN: 'United States of America',
-      type: 'country',
+      nameRU: 'Соединённые Штаты Америки',
+      nameNL: 'Verenigde Staten van Amerika',
+      namePL: 'Stany Zjednoczone',
     },
   },
 ]

From 6e0459ca2da53b185c5d02ed07532c1e56a8975d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 23 Mar 2020 20:43:31 +0100
Subject: [PATCH 106/106] fix(build): make locations spec more resilient

---
 .../schema/resolvers/users/location.spec.js   | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index 2e74e5c03..617951f01 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -19,48 +19,48 @@ const updateUserMutation = gql`
 const newlyCreatedNodesWithLocales = [
   {
     city: {
-      lng: -74.5763,
-      lat: 41.1534,
+      id: expect.stringContaining('place'),
+      type: 'place',
+      name: 'Hamburg',
+      nameEN: 'Hamburg',
+      nameDE: 'Hamburg',
+      namePT: 'Hamburg',
       nameES: 'Hamburg',
       nameFR: 'Hamburg',
       nameIT: 'Hamburg',
-      nameEN: 'Hamburg',
-      type: 'place',
-      namePT: 'Hamburg',
       nameRU: 'Хамбург',
-      nameDE: 'Hamburg',
       nameNL: 'Hamburg',
-      name: 'Hamburg',
       namePL: 'Hamburg',
-      id: 'place.5977106083398860',
+      lng: -74.5763,
+      lat: 41.1534,
     },
     state: {
-      namePT: 'Nova Jérsia',
-      nameRU: 'Нью-Джерси',
-      nameDE: 'New Jersey',
-      nameNL: 'New Jersey',
-      nameES: 'Nueva Jersey',
+      id: expect.stringContaining('region'),
+      type: 'region',
       name: 'New Jersey',
-      namePL: 'New Jersey',
+      nameEN: 'New Jersey',
+      nameDE: 'New Jersey',
+      namePT: 'Nova Jérsia',
+      nameES: 'Nueva Jersey',
       nameFR: 'New Jersey',
       nameIT: 'New Jersey',
-      id: 'region.14919479731700330',
-      nameEN: 'New Jersey',
-      type: 'region',
+      nameRU: 'Нью-Джерси',
+      nameNL: 'New Jersey',
+      namePL: 'New Jersey',
     },
     country: {
-      namePT: 'Estados Unidos',
-      nameRU: 'Соединённые Штаты Америки',
-      nameDE: 'Vereinigte Staaten',
-      nameNL: 'Verenigde Staten van Amerika',
-      nameES: 'Estados Unidos',
-      namePL: 'Stany Zjednoczone',
+      id: expect.stringContaining('country'),
+      type: 'country',
       name: 'United States of America',
+      nameEN: 'United States of America',
+      nameDE: 'Vereinigte Staaten',
+      namePT: 'Estados Unidos',
+      nameES: 'Estados Unidos',
       nameFR: 'États-Unis',
       nameIT: "Stati Uniti d'America",
-      id: 'country.9053006287256050',
-      nameEN: 'United States of America',
-      type: 'country',
+      nameRU: 'Соединённые Штаты Америки',
+      nameNL: 'Verenigde Staten van Amerika',
+      namePL: 'Stany Zjednoczone',
     },
   },
 ]