From 863060149ad0277dfa1a3e83f947f98f69ce8513 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 17 Jun 2019 12:41:02 -0300
Subject: [PATCH 01/69] Add UI for adding tags to a contribution

---
 .../ContributionForm/ContributionForm.spec.js | 35 +++++++++++++++++--
 webapp/components/ContributionForm/index.vue  | 25 +++++++++++++
 webapp/locales/de.json                        |  4 ++-
 webapp/locales/en.json                        |  4 ++-
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index f7f306fc3..14877c395 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -15,6 +15,8 @@ describe('ContributionForm.vue', () => {
   let deutschOption
   let cancelBtn
   let mocks
+  let tagsInput
+  let chipText
   const postTitle = 'this is a title for a post'
   const postContent = 'this is a post'
   const computed = { locale: () => 'English' }
@@ -79,10 +81,16 @@ describe('ContributionForm.vue', () => {
       })
 
       describe('valid form submission', () => {
-        expectedParams = {
-          variables: { title: postTitle, content: postContent, language: 'en', id: null },
-        }
         beforeEach(async () => {
+          expectedParams = {
+            variables: {
+              title: postTitle,
+              content: postContent,
+              language: 'en',
+              id: null,
+              tags: [],
+            },
+          }
           postTitleInput = wrapper.find('.ds-input')
           postTitleInput.setValue('this is a title for a post')
           wrapper.vm.updateEditorContent('this is a post')
@@ -105,6 +113,27 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
+        it('supports adding tags', async () => {
+          expectedParams.variables.tags = ['Frieden']
+          tagsInput = wrapper.findAll('input').at(1)
+          tagsInput.setValue('Frieden')
+          tagsInput.trigger('keyup.enter')
+          await wrapper.find('form').trigger('submit')
+          expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+        })
+
+        it('displays tags if they exist', () => {
+          expectedParams.variables.tags = ['Frieden']
+          tagsInput = wrapper.findAll('input').at(1)
+          tagsInput.setValue('Frieden')
+          tagsInput.trigger('keyup.enter')
+          chipText = wrapper
+            .findAll('span.ds-chip')
+            .at(0)
+            .text()
+          expect(chipText).toEqual('Frieden')
+        })
+
         it("pushes the user to the post's page", async () => {
           expect(mocks.$router.push).toHaveBeenCalledTimes(1)
         })
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 62c3650c8..8a1283902 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -7,6 +7,17 @@
           <hc-editor :users="users" :value="form.content" @input="updateEditorContent" />
         </no-ssr>
         <ds-space margin-bottom="xxx-large" />
+        <ds-input
+          model="tagValue"
+          :label="$t('contribution.tagsInputLabel')"
+          :placeholder="$t('contribution.tagsInputPlaceholder')"
+          @input.native="handleInput"
+          @keyup.enter.native="addTag(form.tagValue)"
+          :disabled="form.tags.length >= 5"
+        ></ds-input>
+        <ds-chip v-for="(tag, index) in form.tags" @remove="removeTag(index)" removable :key="tag">
+          {{ tag }}
+        </ds-chip>
         <ds-flex class="contribution-form-footer">
           <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
           <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
@@ -20,6 +31,7 @@
             />
           </ds-flex-item>
         </ds-flex>
+        <ds-space />
         <div slot="footer" style="text-align: right">
           <ds-button
             :disabled="loading || disabled"
@@ -65,6 +77,8 @@ export default {
         content: '',
         language: null,
         languageOptions: [],
+        tagValue: null,
+        tags: [],
       },
       formSchema: {
         title: { required: true, min: 3, max: 64 },
@@ -115,6 +129,7 @@ export default {
             title: this.form.title,
             content: this.form.content,
             language: this.form.language ? this.form.language.value : this.$i18n.locale(),
+            tags: this.form.tags,
           },
         })
         .then(res => {
@@ -144,6 +159,16 @@ export default {
         this.form.languageOptions.push({ label: locale.name, value: locale.code })
       })
     },
+    removeTag(index) {
+      this.form.tags.splice(index, 1)
+    },
+    handleInput(e) {
+      this.form.tagValue = e.target ? e.target.value.trim() : ''
+    },
+    addTag(tag) {
+      this.form.tags.push(tag)
+      this.form.tagValue = ''
+    },
   },
   apollo: {
     User: {
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index efe05a472..7eef78b76 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -304,6 +304,8 @@
   },
   "contribution": {
     "success": "Gespeichert!",
-    "languageSelectLabel": "Sprache"
+    "languageSelectLabel": "Sprache",
+    "tagsInputLabel": "Tags",
+    "tagsInputPlaceholder": "Hinzufügen ein Tag"
   }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 4fdcadedb..597e4f540 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -303,6 +303,8 @@
   },
   "contribution": {
     "success": "Saved!",
-    "languageSelectLabel": "Language"
+    "languageSelectLabel": "Language",
+    "tagsInputLabel": "Tags",
+    "tagsInputPlaceholder": "Add a tag"
   }
 }

From 4e780f52dc35f731a2d688c2bd7835129d8f9244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 17 Jun 2019 18:44:17 +0200
Subject: [PATCH 02/69] Copy and refactoring Mentions to Tags, Started

---
 webapp/components/ContributionForm/index.vue |  35 ++++-
 webapp/components/Editor/index.vue           | 138 +++++++++++++++----
 webapp/components/Editor/nodes/Mention.js    |   6 +-
 webapp/components/Editor/nodes/Tag.js        |  39 ++++++
 4 files changed, 185 insertions(+), 33 deletions(-)
 create mode 100644 webapp/components/Editor/nodes/Tag.js

diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 62c3650c8..3126fdc46 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -4,7 +4,12 @@
       <ds-card>
         <ds-input model="title" class="post-title" placeholder="Title" name="title" autofocus />
         <no-ssr>
-          <hc-editor :users="users" :value="form.content" @input="updateEditorContent" />
+          <hc-editor
+            :users="users"
+            :tags="tags"
+            :value="form.content"
+            @input="updateEditorContent"
+          />
         </no-ssr>
         <ds-space margin-bottom="xxx-large" />
         <ds-flex class="contribution-form-footer">
@@ -75,6 +80,7 @@ export default {
       disabled: false,
       slug: null,
       users: [],
+      tags: [],
     }
   },
   watch: {
@@ -148,17 +154,34 @@ export default {
   apollo: {
     User: {
       query() {
-        return gql(`{
-          User(orderBy: slug_asc) {
-            id
-            slug
+        return gql`
+          {
+            User(orderBy: slug_asc) {
+              id
+              slug
+            }
           }
-        }`)
+        `
       },
       result(result) {
         this.users = result.data.User
       },
     },
+    Tag: {
+      query() {
+        return gql`
+          {
+            Tag(orderBy: name_asc) {
+              id
+              name
+            }
+          }
+        `
+      },
+      result(result) {
+        this.tags = result.data.Tag
+      },
+    },
   },
 }
 </script>
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index 0690b15bd..6307ff5ee 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -1,20 +1,30 @@
 <template>
   <div class="editor">
     <div v-show="showSuggestions" ref="suggestions" class="suggestion-list">
-      <template v-if="hasResults">
+      <template v-if="usersFilterHasResults">
         <div
           v-for="(user, index) in filteredUsers"
           :key="user.id"
           class="suggestion-list__item"
           :class="{ 'is-selected': navigatedUserIndex === index }"
-          @click="selectUser(user)"
+          @click="selectItem(user, 'mention')"
         >
           @{{ user.slug }}
         </div>
       </template>
-      <div v-else class="suggestion-list__item is-empty">
-        No users found
-      </div>
+      <div v-else class="suggestion-list__item is-empty">No users found</div>
+      <template v-if="tagsFilterHasResults">
+        <div
+          v-for="(tag, index) in filteredTags"
+          :key="tag.id"
+          class="suggestion-list__item"
+          :class="{ 'is-selected': navigatedUserIndex === index }"
+          @click="selectItem(tag, 'tag')"
+        >
+          #{{ tag.name }}
+        </div>
+      </template>
+      <div v-else class="suggestion-list__item is-empty">No users found</div>
     </div>
 
     <editor-menu-bubble :editor="editor">
@@ -175,6 +185,7 @@ import {
   History,
 } from 'tiptap-extensions'
 import Mention from './nodes/Mention.js'
+import Tag from './nodes/Tag.js'
 
 let throttleInputEvent
 
@@ -186,6 +197,7 @@ export default {
   },
   props: {
     users: { type: Array, default: () => [] },
+    tags: { type: Array, default: () => [] },
     value: { type: String, default: '' },
     doc: { type: Object, default: () => {} },
   },
@@ -250,17 +262,82 @@ export default {
             onKeyDown: ({ event }) => {
               // pressing up arrow
               if (event.keyCode === 38) {
-                this.upHandler()
+                this.upHandler(this.filteredUsers)
                 return true
               }
               // pressing down arrow
               if (event.keyCode === 40) {
-                this.downHandler()
+                this.downHandler(this.filteredUsers)
                 return true
               }
               // pressing enter
               if (event.keyCode === 13) {
-                this.enterHandler()
+                this.enterHandler(this.filteredUsers, 'mention')
+                return true
+              }
+              return false
+            },
+            // is called when a suggestion has changed
+            // this function is optional because there is basic filtering built-in
+            // you can overwrite it if you prefer your own filtering
+            // in this example we use fuse.js with support for fuzzy search
+            onFilter: (items, query) => {
+              if (!query) {
+                return items
+              }
+              const fuse = new Fuse(items, {
+                threshold: 0.2,
+                keys: ['slug'],
+              })
+              return fuse.search(query)
+            },
+          }),
+          new Tag({
+            items: () => {
+              return this.tags
+            },
+            onEnter: ({ items, query, range, command, virtualNode }) => {
+              this.query = query
+              this.filteredTags = items
+              this.suggestionRange = range
+              this.renderPopup(virtualNode)
+              // we save the command for inserting a selected mention
+              // this allows us to call it inside of our custom popup
+              // via keyboard navigation and on click
+              this.insertMention = command
+            },
+            // is called when a suggestion has changed
+            onChange: ({ items, query, range, virtualNode }) => {
+              this.query = query
+              this.filteredTags = items
+              this.suggestionRange = range
+              this.navigatedUserIndex = 0
+              this.renderPopup(virtualNode)
+            },
+            // is called when a suggestion is cancelled
+            onExit: () => {
+              // reset all saved values
+              this.query = null
+              this.filteredTags = []
+              this.suggestionRange = null
+              this.navigatedUserIndex = 0
+              this.destroyPopup()
+            },
+            // is called on every keyDown event while a suggestion is active
+            onKeyDown: ({ event }) => {
+              // pressing up arrow
+              if (event.keyCode === 38) {
+                this.upHandler(this.filteredTags)
+                return true
+              }
+              // pressing down arrow
+              if (event.keyCode === 40) {
+                this.downHandler(this.filteredTags)
+                return true
+              }
+              // pressing enter
+              if (event.keyCode === 13) {
+                this.enterHandler(this.filteredTags, 'tag')
                 return true
               }
               return false
@@ -291,17 +368,21 @@ export default {
       query: null,
       suggestionRange: null,
       filteredUsers: [],
+      filteredTags: [],
       navigatedUserIndex: 0,
       insertMention: () => {},
       observer: null,
     }
   },
   computed: {
-    hasResults() {
+    usersFilterHasResults() {
       return this.filteredUsers.length
     },
+    tagsFilterHasResults() {
+      return this.filteredTags.length
+    },
     showSuggestions() {
-      return this.query || this.hasResults
+      return this.query || this.usersFilterHasResults || this.tagsFilterHasResults
     },
   },
   watch: {
@@ -332,31 +413,40 @@ export default {
     },
     // navigate to the previous item
     // if it's the first item, navigate to the last one
-    upHandler() {
+    upHandler(filteredArray) {
       this.navigatedUserIndex =
-        (this.navigatedUserIndex + this.filteredUsers.length - 1) % this.filteredUsers.length
+        (this.navigatedUserIndex + this.filteredArray.length - 1) % this.filteredArray.length
     },
     // navigate to the next item
     // if it's the last item, navigate to the first one
-    downHandler() {
-      this.navigatedUserIndex = (this.navigatedUserIndex + 1) % this.filteredUsers.length
+    downHandler(filteredArray) {
+      this.navigatedUserIndex = (this.navigatedUserIndex + 1) % this.filteredArray.length
     },
-    enterHandler() {
-      const user = this.filteredUsers[this.navigatedUserIndex]
-      if (user) {
-        this.selectUser(user)
+    enterHandler(filteredArray, type) {
+      const item = this.filteredArray[this.navigatedUserIndex]
+      if (item) {
+        this.selectItem(item, type)
       }
     },
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
-    selectUser(user) {
+    selectItem(item, type) {
+      const typeAttrs = {
+        mention: {
+          // TODO: use router here
+          url: `/profile/${item.id}`,
+          label: item.slug,
+        },
+        tag: {
+          // TODO: Fill up with input tag in search field
+          url: ``,
+          // callBack: () => {},
+          label: item.name,
+        },
+      }
       this.insertMention({
         range: this.suggestionRange,
-        attrs: {
-          // TODO: use router here
-          url: `/profile/${user.id}`,
-          label: user.slug,
-        },
+        attrs: typeAttrs[type],
       })
       this.editor.focus()
     },
diff --git a/webapp/components/Editor/nodes/Mention.js b/webapp/components/Editor/nodes/Mention.js
index dc34a05ff..710ac13fd 100644
--- a/webapp/components/Editor/nodes/Mention.js
+++ b/webapp/components/Editor/nodes/Mention.js
@@ -19,9 +19,9 @@ export default class Mention extends TipTapMention {
         `${this.options.matcher.char}${node.attrs.label}`,
       ]
     }
-    patchedSchema.parseDOM = [
-      // this is not implemented
-    ]
+    // patchedSchema.parseDOM = [
+    //   // this is not implemented
+    // ]
     return patchedSchema
   }
 }
diff --git a/webapp/components/Editor/nodes/Tag.js b/webapp/components/Editor/nodes/Tag.js
new file mode 100644
index 000000000..f3fdd75e9
--- /dev/null
+++ b/webapp/components/Editor/nodes/Tag.js
@@ -0,0 +1,39 @@
+import { Mention as TipTapMention } from 'tiptap-extensions'
+
+export default class Tag extends TipTapMention {
+  get defaultOptions() {
+    return {
+      matcher: {
+        char: '#',
+        allowSpaces: false,
+        startOfLine: false,
+      },
+      mentionClass: 'tag',
+      suggestionClass: 'tag-suggestion',
+    }
+  }
+
+  get schema() {
+    const patchedSchema = super.schema
+
+    patchedSchema.attrs = {
+      url: {},
+      label: {},
+    }
+    patchedSchema.toDOM = node => {
+      return [
+        'a',
+        {
+          class: this.options.mentionClass,
+          href: node.attrs.url,
+          target: '_blank',
+        },
+        `${this.options.matcher.char}${node.attrs.label}`,
+      ]
+    }
+    // patchedSchema.parseDOM = [
+    //   // this is not implemented
+    // ]
+    return patchedSchema
+  }
+}

From 4725b8cbd256a6043ac7dafbdc25e170206a60ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jun 2019 09:12:26 +0200
Subject: [PATCH 03/69] Got Tags as `#` in the editor as an extension to work

---
 webapp/components/Editor/index.vue        |  3 +++
 webapp/components/Editor/nodes/Mention.js | 10 +++++++---
 webapp/components/Editor/nodes/Tag.js     | 10 +++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index 6307ff5ee..d8fd45697 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -625,6 +625,9 @@ li > p {
   .mention-suggestion {
     color: $color-primary;
   }
+  .tag-suggestion {
+    color: $color-primary;
+  }
   &__floating-menu {
     position: absolute;
     margin-top: -0.25rem;
diff --git a/webapp/components/Editor/nodes/Mention.js b/webapp/components/Editor/nodes/Mention.js
index 710ac13fd..c48b74286 100644
--- a/webapp/components/Editor/nodes/Mention.js
+++ b/webapp/components/Editor/nodes/Mention.js
@@ -1,6 +1,10 @@
 import { Mention as TipTapMention } from 'tiptap-extensions'
 
 export default class Mention extends TipTapMention {
+  get name() {
+    return 'mention'
+  }
+
   get schema() {
     const patchedSchema = super.schema
 
@@ -19,9 +23,9 @@ export default class Mention extends TipTapMention {
         `${this.options.matcher.char}${node.attrs.label}`,
       ]
     }
-    // patchedSchema.parseDOM = [
-    //   // this is not implemented
-    // ]
+    patchedSchema.parseDOM = [
+      // this is not implemented
+    ]
     return patchedSchema
   }
 }
diff --git a/webapp/components/Editor/nodes/Tag.js b/webapp/components/Editor/nodes/Tag.js
index f3fdd75e9..0a7324c81 100644
--- a/webapp/components/Editor/nodes/Tag.js
+++ b/webapp/components/Editor/nodes/Tag.js
@@ -1,6 +1,10 @@
 import { Mention as TipTapMention } from 'tiptap-extensions'
 
 export default class Tag extends TipTapMention {
+  get name() {
+    return 'tag'
+  }
+
   get defaultOptions() {
     return {
       matcher: {
@@ -31,9 +35,9 @@ export default class Tag extends TipTapMention {
         `${this.options.matcher.char}${node.attrs.label}`,
       ]
     }
-    // patchedSchema.parseDOM = [
-    //   // this is not implemented
-    // ]
+    patchedSchema.parseDOM = [
+      // this is not implemented
+    ]
     return patchedSchema
   }
 }

From ffbe0b949a3bdba6bbc20869e51f120c92af5ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jun 2019 08:40:05 +0200
Subject: [PATCH 04/69] Translate menu item, renamed variables and tried to get
 hashtag to work correct

---
 webapp/components/Editor/index.vue    | 43 ++++++++++++++++-----------
 webapp/components/Editor/nodes/Tag.js |  1 +
 webapp/locales/de.json                |  8 ++++-
 webapp/locales/en.json                |  8 ++++-
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index d8fd45697..4375681b5 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -6,25 +6,27 @@
           v-for="(user, index) in filteredUsers"
           :key="user.id"
           class="suggestion-list__item"
-          :class="{ 'is-selected': navigatedUserIndex === index }"
+          :class="{ 'is-selected': navigatedItemIndex === index }"
           @click="selectItem(user, 'mention')"
         >
           @{{ user.slug }}
         </div>
       </template>
-      <div v-else class="suggestion-list__item is-empty">No users found</div>
+      <div v-else class="suggestion-list__item is-empty">
+        {{ $t('editor.mention.noUsersFound') }}
+      </div>
       <template v-if="tagsFilterHasResults">
         <div
           v-for="(tag, index) in filteredTags"
           :key="tag.id"
           class="suggestion-list__item"
-          :class="{ 'is-selected': navigatedUserIndex === index }"
+          :class="{ 'is-selected': navigatedItemIndex === index }"
           @click="selectItem(tag, 'tag')"
         >
           #{{ tag.name }}
         </div>
       </template>
-      <div v-else class="suggestion-list__item is-empty">No users found</div>
+      <div v-else class="suggestion-list__item is-empty">{{ $t('editor.tag.noTagsFound') }}</div>
     </div>
 
     <editor-menu-bubble :editor="editor">
@@ -246,7 +248,7 @@ export default {
               this.query = query
               this.filteredUsers = items
               this.suggestionRange = range
-              this.navigatedUserIndex = 0
+              this.navigatedItemIndex = 0
               this.renderPopup(virtualNode)
             },
             // is called when a suggestion is cancelled
@@ -255,7 +257,7 @@ export default {
               this.query = null
               this.filteredUsers = []
               this.suggestionRange = null
-              this.navigatedUserIndex = 0
+              this.navigatedItemIndex = 0
               this.destroyPopup()
             },
             // is called on every keyDown event while a suggestion is active
@@ -311,7 +313,7 @@ export default {
               this.query = query
               this.filteredTags = items
               this.suggestionRange = range
-              this.navigatedUserIndex = 0
+              this.navigatedItemIndex = 0
               this.renderPopup(virtualNode)
             },
             // is called when a suggestion is cancelled
@@ -320,7 +322,7 @@ export default {
               this.query = null
               this.filteredTags = []
               this.suggestionRange = null
-              this.navigatedUserIndex = 0
+              this.navigatedItemIndex = 0
               this.destroyPopup()
             },
             // is called on every keyDown event while a suggestion is active
@@ -340,6 +342,11 @@ export default {
                 this.enterHandler(this.filteredTags, 'tag')
                 return true
               }
+              // pressing space
+              if (event.keyCode === 32) {
+                // this.enterHandler(this.filteredTags, 'tag')
+                return true
+              }
               return false
             },
             // is called when a suggestion has changed
@@ -369,17 +376,17 @@ export default {
       suggestionRange: null,
       filteredUsers: [],
       filteredTags: [],
-      navigatedUserIndex: 0,
+      navigatedItemIndex: 0,
       insertMention: () => {},
       observer: null,
     }
   },
   computed: {
     usersFilterHasResults() {
-      return this.filteredUsers.length
+      return this.filteredUsers.length > 0
     },
     tagsFilterHasResults() {
-      return this.filteredTags.length
+      return this.filteredTags.length > 0
     },
     showSuggestions() {
       return this.query || this.usersFilterHasResults || this.tagsFilterHasResults
@@ -414,16 +421,16 @@ export default {
     // navigate to the previous item
     // if it's the first item, navigate to the last one
     upHandler(filteredArray) {
-      this.navigatedUserIndex =
-        (this.navigatedUserIndex + this.filteredArray.length - 1) % this.filteredArray.length
+      this.navigatedItemIndex =
+        (this.navigatedItemIndex + this.filteredArray.length - 1) % this.filteredArray.length
     },
     // navigate to the next item
     // if it's the last item, navigate to the first one
     downHandler(filteredArray) {
-      this.navigatedUserIndex = (this.navigatedUserIndex + 1) % this.filteredArray.length
+      this.navigatedItemIndex = (this.navigatedItemIndex + 1) % this.filteredArray.length
     },
     enterHandler(filteredArray, type) {
-      const item = this.filteredArray[this.navigatedUserIndex]
+      const item = this.filteredArray[this.navigatedItemIndex]
       if (item) {
         this.selectItem(item, type)
       }
@@ -439,8 +446,7 @@ export default {
         },
         tag: {
           // TODO: Fill up with input tag in search field
-          url: ``,
-          // callBack: () => {},
+          url: `/search/hashtag:${item.name}`,
           label: item.name,
         },
       }
@@ -625,6 +631,9 @@ li > p {
   .mention-suggestion {
     color: $color-primary;
   }
+  .tag {
+    color: $color-primary;
+  }
   .tag-suggestion {
     color: $color-primary;
   }
diff --git a/webapp/components/Editor/nodes/Tag.js b/webapp/components/Editor/nodes/Tag.js
index 0a7324c81..e372eb21c 100644
--- a/webapp/components/Editor/nodes/Tag.js
+++ b/webapp/components/Editor/nodes/Tag.js
@@ -31,6 +31,7 @@ export default class Tag extends TipTapMention {
           class: this.options.mentionClass,
           href: node.attrs.url,
           target: '_blank',
+          // contenteditable: 'true',
         },
         `${this.options.matcher.char}${node.attrs.label}`,
       ]
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 2f40bf165..cd9d86819 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -14,7 +14,13 @@
     "hello": "Hallo"
   },
   "editor": {
-    "placeholder": "Schreib etwas Inspirierendes..."
+    "placeholder": "Schreib etwas Inspirierendes...",
+    "mention": {
+      "noUsersFound": "Keine Benutzer gefunden"
+    },
+    "tag": {
+      "noTagsFound": "Keine Hashtags gefunden"
+    }
   },
   "profile": {
     "name": "Mein Profil",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 2d105bc3b..47e649395 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -14,7 +14,13 @@
     "hello": "Hello"
   },
   "editor": {
-    "placeholder": "Leave your inspirational thoughts..."
+    "placeholder": "Leave your inspirational thoughts...",
+    "mention": {
+      "noUsersFound": "No users found"
+    },
+    "tag": {
+      "noTagsFound": "No hashtags found"
+    }
   },
   "profile": {
     "name": "My Profile",

From c5f2d7cc787b5857d8eb8282a78057934b0141b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jun 2019 11:26:51 +0200
Subject: [PATCH 05/69] Solve remaind merge conflict

---
 webapp/components/Editor/index.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index b6e460c83..cbfaec854 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -187,11 +187,8 @@ import {
   History,
 } from 'tiptap-extensions'
 import Mention from './nodes/Mention.js'
-<<<<<<< HEAD
 import Tag from './nodes/Tag.js'
-=======
 import { mapGetters } from 'vuex'
->>>>>>> origin/master
 
 let throttleInputEvent
 
@@ -386,17 +383,12 @@ export default {
     }
   },
   computed: {
-<<<<<<< HEAD
+    ...mapGetters({ placeholder: 'editor/placeholder' }),
     usersFilterHasResults() {
       return this.filteredUsers.length > 0
     },
     tagsFilterHasResults() {
       return this.filteredTags.length > 0
-=======
-    ...mapGetters({ placeholder: 'editor/placeholder' }),
-    hasResults() {
-      return this.filteredUsers.length
->>>>>>> origin/master
     },
     showSuggestions() {
       return this.query || this.usersFilterHasResults || this.tagsFilterHasResults

From 5018e60a1330c1bf2c78db5aed807d1e6438f7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 21 Jun 2019 14:10:56 +0200
Subject: [PATCH 06/69] Renamed Tag to Hashtag in the Frontend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not in the database yet …
---
 webapp/components/ContributionForm/index.vue  |  6 +-
 webapp/components/Editor/index.vue            | 58 ++++++++++---------
 .../Editor/nodes/{Tag.js => Hashtag.js}       |  8 +--
 webapp/locales/de.json                        |  4 +-
 webapp/locales/en.json                        |  4 +-
 5 files changed, 41 insertions(+), 39 deletions(-)
 rename webapp/components/Editor/nodes/{Tag.js => Hashtag.js} (83%)

diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 3126fdc46..6c3c57640 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -6,7 +6,7 @@
         <no-ssr>
           <hc-editor
             :users="users"
-            :tags="tags"
+            :hashtags="hashtags"
             :value="form.content"
             @input="updateEditorContent"
           />
@@ -80,7 +80,7 @@ export default {
       disabled: false,
       slug: null,
       users: [],
-      tags: [],
+      hashtags: [],
     }
   },
   watch: {
@@ -179,7 +179,7 @@ export default {
         `
       },
       result(result) {
-        this.tags = result.data.Tag
+        this.hashtags = result.data.Tag
       },
     },
   },
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index cbfaec854..538aac2fa 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -15,18 +15,20 @@
       <div v-else class="suggestion-list__item is-empty">
         {{ $t('editor.mention.noUsersFound') }}
       </div>
-      <template v-if="tagsFilterHasResults">
+      <template v-if="hashtagsFilterHasResults">
         <div
-          v-for="(tag, index) in filteredTags"
-          :key="tag.id"
+          v-for="(hashtag, index) in filteredHashtags"
+          :key="hashtag.id"
           class="suggestion-list__item"
           :class="{ 'is-selected': navigatedItemIndex === index }"
-          @click="selectItem(tag, 'tag')"
+          @click="selectItem(hashtag, 'hashtag')"
         >
-          #{{ tag.name }}
+          #{{ hashtag.name }}
         </div>
       </template>
-      <div v-else class="suggestion-list__item is-empty">{{ $t('editor.tag.noTagsFound') }}</div>
+      <div v-else class="suggestion-list__item is-empty">
+        {{ $t('editor.hashtag.noHashtagsFound') }}
+      </div>
     </div>
 
     <editor-menu-bubble :editor="editor">
@@ -187,7 +189,7 @@ import {
   History,
 } from 'tiptap-extensions'
 import Mention from './nodes/Mention.js'
-import Tag from './nodes/Tag.js'
+import Hashtag from './nodes/Hashtag.js'
 import { mapGetters } from 'vuex'
 
 let throttleInputEvent
@@ -200,7 +202,7 @@ export default {
   },
   props: {
     users: { type: Array, default: () => [] },
-    tags: { type: Array, default: () => [] },
+    hashtags: { type: Array, default: () => [] },
     value: { type: String, default: '' },
     doc: { type: Object, default: () => {} },
   },
@@ -295,13 +297,13 @@ export default {
               return fuse.search(query)
             },
           }),
-          new Tag({
+          new Hashtag({
             items: () => {
-              return this.tags
+              return this.hashtags
             },
             onEnter: ({ items, query, range, command, virtualNode }) => {
               this.query = query
-              this.filteredTags = items
+              this.filteredHashtags = items
               this.suggestionRange = range
               this.renderPopup(virtualNode)
               // we save the command for inserting a selected mention
@@ -312,7 +314,7 @@ export default {
             // is called when a suggestion has changed
             onChange: ({ items, query, range, virtualNode }) => {
               this.query = query
-              this.filteredTags = items
+              this.filteredHashtags = items
               this.suggestionRange = range
               this.navigatedItemIndex = 0
               this.renderPopup(virtualNode)
@@ -321,7 +323,7 @@ export default {
             onExit: () => {
               // reset all saved values
               this.query = null
-              this.filteredTags = []
+              this.filteredHashtags = []
               this.suggestionRange = null
               this.navigatedItemIndex = 0
               this.destroyPopup()
@@ -330,24 +332,24 @@ export default {
             onKeyDown: ({ event }) => {
               // pressing up arrow
               if (event.keyCode === 38) {
-                this.upHandler(this.filteredTags)
+                this.upHandler(this.filteredHashtags)
                 return true
               }
               // pressing down arrow
               if (event.keyCode === 40) {
-                this.downHandler(this.filteredTags)
+                this.downHandler(this.filteredHashtags)
                 return true
               }
               // pressing enter
               if (event.keyCode === 13) {
-                this.enterHandler(this.filteredTags, 'tag')
+                this.enterHandler(this.filteredHashtags, 'hashtag')
                 return true
               }
               // pressing space
-              if (event.keyCode === 32) {
-                // this.enterHandler(this.filteredTags, 'tag')
-                return true
-              }
+              // if (event.keyCode === 32) {
+              //   // this.enterHandler(this.filteredHashtags, 'hashtag')
+              //   return true
+              // }
               return false
             },
             // is called when a suggestion has changed
@@ -376,7 +378,7 @@ export default {
       query: null,
       suggestionRange: null,
       filteredUsers: [],
-      filteredTags: [],
+      filteredHashtags: [],
       navigatedItemIndex: 0,
       insertMention: () => {},
       observer: null,
@@ -387,11 +389,11 @@ export default {
     usersFilterHasResults() {
       return this.filteredUsers.length > 0
     },
-    tagsFilterHasResults() {
-      return this.filteredTags.length > 0
+    hashtagsFilterHasResults() {
+      return this.filteredHashtags.length > 0
     },
     showSuggestions() {
-      return this.query || this.usersFilterHasResults || this.tagsFilterHasResults
+      return this.query || this.usersFilterHasResults || this.hashtagsFilterHasResults
     },
   },
   watch: {
@@ -446,8 +448,8 @@ export default {
           url: `/profile/${item.id}`,
           label: item.slug,
         },
-        tag: {
-          // TODO: Fill up with input tag in search field
+        hashtag: {
+          // TODO: Fill up with input hashtag in search field
           url: `/search/hashtag:${item.name}`,
           label: item.name,
         },
@@ -633,10 +635,10 @@ li > p {
   .mention-suggestion {
     color: $color-primary;
   }
-  .tag {
+  .hashtag {
     color: $color-primary;
   }
-  .tag-suggestion {
+  .hashtag-suggestion {
     color: $color-primary;
   }
   &__floating-menu {
diff --git a/webapp/components/Editor/nodes/Tag.js b/webapp/components/Editor/nodes/Hashtag.js
similarity index 83%
rename from webapp/components/Editor/nodes/Tag.js
rename to webapp/components/Editor/nodes/Hashtag.js
index e372eb21c..97f43bcd5 100644
--- a/webapp/components/Editor/nodes/Tag.js
+++ b/webapp/components/Editor/nodes/Hashtag.js
@@ -1,8 +1,8 @@
 import { Mention as TipTapMention } from 'tiptap-extensions'
 
-export default class Tag extends TipTapMention {
+export default class Hashtag extends TipTapMention {
   get name() {
-    return 'tag'
+    return 'hashtag'
   }
 
   get defaultOptions() {
@@ -12,8 +12,8 @@ export default class Tag extends TipTapMention {
         allowSpaces: false,
         startOfLine: false,
       },
-      mentionClass: 'tag',
-      suggestionClass: 'tag-suggestion',
+      mentionClass: 'hashtag',
+      suggestionClass: 'hashtag-suggestion',
     }
   }
 
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cd9d86819..6896833ec 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -18,8 +18,8 @@
     "mention": {
       "noUsersFound": "Keine Benutzer gefunden"
     },
-    "tag": {
-      "noTagsFound": "Keine Hashtags gefunden"
+    "hashtag": {
+      "noHashtagsFound": "Keine Hashtags gefunden"
     }
   },
   "profile": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 47e649395..95f0688cb 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -18,8 +18,8 @@
     "mention": {
       "noUsersFound": "No users found"
     },
-    "tag": {
-      "noTagsFound": "No hashtags found"
+    "hashtag": {
+      "noHashtagsFound": "No hashtags found"
     }
   },
   "profile": {

From 1f0f8c9e396ef0619bd9ffa5e63741d088dff21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 24 Jun 2019 09:25:36 +0200
Subject: [PATCH 07/69] Set Hashtag also by press space and creates then a new
 one

Changed Tag permissionMiddleware from isAdmin to allow.
---
 .../src/middleware/permissionsMiddleware.js   |  4 +-
 webapp/components/Editor/index.vue            | 95 +++++++++++--------
 2 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index dbcde849c..0ba11d0c4 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -105,8 +105,8 @@ const permissions = shield(
     Query: {
       '*': deny,
       findPosts: allow,
-      Category: isAdmin,
-      Tag: isAdmin,
+      Category: allow,
+      Tag: allow,
       Report: isModerator,
       Notification: isAdmin,
       statistics: allow,
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index 538aac2fa..c47afb2a8 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -1,33 +1,37 @@
 <template>
   <div class="editor">
     <div v-show="showSuggestions" ref="suggestions" class="suggestion-list">
-      <template v-if="usersFilterHasResults">
-        <div
-          v-for="(user, index) in filteredUsers"
-          :key="user.id"
-          class="suggestion-list__item"
-          :class="{ 'is-selected': navigatedItemIndex === index }"
-          @click="selectItem(user, 'mention')"
-        >
-          @{{ user.slug }}
+      <div v-if="isMention">
+        <template v-if="usersFilterHasResults">
+          <div
+            v-for="(user, index) in filteredUsers"
+            :key="user.id"
+            class="suggestion-list__item"
+            :class="{ 'is-selected': navigatedItemIndex === index }"
+            @click="selectItem(user, mentionSuggestionType)"
+          >
+            @{{ user.slug }}
+          </div>
+        </template>
+        <div v-else class="suggestion-list__item is-empty">
+          {{ $t('editor.mention.noUsersFound') }}
         </div>
-      </template>
-      <div v-else class="suggestion-list__item is-empty">
-        {{ $t('editor.mention.noUsersFound') }}
       </div>
-      <template v-if="hashtagsFilterHasResults">
-        <div
-          v-for="(hashtag, index) in filteredHashtags"
-          :key="hashtag.id"
-          class="suggestion-list__item"
-          :class="{ 'is-selected': navigatedItemIndex === index }"
-          @click="selectItem(hashtag, 'hashtag')"
-        >
-          #{{ hashtag.name }}
+      <div v-if="isHashtag">
+        <template v-if="hashtagsFilterHasResults">
+          <div
+            v-for="(hashtag, index) in filteredHashtags"
+            :key="hashtag.id"
+            class="suggestion-list__item"
+            :class="{ 'is-selected': navigatedItemIndex === index }"
+            @click="selectItem(hashtag, hashtagSuggestionType)"
+          >
+            #{{ hashtag.name }}
+          </div>
+        </template>
+        <div v-else class="suggestion-list__item is-empty">
+          {{ $t('editor.hashtag.noHashtagsFound') }}
         </div>
-      </template>
-      <div v-else class="suggestion-list__item is-empty">
-        {{ $t('editor.hashtag.noHashtagsFound') }}
       </div>
     </div>
 
@@ -234,6 +238,7 @@ export default {
           new History(),
           new Mention({
             items: () => {
+              this.suggestionType = this.mentionSuggestionType
               return this.users
             },
             onEnter: ({ items, query, range, command, virtualNode }) => {
@@ -257,6 +262,7 @@ export default {
             // is called when a suggestion is cancelled
             onExit: () => {
               // reset all saved values
+              this.suggestionType = ''
               this.query = null
               this.filteredUsers = []
               this.suggestionRange = null
@@ -277,7 +283,7 @@ export default {
               }
               // pressing enter
               if (event.keyCode === 13) {
-                this.enterHandler(this.filteredUsers, 'mention')
+                this.enterHandler(this.filteredUsers, this.mentionSuggestionType)
                 return true
               }
               return false
@@ -299,6 +305,7 @@ export default {
           }),
           new Hashtag({
             items: () => {
+              this.suggestionType = this.hashtagSuggestionType
               return this.hashtags
             },
             onEnter: ({ items, query, range, command, virtualNode }) => {
@@ -322,6 +329,7 @@ export default {
             // is called when a suggestion is cancelled
             onExit: () => {
               // reset all saved values
+              this.suggestionType = ''
               this.query = null
               this.filteredHashtags = []
               this.suggestionRange = null
@@ -340,16 +348,11 @@ export default {
                 this.downHandler(this.filteredHashtags)
                 return true
               }
-              // pressing enter
-              if (event.keyCode === 13) {
-                this.enterHandler(this.filteredHashtags, 'hashtag')
+              // pressing enter or pressing space
+              if (event.keyCode === 13 || event.keyCode === 32) {
+                this.enterHandler(this.filteredHashtags, this.hashtagSuggestionType)
                 return true
               }
-              // pressing space
-              // if (event.keyCode === 32) {
-              //   // this.enterHandler(this.filteredHashtags, 'hashtag')
-              //   return true
-              // }
               return false
             },
             // is called when a suggestion has changed
@@ -375,6 +378,9 @@ export default {
       }),
       linkUrl: null,
       linkMenuIsActive: false,
+      mentionSuggestionType: 'mention',
+      hashtagSuggestionType: 'hashtag',
+      suggestionType: '',
       query: null,
       suggestionRange: null,
       filteredUsers: [],
@@ -395,6 +401,12 @@ export default {
     showSuggestions() {
       return this.query || this.usersFilterHasResults || this.hashtagsFilterHasResults
     },
+    isMention() {
+      return this.suggestionType === this.mentionSuggestionType
+    },
+    isHashtag() {
+      return this.suggestionType === this.hashtagSuggestionType
+    },
   },
   watch: {
     value: {
@@ -426,22 +438,25 @@ export default {
     // if it's the first item, navigate to the last one
     upHandler(filteredArray) {
       this.navigatedItemIndex =
-        (this.navigatedItemIndex + this.filteredArray.length - 1) % this.filteredArray.length
+        (this.navigatedItemIndex + filteredArray.length - 1) % filteredArray.length
     },
     // navigate to the next item
     // if it's the last item, navigate to the first one
     downHandler(filteredArray) {
-      this.navigatedItemIndex = (this.navigatedItemIndex + 1) % this.filteredArray.length
+      this.navigatedItemIndex = (this.navigatedItemIndex + 1) % filteredArray.length
     },
-    enterHandler(filteredArray, type) {
-      const item = this.filteredArray[this.navigatedItemIndex]
+    // For hashtags handles pressing of space as enter.
+    enterHandler(filteredArray, suggestionType) {
+      const item = filteredArray[this.navigatedItemIndex]
       if (item) {
-        this.selectItem(item, type)
+        this.selectItem(item, suggestionType)
+      } else if (suggestionType === this.hashtagSuggestionType && this.query !== '') {
+        this.selectItem({ name: this.query }, this.hashtagSuggestionType)
       }
     },
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
-    selectItem(item, type) {
+    selectItem(item, suggestionType) {
       const typeAttrs = {
         mention: {
           // TODO: use router here
@@ -456,7 +471,7 @@ export default {
       }
       this.insertMention({
         range: this.suggestionRange,
-        attrs: typeAttrs[type],
+        attrs: typeAttrs[suggestionType],
       })
       this.editor.focus()
     },

From 8c2c73132257e01eff6bbff936d6e14d613b5361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 24 Jun 2019 12:10:26 +0200
Subject: [PATCH 08/69] Backfactored as close as possible to original of
 Mention.js

---
 webapp/components/Editor/index.vue | 115 ++++++++++++-----------------
 1 file changed, 48 insertions(+), 67 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index c47afb2a8..0376d22c9 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -1,37 +1,21 @@
 <template>
   <div class="editor">
     <div v-show="showSuggestions" ref="suggestions" class="suggestion-list">
-      <div v-if="isMention">
-        <template v-if="usersFilterHasResults">
-          <div
-            v-for="(user, index) in filteredUsers"
-            :key="user.id"
-            class="suggestion-list__item"
-            :class="{ 'is-selected': navigatedItemIndex === index }"
-            @click="selectItem(user, mentionSuggestionType)"
-          >
-            @{{ user.slug }}
-          </div>
-        </template>
-        <div v-else class="suggestion-list__item is-empty">
-          {{ $t('editor.mention.noUsersFound') }}
-        </div>
-      </div>
-      <div v-if="isHashtag">
-        <template v-if="hashtagsFilterHasResults">
-          <div
-            v-for="(hashtag, index) in filteredHashtags"
-            :key="hashtag.id"
-            class="suggestion-list__item"
-            :class="{ 'is-selected': navigatedItemIndex === index }"
-            @click="selectItem(hashtag, hashtagSuggestionType)"
-          >
-            #{{ hashtag.name }}
-          </div>
-        </template>
-        <div v-else class="suggestion-list__item is-empty">
-          {{ $t('editor.hashtag.noHashtagsFound') }}
+      <template v-if="hasResults">
+        <div
+          v-for="(item, index) in filteredItems"
+          :key="item.id"
+          class="suggestion-list__item"
+          :class="{ 'is-selected': navigatedItemIndex === index }"
+          @click="selectItem(item)"
+        >
+          <div v-if="isMention">@{{ item.slug }}</div>
+          <div v-if="isHashtag">#{{ item.name }}</div>
         </div>
+      </template>
+      <div v-else class="suggestion-list__item is-empty">
+        <div v-if="isMention">{{ $t('editor.mention.noUsersFound') }}</div>
+        <div v-if="isHashtag">{{ $t('editor.hashtag.noHashtagsFound') }}</div>
       </div>
     </div>
 
@@ -243,18 +227,18 @@ export default {
             },
             onEnter: ({ items, query, range, command, virtualNode }) => {
               this.query = query
-              this.filteredUsers = items
+              this.filteredItems = items
               this.suggestionRange = range
               this.renderPopup(virtualNode)
               // we save the command for inserting a selected mention
               // this allows us to call it inside of our custom popup
               // via keyboard navigation and on click
-              this.insertMention = command
+              this.insertMentionOrHashtag = command
             },
             // is called when a suggestion has changed
             onChange: ({ items, query, range, virtualNode }) => {
               this.query = query
-              this.filteredUsers = items
+              this.filteredItems = items
               this.suggestionRange = range
               this.navigatedItemIndex = 0
               this.renderPopup(virtualNode)
@@ -262,9 +246,9 @@ export default {
             // is called when a suggestion is cancelled
             onExit: () => {
               // reset all saved values
-              this.suggestionType = ''
+              this.suggestionType = this.nullSuggestionType
               this.query = null
-              this.filteredUsers = []
+              this.filteredItems = []
               this.suggestionRange = null
               this.navigatedItemIndex = 0
               this.destroyPopup()
@@ -273,17 +257,17 @@ export default {
             onKeyDown: ({ event }) => {
               // pressing up arrow
               if (event.keyCode === 38) {
-                this.upHandler(this.filteredUsers)
+                this.upHandler()
                 return true
               }
               // pressing down arrow
               if (event.keyCode === 40) {
-                this.downHandler(this.filteredUsers)
+                this.downHandler()
                 return true
               }
               // pressing enter
               if (event.keyCode === 13) {
-                this.enterHandler(this.filteredUsers, this.mentionSuggestionType)
+                this.enterHandler(this.mentionSuggestionType)
                 return true
               }
               return false
@@ -310,18 +294,18 @@ export default {
             },
             onEnter: ({ items, query, range, command, virtualNode }) => {
               this.query = query
-              this.filteredHashtags = items
+              this.filteredItems = items
               this.suggestionRange = range
               this.renderPopup(virtualNode)
               // we save the command for inserting a selected mention
               // this allows us to call it inside of our custom popup
               // via keyboard navigation and on click
-              this.insertMention = command
+              this.insertMentionOrHashtag = command
             },
             // is called when a suggestion has changed
             onChange: ({ items, query, range, virtualNode }) => {
               this.query = query
-              this.filteredHashtags = items
+              this.filteredItems = items
               this.suggestionRange = range
               this.navigatedItemIndex = 0
               this.renderPopup(virtualNode)
@@ -329,9 +313,9 @@ export default {
             // is called when a suggestion is cancelled
             onExit: () => {
               // reset all saved values
-              this.suggestionType = ''
+              this.suggestionType = this.nullSuggestionType
               this.query = null
-              this.filteredHashtags = []
+              this.filteredItems = []
               this.suggestionRange = null
               this.navigatedItemIndex = 0
               this.destroyPopup()
@@ -340,17 +324,17 @@ export default {
             onKeyDown: ({ event }) => {
               // pressing up arrow
               if (event.keyCode === 38) {
-                this.upHandler(this.filteredHashtags)
+                this.upHandler()
                 return true
               }
               // pressing down arrow
               if (event.keyCode === 40) {
-                this.downHandler(this.filteredHashtags)
+                this.downHandler()
                 return true
               }
               // pressing enter or pressing space
               if (event.keyCode === 13 || event.keyCode === 32) {
-                this.enterHandler(this.filteredHashtags, this.hashtagSuggestionType)
+                this.enterHandler(this.hashtagSuggestionType)
                 return true
               }
               return false
@@ -378,28 +362,25 @@ export default {
       }),
       linkUrl: null,
       linkMenuIsActive: false,
+      nullSuggestionType: '',
       mentionSuggestionType: 'mention',
       hashtagSuggestionType: 'hashtag',
-      suggestionType: '',
+      suggestionType: this.nullSuggestionType,
       query: null,
       suggestionRange: null,
-      filteredUsers: [],
-      filteredHashtags: [],
+      filteredItems: [],
       navigatedItemIndex: 0,
-      insertMention: () => {},
+      insertMentionOrHashtag: () => {},
       observer: null,
     }
   },
   computed: {
     ...mapGetters({ placeholder: 'editor/placeholder' }),
-    usersFilterHasResults() {
-      return this.filteredUsers.length > 0
-    },
-    hashtagsFilterHasResults() {
-      return this.filteredHashtags.length > 0
+    hasResults() {
+      return this.filteredItems.length
     },
     showSuggestions() {
-      return this.query || this.usersFilterHasResults || this.hashtagsFilterHasResults
+      return this.query || this.hasResults
     },
     isMention() {
       return this.suggestionType === this.mentionSuggestionType
@@ -436,27 +417,27 @@ export default {
   methods: {
     // navigate to the previous item
     // if it's the first item, navigate to the last one
-    upHandler(filteredArray) {
+    upHandler() {
       this.navigatedItemIndex =
-        (this.navigatedItemIndex + filteredArray.length - 1) % filteredArray.length
+        (this.navigatedItemIndex + this.filteredItems.length - 1) % this.filteredItems.length
     },
     // navigate to the next item
     // if it's the last item, navigate to the first one
-    downHandler(filteredArray) {
-      this.navigatedItemIndex = (this.navigatedItemIndex + 1) % filteredArray.length
+    downHandler() {
+      this.navigatedItemIndex = (this.navigatedItemIndex + 1) % this.filteredItems.length
     },
     // For hashtags handles pressing of space as enter.
-    enterHandler(filteredArray, suggestionType) {
-      const item = filteredArray[this.navigatedItemIndex]
+    enterHandler() {
+      const item = this.filteredItems[this.navigatedItemIndex]
       if (item) {
-        this.selectItem(item, suggestionType)
-      } else if (suggestionType === this.hashtagSuggestionType && this.query !== '') {
+        this.selectItem(item)
+      } else if (this.suggestionType === this.hashtagSuggestionType && this.query !== '') {
         this.selectItem({ name: this.query }, this.hashtagSuggestionType)
       }
     },
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
-    selectItem(item, suggestionType) {
+    selectItem(item) {
       const typeAttrs = {
         mention: {
           // TODO: use router here
@@ -469,9 +450,9 @@ export default {
           label: item.name,
         },
       }
-      this.insertMention({
+      this.insertMentionOrHashtag({
         range: this.suggestionRange,
-        attrs: typeAttrs[suggestionType],
+        attrs: typeAttrs[this.suggestionType],
       })
       this.editor.focus()
     },

From 12418eefd9c8fea445fd58f21427722d1529398f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 27 Jun 2019 11:10:42 +0200
Subject: [PATCH 09/69] Little refactoring

---
 webapp/components/Editor/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index 0376d22c9..b7fa0263a 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -221,11 +221,14 @@ export default {
           }),
           new History(),
           new Mention({
+            // a list of all suggested items
             items: () => {
-              this.suggestionType = this.mentionSuggestionType
               return this.users
             },
+            // is called when a suggestion starts
             onEnter: ({ items, query, range, command, virtualNode }) => {
+              this.suggestionType = this.mentionSuggestionType
+
               this.query = query
               this.filteredItems = items
               this.suggestionRange = range
@@ -245,8 +248,9 @@ export default {
             },
             // is called when a suggestion is cancelled
             onExit: () => {
-              // reset all saved values
               this.suggestionType = this.nullSuggestionType
+
+              // reset all saved values
               this.query = null
               this.filteredItems = []
               this.suggestionRange = null
@@ -288,11 +292,14 @@ export default {
             },
           }),
           new Hashtag({
+            // a list of all suggested items
             items: () => {
-              this.suggestionType = this.hashtagSuggestionType
               return this.hashtags
             },
+            // is called when a suggestion starts
             onEnter: ({ items, query, range, command, virtualNode }) => {
+              this.suggestionType = this.hashtagSuggestionType
+
               this.query = query
               this.filteredItems = items
               this.suggestionRange = range
@@ -312,8 +319,9 @@ export default {
             },
             // is called when a suggestion is cancelled
             onExit: () => {
-              // reset all saved values
               this.suggestionType = this.nullSuggestionType
+
+              // reset all saved values
               this.query = null
               this.filteredItems = []
               this.suggestionRange = null

From 1d1959561b0a7d5cc83a314b729070c434833539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Jun 2019 08:14:21 +0200
Subject: [PATCH 10/69] First approach to extract the Hashtags in the
 middleware and change the database

---
 .../handleHtmlContent/handleContentData.js    | 77 +++++++++++++++++++
 .../handleContentData.spec.js}                |  0
 .../hashtags/extractHashtags.js               | 21 +++++
 .../notifications/extractMentionedUsers.js}   |  0
 .../extractMentionedUsers.spec.js}            |  4 +-
 backend/src/middleware/index.js               |  8 +-
 backend/src/middleware/notifications/index.js | 30 --------
 webapp/components/Editor/index.vue            |  2 +-
 8 files changed, 105 insertions(+), 37 deletions(-)
 create mode 100644 backend/src/middleware/handleHtmlContent/handleContentData.js
 rename backend/src/middleware/{notifications/spec.js => handleHtmlContent/handleContentData.spec.js} (100%)
 create mode 100644 backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
 rename backend/src/middleware/{notifications/extractIds/index.js => handleHtmlContent/notifications/extractMentionedUsers.js} (100%)
 rename backend/src/middleware/{notifications/extractIds/spec.js => handleHtmlContent/notifications/extractMentionedUsers.spec.js} (98%)
 delete mode 100644 backend/src/middleware/notifications/index.js

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
new file mode 100644
index 000000000..53a6b65fb
--- /dev/null
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -0,0 +1,77 @@
+import extractMentionedUsers from './notifications/extractMentionedUsers'
+import extractHashtags from './hashtags/extractHashtags'
+
+const notify = async (resolve, root, args, context, resolveInfo) => {
+  // extract user ids before xss-middleware removes link classes
+  const ids = extractMentionedUsers(args.content)
+
+  console.log('ids: ', ids)
+
+  const post = await resolve(root, args, context, resolveInfo)
+
+  const session = context.driver.session()
+  const {
+    id: postId
+  } = post
+  const createdAt = new Date().toISOString()
+  const cypher = `
+    match(u:User) where u.id in $ids
+    match(p:Post) where p.id = $postId
+    create(n:Notification{id: apoc.create.uuid(), read: false, createdAt: $createdAt})
+    merge (n)-[:NOTIFIED]->(u)
+    merge (p)-[:NOTIFIED]->(n)
+    `
+  await session.run(cypher, {
+    ids,
+    createdAt,
+    postId
+  })
+  session.close()
+
+  return post
+}
+
+const updateHashtagsOfPost = async (postId, resolve, root, args, context, resolveInfo) => {
+  // extract tag (hashtag) ids before xss-middleware removes link classes
+  const hashtags = extractHashtags(args.content)
+
+  console.log('hashtags: ', hashtags)
+
+  // const post = await resolve(root, args, context, resolveInfo)
+
+  const session = context.driver.session()
+  // const {
+  //   id: postId
+  // } = post
+  // const createdAt = new Date().toISOString()
+  const cypher = `
+    MATCH (p:Post { id: $postId })-[oldRelations: TAGGED]->(oldTags: Tag)
+    DELETE oldRelations
+    WITH p
+    UNWIND $hashtags AS tagName
+    MERGE (t: Tag { id: tagName, name: tagName })
+    MERGE (p)-[:TAGGED]->(t)
+    RETURN t
+    `
+  await session.run(cypher, {
+    postId,
+    hashtags
+  })
+  session.close()
+}
+
+const handleContentData = async (resolve, root, args, context, resolveInfo) => {
+  // extract user ids before xss-middleware removes link classes
+
+  const post = await notify(resolve, root, args, context, resolveInfo)
+  await updateHashtagsOfPost(post.id, resolve, root, args, context, resolveInfo)
+
+  return post
+}
+
+export default {
+  Mutation: {
+    CreatePost: handleContentData,
+    UpdatePost: handleContentData,
+  },
+}
\ No newline at end of file
diff --git a/backend/src/middleware/notifications/spec.js b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
similarity index 100%
rename from backend/src/middleware/notifications/spec.js
rename to backend/src/middleware/handleHtmlContent/handleContentData.spec.js
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
new file mode 100644
index 000000000..194179b16
--- /dev/null
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
@@ -0,0 +1,21 @@
+import cheerio from 'cheerio'
+const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g
+
+export default function (content) {
+  if (!content) return []
+  const $ = cheerio.load(content)
+  const urls = $('.hashtag')
+    .map((_, el) => {
+      return $(el).attr('href')
+    })
+    .get()
+  const hashtags = []
+  urls.forEach(url => {
+    console.log('url: ', url)
+    let match
+    while ((match = ID_REGEX.exec(url)) != null) {
+      hashtags.push(match[1])
+    }
+  })
+  return hashtags
+}
\ No newline at end of file
diff --git a/backend/src/middleware/notifications/extractIds/index.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
similarity index 100%
rename from backend/src/middleware/notifications/extractIds/index.js
rename to backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
diff --git a/backend/src/middleware/notifications/extractIds/spec.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
similarity index 98%
rename from backend/src/middleware/notifications/extractIds/spec.js
rename to backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
index 341c39cec..03de4f1bb 100644
--- a/backend/src/middleware/notifications/extractIds/spec.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
@@ -1,4 +1,4 @@
-import extractIds from '.'
+import extractIds from './extractMentionedUsers'
 
 describe('extractIds', () => {
   describe('content undefined', () => {
@@ -56,4 +56,4 @@ describe('extractIds', () => {
       })
     })
   })
-})
+})
\ No newline at end of file
diff --git a/backend/src/middleware/index.js b/backend/src/middleware/index.js
index 9b85bd340..46470115f 100644
--- a/backend/src/middleware/index.js
+++ b/backend/src/middleware/index.js
@@ -11,7 +11,7 @@ import user from './userMiddleware'
 import includedFields from './includedFieldsMiddleware'
 import orderBy from './orderByMiddleware'
 import validation from './validation'
-import notifications from './notifications'
+import handleContentData from './handleHtmlContent/handleContentData'
 
 export default schema => {
   const middlewares = {
@@ -22,7 +22,7 @@ export default schema => {
     validation: validation,
     sluggify: sluggify,
     excerpt: excerpt,
-    notifications: notifications,
+    handleContentData: handleContentData,
     xss: xss,
     softDelete: softDelete,
     user: user,
@@ -38,7 +38,7 @@ export default schema => {
     'validation',
     'sluggify',
     'excerpt',
-    'notifications',
+    'handleContentData',
     'xss',
     'softDelete',
     'user',
@@ -57,4 +57,4 @@ export default schema => {
   }
 
   return order.map(key => middlewares[key])
-}
+}
\ No newline at end of file
diff --git a/backend/src/middleware/notifications/index.js b/backend/src/middleware/notifications/index.js
deleted file mode 100644
index ca460a512..000000000
--- a/backend/src/middleware/notifications/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import extractIds from './extractIds'
-
-const notify = async (resolve, root, args, context, resolveInfo) => {
-  // extract user ids before xss-middleware removes link classes
-  const ids = extractIds(args.content)
-
-  const post = await resolve(root, args, context, resolveInfo)
-
-  const session = context.driver.session()
-  const { id: postId } = post
-  const createdAt = new Date().toISOString()
-  const cypher = `
-    match(u:User) where u.id in $ids
-    match(p:Post) where p.id = $postId
-    create(n:Notification{id: apoc.create.uuid(), read: false, createdAt: $createdAt})
-    merge (n)-[:NOTIFIED]->(u)
-    merge (p)-[:NOTIFIED]->(n)
-    `
-  await session.run(cypher, { ids, createdAt, postId })
-  session.close()
-
-  return post
-}
-
-export default {
-  Mutation: {
-    CreatePost: notify,
-    UpdatePost: notify,
-  },
-}
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index b7fa0263a..dbb30a42e 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -454,7 +454,7 @@ export default {
         },
         hashtag: {
           // TODO: Fill up with input hashtag in search field
-          url: `/search/hashtag:${item.name}`,
+          url: `/search/hashtag/${item.name}`,
           label: item.name,
         },
       }

From 28e4433b871205f91533e02016172b7ca9e66118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Jun 2019 16:47:26 +0200
Subject: [PATCH 11/69] Refactoring and second approach to change the database

---
 .../handleHtmlContent/handleContentData.js    | 53 +++++++------------
 .../notifications/extractMentionedUsers.js    |  5 +-
 .../ContributionForm/ContributionForm.spec.js | 49 ++++++++++-------
 webapp/components/ContributionForm/index.vue  | 24 ---------
 webapp/components/Editor/index.vue            | 36 +++++++++----
 webapp/locales/de.json                        |  9 ++--
 webapp/locales/en.json                        |  7 ++-
 7 files changed, 87 insertions(+), 96 deletions(-)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
index 53a6b65fb..5fb2ae5cc 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -1,57 +1,34 @@
 import extractMentionedUsers from './notifications/extractMentionedUsers'
 import extractHashtags from './hashtags/extractHashtags'
 
-const notify = async (resolve, root, args, context, resolveInfo) => {
-  // extract user ids before xss-middleware removes link classes
-  const ids = extractMentionedUsers(args.content)
-
-  console.log('ids: ', ids)
-
-  const post = await resolve(root, args, context, resolveInfo)
-
+const notify = async (postId, idsOfMentionedUsers, context) => {
   const session = context.driver.session()
-  const {
-    id: postId
-  } = post
   const createdAt = new Date().toISOString()
   const cypher = `
-    match(u:User) where u.id in $ids
+    match(u:User) where u.id in $idsOfMentionedUsers
     match(p:Post) where p.id = $postId
     create(n:Notification{id: apoc.create.uuid(), read: false, createdAt: $createdAt})
     merge (n)-[:NOTIFIED]->(u)
     merge (p)-[:NOTIFIED]->(n)
     `
   await session.run(cypher, {
-    ids,
+    idsOfMentionedUsers,
     createdAt,
     postId
   })
   session.close()
-
-  return post
 }
 
-const updateHashtagsOfPost = async (postId, resolve, root, args, context, resolveInfo) => {
-  // extract tag (hashtag) ids before xss-middleware removes link classes
-  const hashtags = extractHashtags(args.content)
-
-  console.log('hashtags: ', hashtags)
-
-  // const post = await resolve(root, args, context, resolveInfo)
-
+const updateHashtagsOfPost = async (postId, hashtags, context) => {
   const session = context.driver.session()
-  // const {
-  //   id: postId
-  // } = post
-  // const createdAt = new Date().toISOString()
   const cypher = `
-    MATCH (p:Post { id: $postId })-[oldRelations: TAGGED]->(oldTags: Tag)
+    MATCH (p:Post { id: $postId })-[oldRelations:TAGGED]->(oldTags:Tag)
     DELETE oldRelations
     WITH p
     UNWIND $hashtags AS tagName
-    MERGE (t: Tag { id: tagName, name: tagName })
+    MERGE (t:Tag { id: tagName, name: tagName, disabled: false, deleted: false })
     MERGE (p)-[:TAGGED]->(t)
-    RETURN t
+    RETURN p, t
     `
   await session.run(cypher, {
     postId,
@@ -61,10 +38,20 @@ const updateHashtagsOfPost = async (postId, resolve, root, args, context, resolv
 }
 
 const handleContentData = async (resolve, root, args, context, resolveInfo) => {
-  // extract user ids before xss-middleware removes link classes
+  console.log('args.content: ', args.content)
+  // extract user ids before xss-middleware removes classes via the following "resolve" call
+  const idsOfMentionedUsers = extractMentionedUsers(args.content)
+  console.log('idsOfMentionedUsers: ', idsOfMentionedUsers)
+  // extract tag (hashtag) ids before xss-middleware removes classes via the following "resolve" call
+  const hashtags = extractHashtags(args.content)
+  console.log('hashtags: ', hashtags)
 
-  const post = await notify(resolve, root, args, context, resolveInfo)
-  await updateHashtagsOfPost(post.id, resolve, root, args, context, resolveInfo)
+  // removes classes from the content
+  const post = await resolve(root, args, context, resolveInfo)
+
+  console.log('post.id: ', post.id)
+  await notify(post.id, idsOfMentionedUsers, context)
+  await updateHashtagsOfPost(post.id, hashtags, context)
 
   return post
 }
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
index c2fcf169c..52016146f 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/profile\/([\w\-.!~*'"(),]+)/g
 
-export default function(content) {
+export default function (content) {
   if (!content) return []
   const $ = cheerio.load(content)
   const urls = $('.mention')
@@ -11,10 +11,11 @@ export default function(content) {
     .get()
   const ids = []
   urls.forEach(url => {
+    console.log('url: ', url)
     let match
     while ((match = ID_REGEX.exec(url)) != null) {
       ids.push(match[1])
     }
   })
   return ids
-}
+}
\ No newline at end of file
diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js
index 833f7116b..219b5b803 100644
--- a/webapp/components/ContributionForm/ContributionForm.spec.js
+++ b/webapp/components/ContributionForm/ContributionForm.spec.js
@@ -39,7 +39,9 @@ describe('ContributionForm.vue', () => {
               },
             },
           })
-          .mockRejectedValue({ message: 'Not Authorised!' }),
+          .mockRejectedValue({
+            message: 'Not Authorised!',
+          }),
       },
       $toast: {
         error: jest.fn(),
@@ -66,12 +68,26 @@ describe('ContributionForm.vue', () => {
       getters,
     })
     const Wrapper = () => {
-      return mount(ContributionForm, { mocks, localVue, store, propsData })
+      return mount(ContributionForm, {
+        mocks,
+        localVue,
+        store,
+        propsData,
+      })
     }
 
     beforeEach(() => {
       wrapper = Wrapper()
-      wrapper.setData({ form: { languageOptions: [{ label: 'Deutsch', value: 'de' }] } })
+      wrapper.setData({
+        form: {
+          languageOptions: [
+            {
+              label: 'Deutsch',
+              value: 'de',
+            },
+          ],
+        },
+      })
     })
 
     describe('CreatePost', () => {
@@ -100,7 +116,12 @@ describe('ContributionForm.vue', () => {
         beforeEach(async () => {
           expectedParams = {
             mutation: PostMutations().CreatePost,
-            variables: { title: postTitle, content: postContent, language: 'en', id: null },
+            variables: {
+              title: postTitle,
+              content: postContent,
+              language: 'en',
+              id: null,
+            },
           }
           postTitleInput = wrapper.find('.ds-input')
           postTitleInput.setValue(postTitle)
@@ -124,25 +145,13 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
-        it('supports adding tags', async () => {
+        it.skip('supports adding tags', async () => {
           expectedParams.variables.tags = ['Frieden']
-          tagsInput = wrapper.findAll('input').at(1)
-          tagsInput.setValue('Frieden')
-          tagsInput.trigger('keyup.enter')
-          await wrapper.find('form').trigger('submit')
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
-        it('displays tags if they exist', () => {
+        it.skip('displays tags if they exist', () => {
           expectedParams.variables.tags = ['Frieden']
-          tagsInput = wrapper.findAll('input').at(1)
-          tagsInput.setValue('Frieden')
-          tagsInput.trigger('keyup.enter')
-          chipText = wrapper
-            .findAll('span.ds-chip')
-            .at(0)
-            .text()
-          expect(chipText).toEqual('Frieden')
         })
 
         it("pushes the user to the post's page", async () => {
@@ -210,7 +219,9 @@ describe('ContributionForm.vue', () => {
       })
 
       it('sets language equal to contribution language', () => {
-        expect(wrapper.vm.form.language).toEqual({ value: propsData.contribution.language })
+        expect(wrapper.vm.form.language).toEqual({
+          value: propsData.contribution.language,
+        })
       })
 
       it('calls the UpdatePost apollo mutation', async () => {
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 11d6553f8..4e775caaf 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -12,17 +12,6 @@
           />
         </no-ssr>
         <ds-space margin-bottom="xxx-large" />
-        <ds-input
-          model="tagValue"
-          :label="$t('contribution.tagsInputLabel')"
-          :placeholder="$t('contribution.tagsInputPlaceholder')"
-          @input.native="handleInput"
-          @keyup.enter.native="addTag(form.tagValue)"
-          :disabled="form.tags.length >= 5"
-        ></ds-input>
-        <ds-chip v-for="(tag, index) in form.tags" @remove="removeTag(index)" removable :key="tag">
-          {{ tag }}
-        </ds-chip>
         <ds-flex class="contribution-form-footer">
           <ds-flex-item :width="{ base: '10%', sm: '10%', md: '10%', lg: '15%' }" />
           <ds-flex-item :width="{ base: '80%', sm: '30%', md: '30%', lg: '20%' }">
@@ -82,8 +71,6 @@ export default {
         content: '',
         language: null,
         languageOptions: [],
-        tagValue: null,
-        tags: [],
       },
       formSchema: {
         title: { required: true, min: 3, max: 64 },
@@ -135,7 +122,6 @@ export default {
             title: this.form.title,
             content: this.form.content,
             language: this.form.language ? this.form.language.value : this.$i18n.locale(),
-            tags: this.form.tags,
           },
         })
         .then(res => {
@@ -165,16 +151,6 @@ export default {
         this.form.languageOptions.push({ label: locale.name, value: locale.code })
       })
     },
-    removeTag(index) {
-      this.form.tags.splice(index, 1)
-    },
-    handleInput(e) {
-      this.form.tagValue = e.target ? e.target.value.trim() : ''
-    },
-    addTag(tag) {
-      this.form.tags.push(tag)
-      this.form.tagValue = ''
-    },
   },
   apollo: {
     User: {
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index dbb30a42e..98a5bc3df 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -12,10 +12,19 @@
           <div v-if="isMention">@{{ item.slug }}</div>
           <div v-if="isHashtag">#{{ item.name }}</div>
         </div>
+        <div
+          v-if="isHashtag && query && !filteredItems.find(el => el.name === query)"
+          class="suggestion-list__item is-empty"
+        >
+          {{ $t('editor.hashtag.addHashtag') }}
+        </div>
       </template>
       <div v-else class="suggestion-list__item is-empty">
         <div v-if="isMention">{{ $t('editor.mention.noUsersFound') }}</div>
-        <div v-if="isHashtag">{{ $t('editor.hashtag.noHashtagsFound') }}</div>
+        <div v-if="isHashtag">
+          <div v-if="query === ''">{{ $t('editor.hashtag.noHashtagsFound') }}</div>
+          <div v-else>{{ $t('editor.hashtag.addHashtag') }}</div>
+        </div>
       </div>
     </div>
 
@@ -271,7 +280,7 @@ export default {
               }
               // pressing enter
               if (event.keyCode === 13) {
-                this.enterHandler(this.mentionSuggestionType)
+                this.enterHandler()
                 return true
               }
               return false
@@ -340,9 +349,14 @@ export default {
                 this.downHandler()
                 return true
               }
-              // pressing enter or pressing space
-              if (event.keyCode === 13 || event.keyCode === 32) {
-                this.enterHandler(this.hashtagSuggestionType)
+              // pressing enter
+              if (event.keyCode === 13) {
+                this.enterHandler()
+                return true
+              }
+              // pressing space
+              if (event.keyCode === 32) {
+                this.spaceHandler()
                 return true
               }
               return false
@@ -357,7 +371,7 @@ export default {
               }
               const fuse = new Fuse(items, {
                 threshold: 0.2,
-                keys: ['slug'],
+                keys: ['name'],
               })
               return fuse.search(query)
             },
@@ -434,13 +448,17 @@ export default {
     downHandler() {
       this.navigatedItemIndex = (this.navigatedItemIndex + 1) % this.filteredItems.length
     },
-    // For hashtags handles pressing of space as enter.
+    // Handles pressing of enter.
     enterHandler() {
       const item = this.filteredItems[this.navigatedItemIndex]
       if (item) {
         this.selectItem(item)
-      } else if (this.suggestionType === this.hashtagSuggestionType && this.query !== '') {
-        this.selectItem({ name: this.query }, this.hashtagSuggestionType)
+      }
+    },
+    // For hashtags handles pressing of space.
+    spaceHandler() {
+      if (this.suggestionType === this.hashtagSuggestionType && this.query !== '') {
+        this.selectItem({ name: this.query })
       }
     },
     // we have to replace our suggestion text with a mention
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9dbcd0971..c7d19c39a 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -27,7 +27,7 @@
       "code": "Code eingeben",
       "description": "Öffne dein E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
       "next": "Weiter",
-      "change-password":{
+      "change-password": {
         "success": "Änderung des Passworts war erfolgreich!",
         "error": "Passwort Änderung fehlgeschlagen. Möglicherweise falscher Sicherheitscode?",
         "help": "Falls Probleme auftreten, schreib uns gerne eine Mail an:"
@@ -40,7 +40,8 @@
       "noUsersFound": "Keine Benutzer gefunden"
     },
     "hashtag": {
-      "noHashtagsFound": "Keine Hashtags gefunden"
+      "noHashtagsFound": "Keine Hashtags gefunden",
+      "addHashtag": "Neuer Hashtag"
     }
   },
   "profile": {
@@ -338,9 +339,7 @@
     "filterFollow": "Beiträge filtern von Usern denen ich folge",
     "filterALL": "Alle Beiträge anzeigen",
     "success": "Gespeichert!",
-    "languageSelectLabel": "Sprache",
-    "tagsInputLabel": "Tags",
-    "tagsInputPlaceholder": "Hinzufügen ein Tag"
+    "languageSelectLabel": "Sprache"
   }
 
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 305bc6cc6..cb64c8eb8 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -40,7 +40,8 @@
       "noUsersFound": "No users found"
     },
     "hashtag": {
-      "noHashtagsFound": "No hashtags found"
+      "noHashtagsFound": "No hashtags found",
+      "addHashtag": "New hashtag"
     }
   },
   "profile": {
@@ -337,8 +338,6 @@
     "filterFollow": "Filter contributions from users I follow",
     "filterALL": "View all contributions",
     "success": "Saved!",
-    "languageSelectLabel": "Language",
-    "tagsInputLabel": "Tags",
-    "tagsInputPlaceholder": "Add a tag"
+    "languageSelectLabel": "Language"
   }
 }

From c81b4951868b1d81b22d8b5392c42a3ee0649401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Jun 2019 17:12:14 +0200
Subject: [PATCH 12/69] Lint fix

---
 .../src/middleware/handleHtmlContent/handleContentData.js   | 6 +++---
 .../handleHtmlContent/hashtags/extractHashtags.js           | 4 ++--
 .../notifications/extractMentionedUsers.js                  | 4 ++--
 .../notifications/extractMentionedUsers.spec.js             | 2 +-
 backend/src/middleware/index.js                             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
index 5fb2ae5cc..350be75f4 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -14,7 +14,7 @@ const notify = async (postId, idsOfMentionedUsers, context) => {
   await session.run(cypher, {
     idsOfMentionedUsers,
     createdAt,
-    postId
+    postId,
   })
   session.close()
 }
@@ -32,7 +32,7 @@ const updateHashtagsOfPost = async (postId, hashtags, context) => {
     `
   await session.run(cypher, {
     postId,
-    hashtags
+    hashtags,
   })
   session.close()
 }
@@ -61,4 +61,4 @@ export default {
     CreatePost: handleContentData,
     UpdatePost: handleContentData,
   },
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
index 194179b16..9c0078e7a 100644
--- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g
 
-export default function (content) {
+export default function(content) {
   if (!content) return []
   const $ = cheerio.load(content)
   const urls = $('.hashtag')
@@ -18,4 +18,4 @@ export default function (content) {
     }
   })
   return hashtags
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
index 52016146f..3ada7e6a9 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/profile\/([\w\-.!~*'"(),]+)/g
 
-export default function (content) {
+export default function(content) {
   if (!content) return []
   const $ = cheerio.load(content)
   const urls = $('.mention')
@@ -18,4 +18,4 @@ export default function (content) {
     }
   })
   return ids
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
index 03de4f1bb..4983ad72b 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
@@ -56,4 +56,4 @@ describe('extractIds', () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/backend/src/middleware/index.js b/backend/src/middleware/index.js
index 46470115f..8b3e2e1cb 100644
--- a/backend/src/middleware/index.js
+++ b/backend/src/middleware/index.js
@@ -57,4 +57,4 @@ export default schema => {
   }
 
   return order.map(key => middlewares[key])
-}
\ No newline at end of file
+}

From a4cf2d3ee84d562febef5af47852a3611860bbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 1 Jul 2019 19:51:43 +0200
Subject: [PATCH 13/69] Store Hashtags of Post content in database and write a
 lot of tests

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 .../handleHtmlContent/handleContentData.js    |  25 +-
 .../handleContentData.spec.js                 | 225 +++++++++++++++---
 .../hashtags/extractHashtags.js               |   9 +-
 .../hashtags/extractHashtags.spec.js          |  51 ++++
 .../notifications/extractMentionedUsers.js    |   5 +-
 .../extractMentionedUsers.spec.js             |  22 +-
 webapp/components/ContributionForm/index.vue  |   8 +-
 .../Editor/{spec.js => Editor.spec.js}        |   6 +-
 .../Editor/{index.vue => Editor.vue}          |   0
 .../components/comments/CommentForm/index.vue |   2 +-
 10 files changed, 282 insertions(+), 71 deletions(-)
 create mode 100644 backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
 rename webapp/components/Editor/{spec.js => Editor.spec.js} (94%)
 rename webapp/components/Editor/{index.vue => Editor.vue} (100%)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
index 350be75f4..8efdef90f 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -21,16 +21,25 @@ const notify = async (postId, idsOfMentionedUsers, context) => {
 
 const updateHashtagsOfPost = async (postId, hashtags, context) => {
   const session = context.driver.session()
-  const cypher = `
-    MATCH (p:Post { id: $postId })-[oldRelations:TAGGED]->(oldTags:Tag)
-    DELETE oldRelations
-    WITH p
+  // We need two Cypher statements, because the 'MATCH' in the 'cypherDeletePreviousRelations' statement
+  //  functions as an 'if'. In case there is no previous relation, the rest of the commands are omitted
+  //  and no new Hashtags and relations will be created.
+  const cypherDeletePreviousRelations = `
+    MATCH (p:Post { id: $postId })-[previousRelations:TAGGED]->(t:Tag)
+    DELETE previousRelations
+    RETURN p, t
+    `
+  const cypherCreateNewTagsAndRelations = `
+    MATCH (p:Post { id: $postId})
     UNWIND $hashtags AS tagName
     MERGE (t:Tag { id: tagName, name: tagName, disabled: false, deleted: false })
     MERGE (p)-[:TAGGED]->(t)
     RETURN p, t
     `
-  await session.run(cypher, {
+  await session.run(cypherDeletePreviousRelations, {
+    postId,
+  })
+  await session.run(cypherCreateNewTagsAndRelations, {
     postId,
     hashtags,
   })
@@ -38,18 +47,14 @@ const updateHashtagsOfPost = async (postId, hashtags, context) => {
 }
 
 const handleContentData = async (resolve, root, args, context, resolveInfo) => {
-  console.log('args.content: ', args.content)
   // extract user ids before xss-middleware removes classes via the following "resolve" call
   const idsOfMentionedUsers = extractMentionedUsers(args.content)
-  console.log('idsOfMentionedUsers: ', idsOfMentionedUsers)
   // extract tag (hashtag) ids before xss-middleware removes classes via the following "resolve" call
   const hashtags = extractHashtags(args.content)
-  console.log('hashtags: ', hashtags)
 
   // removes classes from the content
   const post = await resolve(root, args, context, resolveInfo)
 
-  console.log('post.id: ', post.id)
   await notify(post.id, idsOfMentionedUsers, context)
   await updateHashtagsOfPost(post.id, hashtags, context)
 
@@ -61,4 +66,4 @@ export default {
     CreatePost: handleContentData,
     UpdatePost: handleContentData,
   },
-}
+}
\ No newline at end of file
diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
index 985654b0f..12b34dff0 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
@@ -1,5 +1,11 @@
-import { GraphQLClient } from 'graphql-request'
-import { host, login } from '../../jest/helpers'
+import {
+  GraphQLClient
+} from 'graphql-request'
+import gql from 'graphql-tag'
+import {
+  host,
+  login
+} from '../../jest/helpers'
 import Factory from '../../seed/factories'
 
 const factory = Factory()
@@ -20,22 +26,29 @@ afterEach(async () => {
 })
 
 describe('currentUser { notifications }', () => {
-  const query = `query($read: Boolean) {
-          currentUser {
-            notifications(read: $read, orderBy: createdAt_desc) {
-              read
-              post {
-                content
-              }
-            }
+  const query = gql `
+    query($read: Boolean) {
+      currentUser {
+        notifications(read: $read, orderBy: createdAt_desc) {
+          read
+          post {
+            content
           }
-        }`
+        }
+      }
+    }
+  `
 
   describe('authenticated', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
     })
 
     describe('given another user', () => {
@@ -60,17 +73,24 @@ describe('currentUser { notifications }', () => {
           'Hey <a class="mention" href="/profile/you/al-capone">@al-capone</a> how do you do?'
 
         beforeEach(async () => {
-          const createPostMutation = `
-          mutation($title: String!, $content: String!) {
-            CreatePost(title: $title, content: $content) {
-              id
-              title
-              content
+          const createPostMutation = gql `
+            mutation($title: String!, $content: String!) {
+              CreatePost(title: $title, content: $content) {
+                id
+                title
+                content
+              }
             }
-          }
           `
-          authorClient = new GraphQLClient(host, { headers: authorHeaders })
-          const { CreatePost } = await authorClient.request(createPostMutation, { title, content })
+          authorClient = new GraphQLClient(host, {
+            headers: authorHeaders,
+          })
+          const {
+            CreatePost
+          } = await authorClient.request(createPostMutation, {
+            title,
+            content,
+          })
           post = CreatePost
         })
 
@@ -79,10 +99,19 @@ describe('currentUser { notifications }', () => {
             'Hey <a href="/profile/you/al-capone" target="_blank">@al-capone</a> how do you do?'
           const expected = {
             currentUser: {
-              notifications: [{ read: false, post: { content: expectedContent } }],
+              notifications: [{
+                read: false,
+                post: {
+                  content: expectedContent,
+                },
+              }, ],
             },
           }
-          await expect(client.request(query, { read: false })).resolves.toEqual(expected)
+          await expect(
+            client.request(query, {
+              read: false,
+            }),
+          ).resolves.toEqual(expected)
         })
 
         describe('who mentions me again', () => {
@@ -93,16 +122,21 @@ describe('currentUser { notifications }', () => {
             // during development and thought: A feature not a bug! This way we
             // can encode a re-mentioning of users when you edit your post or
             // comment.
-            const createPostMutation = `
-            mutation($id: ID!, $content: String!) {
-              UpdatePost(id: $id, content: $content) {
-                title
-                content
+            const createPostMutation = gql `
+              mutation($id: ID!, $content: String!) {
+                UpdatePost(id: $id, content: $content) {
+                  title
+                  content
+                }
               }
-            }
             `
-            authorClient = new GraphQLClient(host, { headers: authorHeaders })
-            await authorClient.request(createPostMutation, { id: post.id, content: updatedContent })
+            authorClient = new GraphQLClient(host, {
+              headers: authorHeaders,
+            })
+            await authorClient.request(createPostMutation, {
+              id: post.id,
+              content: updatedContent,
+            })
           })
 
           it('creates exactly one more notification', async () => {
@@ -110,16 +144,135 @@ describe('currentUser { notifications }', () => {
               'Hey <a href="/profile/you/al-capone" target="_blank">@al-capone</a> how do you do? One more mention to <a href="/profile/you" target="_blank">@al-capone</a>'
             const expected = {
               currentUser: {
-                notifications: [
-                  { read: false, post: { content: expectedContent } },
-                  { read: false, post: { content: expectedContent } },
+                notifications: [{
+                    read: false,
+                    post: {
+                      content: expectedContent,
+                    },
+                  },
+                  {
+                    read: false,
+                    post: {
+                      content: expectedContent,
+                    },
+                  },
                 ],
               },
             }
-            await expect(client.request(query, { read: false })).resolves.toEqual(expected)
+            await expect(
+              client.request(query, {
+                read: false,
+              }),
+            ).resolves.toEqual(expected)
           })
         })
       })
     })
   })
 })
+
+describe('Hashtags', () => {
+  const postId = 'p135'
+  const postTitle = 'Two Hashtags'
+  const postContent =
+    '<p>Hey Dude, <a class="hashtag" href="/search/hashtag/Democracy">#Democracy</a> should work equal for everybody!? That seems to be the only way to have equal <a class="hashtag" href="/search/hashtag/Liberty">#Liberty</a> for everyone.</p>'
+  const postWithHastagsQuery = gql `
+    query($id: ID) {
+      Post(id: $id) {
+        tags {
+          name
+        }
+      }
+    }
+  `
+  const postWithHastagsVariables = {
+    id: postId,
+  }
+  const createPostMutation = gql `
+    mutation($postId: ID, $postTitle: String!, $postContent: String!) {
+      CreatePost(id: $postId, title: $postTitle, content: $postContent) {
+        id
+        title
+        content
+      }
+    }
+  `
+
+  describe('authenticated', () => {
+    let headers
+    beforeEach(async () => {
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
+    })
+
+    describe('create a Post with Hashtags', () => {
+      beforeEach(async () => {
+        await client.request(createPostMutation, {
+          postId,
+          postTitle,
+          postContent,
+        })
+      })
+
+      it('both Hashtags are created', async () => {
+        const expected = [{
+            name: 'Democracy',
+          },
+          {
+            name: 'Liberty',
+          },
+        ]
+        await expect(
+          client.request(postWithHastagsQuery, postWithHastagsVariables),
+        ).resolves.toEqual({
+          Post: [{
+            tags: expect.arrayContaining(expected),
+          }, ],
+        })
+      })
+
+      describe('afterwards update the Post by removing a Hashtag, leaving a Hashtag and add a Hashtag', () => {
+        // The already existing Hashtag has no class at this point.
+        const updatedPostContent =
+          '<p>Hey Dude, <a class="hashtag" href="/search/hashtag/Elections">#Elections</a> should work equal for everybody!? That seems to be the only way to have equal <a href="/search/hashtag/Liberty">#Liberty</a> for everyone.</p>'
+        const updatePostMutation = gql `
+          mutation($postId: ID!, $postTitle: String, $updatedPostContent: String) {
+            UpdatePost(id: $postId, title: $postTitle, content: $updatedPostContent) {
+              id
+              title
+              content
+            }
+          }
+        `
+
+        it('only one previous Hashtag and the new Hashtag exists', async () => {
+          await client.request(updatePostMutation, {
+            postId,
+            postTitle,
+            updatedPostContent,
+          })
+
+          const expected = [{
+              name: 'Elections',
+            },
+            {
+              name: 'Liberty',
+            },
+          ]
+          await expect(
+            client.request(postWithHastagsQuery, postWithHastagsVariables),
+          ).resolves.toEqual({
+            Post: [{
+              tags: expect.arrayContaining(expected),
+            }, ],
+          })
+        })
+      })
+    })
+  })
+})
\ No newline at end of file
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
index 9c0078e7a..a7c75d2f8 100644
--- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
@@ -1,21 +1,22 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g
 
-export default function(content) {
+export default function (content) {
   if (!content) return []
   const $ = cheerio.load(content)
-  const urls = $('.hashtag')
+  // We can not search for class '.hashtag', because the classes are removed at the 'xss' middleware.
+  //   But we have to know, which Hashtags are removed from the content es well, so we search for the 'a' html-tag.
+  const urls = $('a')
     .map((_, el) => {
       return $(el).attr('href')
     })
     .get()
   const hashtags = []
   urls.forEach(url => {
-    console.log('url: ', url)
     let match
     while ((match = ID_REGEX.exec(url)) != null) {
       hashtags.push(match[1])
     }
   })
   return hashtags
-}
+}
\ No newline at end of file
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
new file mode 100644
index 000000000..1b37aaa34
--- /dev/null
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
@@ -0,0 +1,51 @@
+import extractHashtags from './extractHashtags'
+
+describe('extractHashtags', () => {
+  describe('content undefined', () => {
+    it('returns empty array', () => {
+      expect(extractHashtags()).toEqual([])
+    })
+  })
+
+  describe('searches through links', () => {
+    it('finds links with and without ".hashtag" class and extracts Hashtag names', () => {
+      const content =
+        '<p><a class="hashtag" href="/search/hashtag/Elections">#Elections</a><a href="/search/hashtag/Democracy">#Democracy</a></p>'
+      expect(extractHashtags(content)).toEqual(['Elections', 'Democracy'])
+    })
+
+    it('ignores mentions', () => {
+      const content =
+        '<p>Something inspirational about <a href="/profile/u2" target="_blank">@bob-der-baumeister</a> and <a href="/profile/u3/jenny-rostock" class="mention" target="_blank">@jenny-rostock</a>.</p>'
+      expect(extractHashtags(content)).toEqual([])
+    })
+
+    describe('handles links', () => {
+      it('with domains', () => {
+        const content =
+          '<p><a class="hashtag" href="http://localhost:3000/search/hashtag/Elections">#Elections</a><a href="http://localhost:3000/search/hashtag/Democracy">#Democracy</a></p>'
+        expect(extractHashtags(content)).toEqual(['Elections', 'Democracy'])
+      })
+
+      it('special characters', () => {
+        const content =
+          '<p>Something inspirational about <a href="/search/hashtag/u!*(),2" class="hashtag" target="_blank">#u!*(),2</a> and <a href="/search/hashtag/u.~-3" target="_blank">#u.~-3</a>.</p>'
+        expect(extractHashtags(content)).toEqual(['u!*(),2', 'u.~-3'])
+      })
+    })
+
+    describe('does not crash if', () => {
+      it('`href` contains no Hashtag name', () => {
+        const content =
+          '<p>Something inspirational about <a href="/search/hashtag/" target="_blank">#Democracy</a> and <a href="/search/hashtag" target="_blank">#liberty</a>.</p>'
+        expect(extractHashtags(content)).toEqual([])
+      })
+
+      it('`href` is empty or invalid', () => {
+        const content =
+          '<p>Something inspirational about <a href="" class="hashtag" target="_blank">@bob-der-baumeister</a> and <a href="not-a-url" target="_blank">@jenny-rostock</a>.</p>'
+        expect(extractHashtags(content)).toEqual([])
+      })
+    })
+  })
+})
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
index 3ada7e6a9..ccc9944b2 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/profile\/([\w\-.!~*'"(),]+)/g
 
-export default function(content) {
+export default function (content) {
   if (!content) return []
   const $ = cheerio.load(content)
   const urls = $('.mention')
@@ -11,11 +11,10 @@ export default function(content) {
     .get()
   const ids = []
   urls.forEach(url => {
-    console.log('url: ', url)
     let match
     while ((match = ID_REGEX.exec(url)) != null) {
       ids.push(match[1])
     }
   })
   return ids
-}
+}
\ No newline at end of file
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
index 4983ad72b..fd60f96ab 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
@@ -1,9 +1,9 @@
-import extractIds from './extractMentionedUsers'
+import extractMentionedUsers from './extractMentionedUsers'
 
-describe('extractIds', () => {
+describe('extractMentionedUsers', () => {
   describe('content undefined', () => {
     it('returns empty array', () => {
-      expect(extractIds()).toEqual([])
+      expect(extractMentionedUsers()).toEqual([])
     })
   })
 
@@ -11,33 +11,33 @@ describe('extractIds', () => {
     it('ignores links without .mention class', () => {
       const content =
         '<p>Something inspirational about <a href="/profile/u2" target="_blank">@bob-der-baumeister</a> and <a href="/profile/u3" target="_blank">@jenny-rostock</a>.</p>'
-      expect(extractIds(content)).toEqual([])
+      expect(extractMentionedUsers(content)).toEqual([])
     })
 
     describe('given a link with .mention class', () => {
       it('extracts ids', () => {
         const content =
           '<p>Something inspirational about <a href="/profile/u2" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="/profile/u3/jenny-rostock" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-        expect(extractIds(content)).toEqual(['u2', 'u3'])
+        expect(extractMentionedUsers(content)).toEqual(['u2', 'u3'])
       })
 
       describe('handles links', () => {
         it('with slug and id', () => {
           const content =
             '<p>Something inspirational about <a href="/profile/u2/bob-der-baumeister" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="/profile/u3/jenny-rostock/" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-          expect(extractIds(content)).toEqual(['u2', 'u3'])
+          expect(extractMentionedUsers(content)).toEqual(['u2', 'u3'])
         })
 
         it('with domains', () => {
           const content =
             '<p>Something inspirational about <a href="http://localhost:3000/profile/u2/bob-der-baumeister" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="http://localhost:3000//profile/u3/jenny-rostock/" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-          expect(extractIds(content)).toEqual(['u2', 'u3'])
+          expect(extractMentionedUsers(content)).toEqual(['u2', 'u3'])
         })
 
         it('special characters', () => {
           const content =
             '<p>Something inspirational about <a href="http://localhost:3000/profile/u!*(),2/bob-der-baumeister" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="http://localhost:3000//profile/u.~-3/jenny-rostock/" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-          expect(extractIds(content)).toEqual(['u!*(),2', 'u.~-3'])
+          expect(extractMentionedUsers(content)).toEqual(['u!*(),2', 'u.~-3'])
         })
       })
 
@@ -45,15 +45,15 @@ describe('extractIds', () => {
         it('`href` contains no user id', () => {
           const content =
             '<p>Something inspirational about <a href="/profile" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="/profile/" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-          expect(extractIds(content)).toEqual([])
+          expect(extractMentionedUsers(content)).toEqual([])
         })
 
         it('`href` is empty or invalid', () => {
           const content =
             '<p>Something inspirational about <a href="" class="mention" target="_blank">@bob-der-baumeister</a> and <a href="not-a-url" class="mention" target="_blank">@jenny-rostock</a>.</p>'
-          expect(extractIds(content)).toEqual([])
+          expect(extractMentionedUsers(content)).toEqual([])
         })
       })
     })
   })
-})
+})
\ No newline at end of file
diff --git a/webapp/components/ContributionForm/index.vue b/webapp/components/ContributionForm/index.vue
index 4e775caaf..9444a1062 100644
--- a/webapp/components/ContributionForm/index.vue
+++ b/webapp/components/ContributionForm/index.vue
@@ -28,16 +28,16 @@
         <ds-space />
         <div slot="footer" style="text-align: right">
           <ds-button
+            class="cancel-button"
             :disabled="loading || disabled"
             ghost
-            class="cancel-button"
-            @click="$router.back()"
+            @click.prevent="$router.back()"
           >
             {{ $t('actions.cancel') }}
           </ds-button>
           <ds-button
-            icon="check"
             type="submit"
+            icon="check"
             :loading="loading"
             :disabled="disabled || errors"
             primary
@@ -52,7 +52,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import HcEditor from '~/components/Editor'
+import HcEditor from '~/components/Editor/Editor'
 import orderBy from 'lodash/orderBy'
 import locales from '~/locales'
 import PostMutations from '~/graphql/PostMutations.js'
diff --git a/webapp/components/Editor/spec.js b/webapp/components/Editor/Editor.spec.js
similarity index 94%
rename from webapp/components/Editor/spec.js
rename to webapp/components/Editor/Editor.spec.js
index b982d941d..d457609bd 100644
--- a/webapp/components/Editor/spec.js
+++ b/webapp/components/Editor/Editor.spec.js
@@ -1,5 +1,5 @@
 import { mount, createLocalVue } from '@vue/test-utils'
-import Editor from './'
+import Editor from './Editor'
 import Vuex from 'vuex'
 
 import Styleguide from '@human-connection/styleguide'
@@ -36,7 +36,9 @@ describe('Editor.vue', () => {
         propsData,
         localVue,
         sync: false,
-        stubs: { transition: false },
+        stubs: {
+          transition: false,
+        },
         store,
       }))
     }
diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/Editor.vue
similarity index 100%
rename from webapp/components/Editor/index.vue
rename to webapp/components/Editor/Editor.vue
diff --git a/webapp/components/comments/CommentForm/index.vue b/webapp/components/comments/CommentForm/index.vue
index 753d09c13..14dcace43 100644
--- a/webapp/components/comments/CommentForm/index.vue
+++ b/webapp/components/comments/CommentForm/index.vue
@@ -24,7 +24,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import HcEditor from '~/components/Editor'
+import HcEditor from '~/components/Editor/Editor'
 import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
 import CommentMutations from '~/graphql/CommentMutations.js'
 

From 0982ca716b43438305c00069008a451ae29f7dad Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 1 Jul 2019 18:17:09 -0300
Subject: [PATCH 14/69] Fix lint

---
 .../handleHtmlContent/handleContentData.js    |  2 +-
 .../handleContentData.spec.js                 | 64 ++++++++++---------
 .../hashtags/extractHashtags.js               |  4 +-
 .../notifications/extractMentionedUsers.js    |  4 +-
 .../extractMentionedUsers.spec.js             |  2 +-
 5 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.js b/backend/src/middleware/handleHtmlContent/handleContentData.js
index 8efdef90f..6519ddae7 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.js
@@ -66,4 +66,4 @@ export default {
     CreatePost: handleContentData,
     UpdatePost: handleContentData,
   },
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
index 12b34dff0..5ac0f3eda 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
@@ -1,11 +1,6 @@
-import {
-  GraphQLClient
-} from 'graphql-request'
+import { GraphQLClient } from 'graphql-request'
 import gql from 'graphql-tag'
-import {
-  host,
-  login
-} from '../../jest/helpers'
+import { host, login } from '../../jest/helpers'
 import Factory from '../../seed/factories'
 
 const factory = Factory()
@@ -26,7 +21,7 @@ afterEach(async () => {
 })
 
 describe('currentUser { notifications }', () => {
-  const query = gql `
+  const query = gql`
     query($read: Boolean) {
       currentUser {
         notifications(read: $read, orderBy: createdAt_desc) {
@@ -73,7 +68,7 @@ describe('currentUser { notifications }', () => {
           'Hey <a class="mention" href="/profile/you/al-capone">@al-capone</a> how do you do?'
 
         beforeEach(async () => {
-          const createPostMutation = gql `
+          const createPostMutation = gql`
             mutation($title: String!, $content: String!) {
               CreatePost(title: $title, content: $content) {
                 id
@@ -85,9 +80,7 @@ describe('currentUser { notifications }', () => {
           authorClient = new GraphQLClient(host, {
             headers: authorHeaders,
           })
-          const {
-            CreatePost
-          } = await authorClient.request(createPostMutation, {
+          const { CreatePost } = await authorClient.request(createPostMutation, {
             title,
             content,
           })
@@ -99,12 +92,14 @@ describe('currentUser { notifications }', () => {
             'Hey <a href="/profile/you/al-capone" target="_blank">@al-capone</a> how do you do?'
           const expected = {
             currentUser: {
-              notifications: [{
-                read: false,
-                post: {
-                  content: expectedContent,
+              notifications: [
+                {
+                  read: false,
+                  post: {
+                    content: expectedContent,
+                  },
                 },
-              }, ],
+              ],
             },
           }
           await expect(
@@ -122,7 +117,7 @@ describe('currentUser { notifications }', () => {
             // during development and thought: A feature not a bug! This way we
             // can encode a re-mentioning of users when you edit your post or
             // comment.
-            const createPostMutation = gql `
+            const createPostMutation = gql`
               mutation($id: ID!, $content: String!) {
                 UpdatePost(id: $id, content: $content) {
                   title
@@ -144,7 +139,8 @@ describe('currentUser { notifications }', () => {
               'Hey <a href="/profile/you/al-capone" target="_blank">@al-capone</a> how do you do? One more mention to <a href="/profile/you" target="_blank">@al-capone</a>'
             const expected = {
               currentUser: {
-                notifications: [{
+                notifications: [
+                  {
                     read: false,
                     post: {
                       content: expectedContent,
@@ -176,7 +172,7 @@ describe('Hashtags', () => {
   const postTitle = 'Two Hashtags'
   const postContent =
     '<p>Hey Dude, <a class="hashtag" href="/search/hashtag/Democracy">#Democracy</a> should work equal for everybody!? That seems to be the only way to have equal <a class="hashtag" href="/search/hashtag/Liberty">#Liberty</a> for everyone.</p>'
-  const postWithHastagsQuery = gql `
+  const postWithHastagsQuery = gql`
     query($id: ID) {
       Post(id: $id) {
         tags {
@@ -188,7 +184,7 @@ describe('Hashtags', () => {
   const postWithHastagsVariables = {
     id: postId,
   }
-  const createPostMutation = gql `
+  const createPostMutation = gql`
     mutation($postId: ID, $postTitle: String!, $postContent: String!) {
       CreatePost(id: $postId, title: $postTitle, content: $postContent) {
         id
@@ -220,7 +216,8 @@ describe('Hashtags', () => {
       })
 
       it('both Hashtags are created', async () => {
-        const expected = [{
+        const expected = [
+          {
             name: 'Democracy',
           },
           {
@@ -230,9 +227,11 @@ describe('Hashtags', () => {
         await expect(
           client.request(postWithHastagsQuery, postWithHastagsVariables),
         ).resolves.toEqual({
-          Post: [{
-            tags: expect.arrayContaining(expected),
-          }, ],
+          Post: [
+            {
+              tags: expect.arrayContaining(expected),
+            },
+          ],
         })
       })
 
@@ -240,7 +239,7 @@ describe('Hashtags', () => {
         // The already existing Hashtag has no class at this point.
         const updatedPostContent =
           '<p>Hey Dude, <a class="hashtag" href="/search/hashtag/Elections">#Elections</a> should work equal for everybody!? That seems to be the only way to have equal <a href="/search/hashtag/Liberty">#Liberty</a> for everyone.</p>'
-        const updatePostMutation = gql `
+        const updatePostMutation = gql`
           mutation($postId: ID!, $postTitle: String, $updatedPostContent: String) {
             UpdatePost(id: $postId, title: $postTitle, content: $updatedPostContent) {
               id
@@ -257,7 +256,8 @@ describe('Hashtags', () => {
             updatedPostContent,
           })
 
-          const expected = [{
+          const expected = [
+            {
               name: 'Elections',
             },
             {
@@ -267,12 +267,14 @@ describe('Hashtags', () => {
           await expect(
             client.request(postWithHastagsQuery, postWithHastagsVariables),
           ).resolves.toEqual({
-            Post: [{
-              tags: expect.arrayContaining(expected),
-            }, ],
+            Post: [
+              {
+                tags: expect.arrayContaining(expected),
+              },
+            ],
           })
         })
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
index a7c75d2f8..5e77e6e3a 100644
--- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g
 
-export default function (content) {
+export default function(content) {
   if (!content) return []
   const $ = cheerio.load(content)
   // We can not search for class '.hashtag', because the classes are removed at the 'xss' middleware.
@@ -19,4 +19,4 @@ export default function (content) {
     }
   })
   return hashtags
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
index ccc9944b2..c2fcf169c 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.js
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio'
 const ID_REGEX = /\/profile\/([\w\-.!~*'"(),]+)/g
 
-export default function (content) {
+export default function(content) {
   if (!content) return []
   const $ = cheerio.load(content)
   const urls = $('.mention')
@@ -17,4 +17,4 @@ export default function (content) {
     }
   })
   return ids
-}
\ No newline at end of file
+}
diff --git a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
index fd60f96ab..f39fbc859 100644
--- a/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
+++ b/backend/src/middleware/handleHtmlContent/notifications/extractMentionedUsers.spec.js
@@ -56,4 +56,4 @@ describe('extractMentionedUsers', () => {
       })
     })
   })
-})
\ No newline at end of file
+})

From 91f9aacb79726b5ad8af1d2a441ec749ba9fcd59 Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Wed, 3 Jul 2019 08:26:15 +0200
Subject: [PATCH 15/69] full ads width use with small devices

---
 backend/src/config/index.js    | 18 +++++++++++++++---
 webapp/assets/styles/main.scss |  8 +++++++-
 webapp/layouts/default.vue     |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 320b636e9..53415f050 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -19,7 +19,11 @@ const {
   GRAPHQL_URI = 'http://localhost:4000',
 } = process.env
 
-export const requiredConfigs = { MAPBOX_TOKEN, JWT_SECRET, PRIVATE_KEY_PASSPHRASE }
+export const requiredConfigs = {
+  MAPBOX_TOKEN,
+  JWT_SECRET,
+  PRIVATE_KEY_PASSPHRASE,
+}
 export const smtpConfigs = {
   SMTP_HOST,
   SMTP_PORT,
@@ -27,8 +31,16 @@ export const smtpConfigs = {
   SMTP_USERNAME,
   SMTP_PASSWORD,
 }
-export const neo4jConfigs = { NEO4J_URI, NEO4J_USERNAME, NEO4J_PASSWORD }
-export const serverConfigs = { GRAPHQL_PORT, CLIENT_URI, GRAPHQL_URI }
+export const neo4jConfigs = {
+  NEO4J_URI,
+  NEO4J_USERNAME,
+  NEO4J_PASSWORD,
+}
+export const serverConfigs = {
+  GRAPHQL_PORT,
+  CLIENT_URI,
+  GRAPHQL_URI,
+}
 
 export const developmentConfigs = {
   DEBUG: process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'true',
diff --git a/webapp/assets/styles/main.scss b/webapp/assets/styles/main.scss
index 560249b4a..35e0e2e51 100644
--- a/webapp/assets/styles/main.scss
+++ b/webapp/assets/styles/main.scss
@@ -24,9 +24,11 @@ $easeOut: cubic-bezier(0.19, 1, 0.22, 1);
   transition: opacity 80ms ease-out;
   transition-delay: 80ms;
 }
+
 .layout-leave-active {
   transition: opacity 80ms ease-in;
 }
+
 .layout-enter,
 .layout-leave-active {
   opacity: 0;
@@ -39,6 +41,7 @@ $easeOut: cubic-bezier(0.19, 1, 0.22, 1);
   opacity: 1;
   transform: translate3d(0, 0, 0);
 }
+
 .slide-up-enter,
 .slide-up-leave-active {
   opacity: 0;
@@ -66,7 +69,8 @@ blockquote {
   border-left: 3px dotted $color-neutral-70;
 
   &::before {
-    content: '\201C'; /*Unicode for Left Double Quote*/
+    content: '\201C';
+    /*Unicode for Left Double Quote*/
 
     /*Font*/
     font-size: $font-size-xxxx-large;
@@ -83,6 +87,7 @@ blockquote {
     margin-top: 0;
   }
 }
+
 .main-navigation {
   box-shadow: $box-shadow-base;
   position: fixed;
@@ -105,6 +110,7 @@ hr {
 [class$='menu-trigger'] {
   user-select: none;
 }
+
 [class$='menu-popover'] {
   display: inline-block;
 
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index e3fc1cccd..9743adb6d 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -88,7 +88,7 @@
     </div>
 
     <ds-container>
-      <div style="padding: 6rem 2rem 5rem;">
+      <div :width="{ base: '100%', md: '95%' }">
         <nuxt />
       </div>
     </ds-container>

From ccafc8709cda253c4c6fc771a0727b82f9165921 Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Wed, 3 Jul 2019 12:29:24 +0200
Subject: [PATCH 16/69] fixed a bug

---
 webapp/layouts/default.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 9743adb6d..d52e1e88c 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -86,9 +86,12 @@
         </div>
       </ds-container>
     </div>
-
+    <br />
+    <br />
+    <br />
+    <br />
     <ds-container>
-      <div :width="{ base: '100%', md: '95%' }">
+      <div :width="{ base: '100%', md: '96%' }">
         <nuxt />
       </div>
     </ds-container>

From 10ae4abaae45b36c4cf504d1b9cc7e3f8d34dd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 3 Jul 2019 15:58:42 +0200
Subject: [PATCH 17/69] Use neode to bring `User` mutations under control

This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
---
 .travis.yml                                   |   7 +-
 backend/package.json                          |   6 +-
 backend/src/bootstrap/neo4j.js                |  10 +
 backend/src/bootstrap/neode.js                |  88 ++++
 backend/src/helpers/encryptPassword.js        |   7 +
 backend/src/jest/helpers.js                   |  11 +-
 .../src/middleware/activityPubMiddleware.js   |   2 +-
 backend/src/middleware/dateTimeMiddleware.js  |   1 -
 .../src/middleware/email/emailMiddleware.js   |  57 +++
 .../email/templates/passwordReset.js          |  85 ++++
 .../src/middleware/email/templates/signup.js  |  42 ++
 backend/src/middleware/index.js               |  10 +-
 backend/src/middleware/passwordMiddleware.js  |  21 -
 .../src/middleware/permissionsMiddleware.js   |  41 +-
 backend/src/middleware/sluggifyMiddleware.js  |   8 +-
 .../src/middleware/slugifyMiddleware.spec.js  |  34 +-
 backend/src/middleware/userMiddleware.js      |   2 +-
 backend/src/middleware/validation/index.js    |  13 -
 .../validation/validationMiddleware.js        |  22 +
 backend/src/schema/index.js                   |   6 +-
 backend/src/schema/resolvers/comments.spec.js |  47 +--
 .../src/schema/resolvers/moderation.spec.js   |   2 +-
 backend/src/schema/resolvers/passwordReset.js |  36 +-
 backend/src/schema/resolvers/posts.spec.js    |  45 +-
 backend/src/schema/resolvers/registration.js  | 107 +++++
 .../src/schema/resolvers/registration.spec.js | 395 ++++++++++++++++++
 .../src/schema/resolvers/socialMedia.spec.js  |   9 +-
 .../src/schema/resolvers/user_management.js   |  37 +-
 .../schema/resolvers/user_management.spec.js  | 119 ------
 backend/src/schema/resolvers/users.js         | 122 +++++-
 backend/src/schema/resolvers/users.spec.js    |  75 ++--
 backend/src/schema/types/schema.gql           |   2 -
 .../src/schema/types/type/EmailAddress.gql    |  23 +
 .../src/schema/types/type/InvitationCode.gql  |  13 +
 backend/src/schema/types/type/User.gql        |  96 ++++-
 backend/src/seed/factories/index.js           |  30 +-
 backend/src/seed/factories/users.js           |  63 +--
 backend/src/seed/seed-db.js                   |   1 +
 backend/yarn.lock                             | 163 +++++++-
 cypress/integration/common/steps.js           |   7 +-
 cypress/integration/search/Search.feature     |   6 +-
 cypress/support/factories.js                  |  11 +-
 package.json                                  |   5 +-
 webapp/locales/en.json                        |   2 +-
 webapp/locales/es.json                        |   2 +-
 webapp/plugins/vue-filters.js                 |  10 -
 yarn.lock                                     |  77 +++-
 47 files changed, 1520 insertions(+), 458 deletions(-)
 create mode 100644 backend/src/bootstrap/neode.js
 create mode 100644 backend/src/helpers/encryptPassword.js
 create mode 100644 backend/src/middleware/email/emailMiddleware.js
 create mode 100644 backend/src/middleware/email/templates/passwordReset.js
 create mode 100644 backend/src/middleware/email/templates/signup.js
 delete mode 100644 backend/src/middleware/passwordMiddleware.js
 create mode 100644 backend/src/middleware/validation/validationMiddleware.js
 create mode 100644 backend/src/schema/resolvers/registration.js
 create mode 100644 backend/src/schema/resolvers/registration.spec.js
 create mode 100644 backend/src/schema/types/type/EmailAddress.gql
 create mode 100644 backend/src/schema/types/type/InvitationCode.gql

diff --git a/.travis.yml b/.travis.yml
index f48b0bb36..593b83e5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,10 @@ script:
   - docker-compose exec backend yarn run test:jest --ci --verbose=false --coverage
   - docker-compose exec backend yarn run db:reset
   - docker-compose exec backend yarn run db:seed
-  - docker-compose exec backend yarn run test:cucumber --tags "not @wip"
-  - docker-compose exec backend yarn run db:reset
-  - docker-compose exec backend yarn run db:seed
+  # ActivityPub cucumber testing temporarily disabled because it's too buggy
+  # - docker-compose exec backend yarn run test:cucumber --tags "not @wip"
+  # - docker-compose exec backend yarn run db:reset
+  # - docker-compose exec backend yarn run db:seed
   # Frontend
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test --ci --verbose=false --coverage
diff --git a/backend/package.json b/backend/package.json
index 599e8eac6..5ce312c11 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,17 +42,18 @@
     ]
   },
   "dependencies": {
+    "@hapi/joi": "^15.1.0",
     "activitystrea.ms": "~2.1.3",
     "apollo-cache-inmemory": "~1.6.2",
     "apollo-client": "~2.6.3",
     "apollo-link-context": "~1.0.18",
     "apollo-link-http": "~1.5.15",
-    "apollo-server": "~2.6.7",
+    "apollo-server": "~2.6.6",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
     "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-beta.2",
+    "date-fns": "2.0.0-beta.1",
     "debug": "~4.1.1",
     "dotenv": "~8.0.0",
     "express": "~4.17.1",
@@ -71,6 +72,7 @@
     "merge-graphql-schemas": "^1.5.8",
     "neo4j-driver": "~1.7.4",
     "neo4j-graphql-js": "^2.6.3",
+    "neode": "^0.2.16",
     "node-fetch": "~2.6.0",
     "nodemailer": "^6.2.1",
     "npm-run-all": "~4.1.5",
diff --git a/backend/src/bootstrap/neo4j.js b/backend/src/bootstrap/neo4j.js
index bfa68acf3..f9e3a997d 100644
--- a/backend/src/bootstrap/neo4j.js
+++ b/backend/src/bootstrap/neo4j.js
@@ -1,5 +1,6 @@
 import { v1 as neo4j } from 'neo4j-driver'
 import CONFIG from './../config'
+import setupNeode from './neode'
 
 let driver
 
@@ -14,3 +15,12 @@ export function getDriver(options = {}) {
   }
   return driver
 }
+
+let neodeInstance
+export function neode() {
+  if (!neodeInstance) {
+    const { NEO4J_URI: uri, NEO4J_USERNAME: username, NEO4J_PASSWORD: password } = CONFIG
+    neodeInstance = setupNeode({ uri, username, password })
+  }
+  return neodeInstance
+}
diff --git a/backend/src/bootstrap/neode.js b/backend/src/bootstrap/neode.js
new file mode 100644
index 000000000..419cb1032
--- /dev/null
+++ b/backend/src/bootstrap/neode.js
@@ -0,0 +1,88 @@
+import Neode from 'neode'
+import uuid from 'uuid/v4'
+
+export default function setupNeode(options) {
+  const { uri, username, password } = options
+  const neodeInstance = new Neode(uri, username, password)
+  neodeInstance.model('InvitationCode', {
+    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+    token: { type: 'string', primary: true, token: true },
+    generatedBy: {
+      type: 'relationship',
+      relationship: 'GENERATED',
+      target: 'User',
+      direction: 'in',
+    },
+    activated: {
+      type: 'relationship',
+      relationship: 'ACTIVATED',
+      target: 'EmailAddress',
+      direction: 'out',
+    },
+  })
+  neodeInstance.model('EmailAddress', {
+    email: { type: 'string', primary: true, lowercase: true, email: true },
+    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+    verifiedAt: { type: 'string', isoDate: true },
+    nonce: { type: 'string', token: true },
+    belongsTo: {
+      type: 'relationship',
+      relationship: 'BELONGS_TO',
+      target: 'User',
+      direction: 'out',
+    },
+  })
+  neodeInstance.model('User', {
+    id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
+    actorId: { type: 'string', allow: [null] },
+    name: { type: 'string', min: 3 },
+    email: { type: 'string', lowercase: true, email: true },
+    slug: 'string',
+    encryptedPassword: 'string',
+    avatar: { type: 'string', allow: [null] },
+    coverImg: { type: 'string', allow: [null] },
+    deleted: { type: 'boolean', default: false },
+    disabled: { type: 'boolean', default: false },
+    role: 'string',
+    publicKey: 'string',
+    privateKey: 'string',
+    wasInvited: 'boolean',
+    wasSeeded: 'boolean',
+    locationName: { type: 'string', allow: [null] },
+    about: { type: 'string', allow: [null] },
+    primaryEmail: {
+      type: 'relationship',
+      relationship: 'PRIMARY_EMAIL',
+      target: 'EmailAddress',
+      direction: 'out',
+    },
+    following: {
+      type: 'relationship',
+      relationship: 'FOLLOWS',
+      target: 'User',
+      direction: 'out',
+    },
+    followedBy: {
+      type: 'relationship',
+      relationship: 'FOLLOWS',
+      target: 'User',
+      direction: 'in',
+    },
+    friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
+    disabledBy: {
+      type: 'relationship',
+      relationship: 'DISABLED',
+      target: 'User',
+      direction: 'in',
+    },
+    invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
+    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+    updatedAt: {
+      type: 'string',
+      isoDate: true,
+      required: true,
+      default: () => new Date().toISOString(),
+    },
+  })
+  return neodeInstance
+}
diff --git a/backend/src/helpers/encryptPassword.js b/backend/src/helpers/encryptPassword.js
new file mode 100644
index 000000000..ae98af84f
--- /dev/null
+++ b/backend/src/helpers/encryptPassword.js
@@ -0,0 +1,7 @@
+import { hashSync } from 'bcryptjs'
+
+export default function(args) {
+  args.encryptedPassword = hashSync(args.password, 10)
+  delete args.password
+  return args
+}
diff --git a/backend/src/jest/helpers.js b/backend/src/jest/helpers.js
index d07bc9ad1..e50f30c64 100644
--- a/backend/src/jest/helpers.js
+++ b/backend/src/jest/helpers.js
@@ -4,12 +4,13 @@ import { request } from 'graphql-request'
 // not to be confused with the seeder host
 export const host = 'http://127.0.0.1:4123'
 
-export async function login({ email, password }) {
+export async function login(variables) {
   const mutation = `
-      mutation {
-        login(email:"${email}", password:"${password}")
-      }`
-  const response = await request(host, mutation)
+    mutation($email: String!, $password: String!) {
+      login(email: $email, password: $password)
+    }
+  `
+  const response = await request(host, mutation, variables)
   return {
     authorization: `Bearer ${response.login}`,
   }
diff --git a/backend/src/middleware/activityPubMiddleware.js b/backend/src/middleware/activityPubMiddleware.js
index f3ced42f9..e6fb2385c 100644
--- a/backend/src/middleware/activityPubMiddleware.js
+++ b/backend/src/middleware/activityPubMiddleware.js
@@ -46,7 +46,7 @@ export default {
       }
       return post
     },
-    CreateUser: async (resolve, root, args, context, info) => {
+    SignupVerification: async (resolve, root, args, context, info) => {
       const keys = generateRsaKeyPair()
       Object.assign(args, keys)
       args.actorId = `${activityPub.host}/activitypub/users/${args.slug}`
diff --git a/backend/src/middleware/dateTimeMiddleware.js b/backend/src/middleware/dateTimeMiddleware.js
index ac6e0ac4a..c8af53a7a 100644
--- a/backend/src/middleware/dateTimeMiddleware.js
+++ b/backend/src/middleware/dateTimeMiddleware.js
@@ -9,7 +9,6 @@ const setUpdatedAt = (resolve, root, args, context, info) => {
 
 export default {
   Mutation: {
-    CreateUser: setCreatedAt,
     CreatePost: setCreatedAt,
     CreateComment: setCreatedAt,
     CreateOrganization: setCreatedAt,
diff --git a/backend/src/middleware/email/emailMiddleware.js b/backend/src/middleware/email/emailMiddleware.js
new file mode 100644
index 000000000..0b7cfd058
--- /dev/null
+++ b/backend/src/middleware/email/emailMiddleware.js
@@ -0,0 +1,57 @@
+import CONFIG from '../../config'
+import nodemailer from 'nodemailer'
+import { resetPasswordMail, wrongAccountMail } from './templates/passwordReset'
+import { signupTemplate } from './templates/signup'
+
+const transporter = () => {
+  const configs = {
+    host: CONFIG.SMTP_HOST,
+    port: CONFIG.SMTP_PORT,
+    ignoreTLS: CONFIG.SMTP_IGNORE_TLS,
+    secure: false, // true for 465, false for other ports
+  }
+  const { SMTP_USERNAME: user, SMTP_PASSWORD: pass } = CONFIG
+  if (user && pass) {
+    configs.auth = { user, pass }
+  }
+  return nodemailer.createTransport(configs)
+}
+
+const returnResponse = async (resolve, root, args, context, resolveInfo) => {
+  const { response } = await resolve(root, args, context, resolveInfo)
+  delete response.nonce
+  return response
+}
+
+const sendSignupMail = async (resolve, root, args, context, resolveInfo) => {
+  const { email } = args
+  const { response, nonce } = await resolve(root, args, context, resolveInfo)
+  delete response.nonce
+  await transporter().sendMail(signupTemplate({ email, nonce }))
+  return response
+}
+
+export default function({ isEnabled }) {
+  if (!isEnabled)
+    return {
+      Mutation: {
+        requestPasswordReset: returnResponse,
+        Signup: returnResponse,
+        SignupByInvitation: returnResponse,
+      },
+    }
+
+  return {
+    Mutation: {
+      requestPasswordReset: async (resolve, root, args, context, resolveInfo) => {
+        const { email } = args
+        const { response, user, code, name } = await resolve(root, args, context, resolveInfo)
+        const mailTemplate = user ? resetPasswordMail : wrongAccountMail
+        await transporter().sendMail(mailTemplate({ email, code, name }))
+        return response
+      },
+      Signup: sendSignupMail,
+      SignupByInvitation: sendSignupMail,
+    },
+  }
+}
diff --git a/backend/src/middleware/email/templates/passwordReset.js b/backend/src/middleware/email/templates/passwordReset.js
new file mode 100644
index 000000000..8508adccc
--- /dev/null
+++ b/backend/src/middleware/email/templates/passwordReset.js
@@ -0,0 +1,85 @@
+import CONFIG from '../../../config'
+
+export const from = '"Human Connection" <info@human-connection.org>'
+
+export const resetPasswordMail = options => {
+  const {
+    name,
+    email,
+    code,
+    subject = 'Use this link to reset your password. The link is only valid for 24 hours.',
+    supportUrl = 'https://human-connection.org/en/contact/',
+  } = options
+  const actionUrl = new URL('/password-reset/change-password', CONFIG.CLIENT_URI)
+  actionUrl.searchParams.set('code', code)
+  actionUrl.searchParams.set('email', email)
+
+  return {
+    to: email,
+    subject,
+    text: `
+Hi ${name}!
+
+You recently requested to reset your password for your Human Connection account.
+Use the link below to reset it. This password reset is only valid for the next
+24 hours.
+
+${actionUrl}
+
+If you did not request a password reset, please ignore this email or contact
+support if you have questions:
+
+${supportUrl}
+
+Thanks,
+The Human Connection Team
+
+If you're having trouble with the link above, you can manually copy and
+paste the following code into your browser window:
+
+${code}
+
+Human Connection gemeinnützige GmbH
+Bahnhofstr. 11
+73235 Weilheim / Teck
+Deutschland
+    `,
+  }
+}
+
+export const wrongAccountMail = options => {
+  const {
+    email,
+    subject = `We received a request to reset your password with this email address (${email})`,
+    supportUrl = 'https://human-connection.org/en/contact/',
+  } = options
+  const actionUrl = new URL('/password-reset/request', CONFIG.CLIENT_URI)
+  return {
+    to: email,
+    subject,
+    text: `
+We received a request to reset the password to access Human Connection with your
+email address, but we were unable to find an account associated with this
+address.
+
+If you use Human Connection and were expecting this email, consider trying to
+request a password reset using the email address associated with your account.
+Try a different email:
+
+${actionUrl}
+
+If you do not use Human Connection or did not request a password reset, please
+ignore this email. Feel free to contact support if you have further questions:
+
+${supportUrl}
+
+Thanks,
+The Human Connection Team
+
+Human Connection gemeinnützige GmbH
+Bahnhofstr. 11
+73235 Weilheim / Teck
+Deutschland
+  `,
+  }
+}
diff --git a/backend/src/middleware/email/templates/signup.js b/backend/src/middleware/email/templates/signup.js
new file mode 100644
index 000000000..1a9c0de91
--- /dev/null
+++ b/backend/src/middleware/email/templates/signup.js
@@ -0,0 +1,42 @@
+import CONFIG from '../../../config'
+
+export const from = '"Human Connection" <info@human-connection.org>'
+
+export const signupTemplate = options => {
+  const {
+    email,
+    nonce,
+    subject = 'Signup link',
+    supportUrl = 'https://human-connection.org/en/contact/',
+  } = options
+  const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI)
+  actionUrl.searchParams.set('nonce', nonce)
+
+  return {
+    to: email,
+    subject,
+    text: `
+Welcome to Human Connection! Use this link to complete the registration process
+and create a user account:
+
+${actionUrl}
+
+You can also copy+paste this verification code in your browser window:
+
+${nonce}
+
+If you did not signed up for Human Connection, please ignore this email or
+contact support if you have questions:
+
+${supportUrl}
+
+Thanks,
+The Human Connection Team
+
+Human Connection gemeinnützige GmbH
+Bahnhofstr. 11
+73235 Weilheim / Teck
+Deutschland
+    `,
+  }
+}
diff --git a/backend/src/middleware/index.js b/backend/src/middleware/index.js
index 9b85bd340..14f85f91a 100644
--- a/backend/src/middleware/index.js
+++ b/backend/src/middleware/index.js
@@ -1,6 +1,5 @@
 import CONFIG from './../config'
 import activityPub from './activityPubMiddleware'
-import password from './passwordMiddleware'
 import softDelete from './softDeleteMiddleware'
 import sluggify from './sluggifyMiddleware'
 import excerpt from './excerptMiddleware'
@@ -10,14 +9,14 @@ import permissions from './permissionsMiddleware'
 import user from './userMiddleware'
 import includedFields from './includedFieldsMiddleware'
 import orderBy from './orderByMiddleware'
-import validation from './validation'
+import validation from './validation/validationMiddleware'
 import notifications from './notifications'
+import email from './email/emailMiddleware'
 
 export default schema => {
   const middlewares = {
     permissions: permissions,
     activityPub: activityPub,
-    password: password,
     dateTime: dateTime,
     validation: validation,
     sluggify: sluggify,
@@ -28,16 +27,17 @@ export default schema => {
     user: user,
     includedFields: includedFields,
     orderBy: orderBy,
+    email: email({ isEnabled: CONFIG.SMTP_HOST && CONFIG.SMTP_PORT }),
   }
 
   let order = [
     'permissions',
-    'activityPub',
-    'password',
+    // 'activityPub', disabled temporarily
     'dateTime',
     'validation',
     'sluggify',
     'excerpt',
+    'email',
     'notifications',
     'xss',
     'softDelete',
diff --git a/backend/src/middleware/passwordMiddleware.js b/backend/src/middleware/passwordMiddleware.js
deleted file mode 100644
index 1078e5529..000000000
--- a/backend/src/middleware/passwordMiddleware.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import bcrypt from 'bcryptjs'
-import walkRecursive from '../helpers/walkRecursive'
-
-export default {
-  Mutation: {
-    CreateUser: async (resolve, root, args, context, info) => {
-      args.password = await bcrypt.hashSync(args.password, 10)
-      const result = await resolve(root, args, context, info)
-      result.password = '*****'
-      return result
-    },
-  },
-  Query: async (resolve, root, args, context, info) => {
-    let result = await resolve(root, args, context, info)
-    result = walkRecursive(result, ['password', 'privateKey'], () => {
-      // replace password with asterisk
-      return '*****'
-    })
-    return result
-  },
-}
diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index af4a46d81..8ab3bf167 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -1,4 +1,4 @@
-import { rule, shield, deny, allow, or } from 'graphql-shield'
+import { rule, shield, deny, allow, and, or, not } from 'graphql-shield'
 
 /*
  * TODO: implement
@@ -70,6 +70,29 @@ const onlyEnabledContent = rule({
   return !(disabled || deleted)
 })
 
+const invitationLimitReached = rule({
+  cache: 'no_cache',
+})(async (parent, args, { user, driver }) => {
+  const session = driver.session()
+  try {
+    const result = await session.run(
+      `
+      MATCH (user:User {id:$id})-[:GENERATED]->(i:InvitationCode)
+      RETURN COUNT(i) as count
+      `,
+      { id: user.id },
+    )
+    const [count] = result.records.map(record => {
+      return record.get('count').toNumber()
+    })
+    return count >= 3
+  } catch (e) {
+    throw e
+  } finally {
+    session.close()
+  }
+})
+
 const isAuthor = rule({
   cache: 'no_cache',
 })(async (parent, args, { user, driver }) => {
@@ -101,6 +124,12 @@ const isDeletingOwnAccount = rule({
   return context.user.id === args.id
 })
 
+const noEmailFilter = rule({
+  cache: 'no_cache',
+})(async (_, args) => {
+  return !('email' in args)
+})
+
 // Permissions
 const permissions = shield(
   {
@@ -115,14 +144,17 @@ const permissions = shield(
       currentUser: allow,
       Post: or(onlyEnabledContent, isModerator),
       Comment: allow,
-      User: allow,
+      User: or(noEmailFilter, isAdmin),
       isLoggedIn: allow,
     },
     Mutation: {
       '*': deny,
       login: allow,
+      SignupByInvitation: allow,
+      Signup: isAdmin,
+      SignupVerification: allow,
+      CreateInvitationCode: and(isAuthenticated, or(not(invitationLimitReached), isAdmin)),
       UpdateNotification: belongsToMe,
-      CreateUser: isAdmin,
       UpdateUser: onlyYourself,
       CreatePost: isAuthenticated,
       UpdatePost: isAuthor,
@@ -131,7 +163,6 @@ const permissions = shield(
       CreateBadge: isAdmin,
       UpdateBadge: isAdmin,
       DeleteBadge: isAdmin,
-      AddUserBadges: isAdmin,
       CreateSocialMedia: isAuthenticated,
       DeleteSocialMedia: isAuthenticated,
       // AddBadgeRewarded: isAdmin,
@@ -154,8 +185,6 @@ const permissions = shield(
     },
     User: {
       email: isMyOwn,
-      password: isMyOwn,
-      privateKey: isMyOwn,
     },
   },
   {
diff --git a/backend/src/middleware/sluggifyMiddleware.js b/backend/src/middleware/sluggifyMiddleware.js
index 226bef8e5..6133a3c14 100644
--- a/backend/src/middleware/sluggifyMiddleware.js
+++ b/backend/src/middleware/sluggifyMiddleware.js
@@ -13,6 +13,10 @@ const isUniqueFor = (context, type) => {
 
 export default {
   Mutation: {
+    SignupVerification: async (resolve, root, args, context, info) => {
+      args.slug = args.slug || (await uniqueSlug(args.name, isUniqueFor(context, 'User')))
+      return resolve(root, args, context, info)
+    },
     CreatePost: async (resolve, root, args, context, info) => {
       args.slug = args.slug || (await uniqueSlug(args.title, isUniqueFor(context, 'Post')))
       return resolve(root, args, context, info)
@@ -21,10 +25,6 @@ export default {
       args.slug = args.slug || (await uniqueSlug(args.title, isUniqueFor(context, 'Post')))
       return resolve(root, args, context, info)
     },
-    CreateUser: async (resolve, root, args, context, info) => {
-      args.slug = args.slug || (await uniqueSlug(args.name, isUniqueFor(context, 'User')))
-      return resolve(root, args, context, info)
-    },
     CreateOrganization: async (resolve, root, args, context, info) => {
       args.slug = args.slug || (await uniqueSlug(args.name, isUniqueFor(context, 'Organization')))
       return resolve(root, args, context, info)
diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js
index 4e060dc90..5ee4faa3c 100644
--- a/backend/src/middleware/slugifyMiddleware.spec.js
+++ b/backend/src/middleware/slugifyMiddleware.spec.js
@@ -1,10 +1,12 @@
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../seed/factories'
 import { host, login } from '../jest/helpers'
+import { neode } from '../bootstrap/neo4j'
 
 let authenticatedClient
 let headers
 const factory = Factory()
+const instance = neode()
 
 beforeEach(async () => {
   const adminParams = { role: 'admin', email: 'admin@example.org', password: '1234' }
@@ -76,33 +78,41 @@ describe('slugify', () => {
     })
   })
 
-  describe('CreateUser', () => {
-    const action = async (mutation, params) => {
-      return authenticatedClient.request(`mutation {
-        ${mutation}(password: "yo", email: "123@123.de", ${params}) { slug }
-      }`)
+  describe('SignupVerification', () => {
+    const mutation = `mutation($password: String!, $email: String!, $name: String!, $slug: String, $nonce: String!) {
+      SignupVerification(email: $email, password: $password, name: $name, slug: $slug, nonce: $nonce) { slug }
     }
+    `
+
+    const action = async variables => {
+      // required for SignupVerification
+      await instance.create('EmailAddress', { email: '123@example.org', nonce: '123456' })
+
+      const defaultVariables = { nonce: '123456', password: 'yo', email: '123@example.org' }
+      return authenticatedClient.request(mutation, { ...defaultVariables, ...variables })
+    }
+
     it('generates a slug based on name', async () => {
-      await expect(action('CreateUser', 'name: "I am a user"')).resolves.toEqual({
-        CreateUser: { slug: 'i-am-a-user' },
+      await expect(action({ name: 'I am a user' })).resolves.toEqual({
+        SignupVerification: { slug: 'i-am-a-user' },
       })
     })
 
     describe('if slug exists', () => {
       beforeEach(async () => {
-        await action('CreateUser', 'name: "Pre-existing user", slug: "pre-existing-user"')
+        await factory.create('User', { name: 'pre-existing user', slug: 'pre-existing-user' })
       })
 
       it('chooses another slug', async () => {
-        await expect(action('CreateUser', 'name: "pre-existing-user"')).resolves.toEqual({
-          CreateUser: { slug: 'pre-existing-user-1' },
+        await expect(action({ name: 'pre-existing-user' })).resolves.toEqual({
+          SignupVerification: { slug: 'pre-existing-user-1' },
         })
       })
 
       describe('but if the client specifies a slug', () => {
-        it('rejects CreateUser', async () => {
+        it('rejects SignupVerification', async () => {
           await expect(
-            action('CreateUser', 'name: "Pre-existing user", slug: "pre-existing-user"'),
+            action({ name: 'Pre-existing user', slug: 'pre-existing-user' }),
           ).rejects.toThrow('already exists')
         })
       })
diff --git a/backend/src/middleware/userMiddleware.js b/backend/src/middleware/userMiddleware.js
index 29e512ebd..fafbd44e5 100644
--- a/backend/src/middleware/userMiddleware.js
+++ b/backend/src/middleware/userMiddleware.js
@@ -2,7 +2,7 @@ import createOrUpdateLocations from './nodes/locations'
 
 export default {
   Mutation: {
-    CreateUser: async (resolve, root, args, context, info) => {
+    SignupVerification: async (resolve, root, args, context, info) => {
       const result = await resolve(root, args, context, info)
       await createOrUpdateLocations(args.id, args.locationName, context.driver)
       return result
diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index cfc852dcb..ca7a6b338 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -1,16 +1,5 @@
 import { UserInputError } from 'apollo-server'
 
-const USERNAME_MIN_LENGTH = 3
-
-const validateUsername = async (resolve, root, args, context, info) => {
-  if (!('name' in args) || (args.name && args.name.length >= USERNAME_MIN_LENGTH)) {
-    /* eslint-disable-next-line no-return-await */
-    return await resolve(root, args, context, info)
-  } else {
-    throw new UserInputError(`Username must be at least ${USERNAME_MIN_LENGTH} characters long!`)
-  }
-}
-
 const validateUrl = async (resolve, root, args, context, info) => {
   const { url } = args
   const isValid = url.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:/\n?]+)/g)
@@ -24,8 +13,6 @@ const validateUrl = async (resolve, root, args, context, info) => {
 
 export default {
   Mutation: {
-    CreateUser: validateUsername,
-    UpdateUser: validateUsername,
     CreateSocialMedia: validateUrl,
   },
 }
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
new file mode 100644
index 000000000..9ac15a60f
--- /dev/null
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -0,0 +1,22 @@
+import { UserInputError } from 'apollo-server'
+import Joi from '@hapi/joi'
+
+const validate = schema => {
+  return async (resolve, root, args, context, info) => {
+    const validation = schema.validate(args)
+    if (validation.error) throw new UserInputError(validation.error)
+    return resolve(root, args, context, info)
+  }
+}
+
+const socialMediaSchema = Joi.object().keys({
+  url: Joi.string()
+    .uri()
+    .required(),
+})
+
+export default {
+  Mutation: {
+    CreateSocialMedia: validate(socialMediaSchema),
+  },
+}
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index d294d8aba..8fbb5cfda 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -12,10 +12,12 @@ export default applyScalars(
       resolvers,
       config: {
         query: {
-          exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
+          exclude: ['InvitationCode', 'EmailAddress', 'Notfication', 'Statistics', 'LoggedInUser'],
+          // add 'User' here as soon as possible
         },
         mutation: {
-          exclude: ['Notfication', 'Statistics', 'LoggedInUser'],
+          exclude: ['InvitationCode', 'EmailAddress', 'Notfication', 'Statistics', 'LoggedInUser'],
+          // add 'User' here as soon as possible
         },
         debug: CONFIG.DEBUG,
       },
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 07462ed49..7f17539dc 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -9,12 +9,16 @@ let createCommentVariables
 let createPostVariables
 let createCommentVariablesSansPostId
 let createCommentVariablesWithNonExistentPost
+let userParams
+let authorParams
 
 beforeEach(async () => {
-  await factory.create('User', {
+  userParams = {
+    name: 'TestUser',
     email: 'test@example.org',
     password: '1234',
-  })
+  }
+  await factory.create('User', userParams)
 })
 
 afterEach(async () => {
@@ -53,10 +57,7 @@ describe('CreateComment', () => {
   describe('authenticated', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({
-        email: 'test@example.org',
-        password: '1234',
-      })
+      headers = await login(userParams)
       client = new GraphQLClient(host, {
         headers,
       })
@@ -89,7 +90,7 @@ describe('CreateComment', () => {
 
       const { User } = await client.request(gql`
         {
-          User(email: "test@example.org") {
+          User(name: "TestUser") {
             comments {
               content
             }
@@ -201,15 +202,13 @@ describe('DeleteComment', () => {
   }
 
   beforeEach(async () => {
+    authorParams = {
+      email: 'author@example.org',
+      password: '1234',
+    }
     const asAuthor = Factory()
-    await asAuthor.create('User', {
-      email: 'author@example.org',
-      password: '1234',
-    })
-    await asAuthor.authenticateAs({
-      email: 'author@example.org',
-      password: '1234',
-    })
+    await asAuthor.create('User', authorParams)
+    await asAuthor.authenticateAs(authorParams)
     await asAuthor.create('Post', {
       id: 'p1',
       content: 'Post to be commented',
@@ -233,13 +232,8 @@ describe('DeleteComment', () => {
   describe('authenticated but not the author', () => {
     beforeEach(async () => {
       let headers
-      headers = await login({
-        email: 'test@example.org',
-        password: '1234',
-      })
-      client = new GraphQLClient(host, {
-        headers,
-      })
+      headers = await login(userParams)
+      client = new GraphQLClient(host, { headers })
     })
 
     it('throws authorization error', async () => {
@@ -252,13 +246,8 @@ describe('DeleteComment', () => {
   describe('authenticated as author', () => {
     beforeEach(async () => {
       let headers
-      headers = await login({
-        email: 'author@example.org',
-        password: '1234',
-      })
-      client = new GraphQLClient(host, {
-        headers,
-      })
+      headers = await login(authorParams)
+      client = new GraphQLClient(host, { headers })
     })
 
     it('deletes the comment', async () => {
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index b1dec603b..db679f522 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -254,7 +254,7 @@ describe('enable', () => {
       beforeEach(async () => {
         authenticateClient = setupAuthenticateClient({
           role: 'moderator',
-          email: 'someUser@example.org',
+          email: 'someuser@example.org',
           password: '1234',
         })
       })
diff --git a/backend/src/schema/resolvers/passwordReset.js b/backend/src/schema/resolvers/passwordReset.js
index 13789662b..415eb6f21 100644
--- a/backend/src/schema/resolvers/passwordReset.js
+++ b/backend/src/schema/resolvers/passwordReset.js
@@ -1,22 +1,5 @@
 import uuid from 'uuid/v4'
 import bcrypt from 'bcryptjs'
-import CONFIG from '../../config'
-import nodemailer from 'nodemailer'
-import { resetPasswordMail, wrongAccountMail } from './passwordReset/emailTemplates'
-
-const transporter = () => {
-  const configs = {
-    host: CONFIG.SMTP_HOST,
-    port: CONFIG.SMTP_PORT,
-    ignoreTLS: CONFIG.SMTP_IGNORE_TLS,
-    secure: false, // true for 465, false for other ports
-  }
-  const { SMTP_USERNAME: user, SMTP_PASSWORD: pass } = CONFIG
-  if (user && pass) {
-    configs.auth = { user, pass }
-  }
-  return nodemailer.createTransport(configs)
-}
 
 export async function createPasswordReset(options) {
   const { driver, code, email, issuedAt = new Date() } = options
@@ -42,27 +25,28 @@ export default {
     requestPasswordReset: async (_, { email }, { driver }) => {
       const code = uuid().substring(0, 6)
       const [user] = await createPasswordReset({ driver, code, email })
-      if (CONFIG.SMTP_HOST && CONFIG.SMTP_PORT) {
-        const name = (user && user.name) || ''
-        const mailTemplate = user ? resetPasswordMail : wrongAccountMail
-        await transporter().sendMail(mailTemplate({ email, code, name }))
-      }
-      return true
+      const name = (user && user.name) || ''
+      return { user, code, name, response: true }
     },
     resetPassword: async (_, { email, code, newPassword }, { driver }) => {
       const session = driver.session()
       const stillValid = new Date()
       stillValid.setDate(stillValid.getDate() - 1)
-      const newHashedPassword = await bcrypt.hashSync(newPassword, 10)
+      const encryptedNewPassword = await bcrypt.hashSync(newPassword, 10)
       const cypher = `
       MATCH (pr:PasswordReset {code: $code})
       MATCH (u:User {email: $email})-[:REQUESTED]->(pr)
       WHERE duration.between(pr.issuedAt, datetime()).days <= 0 AND pr.usedAt IS NULL
       SET pr.usedAt = datetime()
-      SET u.password = $newHashedPassword
+      SET u.encryptedPassword = $encryptedNewPassword
       RETURN pr
       `
-      let transactionRes = await session.run(cypher, { stillValid, email, code, newHashedPassword })
+      let transactionRes = await session.run(cypher, {
+        stillValid,
+        email,
+        code,
+        encryptedNewPassword,
+      })
       const [reset] = transactionRes.records.map(record => record.get('pr'))
       const result = !!(reset && reset.properties.usedAt)
       session.close()
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 763945527..2e5069de7 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -4,6 +4,9 @@ import { host, login } from '../../jest/helpers'
 
 const factory = Factory()
 let client
+let userParams
+let authorParams
+
 const postTitle = 'I am a title'
 const postContent = 'Some content'
 const oldTitle = 'Old title'
@@ -33,10 +36,16 @@ const postQueryWithCategories = `
   }
 `
 beforeEach(async () => {
-  await factory.create('User', {
+  userParams = {
+    name: 'TestUser',
     email: 'test@example.org',
     password: '1234',
-  })
+  }
+  authorParams = {
+    email: 'author@example.org',
+    password: '1234',
+  }
+  await factory.create('User', userParams)
 })
 
 afterEach(async () => {
@@ -66,7 +75,7 @@ describe('CreatePost', () => {
   describe('authenticated', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
+      headers = await login(userParams)
       client = new GraphQLClient(host, { headers })
     })
 
@@ -84,7 +93,7 @@ describe('CreatePost', () => {
       await client.request(mutation, createPostVariables)
       const { User } = await client.request(
         `{
-          User(email:"test@example.org") {
+          User(name: "TestUser") {
             contributions {
               title
             }
@@ -163,14 +172,8 @@ describe('UpdatePost', () => {
   let updatePostVariables
   beforeEach(async () => {
     const asAuthor = Factory()
-    await asAuthor.create('User', {
-      email: 'author@example.org',
-      password: '1234',
-    })
-    await asAuthor.authenticateAs({
-      email: 'author@example.org',
-      password: '1234',
-    })
+    await asAuthor.create('User', authorParams)
+    await asAuthor.authenticateAs(authorParams)
     await asAuthor.create('Post', {
       id: 'p1',
       title: oldTitle,
@@ -205,7 +208,7 @@ describe('UpdatePost', () => {
   describe('authenticated but not the author', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
+      headers = await login(userParams)
       client = new GraphQLClient(host, { headers })
     })
 
@@ -219,7 +222,7 @@ describe('UpdatePost', () => {
   describe('authenticated as author', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'author@example.org', password: '1234' })
+      headers = await login(authorParams)
       client = new GraphQLClient(host, { headers })
     })
 
@@ -297,14 +300,8 @@ describe('DeletePost', () => {
 
   beforeEach(async () => {
     const asAuthor = Factory()
-    await asAuthor.create('User', {
-      email: 'author@example.org',
-      password: '1234',
-    })
-    await asAuthor.authenticateAs({
-      email: 'author@example.org',
-      password: '1234',
-    })
+    await asAuthor.create('User', authorParams)
+    await asAuthor.authenticateAs(authorParams)
     await asAuthor.create('Post', {
       id: 'p1',
       content: 'To be deleted',
@@ -321,7 +318,7 @@ describe('DeletePost', () => {
   describe('authenticated but not the author', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
+      headers = await login(userParams)
       client = new GraphQLClient(host, { headers })
     })
 
@@ -333,7 +330,7 @@ describe('DeletePost', () => {
   describe('authenticated as author', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'author@example.org', password: '1234' })
+      headers = await login(authorParams)
       client = new GraphQLClient(host, { headers })
     })
 
diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js
new file mode 100644
index 000000000..3c8243d8a
--- /dev/null
+++ b/backend/src/schema/resolvers/registration.js
@@ -0,0 +1,107 @@
+import { UserInputError } from 'apollo-server'
+import uuid from 'uuid/v4'
+import { neode } from '../../bootstrap/neo4j'
+import fileUpload from './fileUpload'
+import encryptPassword from '../../helpers/encryptPassword'
+
+const instance = neode()
+
+/*
+ * TODO: remove this function as soon type `User` has no `email` property
+ * anymore
+ */
+const checkEmailDoesNotExist = async ({ email }) => {
+  email = email.toLowerCase()
+  const users = await instance.all('User', { email })
+  if (users.length > 0) throw new UserInputError('User account with this email already exists.')
+}
+
+export default {
+  Mutation: {
+    CreateInvitationCode: async (parent, args, context, resolveInfo) => {
+      args.token = uuid().substring(0, 6)
+      const {
+        user: { id: userId },
+      } = context
+      let response
+      try {
+        const [user, invitationCode] = await Promise.all([
+          instance.find('User', userId),
+          instance.create('InvitationCode', args),
+        ])
+        await invitationCode.relateTo(user, 'generatedBy')
+        response = invitationCode.toJson()
+        response.generatedBy = user.toJson()
+      } catch (e) {
+        throw new UserInputError(e)
+      }
+      return response
+    },
+    Signup: async (parent, args, context, resolveInfo) => {
+      const nonce = uuid().substring(0, 6)
+      args.nonce = nonce
+      await checkEmailDoesNotExist({ email: args.email })
+      try {
+        const emailAddress = await instance.create('EmailAddress', args)
+        return { response: emailAddress.toJson(), nonce }
+      } catch (e) {
+        throw new UserInputError(e.message)
+      }
+    },
+    SignupByInvitation: async (parent, args, context, resolveInfo) => {
+      const { token } = args
+      const nonce = uuid().substring(0, 6)
+      args.nonce = nonce
+      await checkEmailDoesNotExist({ email: args.email })
+      try {
+        const result = await instance.cypher(
+          `
+        MATCH (invitationCode:InvitationCode {token:{token}})
+        WHERE NOT (invitationCode)-[:ACTIVATED]->()
+        RETURN invitationCode
+        `,
+          { token },
+        )
+        const validInvitationCode = instance.hydrateFirst(
+          result,
+          'invitationCode',
+          instance.model('InvitationCode'),
+        )
+        if (!validInvitationCode)
+          throw new UserInputError('Invitation code already used or does not exist.')
+        const emailAddress = await instance.create('EmailAddress', args)
+        await validInvitationCode.relateTo(emailAddress, 'activated')
+        return { response: emailAddress.toJson(), nonce }
+      } catch (e) {
+        throw new UserInputError(e)
+      }
+    },
+    SignupVerification: async (object, args, context, resolveInfo) => {
+      let { nonce, email } = args
+      email = email.toLowerCase()
+      const result = await instance.cypher(
+        `
+      MATCH(email:EmailAddress {nonce: {nonce}, email: {email}})
+      WHERE NOT (email)-[:BELONGS_TO]->()
+      RETURN email
+      `,
+        { nonce, email },
+      )
+      const emailAddress = await instance.hydrateFirst(result, 'email', instance.model('Email'))
+      if (!emailAddress) throw new UserInputError('Invalid email or nonce')
+      args = await fileUpload(args, { file: 'avatarUpload', url: 'avatar' })
+      args = await encryptPassword(args)
+      try {
+        const user = await instance.create('User', args)
+        await Promise.all([
+          user.relateTo(emailAddress, 'primaryEmail'),
+          emailAddress.relateTo(user, 'belongsTo'),
+          emailAddress.update({ verifiedAt: new Date().toISOString() }),
+        ])
+        return user.toJson()
+      } catch (e) {
+        throw new UserInputError(e.message)
+      }
+    },
+  },
+}
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
new file mode 100644
index 000000000..e6bce145e
--- /dev/null
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -0,0 +1,395 @@
+import { GraphQLClient } from 'graphql-request'
+import Factory from '../../seed/factories'
+import { host, login } from '../../jest/helpers'
+import { neode } from '../../bootstrap/neo4j'
+
+let factory
+let client
+let variables
+let action
+let userParams
+const instance = neode()
+
+beforeEach(async () => {
+  variables = {}
+  factory = Factory()
+})
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('CreateInvitationCode', () => {
+  const mutation = `mutation { CreateInvitationCode { token } }`
+
+  it('throws Authorization error', async () => {
+    const client = new GraphQLClient(host)
+    await expect(client.request(mutation)).rejects.toThrow('Not Authorised!')
+  })
+
+  describe('authenticated', () => {
+    beforeEach(async () => {
+      userParams = {
+        id: 'i123',
+        name: 'Inviter',
+        email: 'inviter@example.org',
+        password: '1234',
+      }
+      action = async () => {
+        const factory = Factory()
+        await factory.create('User', userParams)
+        const headers = await login(userParams)
+        client = new GraphQLClient(host, { headers })
+        return client.request(mutation)
+      }
+    })
+
+    it('resolves', async () => {
+      await expect(action()).resolves.toEqual({
+        CreateInvitationCode: { token: expect.any(String) },
+      })
+    })
+
+    it('creates an InvitationCode with a `createdAt` attribute', async () => {
+      await action()
+      const codes = await instance.all('InvitationCode')
+      const invitation = await codes.first().toJson()
+      expect(invitation.createdAt).toBeTruthy()
+      expect(Date.parse(invitation.createdAt)).toEqual(expect.any(Number))
+    })
+
+    it('relates inviting User to InvitationCode', async () => {
+      await action()
+      const result = await instance.cypher(
+        'MATCH(code:InvitationCode)<-[:GENERATED]-(user:User) RETURN user',
+      )
+      const inviter = instance.hydrateFirst(result, 'user', instance.model('User'))
+      await expect(inviter.toJson()).resolves.toEqual(expect.objectContaining({ name: 'Inviter' }))
+    })
+
+    describe('who has invited a lot of users already', () => {
+      beforeEach(() => {
+        action = async () => {
+          const factory = Factory()
+          await factory.create('User', userParams)
+          const headers = await login(userParams)
+          client = new GraphQLClient(host, { headers })
+          await Promise.all(
+            [1, 2, 3].map(() => {
+              return client.request(mutation)
+            }),
+          )
+          return client.request(mutation, variables)
+        }
+      })
+
+      describe('as ordinary `user`', () => {
+        it('throws `Not Authorised` because of maximum number of invitations', async () => {
+          await expect(action()).rejects.toThrow('Not Authorised')
+        })
+
+        it('creates no additional invitation codes', async done => {
+          try {
+            await action()
+          } catch (e) {
+            const invitationCodes = await instance.all('InvitationCode')
+            await expect(invitationCodes.toJson()).resolves.toHaveLength(3)
+            done()
+          }
+        })
+      })
+
+      describe('as a strong donator', () => {
+        beforeEach(() => {
+          // What is the setup?
+        })
+
+        it.todo('can invite more people')
+        // it('can invite more people', async () => {
+        // await action()
+        // const invitationQuery = `{ User { createdAt } }`
+        // const { User: users } = await client.request(invitationQuery )
+        // expect(users).toHaveLength(3 + 1 + 1)
+        // })
+      })
+    })
+  })
+})
+
+describe('SignupByInvitation', () => {
+  const mutation = `mutation($email: String!, $token: String!) {
+    SignupByInvitation(email: $email, token: $token) { email }
+  }`
+
+  beforeEach(() => {
+    client = new GraphQLClient(host)
+    action = async () => {
+      return client.request(mutation, variables)
+    }
+  })
+
+  it.todo('throws Authorization error')
+
+  describe('with invalid InvitationCode', () => {
+    beforeEach(() => {
+      variables.token = 'wut?'
+    })
+
+    it.todo('throws UserInputError')
+  })
+
+  describe('with valid InvitationCode', () => {
+    beforeEach(async () => {
+      const inviterParams = {
+        name: 'Inviter',
+        email: 'inviter@example.org',
+        password: '1234',
+      }
+      const factory = Factory()
+      await factory.create('User', inviterParams)
+      const headersOfInviter = await login(inviterParams)
+      const anotherClient = new GraphQLClient(host, { headers: headersOfInviter })
+      const invitationMutation = `mutation { CreateInvitationCode { token } }`
+      const {
+        CreateInvitationCode: { token },
+      } = await anotherClient.request(invitationMutation)
+      variables.token = token
+    })
+
+    describe('given an invalid email', () => {
+      beforeEach(() => {
+        variables.email = 'someuser'
+      })
+
+      it('throws `email is not a valid email`', async () => {
+        await expect(action()).rejects.toThrow('"email" must be a valid email')
+      })
+
+      it('creates no EmailAddress node', async done => {
+        try {
+          await action()
+        } catch (e) {
+          const emailAddresses = await instance.all('EmailAddress')
+          expect(emailAddresses).toHaveLength(0)
+          done()
+        }
+      })
+    })
+
+    describe('given a valid email', () => {
+      beforeEach(() => {
+        variables.email = 'someUser@example.org'
+      })
+
+      it('resolves', async () => {
+        await expect(action()).resolves.toEqual({
+          SignupByInvitation: { email: 'someuser@example.org' },
+        })
+      })
+
+      describe('creates a EmailAddress node', () => {
+        it('with a `createdAt` attribute', async () => {
+          await action()
+          const emailAddresses = await instance.all('EmailAddress')
+          const emailAddress = await emailAddresses.first().toJson()
+          expect(emailAddress.createdAt).toBeTruthy()
+          expect(Date.parse(emailAddress.createdAt)).toEqual(expect.any(Number))
+        })
+
+        it('with a cryptographic `nonce`', async () => {
+          await action()
+          const emailAddresses = await instance.all('EmailAddress')
+          const emailAddress = await emailAddresses.first().toJson()
+          expect(emailAddress.nonce).toEqual(expect.any(String))
+        })
+
+        it('connects inviter through invitation code', async () => {
+          await action()
+          const result = await instance.cypher(
+            'MATCH(inviter:User)-[:GENERATED]->(:InvitationCode)-[:ACTIVATED]->(email:EmailAddress {email: {email}}) RETURN inviter',
+            { email: 'someuser@example.org' },
+          )
+          const inviter = instance.hydrateFirst(result, 'inviter', instance.model('User'))
+          await expect(inviter.toJson()).resolves.toEqual(
+            expect.objectContaining({ name: 'Inviter' }),
+          )
+        })
+
+        describe('using the same InvitationCode twice', () => {
+          it('rejects because codes can be used only once', async done => {
+            await action()
+            try {
+              await action()
+            } catch (e) {
+              expect(e.message).toMatch(/Invitation code already used/)
+              done()
+            }
+          })
+        })
+
+        describe('if a user account with the given email already exists', () => {
+          beforeEach(async () => {
+            await factory.create('User', { email: 'someuser@example.org' })
+          })
+
+          it('throws unique violation error', async () => {
+            await expect(action()).rejects.toThrow('User account with this email already exists.')
+          })
+        })
+
+        describe('if the EmailAddress already exists but without user account', () => {
+          it.todo('decide what to do')
+        })
+      })
+    })
+  })
+})
+
+describe('Signup', () => {
+  const mutation = `mutation($email: String!) {
+    Signup(email: $email) { email }
+  }`
+
+  it.todo('throws AuthorizationError')
+
+  describe('as admin', () => {
+    beforeEach(async () => {
+      userParams = {
+        role: 'admin',
+        email: 'admin@example.org',
+        password: '1234',
+      }
+      variables.email = 'someuser@example.org'
+      const factory = Factory()
+      await factory.create('User', userParams)
+      const headers = await login(userParams)
+      client = new GraphQLClient(host, { headers })
+      action = async () => {
+        return client.request(mutation, variables)
+      }
+    })
+
+    it('is allowed to signup users by email', async () => {
+      await expect(action()).resolves.toEqual({ Signup: { email: 'someuser@example.org' } })
+    })
+
+    it('creates a Signup with a cryptographic `nonce`', async () => {
+      await action()
+      const emailAddresses = await instance.all('EmailAddress')
+      const emailAddress = await emailAddresses.first().toJson()
+      expect(emailAddress.nonce).toEqual(expect.any(String))
+    })
+  })
+})
+
+describe('SignupVerification', () => {
+  const mutation = `
+      mutation($name: String!, $password: String!, $email: String!, $nonce: String!) {
+        SignupVerification(name: $name, password: $password, email: $email, nonce: $nonce) {
+          id
+        }
+      }
+    `
+  describe('given valid password and email', () => {
+    let variables = {
+      nonce: '123456',
+      name: 'John Doe',
+      password: '123',
+      email: 'john@example.org',
+    }
+
+    describe('unauthenticated', () => {
+      beforeEach(async () => {
+        client = new GraphQLClient(host)
+      })
+
+      describe('EmailAddress exists, but is already related to a user account', () => {
+        beforeEach(async () => {
+          const { email, nonce } = variables
+          const [emailAddress, user] = await Promise.all([
+            instance.model('EmailAddress').create({ email, nonce }),
+            instance
+              .model('User')
+              .create({ name: 'Somebody', password: '1234', email: 'john@example.org' }),
+          ])
+          await emailAddress.relateTo(user, 'belongsTo')
+        })
+
+        describe('sending a valid nonce', () => {
+          beforeEach(() => {
+            variables.nonce = '123456'
+          })
+
+          it('rejects', async () => {
+            await expect(client.request(mutation, variables)).rejects.toThrow(
+              'Invalid email or nonce',
+            )
+          })
+        })
+      })
+
+      describe('disconnected EmailAddress exists', () => {
+        beforeEach(async () => {
+          const args = {
+            email: 'john@example.org',
+            nonce: '123456',
+          }
+          await instance.model('EmailAddress').create(args)
+        })
+
+        describe('sending a valid nonce', () => {
+          it('creates a user account', async () => {
+            const expected = {
+              SignupVerification: {
+                id: expect.any(String),
+              },
+            }
+            await expect(client.request(mutation, variables)).resolves.toEqual(expected)
+          })
+
+          it('sets `verifiedAt` attribute of EmailAddress', async () => {
+            await client.request(mutation, variables)
+            const email = await instance.first('EmailAddress', { email: 'john@example.org' })
+            await expect(email.toJson()).resolves.toEqual(
+              expect.objectContaining({
+                verifiedAt: expect.any(String),
+              }),
+            )
+          })
+
+          it('connects User with EmailAddress', async () => {
+            const cypher = `
+                MATCH(email:EmailAddress)-[:BELONGS_TO]->(u:User {name: {name}})
+                RETURN email
+              `
+            await client.request(mutation, variables)
+            const { records: emails } = await instance.cypher(cypher, { name: 'John Doe' })
+            expect(emails).toHaveLength(1)
+          })
+
+          it('marks the EmailAddress as primary', async () => {
+            const cypher = `
+                MATCH(email:EmailAddress)<-[:PRIMARY_EMAIL]-(u:User {name: {name}})
+                RETURN email
+              `
+            await client.request(mutation, variables)
+            const { records: emails } = await instance.cypher(cypher, { name: 'John Doe' })
+            expect(emails).toHaveLength(1)
+          })
+        })
+
+        describe('sending invalid nonce', () => {
+          beforeEach(() => {
+            variables.nonce = 'wut2'
+          })
+
+          it('rejects', async () => {
+            await expect(client.request(mutation, variables)).rejects.toThrow(
+              'Invalid email or nonce',
+            )
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js
index 38850761c..bacc86fbe 100644
--- a/backend/src/schema/resolvers/socialMedia.spec.js
+++ b/backend/src/schema/resolvers/socialMedia.spec.js
@@ -98,14 +98,19 @@ describe('SocialMedia', () => {
       const variables = {
         url: '',
       }
-      await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
+      await expect(client.request(mutationC, variables)).rejects.toThrow(
+        '"url" is not allowed to be empty',
+      )
     })
 
     it('validates URLs', async () => {
       const variables = {
         url: 'not-a-url',
       }
-      await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
+
+      await expect(client.request(mutationC, variables)).rejects.toThrow(
+        '"url" must be a valid uri',
+      )
     })
   })
 })
diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index e33314f7e..120bf1a77 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -5,50 +5,39 @@ import { neo4jgraphql } from 'neo4j-graphql-js'
 
 export default {
   Query: {
-    isLoggedIn: (parent, args, { driver, user }) => {
+    isLoggedIn: (_, args, { driver, user }) => {
       return Boolean(user && user.id)
     },
     currentUser: async (object, params, ctx, resolveInfo) => {
       const { user } = ctx
       if (!user) return null
-      return neo4jgraphql(object, { id: user.id }, ctx, resolveInfo, false)
+      return neo4jgraphql(object, { id: user.id }, ctx, resolveInfo, true)
     },
   },
   Mutation: {
-    signup: async (parent, { email, password }, { req }) => {
-      // if (data[email]) {
-      //   throw new Error('Another User with same email exists.')
-      // }
-      // data[email] = {
-      //   password: await bcrypt.hashSync(password, 10),
-      // }
-
-      return true
-    },
-    login: async (parent, { email, password }, { driver, req, user }) => {
+    login: async (_, { email, password }, { driver, req, user }) => {
       // if (user && user.id) {
       //   throw new Error('Already logged in.')
       // }
       const session = driver.session()
       const result = await session.run(
         'MATCH (user:User {email: $userEmail}) ' +
-          'RETURN user {.id, .slug, .name, .avatar, .email, .password, .role, .disabled} as user LIMIT 1',
+          'RETURN user {.id, .slug, .name, .avatar, .email, .encryptedPassword, .role, .disabled} as user LIMIT 1',
         {
           userEmail: email,
         },
       )
-
       session.close()
-      const [currentUser] = await result.records.map(function(record) {
+      const [currentUser] = await result.records.map(record => {
         return record.get('user')
       })
 
       if (
         currentUser &&
-        (await bcrypt.compareSync(password, currentUser.password)) &&
+        (await bcrypt.compareSync(password, currentUser.encryptedPassword)) &&
         !currentUser.disabled
       ) {
-        delete currentUser.password
+        delete currentUser.encryptedPassword
         return encode(currentUser)
       } else if (currentUser && currentUser.disabled) {
         throw new AuthenticationError('Your account has been disabled.')
@@ -60,7 +49,7 @@ export default {
       const session = driver.session()
       let result = await session.run(
         `MATCH (user:User {email: $userEmail})
-         RETURN user {.id, .email, .password}`,
+         RETURN user {.id, .email, .encryptedPassword}`,
         {
           userEmail: user.email,
         },
@@ -70,22 +59,22 @@ export default {
         return record.get('user')
       })
 
-      if (!(await bcrypt.compareSync(oldPassword, currentUser.password))) {
+      if (!(await bcrypt.compareSync(oldPassword, currentUser.encryptedPassword))) {
         throw new AuthenticationError('Old password is not correct')
       }
 
-      if (await bcrypt.compareSync(newPassword, currentUser.password)) {
+      if (await bcrypt.compareSync(newPassword, currentUser.encryptedPassword)) {
         throw new AuthenticationError('Old password and new password should be different')
       } else {
-        const newHashedPassword = await bcrypt.hashSync(newPassword, 10)
+        const newEncryptedPassword = await bcrypt.hashSync(newPassword, 10)
         session.run(
           `MATCH (user:User {email: $userEmail})
-           SET user.password = $newHashedPassword
+           SET user.encryptedPassword = $newEncryptedPassword
            RETURN user
         `,
           {
             userEmail: user.email,
-            newHashedPassword,
+            newEncryptedPassword,
           },
         )
         session.close()
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 463c5ea6d..50b5896b3 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -1,4 +1,3 @@
-import gql from 'graphql-tag'
 import { GraphQLClient, request } from 'graphql-request'
 import jwt from 'jsonwebtoken'
 import CONFIG from './../../config'
@@ -311,121 +310,3 @@ describe('change password', () => {
     })
   })
 })
-
-describe('do not expose private RSA key', () => {
-  let headers
-  let client
-  let authenticatedClient
-
-  const queryUserPuplicKey = gql`
-    query($queriedUserSlug: String) {
-      User(slug: $queriedUserSlug) {
-        id
-        publicKey
-      }
-    }
-  `
-  const queryUserPrivateKey = gql`
-    query($queriedUserSlug: String) {
-      User(slug: $queriedUserSlug) {
-        id
-        privateKey
-      }
-    }
-  `
-
-  const generateUserWithKeys = async authenticatedClient => {
-    // Generate user with "privateKey" via 'CreateUser' mutation instead of using the factories "factory.create('User', {...})", see above.
-    const variables = {
-      id: 'bcb2d923-f3af-479e-9f00-61b12e864667',
-      password: 'xYz',
-      slug: 'apfel-strudel',
-      name: 'Apfel Strudel',
-      email: 'apfel-strudel@test.org',
-    }
-    await authenticatedClient.request(
-      gql`
-        mutation($id: ID, $password: String!, $slug: String, $name: String, $email: String!) {
-          CreateUser(id: $id, password: $password, slug: $slug, name: $name, email: $email) {
-            id
-          }
-        }
-      `,
-      variables,
-    )
-  }
-
-  beforeEach(async () => {
-    const adminParams = {
-      role: 'admin',
-      email: 'admin@example.org',
-      password: '1234',
-    }
-    // create an admin user who has enough permissions to create other users
-    await factory.create('User', adminParams)
-    const headers = await login(adminParams)
-    authenticatedClient = new GraphQLClient(host, { headers })
-    // but also create an unauthenticated client to issue the `User` query
-    client = new GraphQLClient(host)
-  })
-
-  describe('unauthenticated query of "publicKey" (does the RSA key pair get generated at all?)', () => {
-    it('returns publicKey', async () => {
-      await generateUserWithKeys(authenticatedClient)
-      await expect(
-        await client.request(queryUserPuplicKey, { queriedUserSlug: 'apfel-strudel' }),
-      ).toEqual(
-        expect.objectContaining({
-          User: [
-            {
-              id: 'bcb2d923-f3af-479e-9f00-61b12e864667',
-              publicKey: expect.any(String),
-            },
-          ],
-        }),
-      )
-    })
-  })
-
-  describe('unauthenticated query of "privateKey"', () => {
-    it('throws "Not Authorised!"', async () => {
-      await generateUserWithKeys(authenticatedClient)
-      await expect(
-        client.request(queryUserPrivateKey, { queriedUserSlug: 'apfel-strudel' }),
-      ).rejects.toThrow('Not Authorised')
-    })
-  })
-
-  // authenticate
-  beforeEach(async () => {
-    headers = await login({ email: 'test@example.org', password: '1234' })
-    client = new GraphQLClient(host, { headers })
-  })
-
-  describe('authenticated query of "publicKey"', () => {
-    it('returns publicKey', async () => {
-      await generateUserWithKeys(authenticatedClient)
-      await expect(
-        await client.request(queryUserPuplicKey, { queriedUserSlug: 'apfel-strudel' }),
-      ).toEqual(
-        expect.objectContaining({
-          User: [
-            {
-              id: 'bcb2d923-f3af-479e-9f00-61b12e864667',
-              publicKey: expect.any(String),
-            },
-          ],
-        }),
-      )
-    })
-  })
-
-  describe('authenticated query of "privateKey"', () => {
-    it('throws "Not Authorised!"', async () => {
-      await generateUserWithKeys(authenticatedClient)
-      await expect(
-        client.request(queryUserPrivateKey, { queriedUserSlug: 'apfel-strudel' }),
-      ).rejects.toThrow('Not Authorised')
-    })
-  })
-})
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index c5c3701b5..2d9282b60 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -1,15 +1,84 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import fileUpload from './fileUpload'
+import { neode } from '../../bootstrap/neo4j'
+import { UserInputError } from 'apollo-server'
+
+const instance = neode()
+
+const _has = (resolvers, { key, connection }, { returnType }) => {
+  return async (parent, params, context, resolveInfo) => {
+    if (typeof parent[key] !== 'undefined') return parent[key]
+    const { id } = parent
+    const statement = `MATCH(u:User {id: {id}})${connection} RETURN related`
+    const result = await instance.cypher(statement, { id })
+    let response = result.records.map(r => r.get('related').properties)
+    if (returnType === 'object') response = response[0] || null
+    return response
+  }
+}
+
+const count = obj => {
+  const resolvers = {}
+  for (const [key, connection] of Object.entries(obj)) {
+    resolvers[key] = async (parent, params, context, resolveInfo) => {
+      if (typeof parent[key] !== 'undefined') return parent[key]
+      const { id } = parent
+      const statement = `
+      MATCH(u:User {id: {id}})${connection}
+      WHERE NOT related.deleted = true AND NOT related.disabled = true
+      RETURN COUNT(DISTINCT(related)) as count
+    `
+      const result = await instance.cypher(statement, { id })
+      const [response] = result.records.map(r => r.get('count').toNumber())
+      return response
+    }
+  }
+  return resolvers
+}
+
+const undefinedToNull = list => {
+  const resolvers = {}
+  list.forEach(key => {
+    resolvers[key] = async (parent, params, context, resolveInfo) => {
+      return typeof parent[key] === 'undefined' ? null : parent[key]
+    }
+  })
+  return resolvers
+}
+
+export const hasMany = obj => {
+  const resolvers = {}
+  for (const [key, connection] of Object.entries(obj)) {
+    resolvers[key] = _has(resolvers, { key, connection }, { returnType: 'iterable' })
+  }
+  return resolvers
+}
+
+export const hasOne = obj => {
+  const resolvers = {}
+  for (const [key, connection] of Object.entries(obj)) {
+    resolvers[key] = _has(resolvers, { key, connection }, { returnType: 'object' })
+  }
+  return resolvers
+}
 
 export default {
-  Mutation: {
-    UpdateUser: async (object, params, context, resolveInfo) => {
-      params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar' })
-      return neo4jgraphql(object, params, context, resolveInfo, false)
+  Query: {
+    User: async (object, args, context, resolveInfo) => {
+      return neo4jgraphql(object, args, context, resolveInfo, false)
     },
-    CreateUser: async (object, params, context, resolveInfo) => {
-      params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar' })
-      return neo4jgraphql(object, params, context, resolveInfo, false)
+  },
+  Mutation: {
+    UpdateUser: async (object, args, context, resolveInfo) => {
+      args = await fileUpload(args, { file: 'avatarUpload', url: 'avatar' })
+      try {
+        let user = await instance.find('User', args.id)
+        if (!user) return null
+        await user.update(args)
+        return user.toJson()
+      } catch (e) {
+        throw new UserInputError(e.message)
+      }
     },
     DeleteUser: async (object, params, context, resolveInfo) => {
       const { resource } = params
@@ -34,4 +103,43 @@ export default {
       return neo4jgraphql(object, params, context, resolveInfo, false)
     },
   },
+  User: {
+    ...undefinedToNull([
+      'actorId',
+      'avatar',
+      'coverImg',
+      'deleted',
+      'disabled',
+      'locationName',
+      'about',
+    ]),
+    ...count({
+      contributionsCount: '-[:WROTE]->(related:Post)',
+      friendsCount: '<-[:FRIENDS]->(related:User)',
+      followingCount: '-[:FOLLOWS]->(related:User)',
+      followedByCount: '<-[:FOLLOWS]-(related:User)',
+      commentsCount: '-[:WROTE]->(r:Comment)',
+      commentedCount: '-[:WROTE]->(:Comment)-[:COMMENTS]->(related:Post)',
+      shoutedCount: '-[:SHOUTED]->(related:Post)',
+      badgesCount: '<-[:REWARDED]-(related:Badge)',
+    }),
+    ...hasOne({
+      invitedBy: '<-[:INVITED]-(related:User)',
+      disabledBy: '<-[:DISABLED]-(related:User)',
+    }),
+    ...hasMany({
+      followedBy: '<-[:FOLLOWS]-(related:User)',
+      following: '-[:FOLLOWS]->(related:User)',
+      friends: '-[:FRIENDS]-(related:User)',
+      blacklisted: '-[:BLACKLISTED]->(related:User)',
+      socialMedia: '-[:OWNED]->(related:SocialMedia)',
+      contributions: '-[:WROTE]->(related:Post)',
+      comments: '-[:WROTE]->(related:Comment)',
+      shouted: '-[:SHOUTED]->(related:Post)',
+      organizationsCreated: '-[:CREATED_ORGA]->(related:Organization)',
+      organizationsOwned: '-[:OWNING_ORGA]->(related:Organization)',
+      categories: '-[:CATEGORIZED]->(related:Category)',
+      badges: '-[:REWARDED]->(related:Badge)',
+    }),
+  },
 }
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 9df5473bf..bc95a026a 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -11,51 +11,32 @@ afterEach(async () => {
 })
 
 describe('users', () => {
-  describe('CreateUser', () => {
-    const mutation = `
-      mutation($name: String, $password: String!, $email: String!) {
-        CreateUser(name: $name, password: $password, email: $email) {
-          id
+  describe('User', () => {
+    const query = `query($email: String) { User(email: $email) { id } }`
+    const variables = { email: 'any-email-address@example.org' }
+    beforeEach(() => {
+      client = new GraphQLClient(host)
+    })
+
+    it('is forbidden', async () => {
+      await expect(client.request(query, variables)).rejects.toThrow('Not Authorised')
+    })
+
+    describe('as admin', () => {
+      beforeEach(async () => {
+        const userParams = {
+          role: 'admin',
+          email: 'admin@example.org',
+          password: '1234',
         }
-      }
-    `
-    describe('given valid password and email', () => {
-      const variables = {
-        name: 'John Doe',
-        password: '123',
-        email: '123@123.de',
-      }
-
-      describe('unauthenticated', () => {
-        beforeEach(async () => {
-          client = new GraphQLClient(host)
-        })
-
-        it('is not allowed to create users', async () => {
-          await expect(client.request(mutation, variables)).rejects.toThrow('Not Authorised')
-        })
+        const factory = Factory()
+        await factory.create('User', userParams)
+        const headers = await login(userParams)
+        client = new GraphQLClient(host, { headers })
       })
 
-      describe('authenticated admin', () => {
-        beforeEach(async () => {
-          const adminParams = {
-            role: 'admin',
-            email: 'admin@example.org',
-            password: '1234',
-          }
-          await factory.create('User', adminParams)
-          const headers = await login(adminParams)
-          client = new GraphQLClient(host, { headers })
-        })
-
-        it('is allowed to create new users', async () => {
-          const expected = {
-            CreateUser: {
-              id: expect.any(String),
-            },
-          }
-          await expect(client.request(mutation, variables)).resolves.toEqual(expected)
-        })
+      it('is permitted', async () => {
+        await expect(client.request(query, variables)).resolves.toEqual({ User: [] })
       })
     })
   })
@@ -88,7 +69,7 @@ describe('users', () => {
     describe('as another user', () => {
       beforeEach(async () => {
         const someoneElseParams = {
-          email: 'someoneElse@example.org',
+          email: 'someone-else@example.org',
           password: '1234',
           name: 'James Doe',
         }
@@ -119,12 +100,12 @@ describe('users', () => {
         await expect(client.request(mutation, variables)).resolves.toEqual(expected)
       })
 
-      it('with no name', async () => {
+      it('with `null` as name', async () => {
         const variables = {
           id: 'u47',
           name: null,
         }
-        const expected = 'Username must be at least 3 characters long!'
+        const expected = '"name" must be a string'
         await expect(client.request(mutation, variables)).rejects.toThrow(expected)
       })
 
@@ -133,7 +114,7 @@ describe('users', () => {
           id: 'u47',
           name: '  ',
         }
-        const expected = 'Username must be at least 3 characters long!'
+        const expected = '"name" length must be at least 3 characters long'
         await expect(client.request(mutation, variables)).rejects.toThrow(expected)
       })
     })
@@ -164,7 +145,7 @@ describe('users', () => {
         id: 'u343',
       })
       await factory.create('User', {
-        email: 'friendsAccount@example.org',
+        email: 'friends-account@example.org',
         password: '1234',
         id: 'u565',
       })
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 8b0f422c8..1db4c8fbf 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -23,7 +23,6 @@ type Query {
 type Mutation {
   # Get a JWT Token for the given Email and password
   login(email: String!, password: String!): String!
-  signup(email: String!, password: String!): Boolean!
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, code: String!, newPassword: String!): Boolean!
@@ -40,7 +39,6 @@ type Mutation {
   follow(id: ID!, type: FollowTypeEnum): Boolean!
   # Unfollow the given Type and ID
   unfollow(id: ID!, type: FollowTypeEnum): Boolean!
-  DeleteUser(id: ID!, resource: [Deletable]): User
 }
 
 type Statistics {
diff --git a/backend/src/schema/types/type/EmailAddress.gql b/backend/src/schema/types/type/EmailAddress.gql
new file mode 100644
index 000000000..63b39d457
--- /dev/null
+++ b/backend/src/schema/types/type/EmailAddress.gql
@@ -0,0 +1,23 @@
+type EmailAddress {
+  id: ID!
+  email: String!
+  verifiedAt: String
+  createdAt: String
+}
+
+type Mutation {
+  Signup(email: String!): EmailAddress
+  SignupByInvitation(email: String!, token: String!): EmailAddress
+  SignupVerification(
+    nonce: String!
+    name: String!
+    email: String!
+    password: String!
+    slug: String
+    avatar: String
+    coverImg: String
+    avatarUpload: Upload
+    locationName: String
+    about: String
+  ): User
+}
diff --git a/backend/src/schema/types/type/InvitationCode.gql b/backend/src/schema/types/type/InvitationCode.gql
new file mode 100644
index 000000000..044967286
--- /dev/null
+++ b/backend/src/schema/types/type/InvitationCode.gql
@@ -0,0 +1,13 @@
+type InvitationCode {
+  id: ID!
+  token: String
+  generatedBy: User @relation(name: "GENERATED", direction: "IN")
+
+  #createdAt: DateTime
+  #usedAt: DateTime
+  createdAt: String
+}
+
+type Mutation {
+  CreateInvitationCode: InvitationCode
+}
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 6836f16fe..b11f9dea4 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -3,20 +3,16 @@ type User {
   actorId: String
   name: String
   email: String!
-  slug: String
-  password: String!
+  slug: String!
   avatar: String
   coverImg: String
-  avatarUpload: Upload
   deleted: Boolean
   disabled: Boolean
   disabledBy: User @relation(name: "DISABLED", direction: "IN")
   role: UserGroup
   publicKey: String
-  privateKey: String
-  
-  wasInvited: Boolean
-  wasSeeded: Boolean
+  invitedBy: User @relation(name: "INVITED", direction: "IN")
+  invited: [User] @relation(name: "INVITED", direction: "OUT")
 
   location: Location @cypher(statement: "MATCH (this)-[:IS_IN]->(l:Location) RETURN l")
   locationName: String
@@ -78,3 +74,89 @@ type User {
   badges: [Badge]! @relation(name: "REWARDED", direction: "IN")
   badgesCount: Int! @cypher(statement: "MATCH (this)<-[:REWARDED]-(r:Badge) RETURN COUNT(r)")
 }
+
+
+input _UserFilter {
+  AND: [_UserFilter!]
+  OR: [_UserFilter!]
+  id: ID
+  id_not: ID
+  id_in: [ID!]
+  id_not_in: [ID!]
+  id_contains: ID
+  id_not_contains: ID
+  id_starts_with: ID
+  id_not_starts_with: ID
+  id_ends_with: ID
+  id_not_ends_with: ID
+  friends: _UserFilter
+  friends_not: _UserFilter
+  friends_in: [_UserFilter!]
+  friends_not_in: [_UserFilter!]
+  friends_some: _UserFilter
+  friends_none: _UserFilter
+  friends_single: _UserFilter
+  friends_every: _UserFilter
+  following: _UserFilter
+  following_not: _UserFilter
+  following_in: [_UserFilter!]
+  following_not_in: [_UserFilter!]
+  following_some: _UserFilter
+  following_none: _UserFilter
+  following_single: _UserFilter
+  following_every: _UserFilter
+  followedBy: _UserFilter
+  followedBy_not: _UserFilter
+  followedBy_in: [_UserFilter!]
+  followedBy_not_in: [_UserFilter!]
+  followedBy_some: _UserFilter
+  followedBy_none: _UserFilter
+  followedBy_single: _UserFilter
+  followedBy_every: _UserFilter
+}
+
+type Query {
+  User(
+    id: ID
+    email: String
+    actorId: String
+    name: String
+    slug: String
+    avatar: String
+    coverImg: String
+    role: UserGroup
+    locationName: String
+    about: String
+    createdAt: String
+    updatedAt: String
+    friendsCount: Int
+    followingCount: Int
+    followedByCount: Int
+    followedByCurrentUser: Boolean
+    contributionsCount: Int
+    commentsCount: Int
+    commentedCount: Int
+    shoutedCount: Int
+    badgesCount: Int
+    first: Int
+    offset: Int
+    orderBy: [_UserOrdering]
+    filter: _UserFilter # adding this would expose email
+  ): [User]
+}
+
+type Mutation {
+  UpdateUser (
+    id: ID!
+    name: String
+    email: String
+    slug: String
+    avatar: String
+    coverImg: String
+    avatarUpload: Upload
+    locationName: String
+    about: String
+  ): User
+
+  DeleteUser(id: ID!, resource: [Deletable]): User
+}
diff --git a/backend/src/seed/factories/index.js b/backend/src/seed/factories/index.js
index 211edf87e..b2cf2de45 100644
--- a/backend/src/seed/factories/index.js
+++ b/backend/src/seed/factories/index.js
@@ -1,5 +1,5 @@
 import { GraphQLClient, request } from 'graphql-request'
-import { getDriver } from '../../bootstrap/neo4j'
+import { getDriver, neode } from '../../bootstrap/neo4j'
 import createBadge from './badges.js'
 import createUser from './users.js'
 import createOrganization from './organizations.js'
@@ -48,7 +48,11 @@ export const cleanDatabase = async (options = {}) => {
 }
 
 export default function Factory(options = {}) {
-  const { neo4jDriver = getDriver(), seedServerHost = 'http://127.0.0.1:4001' } = options
+  let {
+    seedServerHost = 'http://127.0.0.1:4001',
+    neo4jDriver = getDriver(),
+    neodeInstance = neode(),
+  } = options
 
   const graphQLClient = new GraphQLClient(seedServerHost)
 
@@ -58,19 +62,23 @@ export default function Factory(options = {}) {
     graphQLClient,
     factories,
     lastResponse: null,
+    neodeInstance,
     async authenticateAs({ email, password }) {
       const headers = await authenticatedHeaders({ email, password }, seedServerHost)
       this.lastResponse = headers
       this.graphQLClient = new GraphQLClient(seedServerHost, { headers })
       return this
     },
-    async create(node, properties) {
-      const { mutation, variables } = this.factories[node](properties)
-      this.lastResponse = await this.graphQLClient.request(mutation, variables)
+    async create(node, args = {}) {
+      const { factory, mutation, variables } = this.factories[node](args)
+      if (factory) {
+        this.lastResponse = await factory({ args, neodeInstance })
+      } else {
+        this.lastResponse = await this.graphQLClient.request(mutation, variables)
+      }
       return this
     },
-    async relate(node, relationship, properties) {
-      const { from, to } = properties
+    async relate(node, relationship, { from, to }) {
       const mutation = `
         mutation {
           Add${node}${relationship}(
@@ -112,6 +120,11 @@ export default function Factory(options = {}) {
       this.lastResponse = await this.graphQLClient.request(mutation)
       return this
     },
+    async invite({ email }) {
+      const mutation = ` mutation($email: String!) { invite( email: $email) } `
+      this.lastResponse = await this.graphQLClient.request(mutation, { email })
+      return this
+    },
     async cleanDatabase() {
       this.lastResponse = await cleanDatabase({ driver: this.neo4jDriver })
       return this
@@ -121,6 +134,9 @@ export default function Factory(options = {}) {
   result.create.bind(result)
   result.relate.bind(result)
   result.mutate.bind(result)
+  result.shout.bind(result)
+  result.follow.bind(result)
+  result.invite.bind(result)
   result.cleanDatabase.bind(result)
   return result
 }
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index ca17d1721..ffe8e7a39 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -1,51 +1,28 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
+import encryptPassword from '../../helpers/encryptPassword'
+import slugify from 'slug'
 
 export default function create(params) {
-  const {
-    id = uuid(),
-    name = faker.name.findName(),
-    slug = '',
-    email = faker.internet.email(),
-    password = '1234',
-    role = 'user',
-    avatar = faker.internet.avatar(),
-    about = faker.lorem.paragraph(),
-  } = params
-
   return {
-    mutation: `
-      mutation(
-        $id: ID!
-        $name: String
-        $slug: String
-        $password: String!
-        $email: String!
-        $avatar: String
-        $about: String
-        $role: UserGroup
-      ) {
-        CreateUser(
-          id: $id
-          name: $name
-          slug: $slug
-          password: $password
-          email: $email
-          avatar: $avatar
-          about: $about
-          role: $role
-        ) {
-          id
-          name
-          slug
-          email
-          avatar
-          role
-          deleted
-          disabled
-        }
+    factory: async ({ args, neodeInstance }) => {
+      const defaults = {
+        id: uuid(),
+        name: faker.name.findName(),
+        email: faker.internet.email(),
+        password: '1234',
+        role: 'user',
+        avatar: faker.internet.avatar(),
+        about: faker.lorem.paragraph(),
       }
-    `,
-    variables: { id, name, slug, password, email, avatar, about, role },
+      defaults.slug = slugify(defaults.name, { lower: true })
+      args = {
+        ...defaults,
+        ...args,
+      }
+      args = await encryptPassword(args)
+      const user = await neodeInstance.create('User', args)
+      return user.toJson()
+    },
   }
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 27c07868d..e31d09a68 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -349,6 +349,7 @@ import Factory from './factories'
     ])
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
+    process.exit(0)
   } catch (err) {
     /* eslint-disable-next-line no-console */
     console.error(err)
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 53075537f..fa3041312 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -704,6 +704,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.4.4":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
@@ -745,6 +752,43 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@hapi/address@2.x.x":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
+  integrity sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==
+
+"@hapi/hoek@6.x.x":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595"
+  integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==
+
+"@hapi/hoek@8.x.x":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.0.1.tgz#9712fa2ad124ac64668ab06ba847b1eaf83a03fd"
+  integrity sha512-cctMYH5RLbElaUpZn3IJaUj9QNQD8iXDnl7xNY6KB1aFD2ciJrwpo3kvZowIT75uA+silJFDnSR2kGakALUymg==
+
+"@hapi/joi@^15.1.0":
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.0.tgz#940cb749b5c55c26ab3b34ce362e82b6162c8e7a"
+  integrity sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==
+  dependencies:
+    "@hapi/address" "2.x.x"
+    "@hapi/hoek" "6.x.x"
+    "@hapi/marker" "1.x.x"
+    "@hapi/topo" "3.x.x"
+
+"@hapi/marker@1.x.x":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769"
+  integrity sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==
+
+"@hapi/topo@3.x.x":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.2.tgz#57cc1317be1a8c5f47c124f9b0e3c49cd78424d2"
+  integrity sha512-r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==
+  dependencies:
+    "@hapi/hoek" "8.x.x"
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -1342,6 +1386,18 @@ apollo-engine-reporting-protobuf@0.3.1:
   dependencies:
     protobufjs "^6.8.6"
 
+apollo-engine-reporting@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.4.tgz#65e12f94221d80b3b1740c26e82ce9bb6bdfb7ee"
+  integrity sha512-DJdYghyUBzT0/LcPLwuQNXDCw06r1RfxkVfNTGKoTv6a+leVvjhDJmXvc+jSuBPwaNsc+RYRnfyQ2qUn9fmfyA==
+  dependencies:
+    apollo-engine-reporting-protobuf "0.3.1"
+    apollo-graphql "^0.3.2"
+    apollo-server-core "2.6.6"
+    apollo-server-env "2.4.0"
+    async-retry "^1.2.1"
+    graphql-extensions "0.7.5"
+
 apollo-engine-reporting@1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.5.tgz#075424d39dfe77a20f96e8e33b7ae52d58c38e1e"
@@ -1371,6 +1427,14 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
+apollo-graphql@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.2.tgz#8881a87f1d5fcf80837b34dba90737e664eabe9a"
+  integrity sha512-YbzYGR14GV0023m//EU66vOzZ3i7c04V/SF8Qk+60vf1sOWyKgO6mxZJ4BKhw10qWUayirhSDxq3frYE+qSG0A==
+  dependencies:
+    apollo-env "0.5.1"
+    lodash.sortby "^4.7.0"
+
 apollo-graphql@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
@@ -1422,6 +1486,32 @@ apollo-server-caching@0.4.0:
   dependencies:
     lru-cache "^5.0.0"
 
+apollo-server-core@2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.6.tgz#55fea7980a943948c49dea20d81b9bbfc0e04f87"
+  integrity sha512-PFSjJbqkV1eetfFJxu11gzklQYC8BrF0RZfvC1d1mhvtxAOKl25uhPHxltN0Omyjp7LW4YeoC6zwl9rLWuhZFQ==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/graphql-playground-html" "1.6.20"
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "0.7.4"
+    apollo-datasource "0.5.0"
+    apollo-engine-reporting "1.3.4"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.4.0"
+    apollo-server-errors "2.3.0"
+    apollo-server-plugin-base "0.5.5"
+    apollo-tracing "0.7.3"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "0.7.5"
+    graphql-subscriptions "^1.0.0"
+    graphql-tag "^2.9.2"
+    graphql-tools "^4.0.0"
+    graphql-upload "^8.0.2"
+    sha.js "^2.4.11"
+    subscriptions-transport-ws "^0.9.11"
+    ws "^6.0.0"
+
 apollo-server-core@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.7.tgz#85b0310f40cfec43a702569c73af16d88776a6f0"
@@ -1470,10 +1560,10 @@ apollo-server-errors@2.3.0:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
   integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
 
-apollo-server-express@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.7.tgz#22307e08b75be1553f4099d00028abe52597767d"
-  integrity sha512-qbCQM+8LxXpwPNN5Sdvcb+Sne8zuCORFt25HJtPJRkHlyBUzOd7JA7SEnUn5e2geTiiGoVIU5leh+++C51udTw==
+apollo-server-express@2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.6.tgz#ec2b955354d7dd4d12fe01ea7e983d302071d5b9"
+  integrity sha512-bY/xrr9lZH+hsjchiQuSXpW3ivXfL1h81M5VE9Ppus1PVwwEIar/irBN+PFp97WxERZPDjVZzrRKa+lRHjtJsA==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.20"
     "@types/accepts" "^1.3.5"
@@ -1481,7 +1571,7 @@ apollo-server-express@2.6.7:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.0"
     accepts "^1.3.5"
-    apollo-server-core "2.6.7"
+    apollo-server-core "2.6.6"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
@@ -1509,6 +1599,11 @@ apollo-server-module-graphiql@^1.3.4, apollo-server-module-graphiql@^1.4.0:
   resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec"
   integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==
 
+apollo-server-plugin-base@0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.5.tgz#364e4a2fca4d95ddeb9fd3e78940ed1da58865c2"
+  integrity sha512-agiuhknyu3lnnEsqUh99tzxwPCGp+TuDK+TSRTkXU1RUG6lY4C3uJp0JGJw03cP+M6ze73TbRjMA4E68g/ks5A==
+
 apollo-server-plugin-base@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz#3a7128437a0f845e7d873fa43ef091ff7bf27975"
@@ -1521,13 +1616,13 @@ apollo-server-testing@~2.6.7:
   dependencies:
     apollo-server-core "2.6.7"
 
-apollo-server@~2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.7.tgz#b707ede529b4d45f2f00a74f3b457658b0e62e83"
-  integrity sha512-4wk9JykURLed6CnNIj9jhU6ueeTVmGBTyAnnvnlhRrOf50JAFszUErZIKg6lw5vVr5riaByrGFIkMBTySCHgPQ==
+apollo-server@~2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.6.tgz#0570fce4a682eb1de8bc1b86dbe2543de440cd4e"
+  integrity sha512-7Bulb3RnOO4/SGA66LXu3ZHCXIK8MYMrsxy4yti1/adDIUmcniolDqJwOYUGoTmv1AQjRxgJb4TVZ0Dk9nrrYg==
   dependencies:
-    apollo-server-core "2.6.7"
-    apollo-server-express "2.6.7"
+    apollo-server-core "2.6.6"
+    apollo-server-express "2.6.6"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
@@ -2584,10 +2679,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.0.0-beta.2:
-  version "2.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.2.tgz#ccd556df832ef761baa88c600f53d2e829245999"
-  integrity sha512-4cicZF707RNerr3/Q3CcdLo+3OHMCfrRXE7h5iFgn7AMvX07sqKLxSf8Yp+WJW5bvKr2cy9/PkctXLv4iFtOaA==
+date-fns@2.0.0-beta.1:
+  version "2.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.1.tgz#6f3209ea8be559211be5160e0a6379a7eade227b"
+  integrity sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw==
 
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
@@ -2816,6 +2911,11 @@ dotenv@^0.4.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-0.4.0.tgz#f6fb351363c2d92207245c737802c9ab5ae1495a"
   integrity sha1-9vs1E2PC2SIHJFxzeALJq1rhSVo=
 
+dotenv@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+  integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
+
 dotenv@~8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
@@ -3727,6 +3827,13 @@ graphql-extensions@0.7.4:
   dependencies:
     "@apollographql/apollo-tools" "^0.3.6"
 
+graphql-extensions@0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.5.tgz#fab2b9e53cf6014952e6547456d50680ff0ea579"
+  integrity sha512-B1m+/WEJa3IYKWqBPS9W/7OasfPmlHOSz5hpEAq2Jbn6T0FQ/d2YWFf2HBETHR3RR2qfT+55VMiYovl2ga3qcg==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+
 graphql-extensions@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.6.tgz#80cdddf08b0af12525529d1922ee2ea0d0cc8ecf"
@@ -4916,7 +5023,7 @@ jmespath@0.15.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
 
-joi@^13.0.0:
+joi@^13.0.0, joi@^13.7.0:
   version "13.7.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f"
   integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==
@@ -5604,6 +5711,15 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+neo4j-driver@^1.6.3:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.5.tgz#c3fe3677f69c12f26944563d45e7e7d818a685e4"
+  integrity sha512-xCD2F5+tp/SD9r5avX5bSoY8u8RH2o793xJ9Ikjz1s5qQy7cFxFbbj2c52uz3BVGhRAx/NmB57VjOquYmmxGtw==
+  dependencies:
+    "@babel/runtime" "^7.4.4"
+    text-encoding-utf-8 "^1.0.2"
+    uri-js "^4.2.2"
+
 neo4j-driver@^1.7.3, neo4j-driver@~1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.4.tgz#9661cf643b63818bff85e82c4691918e75098c1e"
@@ -5623,6 +5739,16 @@ neo4j-graphql-js@^2.6.3:
     lodash "^4.17.11"
     neo4j-driver "^1.7.3"
 
+neode@^0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.2.16.tgz#20532cc67604fd00cc88de841d422f5238ae5bd3"
+  integrity sha512-L9p55IDKGzAZsQgHdXrfd2xasDuB46RipcrPw6NP7ESgkmfJMaMWRZ1F3Kv+f4V4U1WnhZ1IILvwVFhYPnpXEg==
+  dependencies:
+    dotenv "^4.0.0"
+    joi "^13.7.0"
+    neo4j-driver "^1.6.3"
+    uuid "^3.3.2"
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -7411,6 +7537,11 @@ test-exclude@^5.0.0:
     read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
+text-encoding-utf-8@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
+  integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
+
 text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 73313d331..f8d18baa0 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -1,5 +1,6 @@
 import { Given, When, Then } from "cypress-cucumber-preprocessor/steps";
 import { getLangByName } from "../../support/helpers";
+import slugify from 'slug'
 
 /* global cy  */
 
@@ -11,6 +12,7 @@ let loginCredentials = {
 };
 const narratorParams = {
   name: "Peter Pan",
+  slug: 'peter-pan',
   avatar: "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg",
   ...loginCredentials
 };
@@ -171,10 +173,11 @@ When("I press {string}", label => {
 });
 
 Given("we have the following posts in our database:", table => {
-  table.hashes().forEach(({ Author, ...postAttributes }) => {
+  table.hashes().forEach(({ Author, ...postAttributes }, i) => {
+    Author = Author || `author-${i}`
     const userAttributes = {
       name: Author,
-      email: `${Author}@example.org`,
+      email: `${slugify(Author, {lower: true})}@example.org`,
       password: "1234"
     };
     postAttributes.deleted = Boolean(postAttributes.deleted);
diff --git a/cypress/integration/search/Search.feature b/cypress/integration/search/Search.feature
index 71aee608a..c1afc5b97 100644
--- a/cypress/integration/search/Search.feature
+++ b/cypress/integration/search/Search.feature
@@ -6,9 +6,9 @@ Feature: Search
   Background:
     Given I have a user account
     And we have the following posts in our database:
-      | Author        | id | title                                         | content                                 |
-      | Brianna Wiest | p1 | 101 Essays that will change the way you think | 101 Essays, of course!                  |
-      | Brianna Wiest | p2 | No searched for content                       | will be found in this post, I guarantee |
+      | id | title                                         | content                                 |
+      | p1 | 101 Essays that will change the way you think | 101 Essays, of course!                  |
+      | p2 | No searched for content                       | will be found in this post, I guarantee |
     Given I am logged in
 
   Scenario: Search for specific words
diff --git a/cypress/support/factories.js b/cypress/support/factories.js
index 3bdb86800..dd16e8198 100644
--- a/cypress/support/factories.js
+++ b/cypress/support/factories.js
@@ -1,12 +1,15 @@
 import Factory from '../../backend/src/seed/factories'
 import { getDriver } from '../../backend/src/bootstrap/neo4j'
+import setupNeode from '../../backend/src/bootstrap/neode'
+import neode from 'neode'
 
-const neo4jDriver = getDriver({
+const neo4jConfigs = {
   uri: Cypress.env('NEO4J_URI'),
   username: Cypress.env('NEO4J_USERNAME'),
   password: Cypress.env('NEO4J_PASSWORD')
-})
-const factory = Factory({ neo4jDriver })
+}
+const neo4jDriver = getDriver(neo4jConfigs)
+const factory = Factory({ seedServerHost, neo4jDriver, neodeInstance: setupNeode(neo4jConfigs)})
 const seedServerHost = Cypress.env('SEED_SERVER_HOST')
 
 beforeEach(async () => {
@@ -14,7 +17,7 @@ beforeEach(async () => {
 })
 
 Cypress.Commands.add('factory', () => {
-  return Factory({ seedServerHost })
+  return Factory({ seedServerHost, neo4jDriver, neodeInstance: setupNeode(neo4jConfigs) })
 })
 
 Cypress.Commands.add(
diff --git a/package.json b/package.json
index 1446f0009..bfec1d73a 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "test:jest": "cd webapp && yarn test && cd ../backend && yarn test:jest && codecov"
   },
   "devDependencies": {
+    "bcryptjs": "^2.4.3",
     "codecov": "^3.5.0",
     "cross-env": "^5.2.0",
     "cypress": "^3.3.2",
@@ -29,6 +30,8 @@
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
     "neo4j-driver": "^1.7.5",
-    "npm-run-all": "^4.1.5"
+    "neode": "^0.2.16",
+    "npm-run-all": "^4.1.5",
+    "slug": "^1.1.0"
   }
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 398226fa2..de5884f61 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -73,7 +73,7 @@
       "name": "Your data",
       "labelName": "Your Name",
       "namePlaceholder": "Femanon Funny",
-      "labelCity": "Su ciudad o región",
+      "labelCity": "Your City or Region",
       "labelBio": "About You",
       "success": "Your data was successfully updated!"
     },
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index af9c21c3f..dc2c44a1f 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -43,7 +43,7 @@
       "name": "Sus datos",
       "labelName": "Su nombre",
       "namePlaceholder": "Femanon Funny",
-      "labelCity": "Your City or Region",
+      "labelCity": "Su ciudad o región",
       "labelBio": "Acerca de usted",
       "success": "Sus datos han sido actualizados con éxito!"
     },
diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js
index 4bc9ba289..d8bb28473 100644
--- a/webapp/plugins/vue-filters.js
+++ b/webapp/plugins/vue-filters.js
@@ -2,7 +2,6 @@ import Vue from 'vue'
 
 import { enUS, de, nl, fr, es } from 'date-fns/locale'
 import format from 'date-fns/format'
-import addSeconds from 'date-fns/addSeconds'
 import accounting from 'accounting'
 
 export default ({ app = {} }) => {
@@ -39,15 +38,6 @@ export default ({ app = {} }) => {
       }
       return accounting.formatNumber(value || 0, precision, thousands, decimals)
     },
-    // format seconds or milliseconds to durations HH:mm:ss
-    duration: (value, unit = 's') => {
-      if (unit === 'ms') {
-        value = value / 1000
-      }
-      return value
-        ? format(addSeconds(new Date('2000-01-01 00:00'), value), 'HH:mm:ss')
-        : '00:00:00'
-    },
     truncate: (value = '', length = -1) => {
       if (!value || typeof value !== 'string' || value.length <= 0) {
         return ''
diff --git a/yarn.lock b/yarn.lock
index 969656ca1..ea9459d76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1040,6 +1040,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bcryptjs@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
+
 becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz#429ceebbfa5f7e936e78d73fbdc7da7162b20e20"
@@ -2038,6 +2043,11 @@ domain-browser@^1.2.0:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
+dotenv@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+  integrity sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=
+
 dotenv@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
@@ -2658,6 +2668,16 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
+hoek@5.x.x:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da"
+  integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
+
+hoek@6.x.x:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
+
 hosted-git-info@^2.1.4:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
@@ -3033,6 +3053,13 @@ isarray@^2.0.4:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
   integrity sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==
 
+isemail@3.x.x:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
+  integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
+  dependencies:
+    punycode "2.x.x"
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3055,6 +3082,15 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+joi@^13.7.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f"
+  integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==
+  dependencies:
+    hoek "5.x.x"
+    isemail "3.x.x"
+    topo "3.x.x"
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -3524,7 +3560,7 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-neo4j-driver@^1.7.5:
+neo4j-driver@^1.6.3, neo4j-driver@^1.7.5:
   version "1.7.5"
   resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.5.tgz#c3fe3677f69c12f26944563d45e7e7d818a685e4"
   integrity sha512-xCD2F5+tp/SD9r5avX5bSoY8u8RH2o793xJ9Ikjz1s5qQy7cFxFbbj2c52uz3BVGhRAx/NmB57VjOquYmmxGtw==
@@ -3533,6 +3569,16 @@ neo4j-driver@^1.7.5:
     text-encoding-utf-8 "^1.0.2"
     uri-js "^4.2.2"
 
+neode@^0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.2.16.tgz#20532cc67604fd00cc88de841d422f5238ae5bd3"
+  integrity sha512-L9p55IDKGzAZsQgHdXrfd2xasDuB46RipcrPw6NP7ESgkmfJMaMWRZ1F3Kv+f4V4U1WnhZ1IILvwVFhYPnpXEg==
+  dependencies:
+    dotenv "^4.0.0"
+    joi "^13.7.0"
+    neo4j-driver "^1.6.3"
+    uuid "^3.3.2"
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -3965,16 +4011,16 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
+punycode@2.x.x, punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
 punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -4373,6 +4419,13 @@ slice-ansi@0.0.4:
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
   integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
+slug@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/slug/-/slug-1.1.0.tgz#73eef5710416f515077bdf70c683bde4915913c9"
+  integrity sha512-NuIOjDQeTMPm+/AUIHJ5636mF3jOsYLFnoEErl9Tdpt4kpt4fOrAJxscH9mUgX1LtPaEqgPCawBg7A4yhoSWRg==
+  dependencies:
+    unicode ">= 0.3.1"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -4785,6 +4838,13 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+topo@3.x.x:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
+  integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==
+  dependencies:
+    hoek "6.x.x"
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -4864,6 +4924,11 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
   integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
 
+"unicode@>= 0.3.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/unicode/-/unicode-11.0.1.tgz#735bd422ec75cf28d396eb224d535d168d5f1db6"
+  integrity sha512-+cHtykLb+eF1yrSLWTwcYBrqJkTfX7Quoyg7Juhe6uylF43ZbMdxMuSHNYlnyLT8T7POAvavgBthzUF9AIaQvQ==
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"

From daaa979c99323a9aad0690588e9b5e1e626f97a4 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 3 Jul 2019 16:20:30 -0300
Subject: [PATCH 18/69] Remove request for image

- we do not need to request it and if there is none it throws an error
---
 webapp/graphql/PostMutations.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/graphql/PostMutations.js b/webapp/graphql/PostMutations.js
index dba8d32a5..e1164bb5a 100644
--- a/webapp/graphql/PostMutations.js
+++ b/webapp/graphql/PostMutations.js
@@ -50,7 +50,6 @@ export default () => {
           content
           contentExcerpt
           language
-          image
         }
       }
     `,

From e7b70ce7cd8b346b62b64c20d1155f1783d97b04 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 3 Jul 2019 17:08:47 -0300
Subject: [PATCH 19/69] Fix failing test after new implementation merged in

---
 .../handleHtmlContent/handleContentData.spec.js       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
index 5ac0f3eda..e9439fe21 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
@@ -117,9 +117,9 @@ describe('currentUser { notifications }', () => {
             // during development and thought: A feature not a bug! This way we
             // can encode a re-mentioning of users when you edit your post or
             // comment.
-            const createPostMutation = gql`
-              mutation($id: ID!, $content: String!) {
-                UpdatePost(id: $id, content: $content) {
+            const updatePostMutation = gql`
+              mutation($id: ID!, $title: String!, $content: String!) {
+                UpdatePost(id: $id, content: $content, title: $title) {
                   title
                   content
                 }
@@ -128,8 +128,9 @@ describe('currentUser { notifications }', () => {
             authorClient = new GraphQLClient(host, {
               headers: authorHeaders,
             })
-            await authorClient.request(createPostMutation, {
+            await authorClient.request(updatePostMutation, {
               id: post.id,
+              title: post.title,
               content: updatedContent,
             })
           })
@@ -240,7 +241,7 @@ describe('Hashtags', () => {
         const updatedPostContent =
           '<p>Hey Dude, <a class="hashtag" href="/search/hashtag/Elections">#Elections</a> should work equal for everybody!? That seems to be the only way to have equal <a href="/search/hashtag/Liberty">#Liberty</a> for everyone.</p>'
         const updatePostMutation = gql`
-          mutation($postId: ID!, $postTitle: String, $updatedPostContent: String) {
+          mutation($postId: ID!, $postTitle: String!, $updatedPostContent: String!) {
             UpdatePost(id: $postId, title: $postTitle, content: $updatedPostContent) {
               id
               title

From ef46f71c0dfd36122f73eb338f32eae9574d564f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 3 Jul 2019 22:22:32 +0200
Subject: [PATCH 20/69] Follow @mattwr18 code review :+1:

---
 backend/src/schema/resolvers/users.spec.js | 52 +++++++++++++---------
 backend/src/schema/types/type/User.gql     |  2 +-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index bc95a026a..6f9b6dd3d 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -12,31 +12,39 @@ afterEach(async () => {
 
 describe('users', () => {
   describe('User', () => {
-    const query = `query($email: String) { User(email: $email) { id } }`
-    const variables = { email: 'any-email-address@example.org' }
-    beforeEach(() => {
-      client = new GraphQLClient(host)
-    })
-
-    it('is forbidden', async () => {
-      await expect(client.request(query, variables)).rejects.toThrow('Not Authorised')
-    })
-
-    describe('as admin', () => {
+    describe('query by email address', () => {
       beforeEach(async () => {
-        const userParams = {
-          role: 'admin',
-          email: 'admin@example.org',
-          password: '1234',
-        }
-        const factory = Factory()
-        await factory.create('User', userParams)
-        const headers = await login(userParams)
-        client = new GraphQLClient(host, { headers })
+        await factory.create('User', { name: 'Johnny', email: 'any-email-address@example.org' })
       })
 
-      it('is permitted', async () => {
-        await expect(client.request(query, variables)).resolves.toEqual({ User: [] })
+      const query = `query($email: String) { User(email: $email) { name } }`
+      const variables = { email: 'any-email-address@example.org' }
+      beforeEach(() => {
+        client = new GraphQLClient(host)
+      })
+
+      it('is forbidden', async () => {
+        await expect(client.request(query, variables)).rejects.toThrow('Not Authorised')
+      })
+
+      describe('as admin', () => {
+        beforeEach(async () => {
+          const userParams = {
+            role: 'admin',
+            email: 'admin@example.org',
+            password: '1234',
+          }
+          const factory = Factory()
+          await factory.create('User', userParams)
+          const headers = await login(userParams)
+          client = new GraphQLClient(host, { headers })
+        })
+
+        it('is permitted', async () => {
+          await expect(client.request(query, variables)).resolves.toEqual({
+            User: [{ name: 'Johnny' }],
+          })
+        })
       })
     })
   })
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index b11f9dea4..314f03521 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -141,7 +141,7 @@ type Query {
     first: Int
     offset: Int
     orderBy: [_UserOrdering]
-    filter: _UserFilter # adding this would expose email
+    filter: _UserFilter
   ): [User]
 }
 

From 09ff79763d5f02123149796f4502cd8579f4284d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 3 Jul 2019 23:03:06 +0200
Subject: [PATCH 21/69] Follow @mattwr18's other suggestion

---
 backend/src/middleware/permissionsMiddleware.js |  8 ++++----
 .../src/schema/resolvers/registration.spec.js   | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 8ab3bf167..101713f91 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -78,14 +78,14 @@ const invitationLimitReached = rule({
     const result = await session.run(
       `
       MATCH (user:User {id:$id})-[:GENERATED]->(i:InvitationCode)
-      RETURN COUNT(i) as count
+      RETURN COUNT(i) >= 3 as limitReached
       `,
       { id: user.id },
     )
-    const [count] = result.records.map(record => {
-      return record.get('count').toNumber()
+    const [limitReached] = result.records.map(record => {
+      return record.get('limitReached')
     })
-    return count >= 3
+    return limitReached
   } catch (e) {
     throw e
   } finally {
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index e6bce145e..2cbce9a36 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -128,14 +128,15 @@ describe('SignupByInvitation', () => {
     }
   })
 
-  it.todo('throws Authorization error')
-
-  describe('with invalid InvitationCode', () => {
+  describe('with valid email but invalid InvitationCode', () => {
     beforeEach(() => {
+      variables.email = 'any-email@example.org'
       variables.token = 'wut?'
     })
 
-    it.todo('throws UserInputError')
+    it('throws UserInputError', async () => {
+      await expect(action()).rejects.toThrow('Invitation code already used or does not exist.')
+    })
   })
 
   describe('with valid InvitationCode', () => {
@@ -238,6 +239,7 @@ describe('SignupByInvitation', () => {
         })
 
         describe('if the EmailAddress already exists but without user account', () => {
+          // shall we re-send the registration email?
           it.todo('decide what to do')
         })
       })
@@ -250,7 +252,12 @@ describe('Signup', () => {
     Signup(email: $email) { email }
   }`
 
-  it.todo('throws AuthorizationError')
+  it('throws AuthorizationError', async () => {
+    client = new GraphQLClient(host)
+    await expect(
+      client.request(mutation, { email: 'get-me-a-user-account@example.org' }),
+    ).rejects.toThrow('Not Authorised')
+  })
 
   describe('as admin', () => {
     beforeEach(async () => {

From 8b991ea68631441d0829ffad5677ba93c8abca93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 3 Jul 2019 23:22:31 +0200
Subject: [PATCH 22/69] Less log output

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

diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index 120bf1a77..b62f9a609 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -11,7 +11,7 @@ export default {
     currentUser: async (object, params, ctx, resolveInfo) => {
       const { user } = ctx
       if (!user) return null
-      return neo4jgraphql(object, { id: user.id }, ctx, resolveInfo, true)
+      return neo4jgraphql(object, { id: user.id }, ctx, resolveInfo, false)
     },
   },
   Mutation: {

From 450555f6588be5c3a0b48904f3e16d55f6422b19 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2019 04:29:12 +0000
Subject: [PATCH 23/69] Bump eslint-loader from 2.1.2 to 2.2.0 in /webapp

Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/2.1.2...v2.2.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 ab5f3a5fe..3b7b47baf 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -93,7 +93,7 @@
     "eslint": "~5.16.0",
     "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
-    "eslint-loader": "~2.1.2",
+    "eslint-loader": "~2.2.0",
     "eslint-plugin-import": "~2.18.0",
     "eslint-plugin-jest": "~22.7.1",
     "eslint-plugin-node": "~9.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 7162319c4..e70cd9003 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4256,10 +4256,10 @@ eslint-import-resolver-node@^0.3.2:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-loader@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.1.2.tgz#453542a1230d6ffac90e4e7cb9cadba9d851be68"
-  integrity sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==
+eslint-loader@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.0.tgz#e2322b46fc5584ebbffd13c78089cd27d63565a9"
+  integrity sha512-O7zOQw6HS1t8H08O8DsAXPccSIu3xduku/aqdjQwPHp/NzIT/nwwkq+Ly5EtGfXo931/yTwiCuB9kjg/0D2sTg==
   dependencies:
     loader-fs-cache "^1.0.0"
     loader-utils "^1.0.2"

From 842df067547359ab3f6341ca7ab3c6c9c2e300c8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2019 04:30:49 +0000
Subject: [PATCH 24/69] Bump @vue/cli-shared-utils from 3.8.0 to 3.9.0 in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index ab5f3a5fe..d2e70bc95 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -83,7 +83,7 @@
     "@babel/core": "~7.4.5",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.4.5",
-    "@vue/cli-shared-utils": "~3.8.0",
+    "@vue/cli-shared-utils": "~3.9.0",
     "@vue/eslint-config-prettier": "~4.0.1",
     "@vue/server-test-utils": "~1.0.0-beta.29",
     "@vue/test-utils": "~1.0.0-beta.29",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 7162319c4..8e00d9911 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1481,10 +1481,10 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     camelcase "^5.0.0"
 
-"@vue/cli-shared-utils@~3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.8.0.tgz#e7e728164eb92bd9e205fcd08dae896ee79cba5a"
-  integrity sha512-wn1L8pmQnotfftHOYm0VeXs2+cQTySd73uhWXwyO6pT0ehjqlY5c2RTipClmFF3Q+YCYjwlNpsV650F3l1tV8w==
+"@vue/cli-shared-utils@~3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz#cb56a443bf763a873849a11d07e9e7638aa16cc2"
+  integrity sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.1"
@@ -9739,12 +9739,7 @@ semver-diff@^2.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^6.0.0, semver@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
-  integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
-
-semver@^6.1.1:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
   integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==

From 9d6d47cebb292ed145c1fbee2b3ac0e0c8431e39 Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Thu, 4 Jul 2019 10:22:03 +0200
Subject: [PATCH 25/69] large images are set to maximum height

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

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index ade2d9175..bce2d1b95 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -8,9 +8,7 @@
       <nuxt-link
         class="post-link"
         :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-      >
-        {{ post.title }}
-      </nuxt-link>
+      >{{ post.title }}</nuxt-link>
       <ds-space margin-bottom="small" />
       <!-- Username, Image & Date of Post -->
       <div>
@@ -128,6 +126,15 @@ export default {
 </script>
 
 <style lang="scss">
+.ds-card-image img {
+  width: 100%;
+  max-height: 300px;
+  -o-object-fit: cover;
+  object-fit: cover;
+  -o-object-position: center;
+  object-position: center;
+}
+
 .post-card {
   cursor: pointer;
   position: relative;

From 8de9516b9686a37adc2f657074b6600ef3d077ba Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Thu, 4 Jul 2019 11:06:10 +0200
Subject: [PATCH 26/69] large images are set to maximum height fix lint

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

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index bce2d1b95..3fee24176 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -8,7 +8,9 @@
       <nuxt-link
         class="post-link"
         :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-      >{{ post.title }}</nuxt-link>
+      >
+        {{ post.title }}
+      </nuxt-link>
       <ds-space margin-bottom="small" />
       <!-- Username, Image & Date of Post -->
       <div>

From 7fbf634ff477d40f72d2825dc71d7d6496eb22f9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2019 10:20:38 +0000
Subject: [PATCH 27/69] Bump graphql from 14.4.0 to 14.4.2 in /backend

Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.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 5ce312c11..88726f959 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -58,7 +58,7 @@
     "dotenv": "~8.0.0",
     "express": "~4.17.1",
     "faker": "Marak/faker.js#master",
-    "graphql": "~14.4.0",
+    "graphql": "~14.4.2",
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index fa3041312..e0098c448 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3973,10 +3973,10 @@ graphql-yoga@~1.18.0:
     graphql-upload "^8.0.0"
     subscriptions-transport-ws "^0.9.8"
 
-"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.2.1, graphql@~14.4.0:
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.0.tgz#e97086acfc0338e4fdc8f7dba519c6b8a6badfd9"
-  integrity sha512-E55z1oK6e4cGxCqlSsRWytYDPcIUxky3XkbuQUf6TIjCmn6C7CuBJpmkMF1066q95yPAGOZVPTVT7jABKbRFSA==
+"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.2.1, graphql@~14.4.2:
+  version "14.4.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.2.tgz#553a7d546d524663eda49ed6df77577be3203ae3"
+  integrity sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==
   dependencies:
     iterall "^1.2.2"
 

From de6a57ebe71aff5486cd42066cb89ac0a0879dc4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2019 10:20:48 +0000
Subject: [PATCH 28/69] Bump graphql from 14.4.0 to 14.4.2 in /webapp

Bumps [graphql](https://github.com/graphql/graphql-js) from 14.4.0 to 14.4.2.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.4.0...v14.4.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 ab5f3a5fe..4515fdce9 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
     "cross-env": "~5.2.0",
     "date-fns": "2.0.0-beta.2",
     "express": "~4.17.1",
-    "graphql": "~14.4.0",
+    "graphql": "~14.4.2",
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.1.0",
     "nuxt": "~2.8.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 7162319c4..c5799a28b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5216,10 +5216,10 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.2"
     object-path "^0.11.4"
 
-graphql@^14.1.1, graphql@~14.4.0:
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.0.tgz#e97086acfc0338e4fdc8f7dba519c6b8a6badfd9"
-  integrity sha512-E55z1oK6e4cGxCqlSsRWytYDPcIUxky3XkbuQUf6TIjCmn6C7CuBJpmkMF1066q95yPAGOZVPTVT7jABKbRFSA==
+graphql@^14.1.1, graphql@~14.4.2:
+  version "14.4.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.4.2.tgz#553a7d546d524663eda49ed6df77577be3203ae3"
+  integrity sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==
   dependencies:
     iterall "^1.2.2"
 

From 1c8dac7359ff807ea4a2e8a3bbf14c3a15f23e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 4 Jul 2019 19:55:06 +0200
Subject: [PATCH 29/69] Get the links of the Tags in the Post as a URL driven
 query to work

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/schema/resolvers/passwordReset.js | 26 ++++++++++++---
 webapp/components/FilterMenu/FilterMenu.vue   | 32 ++++++++++++++++++-
 webapp/graphql/PostMutations.js               |  1 -
 webapp/locales/de.json                        |  4 ++-
 webapp/locales/en.json                        |  4 ++-
 webapp/pages/index.vue                        | 26 ++++++++++++++-
 webapp/pages/search/hashtag/_id.vue           | 12 +++++++
 7 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 webapp/pages/search/hashtag/_id.vue

diff --git a/backend/src/schema/resolvers/passwordReset.js b/backend/src/schema/resolvers/passwordReset.js
index 13789662b..0cfcd74e7 100644
--- a/backend/src/schema/resolvers/passwordReset.js
+++ b/backend/src/schema/resolvers/passwordReset.js
@@ -13,7 +13,10 @@ const transporter = () => {
   }
   const { SMTP_USERNAME: user, SMTP_PASSWORD: pass } = CONFIG
   if (user && pass) {
-    configs.auth = { user, pass }
+    configs.auth = {
+      user,
+      pass,
+    }
   }
   return nodemailer.createTransport(configs)
 }
@@ -41,11 +44,21 @@ export default {
   Mutation: {
     requestPasswordReset: async (_, { email }, { driver }) => {
       const code = uuid().substring(0, 6)
-      const [user] = await createPasswordReset({ driver, code, email })
+      const [user] = await createPasswordReset({
+        driver,
+        code,
+        email,
+      })
       if (CONFIG.SMTP_HOST && CONFIG.SMTP_PORT) {
         const name = (user && user.name) || ''
         const mailTemplate = user ? resetPasswordMail : wrongAccountMail
-        await transporter().sendMail(mailTemplate({ email, code, name }))
+        await transporter().sendMail(
+          mailTemplate({
+            email,
+            code,
+            name,
+          }),
+        )
       }
       return true
     },
@@ -62,7 +75,12 @@ export default {
       SET u.password = $newHashedPassword
       RETURN pr
       `
-      let transactionRes = await session.run(cypher, { stillValid, email, code, newHashedPassword })
+      let transactionRes = await session.run(cypher, {
+        stillValid,
+        email,
+        code,
+        newHashedPassword,
+      })
       const [reset] = transactionRes.records.map(record => record.get('pr'))
       const result = !!(reset && reset.properties.usedAt)
       session.close()
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 16009b6eb..9bfb3ddba 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-card>
+  <ds-card class="filter-menu-card">
     <ds-flex>
       <ds-flex-item class="filter-menu-title">
         <ds-heading size="h3">{{ $t('filter-menu.title') }}</ds-heading>
@@ -20,6 +20,28 @@
         </div>
       </ds-flex-item>
     </ds-flex>
+    <div v-if="hashtag">
+      <ds-space margin-bottom="x-small" />
+      <ds-flex>
+        <ds-flex-item>
+          <ds-heading size="h3">{{ $t('filter-menu.hashtag-search', { hashtag }) }}</ds-heading>
+        </ds-flex-item>
+        <ds-flex-item>
+          <div class="filter-menu-buttons">
+            <ds-button
+              v-tooltip="{
+                content: this.$t('filter-menu.clearSearch'),
+                placement: 'left',
+                delay: { show: 500 },
+              }"
+              name="filter-by-followed-authors-only"
+              icon="close"
+              @click="clearSearch"
+            />
+          </div>
+        </ds-flex-item>
+      </ds-flex>
+    </div>
   </ds-card>
 </template>
 
@@ -27,6 +49,7 @@
 export default {
   props: {
     user: { type: Object, required: true },
+    hashtag: { type: Object, default: null },
   },
   data() {
     return {
@@ -50,11 +73,18 @@ export default {
         : { author: { followedBy_some: { id: this.user.id } } }
       this.$emit('changeFilterBubble', this.filter)
     },
+    clearSearch() {
+      this.$emit('clearSearch')
+    },
   },
 }
 </script>
 
 <style lang="scss">
+.filter-menu-card {
+  background-color: $background-color-soft;
+}
+
 .filter-menu-title {
   display: flex;
   align-items: center;
diff --git a/webapp/graphql/PostMutations.js b/webapp/graphql/PostMutations.js
index dba8d32a5..e1164bb5a 100644
--- a/webapp/graphql/PostMutations.js
+++ b/webapp/graphql/PostMutations.js
@@ -50,7 +50,6 @@ export default () => {
           content
           contentExcerpt
           language
-          image
         }
       }
     `,
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 84883e1aa..31a7b1757 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -1,6 +1,8 @@
 {
   "filter-menu": {
-    "title": "Deine Filterblase"
+    "title": "Deine Filterblase",
+    "hashtag-search": "Suche nach #{hashtag}",
+    "clearSearch": "Suche löschen"
   },
   "login": {
     "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index aaf4b32e6..43d2db726 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -1,6 +1,8 @@
 {
   "filter-menu": {
-    "title": "Your filter bubble"
+    "title": "Your filter bubble",
+    "hashtag-search": "Searching for #{hashtag}",
+    "clearSearch": "Clear search"
   },
   "login": {
     "copy": "If you already have a human-connection account, login here.",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 40cbebcca..5769f1828 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -2,7 +2,12 @@
   <div>
     <ds-flex :width="{ base: '100%' }" gutter="base">
       <ds-flex-item>
-        <filter-menu :user="currentUser" @changeFilterBubble="changeFilterBubble" />
+        <filter-menu
+          :user="currentUser"
+          @changeFilterBubble="changeFilterBubble"
+          :hashtag="hashtag"
+          @clearSearch="clearSearch"
+        />
       </ds-flex-item>
       <hc-post-card
         v-for="(post, index) in uniq(Post)"
@@ -41,12 +46,19 @@ export default {
     HcLoadMore,
   },
   data() {
+    const { hashtag = null } = this.$route.query
     return {
       // Initialize your apollo data
       Post: [],
       page: 1,
       pageSize: 12,
       filter: {},
+      hashtag,
+    }
+  },
+  mounted() {
+    if (this.hashtag) {
+      this.changeFilterBubble({ tags_some: { name: this.hashtag } })
     }
   },
   computed: {
@@ -62,9 +74,21 @@ export default {
   },
   methods: {
     changeFilterBubble(filter) {
+      if (this.hashtag) {
+        filter = {
+          ...filter,
+          tags_some: { name: this.hashtag },
+        }
+      }
       this.filter = filter
       this.$apollo.queries.Post.refresh()
     },
+    clearSearch() {
+      this.$router.push({ path: '/' })
+      this.hashtag = null
+      delete this.filter.tags_some
+      this.changeFilterBubble(this.filter)
+    },
     uniq(items, field = 'id') {
       return uniqBy(items, field)
     },
diff --git a/webapp/pages/search/hashtag/_id.vue b/webapp/pages/search/hashtag/_id.vue
new file mode 100644
index 000000000..d180b4e4f
--- /dev/null
+++ b/webapp/pages/search/hashtag/_id.vue
@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  mounted() {
+    const { id: hashtag } = this.$route.params
+    this.$router.push({ path: '/', query: { hashtag } })
+  },
+}
+</script>

From 9d5ffa248071addd3274332078654c3ab7a60608 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:21:55 +0000
Subject: [PATCH 30/69] Bump eslint-loader from 2.2.0 to 2.2.1 in /webapp

Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v2.2.0...v2.2.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 d69f7e20e..f40809e2d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -93,7 +93,7 @@
     "eslint": "~5.16.0",
     "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
-    "eslint-loader": "~2.2.0",
+    "eslint-loader": "~2.2.1",
     "eslint-plugin-import": "~2.18.0",
     "eslint-plugin-jest": "~22.7.1",
     "eslint-plugin-node": "~9.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index cc9fcddfc..57aad141b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4256,10 +4256,10 @@ eslint-import-resolver-node@^0.3.2:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-loader@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.0.tgz#e2322b46fc5584ebbffd13c78089cd27d63565a9"
-  integrity sha512-O7zOQw6HS1t8H08O8DsAXPccSIu3xduku/aqdjQwPHp/NzIT/nwwkq+Ly5EtGfXo931/yTwiCuB9kjg/0D2sTg==
+eslint-loader@~2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337"
+  integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==
   dependencies:
     loader-fs-cache "^1.0.0"
     loader-utils "^1.0.2"

From d11881b2f4d9e4426ad0be0ab9e4a09a79c2903b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:22:06 +0000
Subject: [PATCH 31/69] Bump @babel/cli from 7.4.4 to 7.5.0 in /backend

Bumps [@babel/cli](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [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.4.4...v7.5.0)

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

diff --git a/backend/package.json b/backend/package.json
index 88726f959..1fe3ac5b3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -84,7 +84,7 @@
     "wait-on": "~3.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "~7.4.4",
+    "@babel/cli": "~7.5.0",
     "@babel/core": "~7.4.5",
     "@babel/node": "~7.4.5",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e0098c448..cca77fcdd 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -14,10 +14,10 @@
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz#bf9f2acdf319c0959fad8ec1239741dd2ead4e8d"
   integrity sha512-3LWZa80HcP70Pl+H4KhLDJ7S0px+9/c8GTXdl6SpunRecUaB27g/oOQnAjNHLHdbWuGE0uyqcuGiTfbKB3ilaQ==
 
-"@babel/cli@~7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.4.4.tgz#5454bb7112f29026a4069d8e6f0e1794e651966c"
-  integrity sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
+"@babel/cli@~7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.5.0.tgz#f403c930692e28ecfa3bf02a9e7562b474f38271"
+  integrity sha512-qNH55fWbKrEsCwID+Qc/3JDPnsSGpIIiMDbppnR8Z6PxLAqMQCFNqBctkIkBrMH49Nx+qqVTrHRWUR+ho2k+qQ==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"

From 069d461a41446f267a3174de00e7c21db29f25f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:22:28 +0000
Subject: [PATCH 32/69] Bump @babel/core from 7.4.5 to 7.5.0 in /webapp

Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [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.4.5...v7.5.0)

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

diff --git a/webapp/package.json b/webapp/package.json
index d69f7e20e..a62faa9e8 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -80,7 +80,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.4.5",
+    "@babel/core": "~7.5.0",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.4.5",
     "@vue/cli-shared-utils": "~3.9.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index cc9fcddfc..77692a1ab 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -21,18 +21,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@~7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
-  integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
+"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@~7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734"
+  integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
-    "@babel/helpers" "^7.4.4"
-    "@babel/parser" "^7.4.5"
+    "@babel/generator" "^7.5.0"
+    "@babel/helpers" "^7.5.0"
+    "@babel/parser" "^7.5.0"
     "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/traverse" "^7.5.0"
+    "@babel/types" "^7.5.0"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -41,12 +41,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
-  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+"@babel/generator@^7.4.0", "@babel/generator@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a"
+  integrity sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.5.0"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -219,14 +219,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
-  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
+"@babel/helpers@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.0.tgz#7f0c17666e7ed8355ed6eff643dde12fb681ddb4"
+  integrity sha512-EgCUEa8cNwuMrwo87l2d7i2oShi8m2Q58H7h3t4TWtqATZalJYFwfL9DulRe02f3KdqM9xmMCw3v/7Ll+EiaWg==
   dependencies:
     "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/traverse" "^7.5.0"
+    "@babel/types" "^7.5.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -237,10 +237,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
-  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7"
+  integrity sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -673,25 +673,25 @@
     "@babel/parser" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
-  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485"
+  integrity sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
+    "@babel/generator" "^7.5.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/parser" "^7.5.0"
+    "@babel/types" "^7.5.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
-  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab"
+  integrity sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"

From c0f7b48a07e523d8e7f0b87fdbc321546a3faa68 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:22:52 +0000
Subject: [PATCH 33/69] Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in
 /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.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/v22.7.1...v22.7.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 88726f959..c4347cdbc 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -100,7 +100,7 @@
     "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
     "eslint-plugin-import": "~2.18.0",
-    "eslint-plugin-jest": "~22.7.1",
+    "eslint-plugin-jest": "~22.7.2",
     "eslint-plugin-node": "~9.1.0",
     "eslint-plugin-prettier": "~3.1.0",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e0098c448..b0ef59d8c 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3153,10 +3153,10 @@ eslint-plugin-import@~2.18.0:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.7.1:
-  version "22.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.7.1.tgz#5dcdf8f7a285f98040378220d6beca581f0ab2a1"
-  integrity sha512-CrT3AzA738neimv8G8iK2HCkrCwHnAJeeo7k5TEHK86VMItKl6zdJT/tHBDImfnVVAYsVs4Y6BUdBZQCCgfiyw==
+eslint-plugin-jest@~22.7.2:
+  version "22.7.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.7.2.tgz#7ab118a66a34e46ae5e16a128b5d24fd28b43dca"
+  integrity sha512-Aecqe3ulBVI7amgOycVI8ZPL8o0SnGHOf3zn2/Ciu8TXyXDHcjtwD3hOs3ss/Qh/VAwlW/DMcuiXg5btgF+XMA==
 
 eslint-plugin-node@~9.1.0:
   version "9.1.0"

From 7f054809d6239e28bd3a0d998f8d87ae2c7174c5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:23:30 +0000
Subject: [PATCH 34/69] Bump @babel/node from 7.4.5 to 7.5.0 in /backend

Bumps [@babel/node](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [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.4.5...v7.5.0)

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

diff --git a/backend/package.json b/backend/package.json
index 88726f959..a495ec2d8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -86,7 +86,7 @@
   "devDependencies": {
     "@babel/cli": "~7.4.4",
     "@babel/core": "~7.4.5",
-    "@babel/node": "~7.4.5",
+    "@babel/node": "~7.5.0",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.4.5",
     "@babel/register": "~7.4.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e0098c448..749203b48 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -278,10 +278,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/node@~7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.4.5.tgz#bce71bb44d902bfdd4da0b9c839a8a90fc084056"
-  integrity sha512-nDXPT0KwYMycDHhFG9wKlkipCR+iXzzoX9bD2aF2UABLhQ13AKhNi5Y61W8ASGPPll/7p9GrHesmlOgTUJVcfw==
+"@babel/node@~7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.5.0.tgz#bcc5a286317ad771703889fb658e1f768c0a2a2e"
+  integrity sha512-VBlCrbJp7HDrKt4HRbtfq4Rs/XjBokvkfxXRQs4qA1C6eV3JycSOMELx4BFTPFRd9QnNA4PsIRfnvJqe/3tHow==
   dependencies:
     "@babel/polyfill" "^7.0.0"
     "@babel/register" "^7.0.0"

From 4436d06c695acb244459fc32e89d88938ae7ae3e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:23:31 +0000
Subject: [PATCH 35/69] Bump eslint-plugin-jest from 22.7.1 to 22.7.2 in
 /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.1 to 22.7.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/v22.7.1...v22.7.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 d69f7e20e..59b789407 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -95,7 +95,7 @@
     "eslint-config-standard": "~12.0.0",
     "eslint-loader": "~2.2.0",
     "eslint-plugin-import": "~2.18.0",
-    "eslint-plugin-jest": "~22.7.1",
+    "eslint-plugin-jest": "~22.7.2",
     "eslint-plugin-node": "~9.1.0",
     "eslint-plugin-prettier": "~3.1.0",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index cc9fcddfc..c44363c3c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4300,10 +4300,10 @@ eslint-plugin-import@~2.18.0:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.7.1:
-  version "22.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.7.1.tgz#5dcdf8f7a285f98040378220d6beca581f0ab2a1"
-  integrity sha512-CrT3AzA738neimv8G8iK2HCkrCwHnAJeeo7k5TEHK86VMItKl6zdJT/tHBDImfnVVAYsVs4Y6BUdBZQCCgfiyw==
+eslint-plugin-jest@~22.7.2:
+  version "22.7.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.7.2.tgz#7ab118a66a34e46ae5e16a128b5d24fd28b43dca"
+  integrity sha512-Aecqe3ulBVI7amgOycVI8ZPL8o0SnGHOf3zn2/Ciu8TXyXDHcjtwD3hOs3ss/Qh/VAwlW/DMcuiXg5btgF+XMA==
 
 eslint-plugin-node@~9.1.0:
   version "9.1.0"

From 01c73e9996c0d3ec87e8b23493d4538637336431 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:24:02 +0000
Subject: [PATCH 36/69] Bump @babel/preset-env from 7.4.5 to 7.5.0 in /backend

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [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.4.5...v7.5.0)

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

diff --git a/backend/package.json b/backend/package.json
index 88726f959..d4d3841cb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "~7.4.5",
     "@babel/node": "~7.4.5",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
-    "@babel/preset-env": "~7.4.5",
+    "@babel/preset-env": "~7.5.0",
     "@babel/register": "~7.4.4",
     "apollo-server-testing": "~2.6.7",
     "babel-core": "~7.0.0-0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e0098c448..737c443ab 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -304,6 +304,14 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
+"@babel/plugin-proposal-dynamic-import@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
+  integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -312,10 +320,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
-  integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
+"@babel/plugin-proposal-object-rest-spread@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.0.tgz#4838ce3cbc9a84dd00bce7a17e9e9c36119f83a0"
+  integrity sha512-G1qy5EdcO3vYhbxlXjRSR2SXB8GsxYv9hoRKT1Jdn3qy/NUnFqUUnqymKZ00Pbj+3FXNh06B+BUZzecrp3sxNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -352,6 +360,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -387,10 +402,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
-  integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
+"@babel/plugin-transform-async-to-generator@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
+  integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -432,10 +447,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
-  integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
+"@babel/plugin-transform-destructuring@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
+  integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -448,10 +463,10 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
-  integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
+"@babel/plugin-transform-duplicate-keys@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
+  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -492,30 +507,33 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
-  integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
+"@babel/plugin-transform-modules-amd@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
+  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
   dependencies:
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
-  integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
+"@babel/plugin-transform-modules-commonjs@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
+  integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
-  integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
+"@babel/plugin-transform-modules-systemjs@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
+  integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
   dependencies:
     "@babel/helper-hoist-variables" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
   version "7.2.0"
@@ -631,39 +649,41 @@
     core-js "^2.5.7"
     regenerator-runtime "^0.12.0"
 
-"@babel/preset-env@~7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
-  integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
+"@babel/preset-env@~7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.0.tgz#1122a751e864850b4dbce38bd9b4497840ee6f01"
+  integrity sha512-/5oQ7cYg+6sH9Dt9yx5IiylnLPiUdyMHl5y+K0mKVNiW2wJ7FpU5bg8jKcT8PcCbxdYzfv6OuC63jLEtMuRSmQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.5.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.5.0"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.4.4"
+    "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
     "@babel/plugin-transform-block-scoping" "^7.4.4"
     "@babel/plugin-transform-classes" "^7.4.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.4.4"
+    "@babel/plugin-transform-destructuring" "^7.5.0"
     "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
+    "@babel/plugin-transform-duplicate-keys" "^7.5.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
     "@babel/plugin-transform-for-of" "^7.4.4"
     "@babel/plugin-transform-function-name" "^7.4.4"
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
+    "@babel/plugin-transform-modules-amd" "^7.5.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.5.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
     "@babel/plugin-transform-new-target" "^7.4.4"
@@ -678,7 +698,7 @@
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
     "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.5.0"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -735,10 +755,10 @@
     globals "^11.1.0"
     lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
-  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab"
+  integrity sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"
@@ -1901,6 +1921,13 @@ babel-jest@^24.8.0, babel-jest@~24.8.0:
     chalk "^2.4.2"
     slash "^2.0.0"
 
+babel-plugin-dynamic-import-node@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
+  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+  dependencies:
+    object.assign "^4.1.0"
+
 babel-plugin-istanbul@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz#6892f529eff65a3e2d33d87dc5888ffa2ecd4a30"
@@ -5986,6 +6013,11 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
+object-keys@^1.0.11:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
@@ -6003,6 +6035,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"

From 4c2619acb89d3dd11c0f6fba6fe5e6536fba330a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:24:17 +0000
Subject: [PATCH 37/69] Bump node from 12.5-alpine to 12.6-alpine in /webapp

Bumps node from 12.5-alpine to 12.6-alpine.

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

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 9b7f1329c..d3a17a3aa 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.5-alpine as base
+FROM node:12.6-alpine as base
 LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)"
 
 EXPOSE 3000

From 27cc6c49afc23aa821301e81d8687aa3d3f5e50b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2019 04:24:30 +0000
Subject: [PATCH 38/69] Bump node from 12.5-alpine to 12.6-alpine in /backend

Bumps node from 12.5-alpine to 12.6-alpine.

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

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

From 66740b0f55a5d1f89e330bb94eab2c679e501b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 5 Jul 2019 15:52:00 +0200
Subject: [PATCH 39/69] Neo4j uses a different name for its env vars

---
 backend/.env.template                          |  2 +-
 .../human-connection/deployment-neo4j.yaml     | 18 +++---------------
 .../templates/configmap.template.yaml          |  3 ++-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/backend/.env.template b/backend/.env.template
index 0c80529a1..594c7b28b 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -1,5 +1,5 @@
 NEO4J_URI=bolt://localhost:7687
-NEO4J_USER=neo4j
+NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=letmein
 GRAPHQL_PORT=4000
 GRAPHQL_URI=http://localhost:4000
diff --git a/deployment/human-connection/deployment-neo4j.yaml b/deployment/human-connection/deployment-neo4j.yaml
index 3c4887194..afc03ca0d 100644
--- a/deployment/human-connection/deployment-neo4j.yaml
+++ b/deployment/human-connection/deployment-neo4j.yaml
@@ -32,21 +32,9 @@
             value: 1G
           - name: NEO4J_dbms_memory_heap_max__size
             value: 1G
-          - name: NEO4J_URI
-            valueFrom:
-              configMapKeyRef:
-                name: configmap
-                key: NEO4J_URI
-          - name: NEO4J_USER
-            valueFrom:
-              configMapKeyRef:
-                name: configmap
-                key: NEO4J_USER
-          - name: NEO4J_AUTH
-            valueFrom:
-              configMapKeyRef:
-                name: configmap
-                key: NEO4J_AUTH
+          envFrom:
+          - configMapRef:
+              name: configmap
           ports:
           - containerPort: 7687
           - containerPort: 7474
diff --git a/deployment/human-connection/templates/configmap.template.yaml b/deployment/human-connection/templates/configmap.template.yaml
index 762901ae8..2b7ffeeb8 100644
--- a/deployment/human-connection/templates/configmap.template.yaml
+++ b/deployment/human-connection/templates/configmap.template.yaml
@@ -10,7 +10,8 @@
     GRAPHQL_URI: "http://nitro-backend.human-connection:4000"
     MOCKS: "false"
     NEO4J_URI: "bolt://nitro-neo4j.human-connection:7687"
-    NEO4J_USER: "neo4j"
+    NEO4J_USERNAME: "neo4j"
+    NEO4J_PASSWORD: "neo4j"
     NEO4J_AUTH: "none"
     CLIENT_URI: "https://nitro-staging.human-connection.org"
   metadata:

From 99b62543031fe8714c5a415bb7abd8c6827a5375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 16:27:56 +0200
Subject: [PATCH 40/69] Split neode models into own directory

---
 backend/src/bootstrap/neode.js       | 82 +---------------------------
 backend/src/models/EmailAddress.js   | 12 ++++
 backend/src/models/InvitationCode.js | 16 ++++++
 backend/src/models/User.js           | 54 ++++++++++++++++++
 4 files changed, 83 insertions(+), 81 deletions(-)
 create mode 100644 backend/src/models/EmailAddress.js
 create mode 100644 backend/src/models/InvitationCode.js
 create mode 100644 backend/src/models/User.js

diff --git a/backend/src/bootstrap/neode.js b/backend/src/bootstrap/neode.js
index 419cb1032..12ac3c299 100644
--- a/backend/src/bootstrap/neode.js
+++ b/backend/src/bootstrap/neode.js
@@ -1,88 +1,8 @@
 import Neode from 'neode'
-import uuid from 'uuid/v4'
 
 export default function setupNeode(options) {
   const { uri, username, password } = options
   const neodeInstance = new Neode(uri, username, password)
-  neodeInstance.model('InvitationCode', {
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    token: { type: 'string', primary: true, token: true },
-    generatedBy: {
-      type: 'relationship',
-      relationship: 'GENERATED',
-      target: 'User',
-      direction: 'in',
-    },
-    activated: {
-      type: 'relationship',
-      relationship: 'ACTIVATED',
-      target: 'EmailAddress',
-      direction: 'out',
-    },
-  })
-  neodeInstance.model('EmailAddress', {
-    email: { type: 'string', primary: true, lowercase: true, email: true },
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    verifiedAt: { type: 'string', isoDate: true },
-    nonce: { type: 'string', token: true },
-    belongsTo: {
-      type: 'relationship',
-      relationship: 'BELONGS_TO',
-      target: 'User',
-      direction: 'out',
-    },
-  })
-  neodeInstance.model('User', {
-    id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
-    actorId: { type: 'string', allow: [null] },
-    name: { type: 'string', min: 3 },
-    email: { type: 'string', lowercase: true, email: true },
-    slug: 'string',
-    encryptedPassword: 'string',
-    avatar: { type: 'string', allow: [null] },
-    coverImg: { type: 'string', allow: [null] },
-    deleted: { type: 'boolean', default: false },
-    disabled: { type: 'boolean', default: false },
-    role: 'string',
-    publicKey: 'string',
-    privateKey: 'string',
-    wasInvited: 'boolean',
-    wasSeeded: 'boolean',
-    locationName: { type: 'string', allow: [null] },
-    about: { type: 'string', allow: [null] },
-    primaryEmail: {
-      type: 'relationship',
-      relationship: 'PRIMARY_EMAIL',
-      target: 'EmailAddress',
-      direction: 'out',
-    },
-    following: {
-      type: 'relationship',
-      relationship: 'FOLLOWS',
-      target: 'User',
-      direction: 'out',
-    },
-    followedBy: {
-      type: 'relationship',
-      relationship: 'FOLLOWS',
-      target: 'User',
-      direction: 'in',
-    },
-    friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
-    disabledBy: {
-      type: 'relationship',
-      relationship: 'DISABLED',
-      target: 'User',
-      direction: 'in',
-    },
-    invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    updatedAt: {
-      type: 'string',
-      isoDate: true,
-      required: true,
-      default: () => new Date().toISOString(),
-    },
-  })
+  neodeInstance.withDirectory(`${__dirname}/../models`)
   return neodeInstance
 }
diff --git a/backend/src/models/EmailAddress.js b/backend/src/models/EmailAddress.js
new file mode 100644
index 000000000..ddd56c297
--- /dev/null
+++ b/backend/src/models/EmailAddress.js
@@ -0,0 +1,12 @@
+module.exports = {
+  email: { type: 'string', primary: true, lowercase: true, email: true },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  verifiedAt: { type: 'string', isoDate: true },
+  nonce: { type: 'string', token: true },
+  belongsTo: {
+    type: 'relationship',
+    relationship: 'BELONGS_TO',
+    target: 'User',
+    direction: 'out',
+  },
+}
diff --git a/backend/src/models/InvitationCode.js b/backend/src/models/InvitationCode.js
new file mode 100644
index 000000000..f137f6c15
--- /dev/null
+++ b/backend/src/models/InvitationCode.js
@@ -0,0 +1,16 @@
+module.exports = {
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  token: { type: 'string', primary: true, token: true },
+  generatedBy: {
+    type: 'relationship',
+    relationship: 'GENERATED',
+    target: 'User',
+    direction: 'in',
+  },
+  activated: {
+    type: 'relationship',
+    relationship: 'ACTIVATED',
+    target: 'EmailAddress',
+    direction: 'out',
+  },
+}
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
new file mode 100644
index 000000000..9ad07cf11
--- /dev/null
+++ b/backend/src/models/User.js
@@ -0,0 +1,54 @@
+import uuid from 'uuid/v4'
+
+module.exports = {
+  id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
+  actorId: { type: 'string', allow: [null] },
+  name: { type: 'string', min: 3 },
+  email: { type: 'string', lowercase: true, email: true },
+  slug: 'string',
+  encryptedPassword: 'string',
+  avatar: { type: 'string', allow: [null] },
+  coverImg: { type: 'string', allow: [null] },
+  deleted: { type: 'boolean', default: false },
+  disabled: { type: 'boolean', default: false },
+  role: 'string',
+  publicKey: 'string',
+  privateKey: 'string',
+  wasInvited: 'boolean',
+  wasSeeded: 'boolean',
+  locationName: { type: 'string', allow: [null] },
+  about: { type: 'string', allow: [null] },
+  primaryEmail: {
+    type: 'relationship',
+    relationship: 'PRIMARY_EMAIL',
+    target: 'EmailAddress',
+    direction: 'out',
+  },
+  following: {
+    type: 'relationship',
+    relationship: 'FOLLOWS',
+    target: 'User',
+    direction: 'out',
+  },
+  followedBy: {
+    type: 'relationship',
+    relationship: 'FOLLOWS',
+    target: 'User',
+    direction: 'in',
+  },
+  friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
+  disabledBy: {
+    type: 'relationship',
+    relationship: 'DISABLED',
+    target: 'User',
+    direction: 'in',
+  },
+  invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  updatedAt: {
+    type: 'string',
+    isoDate: true,
+    required: true,
+    default: () => new Date().toISOString(),
+  },
+}

From e77bf314706f2bcab0cfdabc2c14ac9b601b1592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 16:44:07 +0200
Subject: [PATCH 41/69] User role must be set

---
 backend/src/models/User.js             |  2 +-
 backend/src/models/spec/User.spec.js   | 20 ++++++++++++++++++++
 backend/src/schema/types/type/User.gql |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/models/spec/User.spec.js

diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 9ad07cf11..060359682 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -11,7 +11,7 @@ module.exports = {
   coverImg: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
-  role: 'string',
+  role: { type: 'string', required: true, default: 'user' },
   publicKey: 'string',
   privateKey: 'string',
   wasInvited: 'boolean',
diff --git a/backend/src/models/spec/User.spec.js b/backend/src/models/spec/User.spec.js
new file mode 100644
index 000000000..d1aa79b7d
--- /dev/null
+++ b/backend/src/models/spec/User.spec.js
@@ -0,0 +1,20 @@
+import Factory from '../../seed/factories'
+import { neode } from '../../bootstrap/neo4j'
+
+const factory = Factory()
+const instance = neode()
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('role', () => {
+  it('defaults to `user`', async () => {
+    const user = await instance.create('User', { name: 'John' })
+    await expect(user.toJson()).resolves.toEqual(
+      expect.objectContaining({
+        role: 'user',
+      }),
+    )
+  })
+})
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 314f03521..b984f2d79 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -9,7 +9,7 @@ type User {
   deleted: Boolean
   disabled: Boolean
   disabledBy: User @relation(name: "DISABLED", direction: "IN")
-  role: UserGroup
+  role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")
   invited: [User] @relation(name: "INVITED", direction: "OUT")

From 888da86c6d3ee4490eb60deb70c6bbf8743877ab Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 18:03:54 +0200
Subject: [PATCH 42/69] update instructions to edit docs

---
 README.md                  |  2 +-
 edit-this-documentation.md | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ac7d2a024..411f7d842 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Thank you lokalise for providing us with a premium account :raised_hands:.
 ## Developer Chat
 
 Join our friendly open-source community on [Discord](https://discord.gg/6ub73U3) :heart_eyes_cat:
-Just introduce yourself at `#user-presentation` and mention `@@Mentor` to get you onboard :neckbeard:
+Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard:
 Check out the [contribution guideline](./CONTRIBUTING.md), too!
 
 
diff --git a/edit-this-documentation.md b/edit-this-documentation.md
index b01ace78f..cd83ac7a6 100644
--- a/edit-this-documentation.md
+++ b/edit-this-documentation.md
@@ -1,12 +1,6 @@
 # Edit this Documentation
 
-Go to the section and theme you want to change: On the left navigator.
-
-Click **Edit on GitHub** on the right.
-
-On the **Issue** tab you’ll find the open issues. Read what need to be done by clicking on the issue you like to fix.
-
-By going backwards in the browser **\(!\)**, again go to the **Code** tab.
+Find the [**table of contents** for this documentation on GitHub](https://github.com/Human-Connection/Human-Connection/blob/master/SUMMARY.md) and navigate to the file you need to update.
 
 Click on the **edit pencil** on the right side directly above the text to edit this file on your fork of Human Connection \(HC\).
 
@@ -14,7 +8,7 @@ You can see a preview of your changes by clicking the **Preview changes** tab as
 
 If you are ready, fill in the **Propose file change** at the end of the webpage.
 
-After that you have to send your change to the HC basis with a pull request. Here make a comment which issue you have fixed. At least the number.
+After that you have to send your change to the HC basis with a pull request. Here make a comment which issue you have fixed. (If you are working on one of our [open issues](https://github.com/Human-Connection/Human-Connection/issues) please include the number.)
 
 ## Markdown your documentation
 
@@ -117,4 +111,3 @@ TODO: How to modify screenshots in Linux ...
 {% endhint %}
 {% endtab %}
 {% endtabs %}
-

From 4725f41a0dea92a570c74a67729516e122a053bc Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 18:26:22 +0200
Subject: [PATCH 43/69] update neo4j readme

---
 neo4j/README.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/neo4j/README.md b/neo4j/README.md
index 379a89eec..78c4bc62e 100644
--- a/neo4j/README.md
+++ b/neo4j/README.md
@@ -20,7 +20,7 @@ for an interactive cypher shell and a visualization of the graph.
 
 ## Installation without Docker
 
-Install community edition of [Neo4J]() along with the plugin
+Install the community edition of [Neo4j](https://neo4j.com/) along with the plugin
 [Apoc](https://github.com/neo4j-contrib/neo4j-apoc-procedures) on your system.
 
 To do so, go to [releases](https://neo4j.com/download-center/#releases), choose
@@ -28,7 +28,13 @@ To do so, go to [releases](https://neo4j.com/download-center/#releases), choose
 and unpack the files.
 
 Download [Neo4j Apoc](https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases)
-and drop the file into the `plugins` folder of the just extracted Neo4j-Server.
+and drop the `.jar` file into the `plugins` folder of the just extracted Neo4j-Server.
+
+Then make sure to allow Apoc procedures by adding the following line to your Neo4j configuration \(`conf/neo4j.conf`\):
+
+```
+dbms.security.procedures.unrestricted=apoc.*
+```
 
 ### Alternatives
 
@@ -59,6 +65,6 @@ $ cp .env.template .env
 $ ./db_setup.sh
 ```
 
-Otherwise if you don't have `cypher-shell` available, simply copy the cypher
-statements [from the script](./neo4j/db_setup.sh) and paste the scripts into your
-database [browser frontend](http://localhost:7474).
+Otherwise, if you don't have `cypher-shell` available, copy the cypher
+statements [from the `db_setup.sh` script](https://github.com/Human-Connection/Human-Connection/blob/master/neo4j/db_setup.sh) and paste the scripts into your
+[database browser frontend](http://localhost:7474).

From b2e68bf9df09ee43c4ca97e730b59bf0b6697155 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 18:57:34 +0200
Subject: [PATCH 44/69] fix typo in webapp readme

---
 webapp/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/README.md b/webapp/README.md
index ce27eca2f..604c7e6ba 100644
--- a/webapp/README.md
+++ b/webapp/README.md
@@ -41,4 +41,4 @@ All reusable Components \(for example avatar\) should be done inside the [Nitro-
 
 More information can be found here: [https://github.com/Human-Connection/Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide)
 
-If you need to change something in the styleguide and want to see the effects on the frontend immediately, then we have you covered. You need to clone the styleguide to the parent directory `../Nitro-Styleguide` and run `yarn && yarn run dev`. After that you run `yarn run dev:styleguide` instead of `yarn run dev` and you will see your changes reflected inside the fronten!
+If you need to change something in the styleguide and want to see the effects on the frontend immediately, then we have you covered. You need to clone the styleguide to the parent directory `../Nitro-Styleguide` and run `yarn && yarn run dev`. After that you run `yarn run dev:styleguide` instead of `yarn run dev` and you will see your changes reflected inside the frontend!

From 1f9f7e205a879e1809bd104b9d2ddb988a497b1e Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 19:10:21 +0200
Subject: [PATCH 45/69] remove "not required" line from webapp docs

---
 webapp/assets.md     | 5 +----
 webapp/components.md | 3 ---
 webapp/layouts.md    | 3 ---
 webapp/middleware.md | 5 +----
 webapp/plugins.md    | 3 ---
 webapp/static.md     | 5 ++---
 webapp/store.md      | 5 +----
 7 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/webapp/assets.md b/webapp/assets.md
index 06786539d..6ac7dc388 100644
--- a/webapp/assets.md
+++ b/webapp/assets.md
@@ -1,8 +1,5 @@
 # ASSETS
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.
+This directory contains your un-compiled assets such as LESS, SASS, or JavaScript – in our case SCSS styles.
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked).
-
diff --git a/webapp/components.md b/webapp/components.md
index be43ae454..92b3dd1fb 100644
--- a/webapp/components.md
+++ b/webapp/components.md
@@ -1,8 +1,5 @@
 # COMPONENTS
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
 The components directory contains your Vue.js Components.
 
 _Nuxt.js doesn't supercharge these components._
-
diff --git a/webapp/layouts.md b/webapp/layouts.md
index 300b5af89..a709d79fe 100644
--- a/webapp/layouts.md
+++ b/webapp/layouts.md
@@ -1,8 +1,5 @@
 # LAYOUTS
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
 This directory contains your Application Layouts.
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts).
-
diff --git a/webapp/middleware.md b/webapp/middleware.md
index 92c2ba10b..a899527e2 100644
--- a/webapp/middleware.md
+++ b/webapp/middleware.md
@@ -1,8 +1,5 @@
 # MIDDLEWARE
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
-This directory contains your application middleware. The middleware lets you define custom function to be ran before rendering a page or a group of pages \(layouts\).
+This directory contains our application middleware. The middleware lets you define custom functions to be ran before rendering a page or a group of pages \(layouts\).
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware).
-
diff --git a/webapp/plugins.md b/webapp/plugins.md
index a54b05d0b..dc7b545f2 100644
--- a/webapp/plugins.md
+++ b/webapp/plugins.md
@@ -1,8 +1,5 @@
 # PLUGINS
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
 This directory contains your Javascript plugins that you want to run before mounting the root Vue.js application.
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/plugins).
-
diff --git a/webapp/static.md b/webapp/static.md
index 748e8c5ed..db271e3a5 100644
--- a/webapp/static.md
+++ b/webapp/static.md
@@ -1,10 +1,9 @@
 # STATIC
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
 This directory contains your static files. Each file inside this directory is mapped to `/`.
 
 Example: `/static/robots.txt` is mapped as `/robots.txt`.
 
-More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
+We use it for images.
 
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
diff --git a/webapp/store.md b/webapp/store.md
index 1310aa2da..6c8e3735c 100644
--- a/webapp/store.md
+++ b/webapp/store.md
@@ -1,10 +1,7 @@
 # STORE
 
-**This directory is not required, you can delete it if you don't want to use it.**
-
 This directory contains your Vuex Store files. Vuex Store option is implemented in the Nuxt.js framework.
 
-Creating a file in this directory activate the option in the framework automatically.
+Creating a file in this directory activates the option in the framework automatically.
 
 More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store).
-

From a1f28810b9f098fa06f792b9d4653f0384c3d2d1 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 19:14:46 +0200
Subject: [PATCH 46/69] fix link in contributing readme

---
 CONTRIBUTING.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19aaf3301..0eb90a824 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,9 +4,9 @@ Thanks so much for thinking of contributing to the Human Connection project, we
 
 ## Getting Set Up
 
-Instructions for how to install all the necessary software can be found in our [documentation](https://docs.human-connection.org/human-connection/)
+Instructions for how to install all the necessary software can be found in our [documentation](https://docs.human-connection.org/human-connection/).
 
-We recommend that new folks should ideally work together with an existing developer. Please join our discord instance to chat with developers or just ask them in tickets in [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353):
+We recommend that new folks should ideally work together with an existing developer. Please join our [discord](https://discord.gg/6ub73U3) instance to chat with developers or just ask them in tickets in [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f/boards?repos=152252353):
 
 ![](https://dl.dropbox.com/s/vbmcihkduy9dhko/Screenshot%202019-01-03%2015.50.11.png?dl=0)
 
@@ -17,7 +17,7 @@ Here are some general notes on our development flow:
 * Currently operating in two week sprints
 * We are using ZenHub to coordinate
   * estimating time per issue is the crucial feature of [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f) that Github does not have
-  * "up-for-grabs" links to [Github project](https://github.com/orgs/Human-Connection/projects/10?card_filter_query=label%3A"good+first+issue)
+  * "up-for-grabs" links to [Github project](https://github.com/Human-Connection/Human-Connection/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
   * ordering on ZenHub not necessarily reflected on github projects
 * AgileVentures run open pairing sessions at 10:30am UTC each week on Tuesdays and Thursdays
 * Core team
@@ -51,19 +51,19 @@ But what do we do when waiting for merge into master \(wanting to keep PRs small
   * solutions
     * 1\) put 2nd PR into branch that the first PR is hitting - but requires update after merging
     * 2\) prefer to leave exiting PR until it can be reviewed, and instead go and work on some other part of the codebase that is not impacted by the first PR
-    
+
 ### Code Review
-* Github setting in place - at least one review is required to merge 
+* Github setting in place - at least one review is required to merge
   - in principle anyone (who is not the PR owner) can review
   - but often it will be the core developers (Robert, Ulf, Greg, Wolfgang?)
   - once there is a review, and presuming no requested changes, PR opener can merge
 
 * CI/tests
-  - the CI needs to pass 
+  - the CI needs to pass
     - linting  <-- autofix?
     - tests (unit, feature) (backend, frontend)
     - codecoverage
-    
+
 ## Notes
 
 question: when you want to pick a task - \(find out priority\) - is it in discord? is it in AV slack? --&gt; Robert says you can always ask in discord - group channels are the best
@@ -77,4 +77,3 @@ Matt makes point that new stories will have to be taken off the "New Issues" and
 Robert notes that everyone is invited to join the kickoff meetings
 
 Robert - difference between "important" \(creates a lot of value\) and "beginner friendly" \(easy to implement\)
-

From e69f292bd83542aa54584a2ee70ec3767261eded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 8 Jul 2019 19:25:57 +0200
Subject: [PATCH 47/69] Hashtags restricted in the chars, in Editor Suggestions
 and Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 .../handleContentData.spec.js                 |   7 +-
 .../hashtags/extractHashtags.js               |   8 +-
 .../hashtags/extractHashtags.spec.js          |  18 +-
 backend/src/seed/seed-db.js                   | 600 ++++++++++++++----
 webapp/components/Editor/Editor.vue           |  59 +-
 webapp/layouts/default.vue                    |   2 +-
 webapp/locales/de.json                        |   3 +-
 webapp/locales/en.json                        |   3 +-
 8 files changed, 553 insertions(+), 147 deletions(-)

diff --git a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
index e9439fe21..aa281e6d7 100644
--- a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
@@ -177,6 +177,7 @@ describe('Hashtags', () => {
     query($id: ID) {
       Post(id: $id) {
         tags {
+          id
           name
         }
       }
@@ -216,12 +217,14 @@ describe('Hashtags', () => {
         })
       })
 
-      it('both Hashtags are created', async () => {
+      it('both Hashtags are created with the "id" set to thier "name"', async () => {
         const expected = [
           {
+            id: 'Democracy',
             name: 'Democracy',
           },
           {
+            id: 'Liberty',
             name: 'Liberty',
           },
         ]
@@ -259,9 +262,11 @@ describe('Hashtags', () => {
 
           const expected = [
             {
+              id: 'Elections',
               name: 'Elections',
             },
             {
+              id: 'Liberty',
               name: 'Liberty',
             },
           ]
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
index 5e77e6e3a..fd6613065 100644
--- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.js
@@ -1,5 +1,11 @@
 import cheerio from 'cheerio'
-const ID_REGEX = /\/search\/hashtag\/([\w\-.!~*'"(),]+)/g
+// formats of a Hashtag:
+//   https://en.wikipedia.org/w/index.php?title=Hashtag&oldid=905141980#Style
+// here:
+//    0. Search for whole string.
+//    1. Hashtag has only 'a-z', 'A-Z', and '0-9'.
+//    2. If it starts with a digit '0-9' than 'a-z', or 'A-Z' has to follow.
+const ID_REGEX = /^\/search\/hashtag\/(([a-zA-Z]+[a-zA-Z0-9]*)|([0-9]+[a-zA-Z]+[a-zA-Z0-9]*))$/g
 
 export default function(content) {
   if (!content) return []
diff --git a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
index 1b37aaa34..eb581d8f5 100644
--- a/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
+++ b/backend/src/middleware/handleHtmlContent/hashtags/extractHashtags.spec.js
@@ -21,16 +21,16 @@ describe('extractHashtags', () => {
     })
 
     describe('handles links', () => {
-      it('with domains', () => {
+      it('ignores links with domains', () => {
         const content =
-          '<p><a class="hashtag" href="http://localhost:3000/search/hashtag/Elections">#Elections</a><a href="http://localhost:3000/search/hashtag/Democracy">#Democracy</a></p>'
-        expect(extractHashtags(content)).toEqual(['Elections', 'Democracy'])
+          '<p><a class="hashtag" href="http://localhost:3000/search/hashtag/Elections">#Elections</a><a href="/search/hashtag/Democracy">#Democracy</a></p>'
+        expect(extractHashtags(content)).toEqual(['Democracy'])
       })
 
-      it('special characters', () => {
+      it('ignores Hashtag links with not allowed character combinations', () => {
         const content =
-          '<p>Something inspirational about <a href="/search/hashtag/u!*(),2" class="hashtag" target="_blank">#u!*(),2</a> and <a href="/search/hashtag/u.~-3" target="_blank">#u.~-3</a>.</p>'
-        expect(extractHashtags(content)).toEqual(['u!*(),2', 'u.~-3'])
+          '<p>Something inspirational about <a href="/search/hashtag/AbcDefXyz0123456789!*(),2" class="hashtag" target="_blank">#AbcDefXyz0123456789!*(),2</a>, <a href="/search/hashtag/0123456789" class="hashtag" target="_blank">#0123456789</a>, <a href="/search/hashtag/0123456789a" class="hashtag" target="_blank">#0123456789a</a> and <a href="/search/hashtag/AbcDefXyz0123456789" target="_blank">#AbcDefXyz0123456789</a>.</p>'
+        expect(extractHashtags(content)).toEqual(['0123456789a', 'AbcDefXyz0123456789'])
       })
     })
 
@@ -41,6 +41,12 @@ describe('extractHashtags', () => {
         expect(extractHashtags(content)).toEqual([])
       })
 
+      it('`href` contains Hashtag as page anchor', () => {
+        const content =
+          '<p>Something inspirational about <a href="https://www.example.org/#anchor" target="_blank">#anchor</a>.</p>'
+        expect(extractHashtags(content)).toEqual([])
+      })
+
       it('`href` is empty or invalid', () => {
         const content =
           '<p>Something inspirational about <a href="" class="hashtag" target="_blank">@bob-der-baumeister</a> and <a href="not-a-url" target="_blank">@jenny-rostock</a>.</p>'
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index e31d09a68..18eefb76f 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -69,47 +69,144 @@ import Factory from './factories'
         role: 'user',
         email: 'user@example.org',
       }),
-      f.create('User', { id: 'u4', name: 'Tick', role: 'user', email: 'tick@example.org' }),
-      f.create('User', { id: 'u5', name: 'Trick', role: 'user', email: 'trick@example.org' }),
-      f.create('User', { id: 'u6', name: 'Track', role: 'user', email: 'track@example.org' }),
-      f.create('User', { id: 'u7', name: 'Dagobert', role: 'user', email: 'dagobert@example.org' }),
+      f.create('User', {
+        id: 'u4',
+        name: 'Tick',
+        role: 'user',
+        email: 'tick@example.org',
+      }),
+      f.create('User', {
+        id: 'u5',
+        name: 'Trick',
+        role: 'user',
+        email: 'trick@example.org',
+      }),
+      f.create('User', {
+        id: 'u6',
+        name: 'Track',
+        role: 'user',
+        email: 'track@example.org',
+      }),
+      f.create('User', {
+        id: 'u7',
+        name: 'Dagobert',
+        role: 'user',
+        email: 'dagobert@example.org',
+      }),
     ])
 
     const [asAdmin, asModerator, asUser, asTick, asTrick, asTrack] = await Promise.all([
-      Factory().authenticateAs({ email: 'admin@example.org', password: '1234' }),
-      Factory().authenticateAs({ email: 'moderator@example.org', password: '1234' }),
-      Factory().authenticateAs({ email: 'user@example.org', password: '1234' }),
-      Factory().authenticateAs({ email: 'tick@example.org', password: '1234' }),
-      Factory().authenticateAs({ email: 'trick@example.org', password: '1234' }),
-      Factory().authenticateAs({ email: 'track@example.org', password: '1234' }),
+      Factory().authenticateAs({
+        email: 'admin@example.org',
+        password: '1234',
+      }),
+      Factory().authenticateAs({
+        email: 'moderator@example.org',
+        password: '1234',
+      }),
+      Factory().authenticateAs({
+        email: 'user@example.org',
+        password: '1234',
+      }),
+      Factory().authenticateAs({
+        email: 'tick@example.org',
+        password: '1234',
+      }),
+      Factory().authenticateAs({
+        email: 'trick@example.org',
+        password: '1234',
+      }),
+      Factory().authenticateAs({
+        email: 'track@example.org',
+        password: '1234',
+      }),
     ])
 
     await Promise.all([
-      f.relate('User', 'Badges', { from: 'b6', to: 'u1' }),
-      f.relate('User', 'Badges', { from: 'b5', to: 'u2' }),
-      f.relate('User', 'Badges', { from: 'b4', to: 'u3' }),
-      f.relate('User', 'Badges', { from: 'b3', to: 'u4' }),
-      f.relate('User', 'Badges', { from: 'b2', to: 'u5' }),
-      f.relate('User', 'Badges', { from: 'b1', to: 'u6' }),
-      f.relate('User', 'Friends', { from: 'u1', to: 'u2' }),
-      f.relate('User', 'Friends', { from: 'u1', to: 'u3' }),
-      f.relate('User', 'Friends', { from: 'u2', to: 'u3' }),
-      f.relate('User', 'Blacklisted', { from: 'u7', to: 'u4' }),
-      f.relate('User', 'Blacklisted', { from: 'u7', to: 'u5' }),
-      f.relate('User', 'Blacklisted', { from: 'u7', to: 'u6' }),
+      f.relate('User', 'Badges', {
+        from: 'b6',
+        to: 'u1',
+      }),
+      f.relate('User', 'Badges', {
+        from: 'b5',
+        to: 'u2',
+      }),
+      f.relate('User', 'Badges', {
+        from: 'b4',
+        to: 'u3',
+      }),
+      f.relate('User', 'Badges', {
+        from: 'b3',
+        to: 'u4',
+      }),
+      f.relate('User', 'Badges', {
+        from: 'b2',
+        to: 'u5',
+      }),
+      f.relate('User', 'Badges', {
+        from: 'b1',
+        to: 'u6',
+      }),
+      f.relate('User', 'Friends', {
+        from: 'u1',
+        to: 'u2',
+      }),
+      f.relate('User', 'Friends', {
+        from: 'u1',
+        to: 'u3',
+      }),
+      f.relate('User', 'Friends', {
+        from: 'u2',
+        to: 'u3',
+      }),
+      f.relate('User', 'Blacklisted', {
+        from: 'u7',
+        to: 'u4',
+      }),
+      f.relate('User', 'Blacklisted', {
+        from: 'u7',
+        to: 'u5',
+      }),
+      f.relate('User', 'Blacklisted', {
+        from: 'u7',
+        to: 'u6',
+      }),
     ])
 
     await Promise.all([
-      asAdmin.follow({ id: 'u3', type: 'User' }),
-      asModerator.follow({ id: 'u4', type: 'User' }),
-      asUser.follow({ id: 'u4', type: 'User' }),
-      asTick.follow({ id: 'u6', type: 'User' }),
-      asTrick.follow({ id: 'u4', type: 'User' }),
-      asTrack.follow({ id: 'u3', type: 'User' }),
+      asAdmin.follow({
+        id: 'u3',
+        type: 'User',
+      }),
+      asModerator.follow({
+        id: 'u4',
+        type: 'User',
+      }),
+      asUser.follow({
+        id: 'u4',
+        type: 'User',
+      }),
+      asTick.follow({
+        id: 'u6',
+        type: 'User',
+      }),
+      asTrick.follow({
+        id: 'u4',
+        type: 'User',
+      }),
+      asTrack.follow({
+        id: 'u3',
+        type: 'User',
+      }),
     ])
 
     await Promise.all([
-      f.create('Category', { id: 'cat1', name: 'Just For Fun', slug: 'justforfun', icon: 'smile' }),
+      f.create('Category', {
+        id: 'cat1',
+        name: 'Just For Fun',
+        slug: 'justforfun',
+        icon: 'smile',
+      }),
       f.create('Category', {
         id: 'cat2',
         name: 'Happyness & Values',
@@ -203,10 +300,22 @@ import Factory from './factories'
     ])
 
     await Promise.all([
-      f.create('Tag', { id: 't1', name: 'Umwelt' }),
-      f.create('Tag', { id: 't2', name: 'Naturschutz' }),
-      f.create('Tag', { id: 't3', name: 'Demokratie' }),
-      f.create('Tag', { id: 't4', name: 'Freiheit' }),
+      f.create('Tag', {
+        id: 'Umwelt',
+        name: 'Umwelt',
+      }),
+      f.create('Tag', {
+        id: 'Naturschutz',
+        name: 'Naturschutz',
+      }),
+      f.create('Tag', {
+        id: 'Demokratie',
+        name: 'Demokratie',
+      }),
+      f.create('Tag', {
+        id: 'Freiheit',
+        name: 'Freiheit',
+      }),
     ])
 
     const mention1 = 'Hey <a class="mention" href="/profile/u3">@jenny-rostock</a>, what\'s up?'
@@ -214,108 +323,347 @@ import Factory from './factories'
       'Hey <a class="mention" href="/profile/u3">@jenny-rostock</a>, here is another notification for you!'
 
     await Promise.all([
-      asAdmin.create('Post', { id: 'p0', image: faker.image.unsplash.food() }),
-      asModerator.create('Post', { id: 'p1', image: faker.image.unsplash.technology() }),
-      asUser.create('Post', { id: 'p2' }),
-      asTick.create('Post', { id: 'p3' }),
-      asTrick.create('Post', { id: 'p4' }),
-      asTrack.create('Post', { id: 'p5' }),
-      asAdmin.create('Post', { id: 'p6', image: faker.image.unsplash.buildings() }),
-      asModerator.create('Post', { id: 'p7', content: `${mention1} ${faker.lorem.paragraph()}` }),
-      asUser.create('Post', { id: 'p8', image: faker.image.unsplash.nature() }),
-      asTick.create('Post', { id: 'p9' }),
-      asTrick.create('Post', { id: 'p10' }),
-      asTrack.create('Post', { id: 'p11', image: faker.image.unsplash.people() }),
-      asAdmin.create('Post', { id: 'p12', content: `${mention2} ${faker.lorem.paragraph()}` }),
-      asModerator.create('Post', { id: 'p13' }),
-      asUser.create('Post', { id: 'p14', image: faker.image.unsplash.objects() }),
-      asTick.create('Post', { id: 'p15' }),
+      asAdmin.create('Post', {
+        id: 'p0',
+        image: faker.image.unsplash.food(),
+      }),
+      asModerator.create('Post', {
+        id: 'p1',
+        image: faker.image.unsplash.technology(),
+      }),
+      asUser.create('Post', {
+        id: 'p2',
+      }),
+      asTick.create('Post', {
+        id: 'p3',
+      }),
+      asTrick.create('Post', {
+        id: 'p4',
+      }),
+      asTrack.create('Post', {
+        id: 'p5',
+      }),
+      asAdmin.create('Post', {
+        id: 'p6',
+        image: faker.image.unsplash.buildings(),
+      }),
+      asModerator.create('Post', {
+        id: 'p7',
+        content: `${mention1} ${faker.lorem.paragraph()}`,
+      }),
+      asUser.create('Post', {
+        id: 'p8',
+        image: faker.image.unsplash.nature(),
+      }),
+      asTick.create('Post', {
+        id: 'p9',
+      }),
+      asTrick.create('Post', {
+        id: 'p10',
+      }),
+      asTrack.create('Post', {
+        id: 'p11',
+        image: faker.image.unsplash.people(),
+      }),
+      asAdmin.create('Post', {
+        id: 'p12',
+        content: `${mention2} ${faker.lorem.paragraph()}`,
+      }),
+      asModerator.create('Post', {
+        id: 'p13',
+      }),
+      asUser.create('Post', {
+        id: 'p14',
+        image: faker.image.unsplash.objects(),
+      }),
+      asTick.create('Post', {
+        id: 'p15',
+      }),
     ])
 
     await Promise.all([
-      f.relate('Post', 'Categories', { from: 'p0', to: 'cat16' }),
-      f.relate('Post', 'Categories', { from: 'p1', to: 'cat1' }),
-      f.relate('Post', 'Categories', { from: 'p2', to: 'cat2' }),
-      f.relate('Post', 'Categories', { from: 'p3', to: 'cat3' }),
-      f.relate('Post', 'Categories', { from: 'p4', to: 'cat4' }),
-      f.relate('Post', 'Categories', { from: 'p5', to: 'cat5' }),
-      f.relate('Post', 'Categories', { from: 'p6', to: 'cat6' }),
-      f.relate('Post', 'Categories', { from: 'p7', to: 'cat7' }),
-      f.relate('Post', 'Categories', { from: 'p8', to: 'cat8' }),
-      f.relate('Post', 'Categories', { from: 'p9', to: 'cat9' }),
-      f.relate('Post', 'Categories', { from: 'p10', to: 'cat10' }),
-      f.relate('Post', 'Categories', { from: 'p11', to: 'cat11' }),
-      f.relate('Post', 'Categories', { from: 'p12', to: 'cat12' }),
-      f.relate('Post', 'Categories', { from: 'p13', to: 'cat13' }),
-      f.relate('Post', 'Categories', { from: 'p14', to: 'cat14' }),
-      f.relate('Post', 'Categories', { from: 'p15', to: 'cat15' }),
+      f.relate('Post', 'Categories', {
+        from: 'p0',
+        to: 'cat16',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p1',
+        to: 'cat1',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p2',
+        to: 'cat2',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p3',
+        to: 'cat3',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p4',
+        to: 'cat4',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p5',
+        to: 'cat5',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p6',
+        to: 'cat6',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p7',
+        to: 'cat7',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p8',
+        to: 'cat8',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p9',
+        to: 'cat9',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p10',
+        to: 'cat10',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p11',
+        to: 'cat11',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p12',
+        to: 'cat12',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p13',
+        to: 'cat13',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p14',
+        to: 'cat14',
+      }),
+      f.relate('Post', 'Categories', {
+        from: 'p15',
+        to: 'cat15',
+      }),
 
-      f.relate('Post', 'Tags', { from: 'p0', to: 't4' }),
-      f.relate('Post', 'Tags', { from: 'p1', to: 't1' }),
-      f.relate('Post', 'Tags', { from: 'p2', to: 't2' }),
-      f.relate('Post', 'Tags', { from: 'p3', to: 't3' }),
-      f.relate('Post', 'Tags', { from: 'p4', to: 't4' }),
-      f.relate('Post', 'Tags', { from: 'p5', to: 't1' }),
-      f.relate('Post', 'Tags', { from: 'p6', to: 't2' }),
-      f.relate('Post', 'Tags', { from: 'p7', to: 't3' }),
-      f.relate('Post', 'Tags', { from: 'p8', to: 't4' }),
-      f.relate('Post', 'Tags', { from: 'p9', to: 't1' }),
-      f.relate('Post', 'Tags', { from: 'p10', to: 't2' }),
-      f.relate('Post', 'Tags', { from: 'p11', to: 't3' }),
-      f.relate('Post', 'Tags', { from: 'p12', to: 't4' }),
-      f.relate('Post', 'Tags', { from: 'p13', to: 't1' }),
-      f.relate('Post', 'Tags', { from: 'p14', to: 't2' }),
-      f.relate('Post', 'Tags', { from: 'p15', to: 't3' }),
+      f.relate('Post', 'Tags', {
+        from: 'p0',
+        to: 'Freiheit',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p1',
+        to: 'Umwelt',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p2',
+        to: 'Naturschutz',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p3',
+        to: 'Demokratie',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p4',
+        to: 'Freiheit',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p5',
+        to: 'Umwelt',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p6',
+        to: 'Naturschutz',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p7',
+        to: 'Demokratie',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p8',
+        to: 'Freiheit',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p9',
+        to: 'Umwelt',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p10',
+        to: 'Naturschutz',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p11',
+        to: 'Demokratie',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p12',
+        to: 'Freiheit',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p13',
+        to: 'Umwelt',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p14',
+        to: 'Naturschutz',
+      }),
+      f.relate('Post', 'Tags', {
+        from: 'p15',
+        to: 'Demokratie',
+      }),
     ])
 
     await Promise.all([
-      asAdmin.shout({ id: 'p2', type: 'Post' }),
-      asAdmin.shout({ id: 'p6', type: 'Post' }),
-      asModerator.shout({ id: 'p0', type: 'Post' }),
-      asModerator.shout({ id: 'p6', type: 'Post' }),
-      asUser.shout({ id: 'p6', type: 'Post' }),
-      asUser.shout({ id: 'p7', type: 'Post' }),
-      asTick.shout({ id: 'p8', type: 'Post' }),
-      asTick.shout({ id: 'p9', type: 'Post' }),
-      asTrack.shout({ id: 'p10', type: 'Post' }),
+      asAdmin.shout({
+        id: 'p2',
+        type: 'Post',
+      }),
+      asAdmin.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asModerator.shout({
+        id: 'p0',
+        type: 'Post',
+      }),
+      asModerator.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asUser.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asUser.shout({
+        id: 'p7',
+        type: 'Post',
+      }),
+      asTick.shout({
+        id: 'p8',
+        type: 'Post',
+      }),
+      asTick.shout({
+        id: 'p9',
+        type: 'Post',
+      }),
+      asTrack.shout({
+        id: 'p10',
+        type: 'Post',
+      }),
     ])
     await Promise.all([
-      asAdmin.shout({ id: 'p2', type: 'Post' }),
-      asAdmin.shout({ id: 'p6', type: 'Post' }),
-      asModerator.shout({ id: 'p0', type: 'Post' }),
-      asModerator.shout({ id: 'p6', type: 'Post' }),
-      asUser.shout({ id: 'p6', type: 'Post' }),
-      asUser.shout({ id: 'p7', type: 'Post' }),
-      asTick.shout({ id: 'p8', type: 'Post' }),
-      asTick.shout({ id: 'p9', type: 'Post' }),
-      asTrack.shout({ id: 'p10', type: 'Post' }),
+      asAdmin.shout({
+        id: 'p2',
+        type: 'Post',
+      }),
+      asAdmin.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asModerator.shout({
+        id: 'p0',
+        type: 'Post',
+      }),
+      asModerator.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asUser.shout({
+        id: 'p6',
+        type: 'Post',
+      }),
+      asUser.shout({
+        id: 'p7',
+        type: 'Post',
+      }),
+      asTick.shout({
+        id: 'p8',
+        type: 'Post',
+      }),
+      asTick.shout({
+        id: 'p9',
+        type: 'Post',
+      }),
+      asTrack.shout({
+        id: 'p10',
+        type: 'Post',
+      }),
     ])
 
     await Promise.all([
-      asUser.create('Comment', { id: 'c1', postId: 'p1' }),
-      asTick.create('Comment', { id: 'c2', postId: 'p1' }),
-      asTrack.create('Comment', { id: 'c3', postId: 'p3' }),
-      asTrick.create('Comment', { id: 'c4', postId: 'p2' }),
-      asModerator.create('Comment', { id: 'c5', postId: 'p3' }),
-      asAdmin.create('Comment', { id: 'c6', postId: 'p4' }),
-      asUser.create('Comment', { id: 'c7', postId: 'p2' }),
-      asTick.create('Comment', { id: 'c8', postId: 'p15' }),
-      asTrick.create('Comment', { id: 'c9', postId: 'p15' }),
-      asTrack.create('Comment', { id: 'c10', postId: 'p15' }),
-      asUser.create('Comment', { id: 'c11', postId: 'p15' }),
-      asUser.create('Comment', { id: 'c12', postId: 'p15' }),
+      asUser.create('Comment', {
+        id: 'c1',
+        postId: 'p1',
+      }),
+      asTick.create('Comment', {
+        id: 'c2',
+        postId: 'p1',
+      }),
+      asTrack.create('Comment', {
+        id: 'c3',
+        postId: 'p3',
+      }),
+      asTrick.create('Comment', {
+        id: 'c4',
+        postId: 'p2',
+      }),
+      asModerator.create('Comment', {
+        id: 'c5',
+        postId: 'p3',
+      }),
+      asAdmin.create('Comment', {
+        id: 'c6',
+        postId: 'p4',
+      }),
+      asUser.create('Comment', {
+        id: 'c7',
+        postId: 'p2',
+      }),
+      asTick.create('Comment', {
+        id: 'c8',
+        postId: 'p15',
+      }),
+      asTrick.create('Comment', {
+        id: 'c9',
+        postId: 'p15',
+      }),
+      asTrack.create('Comment', {
+        id: 'c10',
+        postId: 'p15',
+      }),
+      asUser.create('Comment', {
+        id: 'c11',
+        postId: 'p15',
+      }),
+      asUser.create('Comment', {
+        id: 'c12',
+        postId: 'p15',
+      }),
     ])
 
     const disableMutation = 'mutation($id: ID!) { disable(id: $id) }'
     await Promise.all([
-      asModerator.mutate(disableMutation, { id: 'p11' }),
-      asModerator.mutate(disableMutation, { id: 'c5' }),
+      asModerator.mutate(disableMutation, {
+        id: 'p11',
+      }),
+      asModerator.mutate(disableMutation, {
+        id: 'c5',
+      }),
     ])
 
     await Promise.all([
-      asTick.create('Report', { description: "I don't like this comment", id: 'c1' }),
-      asTrick.create('Report', { description: "I don't like this post", id: 'p1' }),
-      asTrack.create('Report', { description: "I don't like this user", id: 'u1' }),
+      asTick.create('Report', {
+        description: "I don't like this comment",
+        id: 'c1',
+      }),
+      asTrick.create('Report', {
+        description: "I don't like this post",
+        id: 'p1',
+      }),
+      asTrack.create('Report', {
+        description: "I don't like this user",
+        id: 'u1',
+      }),
     ])
 
     await Promise.all([
@@ -342,10 +690,22 @@ import Factory from './factories'
     ])
 
     await Promise.all([
-      f.relate('Organization', 'CreatedBy', { from: 'u1', to: 'o1' }),
-      f.relate('Organization', 'CreatedBy', { from: 'u1', to: 'o2' }),
-      f.relate('Organization', 'OwnedBy', { from: 'u2', to: 'o2' }),
-      f.relate('Organization', 'OwnedBy', { from: 'u2', to: 'o3' }),
+      f.relate('Organization', 'CreatedBy', {
+        from: 'u1',
+        to: 'o1',
+      }),
+      f.relate('Organization', 'CreatedBy', {
+        from: 'u1',
+        to: 'o2',
+      }),
+      f.relate('Organization', 'OwnedBy', {
+        from: 'u2',
+        to: 'o2',
+      }),
+      f.relate('Organization', 'OwnedBy', {
+        from: 'u2',
+        to: 'o3',
+      }),
     ])
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 98a5bc3df..4413bfa0d 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="editor">
+    <!-- Mention and Hashtag Suggestions Menu -->
     <div v-show="showSuggestions" ref="suggestions" class="suggestion-list">
+      <!-- "filteredItems" array is not empty -->
       <template v-if="hasResults">
         <div
           v-for="(item, index) in filteredItems"
@@ -12,18 +14,36 @@
           <div v-if="isMention">@{{ item.slug }}</div>
           <div v-if="isHashtag">#{{ item.name }}</div>
         </div>
-        <div
-          v-if="isHashtag && query && !filteredItems.find(el => el.name === query)"
-          class="suggestion-list__item is-empty"
-        >
-          {{ $t('editor.hashtag.addHashtag') }}
+        <div v-if="isHashtag">
+          <!-- if query is not empty and is find fully in the suggestions array ... -->
+          <div v-if="query && !filteredItems.find(el => el.name === query)">
+            <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
+            <div class="suggestion-list__item" @click="selectItem({ name: query })">
+              #{{ query }}
+            </div>
+          </div>
+          <!-- otherwise if sanitized query is empty advice the user to add a char -->
+          <div v-else-if="!query">
+            <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addLetter') }}</div>
+          </div>
         </div>
       </template>
-      <div v-else class="suggestion-list__item is-empty">
-        <div v-if="isMention">{{ $t('editor.mention.noUsersFound') }}</div>
+      <!-- if "!hasResults" -->
+      <div v-else>
+        <div v-if="isMention" class="suggestion-list__item is-empty">
+          {{ $t('editor.mention.noUsersFound') }}
+        </div>
         <div v-if="isHashtag">
-          <div v-if="query === ''">{{ $t('editor.hashtag.noHashtagsFound') }}</div>
-          <div v-else>{{ $t('editor.hashtag.addHashtag') }}</div>
+          <div v-if="query === ''" class="suggestion-list__item is-empty">
+            {{ $t('editor.hashtag.noHashtagsFound') }}
+          </div>
+          <!-- if "query" is not empty -->
+          <div v-else>
+            <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
+            <div class="suggestion-list__item" @click="selectItem({ name: query })">
+              #{{ query }}
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -309,7 +329,7 @@ export default {
             onEnter: ({ items, query, range, command, virtualNode }) => {
               this.suggestionType = this.hashtagSuggestionType
 
-              this.query = query
+              this.query = this.sanitizedQuery(query)
               this.filteredItems = items
               this.suggestionRange = range
               this.renderPopup(virtualNode)
@@ -320,7 +340,7 @@ export default {
             },
             // is called when a suggestion has changed
             onChange: ({ items, query, range, virtualNode }) => {
-              this.query = query
+              this.query = this.sanitizedQuery(query)
               this.filteredItems = items
               this.suggestionRange = range
               this.navigatedItemIndex = 0
@@ -366,14 +386,15 @@ export default {
             // you can overwrite it if you prefer your own filtering
             // in this example we use fuse.js with support for fuzzy search
             onFilter: (items, query) => {
+              query = this.sanitizedQuery(query)
               if (!query) {
                 return items
               }
-              const fuse = new Fuse(items, {
-                threshold: 0.2,
-                keys: ['name'],
-              })
-              return fuse.search(query)
+              return items.filter(item =>
+                JSON.stringify(item)
+                  .toLowerCase()
+                  .includes(query.toLowerCase()),
+              )
             },
           }),
         ],
@@ -437,6 +458,12 @@ export default {
     this.editor.destroy()
   },
   methods: {
+    sanitizedQuery(query) {
+      // remove all not allowed chars
+      query = query.replace(/[^a-zA-Z0-9]/gm, '')
+      // if the query is only made of digits, make it empty
+      return query.replace(/[0-9]/gm, '') === '' ? '' : query
+    },
     // navigate to the previous item
     // if it's the first item, navigate to the last one
     upHandler() {
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 93ba809f4..34c5a54e1 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -5,7 +5,7 @@
         <div>
           <ds-flex>
             <ds-flex-item :width="{ base: '49px', md: '150px' }">
-              <a v-router-link style="display: inline-flex" href="/">
+              <a @click="$router.push('/').go('/')">
                 <ds-logo />
               </a>
             </ds-flex-item>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 31a7b1757..1df329fe1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -43,7 +43,8 @@
     },
     "hashtag": {
       "noHashtagsFound": "Keine Hashtags gefunden",
-      "addHashtag": "Neuer Hashtag"
+      "addHashtag": "Neuer Hashtag",
+      "addLetter": "Tippe einen Buchstaben"
     }
   },
   "profile": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 18247c148..bdf6f85fb 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -43,7 +43,8 @@
     },
     "hashtag": {
       "noHashtagsFound": "No hashtags found",
-      "addHashtag": "New hashtag"
+      "addHashtag": "New hashtag",
+      "addLetter": "Type a letter"
     }
   },
   "profile": {

From 4479431486551e55e3c401b2a8a67073053e8779 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Mon, 8 Jul 2019 19:27:30 +0200
Subject: [PATCH 48/69] replace internal links in features doc

---
 cypress/features.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/cypress/features.md b/cypress/features.md
index eb8292c3b..3adfd8771 100644
--- a/cypress/features.md
+++ b/cypress/features.md
@@ -16,7 +16,7 @@ The following features will be implemented. This gets done in three steps:
 
 ### User Account
 
-[Cucumber Features](./integration/user_account)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/user_account)
 
 * Sign-up
 * Agree to Data Privacy Statement
@@ -34,7 +34,7 @@ The following features will be implemented. This gets done in three steps:
 
 ### User Profile
 
-[Cucumber Features](./integration/user_profile)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/user_profile)
 
 * Upload and Change Avatar
 * Upload and Change Profile Picture
@@ -59,7 +59,7 @@ The following features will be implemented. This gets done in three steps:
 
 ### Posts
 
-[Cucumber Features](./integration/post/)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/post)
 
 * Creating Posts
 * Persistent Links
@@ -78,13 +78,13 @@ The following features will be implemented. This gets done in three steps:
 
 ### Comments
 
-* Creating Comments 
+* Creating Comments
 * Deleting Comments
 * Editing Comments
 * Upvote comments of others
 
 ### Notifications
-[Cucumber features](./integration/notifications)
+[Cucumber features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/notifications)
 
 * User @-mentionings
 * Notify authors for comments
@@ -94,12 +94,12 @@ The following features will be implemented. This gets done in three steps:
 
 * Show Posts by Tiles
 * Show Posts as List
-* Filter by Category \(Health and Wellbeing, Global Peace & Non-Violence, ...\) 
+* Filter by Category \(Health and Wellbeing, Global Peace & Non-Violence, ...\)
 * Filter by Mood \(Funny, Happy, Surprised, Cry, Angry, ...\)
 * Filter by Source \(Connections, Following, Individuals, Non-Profits, ...\)
 * Filter by Posts & Tools \(Post, Events, CanDos, ...\)
 * Filter by Format Type \(Text, Pictures, Video, ...\)
-* Extended Filter \(Continent, Country, Language, ...\) 
+* Extended Filter \(Continent, Country, Language, ...\)
 * Sort Posts by Date
 * Sort Posts by Shouts
 * Sort Posts by most Comments
@@ -116,7 +116,7 @@ The following features will be implemented. This gets done in three steps:
 
 ### Search
 
-[Cucumber Features](./integration/search)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/search)
 
 * Search for Categories
 * Search for Tags
@@ -186,13 +186,13 @@ The following features will be implemented. This gets done in three steps:
 
 ### More Info
 
-Shows autmatically releated information for existing post.
+Shows automatically related information for existing post.
 
 * Show related Posts
 * Show Pros and Cons
 * Show Bestlist
 * Show Votes
-* Link to corresponding Chatroom 
+* Link to corresponding Chatroom
 
 ### Take Action
 
@@ -237,7 +237,7 @@ Shows automatically related actions for existing post.
 
 ### Moderation
 
-[Cucumber Features](./integration/moderation)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/moderation)
 
 * Report Button for users for doubtful Content
 * Moderator Panel
@@ -262,7 +262,7 @@ Shows automatically related actions for existing post.
 
 ### Internationalization
 
-[Cucumber Features](./integration/internationalization)
+[Cucumber Features](https://github.com/Human-Connection/Human-Connection/tree/master/cypress/integration/internationalization)
 
 * Frontend UI
 * Backend Error Messages
@@ -276,4 +276,3 @@ Shows automatically related actions for existing post.
 * Receiving Undo and Delete Activities for Articles and Notes
 * Serving Webfinger records and Actor Objects
 * Serving Followers, Following and Outbox collections
-

From e4173a24aa2d65b947d1f470c79998a17bdd3a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 19:50:19 +0200
Subject: [PATCH 49/69] Fix backend tests

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

diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 060359682..d8f768ae9 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -11,7 +11,7 @@ module.exports = {
   coverImg: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
-  role: { type: 'string', required: true, default: 'user' },
+  role: { type: 'string', default: 'user' },
   publicKey: 'string',
   privateKey: 'string',
   wasInvited: 'boolean',

From a3de375fef2f153ff33db9390ffe2e3846f7ad1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 20:27:23 +0200
Subject: [PATCH 50/69] neodes `withDir` seems incompatible with cypress

---
 backend/src/bootstrap/neode.js             |  3 ++-
 backend/src/models/{spec => }/User.spec.js |  4 ++--
 backend/src/models/index.js                | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 rename backend/src/models/{spec => }/User.spec.js (80%)
 create mode 100644 backend/src/models/index.js

diff --git a/backend/src/bootstrap/neode.js b/backend/src/bootstrap/neode.js
index 12ac3c299..65a2074be 100644
--- a/backend/src/bootstrap/neode.js
+++ b/backend/src/bootstrap/neode.js
@@ -1,8 +1,9 @@
 import Neode from 'neode'
+import models from '../models'
 
 export default function setupNeode(options) {
   const { uri, username, password } = options
   const neodeInstance = new Neode(uri, username, password)
-  neodeInstance.withDirectory(`${__dirname}/../models`)
+  neodeInstance.with(models)
   return neodeInstance
 }
diff --git a/backend/src/models/spec/User.spec.js b/backend/src/models/User.spec.js
similarity index 80%
rename from backend/src/models/spec/User.spec.js
rename to backend/src/models/User.spec.js
index d1aa79b7d..e00136970 100644
--- a/backend/src/models/spec/User.spec.js
+++ b/backend/src/models/User.spec.js
@@ -1,5 +1,5 @@
-import Factory from '../../seed/factories'
-import { neode } from '../../bootstrap/neo4j'
+import Factory from '../seed/factories'
+import { neode } from '../bootstrap/neo4j'
 
 const factory = Factory()
 const instance = neode()
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
new file mode 100644
index 000000000..dbf654c68
--- /dev/null
+++ b/backend/src/models/index.js
@@ -0,0 +1,13 @@
+import fs from 'fs'
+import path from 'path'
+
+const models = {}
+fs.readdirSync(__dirname).forEach(file => {
+  file = path.join(__dirname, file).toString('utf-8')
+  const name = path.basename(file, '.js')
+  if (!/\.spec/.test(name) && path.extname(file) === '.js') {
+    // Is a gql file
+    models[name] = require(file)
+  }
+})
+export default models

From 20c118eab14dfd4a9e45f5dc9954e147892ef8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 22:54:17 +0200
Subject: [PATCH 51/69] Prefer `nuxt-link` component over events

@Tirokk I believe the Logo should also reset the search and filter
settings. However, even the previous implementation did not behave in
that way. A click on the logo will bring you back to the index page but
it will not reset your filter settings.

I fixed this because `$router.push(...).go(...)` will certainly throw an
null pointer error.
---
 webapp/layouts/default.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 34c5a54e1..b3eaf6fd9 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -5,9 +5,9 @@
         <div>
           <ds-flex>
             <ds-flex-item :width="{ base: '49px', md: '150px' }">
-              <a @click="$router.push('/').go('/')">
+              <nuxt-link to="/">
                 <ds-logo />
-              </a>
+              </nuxt-link>
             </ds-flex-item>
             <ds-flex-item>
               <div id="nav-search-box" v-on:click="unfolded" @blur.capture="foldedup">

From ec19c732e5678544d8dfd50c25f2c33e5aeb217e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 23:10:46 +0200
Subject: [PATCH 52/69] Get rid of obsolete /search/hashtag page

@Tirokk there is this neat URL module: https://nodejs.org/api/url.html

It has convenience methods for adding query params. I'm just not quite
sure about browser compatibility though.
---
 webapp/components/Editor/Editor.vue         |  4 +++-
 webapp/components/FilterMenu/FilterMenu.vue |  2 +-
 webapp/pages/search/hashtag/_id.vue         | 12 ------------
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 webapp/pages/search/hashtag/_id.vue

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 4413bfa0d..1d9c41129 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -491,6 +491,8 @@ export default {
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
     selectItem(item) {
+      const searchUrl = new URL('/')
+      searchUrl.searchParams.set('hashtag', item.name)
       const typeAttrs = {
         mention: {
           // TODO: use router here
@@ -499,7 +501,7 @@ export default {
         },
         hashtag: {
           // TODO: Fill up with input hashtag in search field
-          url: `/search/hashtag/${item.name}`,
+          url: searchUrl.href,
           label: item.name,
         },
       }
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 9bfb3ddba..2640cfead 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -49,7 +49,7 @@
 export default {
   props: {
     user: { type: Object, required: true },
-    hashtag: { type: Object, default: null },
+    hashtag: { type: String, default: null },
   },
   data() {
     return {
diff --git a/webapp/pages/search/hashtag/_id.vue b/webapp/pages/search/hashtag/_id.vue
deleted file mode 100644
index d180b4e4f..000000000
--- a/webapp/pages/search/hashtag/_id.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script>
-export default {
-  mounted() {
-    const { id: hashtag } = this.$route.params
-    this.$router.push({ path: '/', query: { hashtag } })
-  },
-}
-</script>

From f3ac218c735dd6b9ba662995fa156368464de1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 8 Jul 2019 23:42:13 +0200
Subject: [PATCH 53/69] Silly cypress cannot deal with `fs` npm module

... a server-side npm package and does not work for the browser.
---
 backend/src/models/index.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index dbf654c68..0e6ae5864 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -1,13 +1,7 @@
-import fs from 'fs'
-import path from 'path'
-
-const models = {}
-fs.readdirSync(__dirname).forEach(file => {
-  file = path.join(__dirname, file).toString('utf-8')
-  const name = path.basename(file, '.js')
-  if (!/\.spec/.test(name) && path.extname(file) === '.js') {
-    // Is a gql file
-    models[name] = require(file)
-  }
-})
-export default models
+// 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 {
+  User: require('./User.js'),
+  InvitationCode: require('./InvitationCode.js'),
+  EmailAddress: require('./EmailAddress.js'),
+}

From 5063f9a44722ff2bc34243e240f9a33f1ba00625 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2019 21:49:22 +0000
Subject: [PATCH 54/69] Bump @babel/core from 7.4.5 to 7.5.0 in /backend

Bumps [@babel/core](https://github.com/babel/babel) from 7.4.5 to 7.5.0.
- [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.4.5...v7.5.0)

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

diff --git a/backend/package.json b/backend/package.json
index 8cb6b4148..0c7344669 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -85,7 +85,7 @@
   },
   "devDependencies": {
     "@babel/cli": "~7.5.0",
-    "@babel/core": "~7.4.5",
+    "@babel/core": "~7.5.0",
     "@babel/node": "~7.5.0",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.5.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index cad31370e..1dd61fbf7 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -38,18 +38,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@~7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
-  integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
+"@babel/core@^7.1.0", "@babel/core@~7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734"
+  integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
-    "@babel/helpers" "^7.4.4"
-    "@babel/parser" "^7.4.5"
+    "@babel/generator" "^7.5.0"
+    "@babel/helpers" "^7.5.0"
+    "@babel/parser" "^7.5.0"
     "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/traverse" "^7.5.0"
+    "@babel/types" "^7.5.0"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -58,12 +58,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
-  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+"@babel/generator@^7.0.0", "@babel/generator@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a"
+  integrity sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.5.0"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -260,14 +260,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
-  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
+"@babel/helpers@^7.5.0":
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.2.tgz#97424dc82fc0041f4c751119b4d2b1ec68cdb5ba"
+  integrity sha512-NDkkTqDvgFUeo8djXBOiwO/mFjownznOWvmP9hvNdfiFUmx0nwNOqxuaTTbxjH744eQsD9M5ubC7gdANBvIWPw==
   dependencies:
     "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/traverse" "^7.5.0"
+    "@babel/types" "^7.5.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -290,10 +290,10 @@
     node-environment-flags "^1.0.5"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
-  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.4", "@babel/parser@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7"
+  integrity sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -740,17 +740,17 @@
     "@babel/parser" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
-  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.0":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485"
+  integrity sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.4.4"
+    "@babel/generator" "^7.5.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.4.5"
-    "@babel/types" "^7.4.4"
+    "@babel/parser" "^7.5.0"
+    "@babel/types" "^7.5.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"

From 96be771f3de0bb648137c761abd266264daecc8d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2019 21:50:40 +0000
Subject: [PATCH 55/69] Bump @babel/preset-env from 7.4.5 to 7.5.2 in /backend

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.2.
- [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.4.5...v7.5.2)

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 8cb6b4148..8a215ef93 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "~7.4.5",
     "@babel/node": "~7.5.0",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
-    "@babel/preset-env": "~7.5.0",
+    "@babel/preset-env": "~7.5.2",
     "@babel/register": "~7.4.4",
     "apollo-server-testing": "~2.6.7",
     "babel-core": "~7.0.0-0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index cad31370e..534f69476 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -320,10 +320,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.0.tgz#4838ce3cbc9a84dd00bce7a17e9e9c36119f83a0"
-  integrity sha512-G1qy5EdcO3vYhbxlXjRSR2SXB8GsxYv9hoRKT1Jdn3qy/NUnFqUUnqymKZ00Pbj+3FXNh06B+BUZzecrp3sxNw==
+"@babel/plugin-proposal-object-rest-spread@^7.5.2":
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.2.tgz#ec92b0c6419074ea7af77c78b7c5d42041f2f5a9"
+  integrity sha512-C/JU3YOx5J4d9s0GGlJlYXVwsbd5JmqQ0AvB7cIDAx7nN57aDTnlJEsZJPuSskeBtMGFWSWU5Q+piTiDe0s7FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -649,17 +649,17 @@
     core-js "^2.5.7"
     regenerator-runtime "^0.12.0"
 
-"@babel/preset-env@~7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.0.tgz#1122a751e864850b4dbce38bd9b4497840ee6f01"
-  integrity sha512-/5oQ7cYg+6sH9Dt9yx5IiylnLPiUdyMHl5y+K0mKVNiW2wJ7FpU5bg8jKcT8PcCbxdYzfv6OuC63jLEtMuRSmQ==
+"@babel/preset-env@~7.5.2":
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.2.tgz#34a46f01aed617b174b8dbaf8fed9239300343d0"
+  integrity sha512-7rRJLaUqJhQ+8xGrWtMROAgOi/+udIzyK2ES9NHhDIUvR2zfx/ON5lRR8ACUGehIYst8KVbl4vpkgOqn08gBxA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-dynamic-import" "^7.5.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.5.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.5.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
     "@babel/plugin-syntax-async-generators" "^7.2.0"

From f5522d0e40952bde1748f38d20bf36bb636e76e4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 04:26:39 +0000
Subject: [PATCH 56/69] Bump graphql-shield from 6.0.2 to 6.0.3 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.2...v6.0.3)

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 c1d00e405..4339f32ed 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -62,7 +62,7 @@
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
-    "graphql-shield": "~6.0.2",
+    "graphql-shield": "~6.0.3",
     "graphql-tag": "~2.10.1",
     "graphql-yoga": "~1.18.0",
     "helmet": "~3.18.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index cec85f693..596a0c917 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1174,10 +1174,10 @@
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
   integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
 
-"@types/yup@0.26.20":
-  version "0.26.20"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.20.tgz#3b85a05f5dd76e2e8475abb6a8aeae7777627143"
-  integrity sha512-LpCsA6NG7vIU7Umv1k4w3YGIBH5ZLZRPEKo8vJLHVbBUqRy2WaJ002kbsRqcwODpkICAOMuyGOqLQJa5isZ8+g==
+"@types/yup@0.26.21":
+  version "0.26.21"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.21.tgz#bfca27a02a0631495bfd25b6c63647a125e6944e"
+  integrity sha512-1C45M7hZrVsl8bXxYV01bitRp0r35djt+eX5HWFH3NdH+8ejqta3KM7rmQLRLrupkhF7jRkAtXl2EgDsriIqwA==
 
 "@types/zen-observable@^0.5.3":
   version "0.5.4"
@@ -3922,12 +3922,12 @@ graphql-request@~1.8.2:
   dependencies:
     cross-fetch "2.2.2"
 
-graphql-shield@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-6.0.2.tgz#3ebad8faacbada91b8e576029732e91b5a041c7f"
-  integrity sha512-3qV2qjeNZla1Fyg6Q2NR5J9AsMaNePLbUboOwhRXB7IcMnTnrxSiVn2R//8VnjnmBjF9rcvgAIAvETZ8AKGfsg==
+graphql-shield@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-6.0.3.tgz#a79ca8b2fe58fb9558ffc0e64fa8aa19f63af1b3"
+  integrity sha512-+yVT/dRWsRqeJOTHcEElJVfvIRPrhBqPlg5FHLmSkWNdGMR4AFqAQGrJteuZuNDvJ3bt380CZ96Bvf4J9hUpKA==
   dependencies:
-    "@types/yup" "0.26.20"
+    "@types/yup" "0.26.21"
     lightercollective "^0.3.0"
     object-hash "^1.3.1"
     yup "^0.27.0"

From f2d0cd1f6aa082ea580812ae53926132bc32ade3 Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Tue, 9 Jul 2019 10:00:45 +0200
Subject: [PATCH 57/69] footer created, new pages, imprint, terms and
 conditions, history, privacy policy, imprint created and languages adapted

---
 webapp/layouts/default.vue                  | 22 ++++++-
 webapp/locales/de.json                      | 15 +++++
 webapp/locales/en.json                      | 14 ++++
 webapp/locales/es.json                      | 14 ++++
 webapp/locales/fr.json                      | 14 ++++
 webapp/locales/it.json                      | 17 ++++-
 webapp/locales/nl.json                      | 17 ++++-
 webapp/locales/pl.json                      | 17 ++++-
 webapp/locales/pt.json                      | 18 +++++-
 webapp/pages/admin.vue                      |  4 +-
 webapp/pages/changelog/index.vue            | 14 ++++
 webapp/pages/imprint/index.vue              | 72 +++++++++++++++++++++
 webapp/pages/privacy/index.vue              | 13 ++++
 webapp/pages/terms-and-conditions/index.vue | 13 ++++
 14 files changed, 256 insertions(+), 8 deletions(-)
 create mode 100644 webapp/pages/changelog/index.vue
 create mode 100644 webapp/pages/imprint/index.vue
 create mode 100644 webapp/pages/privacy/index.vue
 create mode 100644 webapp/pages/terms-and-conditions/index.vue

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 93ba809f4..3cd9d7126 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -92,7 +92,17 @@
         <nuxt />
       </div>
     </ds-container>
-
+    <div id="footer" class="ds-footer">
+      <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
+      &nbsp;⏐&nbsp;
+      <a href="/imprint">{{ $t('site.imprint') }}</a>
+      &nbsp;‑&nbsp;
+      <a href="/terms-and-conditions">{{ $t('site.termsAc') }}</a>
+      &nbsp;‑&nbsp;
+      <a href="/privacy">{{ $t('site.privacy') }}</a>
+      &nbsp;‑&nbsp;
+      <a href="/changelog">{{ $t('site.changelog') }}</a>
+    </div>
     <div id="overlay" />
     <no-ssr>
       <modal />
@@ -123,6 +133,7 @@ export default {
   data() {
     return {
       mobileSearchVisible: false,
+      footerOpen: false,
     }
   },
   computed: {
@@ -271,4 +282,13 @@ export default {
     }
   }
 }
+.ds-footer {
+  text-align: center;
+  position: fixed;
+  bottom: 0px;
+  z-index: 10;
+  background-color: white;
+  width: 100%;
+  padding: 10px 10px;
+}
 </style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 430402c84..e937b65f0 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -2,6 +2,21 @@
   "filter-menu": {
     "title": "Deine Filterblase"
   },
+  "site": {
+    "made": "Mit &#10084; gemacht",
+    "imprint": "Impressum",
+    "termsAc": "Nutzungsbedingungen",
+    "privacy": "Datenschutz",
+    "changelog": "Änderungen & Verlauf",
+    "contact": "Kontakt",
+    "tribunal": "Registergericht",
+    "register": "Registernummer",
+    "director": "Geschäftsführer",
+    "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)",
+    "responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ",
+    "bank": "Bankverbindung",
+    "germany": "Deutschland"
+  },
   "login": {
     "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
     "login": "Einloggen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index de5884f61..6f01db0ae 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -2,6 +2,20 @@
   "filter-menu": {
     "title": "Your filter bubble"
   },
+  "site": {
+    "made": "With &#10084; made",
+    "imprint": "Imprint",
+    "termsAc": "terms and conditions",
+    "privacy": "data protection",
+    "changelog": "Changes & History",
+    "contact": "Contact",
+    "tribunal": "register court",
+    "register": "register number",
+    "director": "Managing Director",
+    "taxident": "Value added tax identification number according to § 27 a Value Added Tax Act (Germany)",
+    "responsible": "Responsible according to § 55 Abs. 2 RStV (Germany) ",
+    "bank": "bank account"
+  },
   "login": {
     "copy": "If you already have a human-connection account, login here.",
     "login": "Login",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index dc2c44a1f..823b90205 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -2,6 +2,20 @@
   "filter-menu": {
     "title": "Su burbuja de filtro"
   },
+  "site": {
+    "made": "Con &#10084; realizado",
+    "imprint": "Pie de imprenta",
+    "termsAc": "términos y condiciones",
+    "privacy": "protección de datos",
+    "changelog": "Cambios e historia",
+    "contact": "Contacto",
+    "tribunal": "tribunal de registro",
+    "register": "número de registro",
+    "director": "Director General",
+    "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)",
+    "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)",
+    "bank": "cuenta"
+  },
   "login": {
     "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
     "login": "Iniciar sesión",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index cfcabc221..a036c3d4c 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -2,6 +2,20 @@
   "filter-menu": {
     "title": "Votre bulle de filtre"
   },
+  "site": {
+    "made": "Avec &#10084; fait",
+    "imprint": "Mentions légales",
+    "termsAc": "modalités et conditions",
+    "privacy": "protection des données",
+    "changelog": "Changements et historique",
+    "contact": "Contacter",
+    "tribunal": "tribunal de registre",
+    "register": "numéro de registre",
+    "director": "Directeur Général",
+    "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)",
+    "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)",
+    "bank": "Bankverbindung"
+  },
   "login": {
     "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
     "login": "Connexion",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 25005a07a..968ee3269 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -1,4 +1,19 @@
 {
+  "site": {
+    "made": "Con &#10084; fatto",
+    "imprint": "Impressum",
+    "termsAc": "Condizioni d'uso",
+    "privacy": "protezione dei dati",
+    "changelog": "Cambiamenti e storia",
+    "contact": "Contatto",
+    "tribunal": "registro tribunale",
+    "register": "numero di registro",
+    "director": "Direttore Generale",
+    "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)",
+    "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)",
+    "bank": "conto bancario",
+    "germany": "Germania"
+  },
   "login": {
     "copy": "Se sei gia registrato su Human Connection, accedi qui.",
     "login": "Accesso",
@@ -126,4 +141,4 @@
     "edit": "Modifica",
     "delete": "Cancella"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 6c52877a4..a2bde02f1 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -1,4 +1,19 @@
 {
+  "site": {
+    "made": "Met &#10084; gemaakt",
+    "imprint": "Afdruk",
+    "termsAc": "Gebruiksvoorwaarden",
+    "privacy": "gegevensbescherming",
+    "changelog": "Veranderingen & Geschiedenis",
+    "contact": "contact",
+    "tribunal": "registerrechtbank",
+    "register": "inschrijfnummer",
+    "director": "Directeur",
+    "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
+    "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).",
+    "bank": "bankrekening",
+    "germany": "Duitsland"
+  },
   "login": {
     "copy": "Als u al een mini-aansluiting account heeft, log dan hier in.",
     "login": "Inloggen",
@@ -156,4 +171,4 @@
   "shoutButton": {
     "shouted": "uitgeroepen"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 506a04f1b..f53d95c3d 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -1,4 +1,19 @@
 {
+  "site": {
+    "made": "Z &#10084; zrobiony",
+    "imprint": "Nadruk",
+    "termsAc": "Warunki użytkowania",
+    "privacy": "ochrona danych",
+    "changelog": "Zmiany i historia",
+    "contact": "Kontakt",
+    "tribunal": "sąd rejestrowy",
+    "register": "numer rejestracyjny",
+    "director": "Dyrektor zarządzający",
+    "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)",
+    "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)",
+    "bank": "rachunek bankowy",
+    "germany": "Niemcy"
+  },
   "login": {
     "copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.",
     "login": "logowanie",
@@ -187,4 +202,4 @@
   "shoutButton": {
     "shouted": "krzyczeć"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 0636ba6f9..d84e00c08 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -1,4 +1,20 @@
 {
+  "site": {
+    "made": "Com &#10084; feito",
+    "imprint": "Impressão",
+    "termsAc": "termos e condições",
+    "privacy": "protecção de dados",
+    "changelog": "Mudanças e Histórico",
+    "contact": "Contato",
+    "tribunal": "tribunal",
+    "tribunal": "tribunal de registo",
+    "register": "número de registo",
+    "director": "Diretor Administrativo",
+    "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)",
+    "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
+    "bank": "conta bancária",
+    "germany": "Alemanha"
+  },
   "login": {
     "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
     "login": "Entrar",
@@ -187,4 +203,4 @@
   "shoutButton": {
     "shouted": "Aclamou"
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/pages/admin.vue b/webapp/pages/admin.vue
index 0cbee05d5..818cb58b5 100644
--- a/webapp/pages/admin.vue
+++ b/webapp/pages/admin.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
-    <ds-heading tag="h1">
-      {{ $t('admin.name') }}
-    </ds-heading>
+    <ds-heading tag="h1">{{ $t('admin.name') }}</ds-heading>
     <ds-flex gutter="small">
       <ds-flex-item :width="{ base: '100%', md: '200px' }">
         <ds-menu :routes="routes" :is-exact="() => true" />
diff --git a/webapp/pages/changelog/index.vue b/webapp/pages/changelog/index.vue
new file mode 100644
index 000000000..54bd18f63
--- /dev/null
+++ b/webapp/pages/changelog/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <ds-space>
+      <ds-heading tag="h2">{{ $t('site.changelog') }}</ds-heading>
+    </ds-space>
+
+    <ds-container>
+      <ds-space margin-top="large">
+        <ds-text>{{ $t('site.changelog') }}</ds-text>
+        <ds-text>...</ds-text>
+      </ds-space>
+    </ds-container>
+  </div>
+</template>
diff --git a/webapp/pages/imprint/index.vue b/webapp/pages/imprint/index.vue
new file mode 100644
index 000000000..8ce393576
--- /dev/null
+++ b/webapp/pages/imprint/index.vue
@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <ds-space>
+      <ds-heading tag="h2">{{ $t('site.imprint') }}</ds-heading>
+    </ds-space>
+
+    <ds-container>
+      <ds-space margin-top="large">
+        <ds-text>
+          <div>
+            <p>
+              <strong>Human Connection gemeinnützige GmbH</strong>
+            </p>
+            <p>Bahnhofstr. 11</p>
+            <p>73235 Weilheim / Teck</p>
+            <p>{{ $t('site.germany') }}</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.contact') }}</strong>
+            </p>
+            <p>Tel.: +49 151 / 43 80 42 22</p>
+            <p>
+              E-Mail:
+              <a
+                class="hc-editor-link-blot"
+                href="mailto:info@human-connection.org"
+                target="_blank"
+              >
+                info@human-connection.org
+              </a>
+            </p>
+            <br />
+            <p>
+              <strong>{{ $t('site.tribunal') }}</strong>
+            </p>
+            <p>Amtsgericht Stuttgart</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.register') }}</strong>
+            </p>
+            <p>HRB 741951</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.director') }}</strong>
+            </p>
+            <p>Dennis Hack</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.taxident') }}</strong>
+            </p>
+            <p>DE284651760</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.responsible') }}</strong>
+            </p>
+            <p>Dennis Hack</p>
+            <p>Bahnhofstr. 11</p>
+            <p>73235 Weilheim / Teck</p>
+            <p>{{ $t('site.germany') }}</p>
+            <br />
+            <p>
+              <strong>{{ $t('site.bank') }}</strong>
+            </p>
+            <p>GLS Bank</p>
+            <p>IBAN:&nbsp;DE08 4306 0967 7024 1934 00</p>
+            <p>BIC / SWIFT:&nbsp;GENODEM1GLS</p>
+          </div>
+        </ds-text>
+      </ds-space>
+    </ds-container>
+  </div>
+</template>
diff --git a/webapp/pages/privacy/index.vue b/webapp/pages/privacy/index.vue
new file mode 100644
index 000000000..d126ff2e0
--- /dev/null
+++ b/webapp/pages/privacy/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <ds-space>
+      <ds-heading tag="h2">{{ $t('site.privacy') }}</ds-heading>
+    </ds-space>
+    <ds-container>
+      <ds-space margin-top="large">
+        <ds-text>{{ $t('site.privacy') }}</ds-text>
+        <ds-text>...</ds-text>
+      </ds-space>
+    </ds-container>
+  </div>
+</template>
diff --git a/webapp/pages/terms-and-conditions/index.vue b/webapp/pages/terms-and-conditions/index.vue
new file mode 100644
index 000000000..1f7799175
--- /dev/null
+++ b/webapp/pages/terms-and-conditions/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <ds-space>
+      <ds-heading tag="h2">{{ $t('site.termsAc') }}</ds-heading>
+    </ds-space>
+    <ds-container>
+      <ds-space margin-top="large">
+        <ds-text>{{ $t('site.termsAc') }}</ds-text>
+        <ds-text>...</ds-text>
+      </ds-space>
+    </ds-container>
+  </div>
+</template>

From 48454dda5622ef790be843cf60b08e6f7fa7966d Mon Sep 17 00:00:00 2001
From: senderfm <dev@sender.fm>
Date: Tue, 9 Jul 2019 10:59:21 +0200
Subject: [PATCH 58/69] fix review, page conditions of use in german and
 english ok

---
 webapp/layouts/default.vue                  | 1 -
 webapp/locales/de.json                      | 3 +++
 webapp/locales/en.json                      | 6 +++++-
 webapp/locales/es.json                      | 3 ++-
 webapp/locales/fr.json                      | 3 ++-
 webapp/pages/terms-and-conditions/index.vue | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 3cd9d7126..d59f05fa3 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -133,7 +133,6 @@ export default {
   data() {
     return {
       mobileSearchVisible: false,
-      footerOpen: false,
     }
   },
   computed: {
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e937b65f0..5adaf53e9 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -358,6 +358,9 @@
     "categories": {
       "infoSelectedNoOfMaxCategories": "{chosen} von {max} Kategorien ausgewählt"
     }
+  },
+  "terms": {
+    "text": "<div ><ol><li><strong>UNFALLGEFAHR: </strong>Das ist eine Testversion! Alle Daten, Dein Profil und die Server können jederzeit komplett vernichtet, verloren, verbrannt und vielleicht auch in der Nähe von Alpha Centauri synchronisiert werden. Die Benutzung läuft auf eigene Gefahr. Mit kommerziellen Nebenwirkungen ist jedoch nicht zu rechnen.</li><br><li><strong>DU UND DEINE DATEN: </strong>Bitte beachte, dass wir die Inhalte der Alphaversion zu Werbezwecken, Webpräsentationen usw. verwenden, aber wir glauben, dass das auch in Deinem Interesse ist. Am besten keinen Nachnamen eingeben und bei noch mehr Datensparsamkeit ein Profilfoto ohne Identität verwenden. Mehr in unserer <a  href='/pages/privacy' target='_blank'>Datenschutzerklärung</a>.</li><br><li><strong>BAUSTELLEN: </strong>Das ist immer noch eine Testversion. Wenn etwas nicht funktioniert, blockiert, irritiert, falsch angezeigt, verbogen oder nicht anklickbar ist, bitten wir dies zu entschuldigen. Fehler, Käfer und Bugs bitte melden! <a href='http://localhost:3000/%22https://human-connection.org/alpha/#bugreport%5C%22' target='_blank'>https://human-connection.org/support</a></li><br><li><strong>VERHALTENSCODEX</strong>: Die Verhaltensregeln dienen als Leitsätze für den persönlichen Auftritt und den Umgang untereinander. Wer als Nutzer im Human Connection Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an: <a  href='https://alpha.human-connection.org/pages/code-of-conduct' target='_blank'>https://alpha.human-connection.org/pages/code-of-conduct</a></li><br><li><strong>MODERATION: </strong>Solange kein Community-Moderationssystem lauffähig ist, entscheidet ein Regenbogen-Einhorn darüber, ob Du körperlich und psychisch stabil genug bist, unsere Testversion zu bedienen. Das Einhorn kann Dich jederzeit von der Alpha entfernen. Also sei nett und lass Regenbogenfutter da!</li><br><li><strong>FAIRNESS: </strong>Sollte Dir die Alphaversion unseres Netzwerks wider Erwarten, egal aus welchen Gründen, nicht gefallen, überweisen wir Dir Deine gespendeten Monatsbeiträge innerhalb der ersten 2 Monate gerne zurück. Einfach Mail an: <a href='mailto:info@human-connection.org' target='_blank'>info@human-connection.org </a><strong>Achtung: Viele Funktionen werden erst nach und nach eingebaut. </strong></li><br><li><strong>FRAGEN?</strong> Die Termine und Links zu den Zoom-Räumen findest Du hier: <a href='http://localhost:3000/%22https://human-connection.org/events-und-news//%22' target='_blank'>https://human-connection.org/veranstaltungen/</a></li><br><li><strong>VON MENSCHEN FÜR MENSCHEN: </strong>Bitte hilf uns weitere monatlichen Spender für Human Connection zu bekommen, damit das Netzwerk so schnell wie möglich offiziell an den Start gehen kann. <a href='http://localhost:3000/%22https://human-connection.org/alpha/#bugreport%5C%22' target='_blank'>https://human-connection.org</a></li></ol><p>Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎</p><br><p><strong>Herzlichst,</strong></p><p><strong>Euer Human Connection Team</strong></p></div>"
   }
 
 }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 6f01db0ae..6b3a63816 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -14,7 +14,8 @@
     "director": "Managing Director",
     "taxident": "Value added tax identification number according to § 27 a Value Added Tax Act (Germany)",
     "responsible": "Responsible according to § 55 Abs. 2 RStV (Germany) ",
-    "bank": "bank account"
+    "bank": "bank account",
+    "germany": "Germany"
   },
   "login": {
     "copy": "If you already have a human-connection account, login here.",
@@ -357,5 +358,8 @@
     "categories": {
       "infoSelectedNoOfMaxCategories": "{chosen} of {max} categories selected"
     }
+  },
+  "terms": {
+    "text": "<div><ol><li><strong>RISK OF ACCIDENT:</strong> This is a test version! All data, your profile and the server can be completely destroyed, wiped out, lost, burnt and eventually synchronised near Alpha Centauri at any time. Use on your own risk. Commercial effects are not likely though.</li><br><li><strong>YOU AND YOUR DATA:</strong> Please notice, that the content of the alpha version will be used for publicity and web presentations etc. but we are sure, this is to your interest. If you like use no surnames and if you want to disclose less data use a profile picture without identity. You can find more information in our <a   href='/pages/privacy' target='_blank'>privacy policy</a>.</li><br><li><strong>SITE:</strong> This is still a test version. Please excuse if some applications are not working, blocking, irritating, displayed falsely or not able to be clicked on. Please report faults and bugs! <a   href='https://human-connection.org/support' target='_blank'>https://human-connection.org/support</a></li><br><li><strong>CODE OF CONDUCT</strong>: The code of conduct serves as guiding principles for our personal appearance and interaction with one another. Anyone who is active as a user in the Human Connection Network, writes articles, comments or contacts other users, including those outside the network, acknowledges these rules of conduct as binding: <a  href='https://alpha.human-connection.org/pages/code-of-conduct' target='_blank'>https://alpha.human-connection.org/pages/code-of-conduct</a></li><br><li><strong>MODERATION:</strong> As long as there is no community moderation-system in operation, a rainbow colored unicorn decides, if you are physically and mentally stable enough to operate our test version. The unicorn can delete you from the alpha version at any time. So be so kind and leave rainbow food!</li><br><li><strong>FAIRNESS:</strong> If, against all expectations, our alpha version is not to your liking, we return your monthly payment within the first two months. Please send a mail to: <a   href='mailto:info@human-connection.org' target='_blank'>info@human-connection.org</a>. <strong>Attention: Pleace note that more features are build in on regular basis.</strong></li><br><li><strong>QUESTIONS?</strong> You can find the dates and links to our zoom-rooms here: <a href='https://human-connection.org/events-und-news/' target='_blank'>https://human-connection.org/events-und-news/</a></li><br><li><strong>FROM HUMAN BEING TO HUMAN BEING: </strong>Please help us to get new donators for Human Connection, so the network can take off as soon as possible. <a  href='https://human-connection.org/' target='_blank'>https://human-connection.org</a></li></ol><br><p>Now have fun with the alpha version of Human Connection! For the first universal peace.<strong> ♥︎</strong></p><p><strong> </strong></p><br><p><strong>Thank you very much, </strong></p><p><strong>your Human Connection Team</strong></p></div>"
   }
 }
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 823b90205..1d8f08ecc 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -14,7 +14,8 @@
     "director": "Director General",
     "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)",
     "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)",
-    "bank": "cuenta"
+    "bank": "cuenta",
+    "germany": "Alemania"
   },
   "login": {
     "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index a036c3d4c..c04e42a89 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -14,7 +14,8 @@
     "director": "Directeur Général",
     "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)",
     "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)",
-    "bank": "Bankverbindung"
+    "bank": "Bankverbindung",
+    "germany": "Allemagne"
   },
   "login": {
     "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
diff --git a/webapp/pages/terms-and-conditions/index.vue b/webapp/pages/terms-and-conditions/index.vue
index 1f7799175..1410453fd 100644
--- a/webapp/pages/terms-and-conditions/index.vue
+++ b/webapp/pages/terms-and-conditions/index.vue
@@ -6,7 +6,7 @@
     <ds-container>
       <ds-space margin-top="large">
         <ds-text>{{ $t('site.termsAc') }}</ds-text>
-        <ds-text>...</ds-text>
+        <ds-text v-html="$t('terms.text')"></ds-text>
       </ds-space>
     </ds-container>
   </div>

From 6f24f066d6275849ca3c33942ce5c044923c9550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 9 Jul 2019 14:39:28 +0200
Subject: [PATCH 59/69] Revert "Get rid of obsolete /search/hashtag page"

This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
---
 webapp/components/Editor/Editor.vue         |  4 +---
 webapp/components/FilterMenu/FilterMenu.vue |  2 +-
 webapp/pages/search/hashtag/_id.vue         | 12 ++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 webapp/pages/search/hashtag/_id.vue

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 1d9c41129..4413bfa0d 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -491,8 +491,6 @@ export default {
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
     selectItem(item) {
-      const searchUrl = new URL('/')
-      searchUrl.searchParams.set('hashtag', item.name)
       const typeAttrs = {
         mention: {
           // TODO: use router here
@@ -501,7 +499,7 @@ export default {
         },
         hashtag: {
           // TODO: Fill up with input hashtag in search field
-          url: searchUrl.href,
+          url: `/search/hashtag/${item.name}`,
           label: item.name,
         },
       }
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 2640cfead..9bfb3ddba 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -49,7 +49,7 @@
 export default {
   props: {
     user: { type: Object, required: true },
-    hashtag: { type: String, default: null },
+    hashtag: { type: Object, default: null },
   },
   data() {
     return {
diff --git a/webapp/pages/search/hashtag/_id.vue b/webapp/pages/search/hashtag/_id.vue
new file mode 100644
index 000000000..d180b4e4f
--- /dev/null
+++ b/webapp/pages/search/hashtag/_id.vue
@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  mounted() {
+    const { id: hashtag } = this.$route.params
+    this.$router.push({ path: '/', query: { hashtag } })
+  },
+}
+</script>

From 17743043caf6875c22328ba136f1ade81d28d8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 9 Jul 2019 23:35:34 +0200
Subject: [PATCH 60/69] Always prefer `<nuxt-link>` over `<a>`

@ogerly, if we link into another page of our application, we should
always use `nuxt-link`. It is a feature of NuxtJs and it does
prefetching, among other things. So it improves the performance of
our site!
---
 webapp/layouts/default.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index d59f05fa3..91239fe25 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -94,14 +94,14 @@
     </ds-container>
     <div id="footer" class="ds-footer">
       <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
-      &nbsp;⏐&nbsp;
-      <a href="/imprint">{{ $t('site.imprint') }}</a>
+      &nbsp;-&nbsp;
+      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
       &nbsp;‑&nbsp;
-      <a href="/terms-and-conditions">{{ $t('site.termsAc') }}</a>
+      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAc') }}</nuxt-link>
       &nbsp;‑&nbsp;
-      <a href="/privacy">{{ $t('site.privacy') }}</a>
+      <nuxt-link to="/privacy">{{ $t('site.privacy') }}</nuxt-link>
       &nbsp;‑&nbsp;
-      <a href="/changelog">{{ $t('site.changelog') }}</a>
+      <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
     </div>
     <div id="overlay" />
     <no-ssr>

From ce397b6746a8b64de4c600069bea785b8c31d83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 9 Jul 2019 23:38:39 +0200
Subject: [PATCH 61/69] Fix English locale

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

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 6b3a63816..4f7a27c4e 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -3,14 +3,14 @@
     "title": "Your filter bubble"
   },
   "site": {
-    "made": "With &#10084; made",
+    "made": "Made with &#10084;",
     "imprint": "Imprint",
-    "termsAc": "terms and conditions",
-    "privacy": "data protection",
+    "termsAc": "Terms and conditions",
+    "privacy": "Data privacy",
     "changelog": "Changes & History",
     "contact": "Contact",
-    "tribunal": "register court",
-    "register": "register number",
+    "tribunal": "Registry court",
+    "register": "Registry number",
     "director": "Managing Director",
     "taxident": "Value added tax identification number according to § 27 a Value Added Tax Act (Germany)",
     "responsible": "Responsible according to § 55 Abs. 2 RStV (Germany) ",

From 310cc52ddf39cc1c36b000571fac2126d694d22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 10 Jul 2019 01:23:36 +0200
Subject: [PATCH 62/69] Don't remove the previous styling

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

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index bd30fdd88..a981c6515 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -87,7 +87,7 @@
       </ds-container>
     </div>
     <ds-container style="word-break: break-all">
-      <div :width="{ base: '100%', md: '96%' }">
+      <div style="padding: 6rem 2rem 5rem;" :width="{ base: '100%', md: '96%' }">
         <nuxt />
       </div>
     </ds-container>

From 65679d417d28cf41d0a1c9916c294c05ae7578af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 10 Jul 2019 00:52:36 +0200
Subject: [PATCH 63/69] Move page components into single file

+ Spice it up a little by translating the page component's title.
---
 webapp/pages/{changelog/index.vue => changelog.vue}    | 10 ++++++++++
 webapp/pages/{imprint/index.vue => imprint.vue}        | 10 ++++++++++
 webapp/pages/{privacy/index.vue => privacy.vue}        | 10 ++++++++++
 .../index.vue => terms-and-conditions.vue}             | 10 ++++++++++
 4 files changed, 40 insertions(+)
 rename webapp/pages/{changelog/index.vue => changelog.vue} (73%)
 rename webapp/pages/{imprint/index.vue => imprint.vue} (94%)
 rename webapp/pages/{privacy/index.vue => privacy.vue} (73%)
 rename webapp/pages/{terms-and-conditions/index.vue => terms-and-conditions.vue} (74%)

diff --git a/webapp/pages/changelog/index.vue b/webapp/pages/changelog.vue
similarity index 73%
rename from webapp/pages/changelog/index.vue
rename to webapp/pages/changelog.vue
index 54bd18f63..8c4a22775 100644
--- a/webapp/pages/changelog/index.vue
+++ b/webapp/pages/changelog.vue
@@ -12,3 +12,13 @@
     </ds-container>
   </div>
 </template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$t('site.changelog'),
+    }
+  },
+}
+</script>
diff --git a/webapp/pages/imprint/index.vue b/webapp/pages/imprint.vue
similarity index 94%
rename from webapp/pages/imprint/index.vue
rename to webapp/pages/imprint.vue
index 8ce393576..67e144237 100644
--- a/webapp/pages/imprint/index.vue
+++ b/webapp/pages/imprint.vue
@@ -70,3 +70,13 @@
     </ds-container>
   </div>
 </template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$t('site.imprint'),
+    }
+  },
+}
+</script>
diff --git a/webapp/pages/privacy/index.vue b/webapp/pages/privacy.vue
similarity index 73%
rename from webapp/pages/privacy/index.vue
rename to webapp/pages/privacy.vue
index d126ff2e0..b68b27e28 100644
--- a/webapp/pages/privacy/index.vue
+++ b/webapp/pages/privacy.vue
@@ -11,3 +11,13 @@
     </ds-container>
   </div>
 </template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$t('site.privacy'),
+    }
+  },
+}
+</script>
diff --git a/webapp/pages/terms-and-conditions/index.vue b/webapp/pages/terms-and-conditions.vue
similarity index 74%
rename from webapp/pages/terms-and-conditions/index.vue
rename to webapp/pages/terms-and-conditions.vue
index 1410453fd..428f3147a 100644
--- a/webapp/pages/terms-and-conditions/index.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -11,3 +11,13 @@
     </ds-container>
   </div>
 </template>
+
+<script>
+export default {
+  head() {
+    return {
+      title: this.$t('site.termsAc'),
+    }
+  },
+}
+</script>

From 133012145ca07da2fed2a9e893f5558018d2ce7c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 04:23:04 +0000
Subject: [PATCH 64/69] Bump cypress from 3.3.2 to 3.4.0

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

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

diff --git a/package.json b/package.json
index bfec1d73a..b93b154ac 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "bcryptjs": "^2.4.3",
     "codecov": "^3.5.0",
     "cross-env": "^5.2.0",
-    "cypress": "^3.3.2",
+    "cypress": "^3.4.0",
     "cypress-cucumber-preprocessor": "^1.12.0",
     "cypress-file-upload": "^3.2.0",
     "cypress-plugin-retries": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index ea9459d76..af9856bfc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1837,10 +1837,10 @@ cypress-plugin-retries@^1.2.2:
   resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.2.2.tgz#7235371ca575ad9e16f883169e7f1588379f80f2"
   integrity sha512-+bVAqJAIwpFQbgM1mAdTgCXXhowEK0pF5DqhId2h0Wq+HQ+QQ2w3hspisVUPTY+HGvncMkddUQQGF5fATuaTvQ==
 
-cypress@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.3.2.tgz#105d9283c747884d534b88a8e6c857d977887024"
-  integrity sha512-d2gFX0KBBdNfMMZ/ud9ouNqjDtMM3Tf5Z50hkl8Ldb8T+jKc7RLFo/4FjMu9i28T2x+50Sx8sN/kLzxr2oeWNg==
+cypress@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.4.0.tgz#8053ee107eb6309f26abd57e882d05578bdc3391"
+  integrity sha512-vUE+sK3l23fhs5qTN3dKpveyP0fGr37VmK3FSYaTEjbqC/qh4DbA1Ych/3bLStUpHP4rpE5KAx7i1s/tpdD9vQ==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
@@ -1868,7 +1868,7 @@ cypress@^3.3.2:
     moment "2.24.0"
     ramda "0.24.1"
     request "2.88.0"
-    request-progress "0.4.0"
+    request-progress "3.0.0"
     supports-color "5.5.0"
     tmp "0.1.0"
     url "0.11.0"
@@ -3596,11 +3596,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-eta@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/node-eta/-/node-eta-0.1.1.tgz#4066109b39371c761c72b7ebda9a9ea0a5de121f"
-  integrity sha1-QGYQmzk3HHYccrfr2pqeoKXeEh8=
-
 node-fetch@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
@@ -4208,13 +4203,12 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request-progress@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-0.4.0.tgz#c1954e39086aa85269c5660bcee0142a6a70d7e7"
-  integrity sha1-wZVOOQhqqFJpxWYLzuAUKmpw1+c=
+request-progress@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
+  integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=
   dependencies:
-    node-eta "^0.1.1"
-    throttleit "^0.0.2"
+    throttleit "^1.0.0"
 
 request@2.88.0:
   version "2.88.0"
@@ -4763,10 +4757,10 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-throttleit@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
-  integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8=
+throttleit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
+  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
 
 through2@^2.0.0:
   version "2.0.5"

From db4122da091610e5fd66ddc89b828a2f2adf7c1c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 04:24:01 +0000
Subject: [PATCH 65/69] Bump @babel/core from 7.5.0 to 7.5.4 in /webapp

Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

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 8d7c6278d..b46ae23af 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -80,7 +80,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.5.0",
+    "@babel/core": "~7.5.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.4.5",
     "@vue/cli-shared-utils": "~3.9.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 22f2afbfa..dca3b5e9c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -21,14 +21,14 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@~7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734"
-  integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==
+"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@~7.5.4":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.4.tgz#4c32df7ad5a58e9ea27ad025c11276324e0b4ddd"
+  integrity sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.5.0"
-    "@babel/helpers" "^7.5.0"
+    "@babel/helpers" "^7.5.4"
     "@babel/parser" "^7.5.0"
     "@babel/template" "^7.4.4"
     "@babel/traverse" "^7.5.0"
@@ -219,10 +219,10 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.0.tgz#7f0c17666e7ed8355ed6eff643dde12fb681ddb4"
-  integrity sha512-EgCUEa8cNwuMrwo87l2d7i2oShi8m2Q58H7h3t4TWtqATZalJYFwfL9DulRe02f3KdqM9xmMCw3v/7Ll+EiaWg==
+"@babel/helpers@^7.5.4":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.4.tgz#2f00608aa10d460bde0ccf665d6dcf8477357cf0"
+  integrity sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==
   dependencies:
     "@babel/template" "^7.4.4"
     "@babel/traverse" "^7.5.0"

From a0d9c6dbaa061f0960d9f6b616c8c2c0e755272b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 04:24:40 +0000
Subject: [PATCH 66/69] Bump apollo-server-testing from 2.6.7 to 2.6.8 in
 /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 4339f32ed..87c2acc22 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -90,7 +90,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.5.2",
     "@babel/register": "~7.4.4",
-    "apollo-server-testing": "~2.6.7",
+    "apollo-server-testing": "~2.6.8",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.2",
     "babel-jest": "~24.8.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 596a0c917..f33f62685 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1558,6 +1558,32 @@ apollo-server-core@2.6.7:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
+apollo-server-core@2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.8.tgz#c8758b5f26b5f3b9fef51b911265b80a9ce5251d"
+  integrity sha512-Jxw+6R/2I2LiZ6kjRFTzPpdjw7HfuVLfNU+svgNlxioLducxBH/wqUs3qYTf4eVUUtWy+nSS/BUf/Ullo+Ur0Q==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/graphql-playground-html" "1.6.20"
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "0.7.4"
+    apollo-datasource "0.5.0"
+    apollo-engine-reporting "1.3.5"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.4.0"
+    apollo-server-errors "2.3.0"
+    apollo-server-plugin-base "0.5.7"
+    apollo-tracing "0.7.3"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "0.7.6"
+    graphql-subscriptions "^1.0.0"
+    graphql-tag "^2.9.2"
+    graphql-tools "^4.0.0"
+    graphql-upload "^8.0.2"
+    sha.js "^2.4.11"
+    subscriptions-transport-ws "^0.9.11"
+    ws "^6.0.0"
+
 apollo-server-core@^1.3.6, apollo-server-core@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.4.0.tgz#4faff7f110bfdd6c3f47008302ae24140f94c592"
@@ -1629,12 +1655,17 @@ apollo-server-plugin-base@0.5.6:
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz#3a7128437a0f845e7d873fa43ef091ff7bf27975"
   integrity sha512-wJvcPqfm/kiBwY5JZT85t2A4pcHv24xdQIpWMNt1zsnx77lIZqJmhsc22eSUSrlnYqUMXC4XMVgSUfAO4oI9wg==
 
-apollo-server-testing@~2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.7.tgz#cfc6366921eb99fd0cbc5d02552a8a5b268787d5"
-  integrity sha512-lqgZuSqBd5hkRILeVEleo2ScJjukR/E71Mv67vPBUs01s0gEHNnjSRnuOJJOM3cAFBQOdKPc42cHGANzf2ZZTw==
+apollo-server-plugin-base@0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.7.tgz#267faeb5c2de7fa8d3be469cb99f82f601be7aed"
+  integrity sha512-HeEwEZ92c2XYRV+0CFLbstW3vUJ4idCxR9E9Q3wwvhXrq8gaGzqyDoC8EzAzRxCJUKcEn7xQOpT/AUTC/KtkRA==
+
+apollo-server-testing@~2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.8.tgz#e75364df7fdc2d6a11023f8a0f72a14309b90800"
+  integrity sha512-pch2I+8QhdXBMnGDctVth4BcZ5hocwY/ogtBMoQuv7H2HBnlDOz7dCM9BH4TW3+Tk6cFgvLTaDtLJ+NxMCtyVA==
   dependencies:
-    apollo-server-core "2.6.7"
+    apollo-server-core "2.6.8"
 
 apollo-server@~2.6.6:
   version "2.6.6"

From a6de369277a038562891b8cd9caa88f69b716bf5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 04:25:20 +0000
Subject: [PATCH 67/69] Bump @babel/core from 7.5.0 to 7.5.4 in /backend

Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

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 4339f32ed..a1cd1de08 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -85,7 +85,7 @@
   },
   "devDependencies": {
     "@babel/cli": "~7.5.0",
-    "@babel/core": "~7.5.0",
+    "@babel/core": "~7.5.4",
     "@babel/node": "~7.5.0",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.5.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 596a0c917..2792bae64 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -38,14 +38,14 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@~7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734"
-  integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==
+"@babel/core@^7.1.0", "@babel/core@~7.5.4":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.4.tgz#4c32df7ad5a58e9ea27ad025c11276324e0b4ddd"
+  integrity sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.5.0"
-    "@babel/helpers" "^7.5.0"
+    "@babel/helpers" "^7.5.4"
     "@babel/parser" "^7.5.0"
     "@babel/template" "^7.4.4"
     "@babel/traverse" "^7.5.0"
@@ -260,10 +260,10 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.5.0":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.2.tgz#97424dc82fc0041f4c751119b4d2b1ec68cdb5ba"
-  integrity sha512-NDkkTqDvgFUeo8djXBOiwO/mFjownznOWvmP9hvNdfiFUmx0nwNOqxuaTTbxjH744eQsD9M5ubC7gdANBvIWPw==
+"@babel/helpers@^7.5.4":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.4.tgz#2f00608aa10d460bde0ccf665d6dcf8477357cf0"
+  integrity sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==
   dependencies:
     "@babel/template" "^7.4.4"
     "@babel/traverse" "^7.5.0"

From e0d8e4a00870fc8bf01a4f765a22a63f6f6b6412 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 04:26:43 +0000
Subject: [PATCH 68/69] Bump lodash from 4.17.11 to 4.17.13 in /backend

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

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 4339f32ed..038dd1cc7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -68,7 +68,7 @@
     "helmet": "~3.18.0",
     "jsonwebtoken": "~8.5.1",
     "linkifyjs": "~2.1.8",
-    "lodash": "~4.17.11",
+    "lodash": "~4.17.13",
     "merge-graphql-schemas": "^1.5.8",
     "neo4j-driver": "~1.7.4",
     "neo4j-graphql-js": "^2.6.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 596a0c917..59fe06ac7 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -5428,10 +5428,10 @@ lodash@=3.10.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.11:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.13:
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
+  integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==
 
 long@^4.0.0:
   version "4.0.0"

From 7f68fd6c9bc81c9eecbb3c1de05d70c3c0ad5a4f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 06:44:08 +0000
Subject: [PATCH 69/69] Bump apollo-server from 2.6.6 to 2.6.8 in /backend

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

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

diff --git a/backend/package.json b/backend/package.json
index 913538d06..2d0ecee20 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -48,7 +48,7 @@
     "apollo-client": "~2.6.3",
     "apollo-link-context": "~1.0.18",
     "apollo-link-http": "~1.5.15",
-    "apollo-server": "~2.6.6",
+    "apollo-server": "~2.6.8",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index efcb06833..dd0f167d5 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1406,18 +1406,6 @@ apollo-engine-reporting-protobuf@0.3.1:
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.4.tgz#65e12f94221d80b3b1740c26e82ce9bb6bdfb7ee"
-  integrity sha512-DJdYghyUBzT0/LcPLwuQNXDCw06r1RfxkVfNTGKoTv6a+leVvjhDJmXvc+jSuBPwaNsc+RYRnfyQ2qUn9fmfyA==
-  dependencies:
-    apollo-engine-reporting-protobuf "0.3.1"
-    apollo-graphql "^0.3.2"
-    apollo-server-core "2.6.6"
-    apollo-server-env "2.4.0"
-    async-retry "^1.2.1"
-    graphql-extensions "0.7.5"
-
 apollo-engine-reporting@1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.5.tgz#075424d39dfe77a20f96e8e33b7ae52d58c38e1e"
@@ -1447,14 +1435,6 @@ apollo-errors@^1.9.0:
     assert "^1.4.1"
     extendable-error "^0.1.5"
 
-apollo-graphql@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.2.tgz#8881a87f1d5fcf80837b34dba90737e664eabe9a"
-  integrity sha512-YbzYGR14GV0023m//EU66vOzZ3i7c04V/SF8Qk+60vf1sOWyKgO6mxZJ4BKhw10qWUayirhSDxq3frYE+qSG0A==
-  dependencies:
-    apollo-env "0.5.1"
-    lodash.sortby "^4.7.0"
-
 apollo-graphql@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
@@ -1506,32 +1486,6 @@ apollo-server-caching@0.4.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.6.tgz#55fea7980a943948c49dea20d81b9bbfc0e04f87"
-  integrity sha512-PFSjJbqkV1eetfFJxu11gzklQYC8BrF0RZfvC1d1mhvtxAOKl25uhPHxltN0Omyjp7LW4YeoC6zwl9rLWuhZFQ==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-    "@apollographql/graphql-playground-html" "1.6.20"
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "0.7.4"
-    apollo-datasource "0.5.0"
-    apollo-engine-reporting "1.3.4"
-    apollo-server-caching "0.4.0"
-    apollo-server-env "2.4.0"
-    apollo-server-errors "2.3.0"
-    apollo-server-plugin-base "0.5.5"
-    apollo-tracing "0.7.3"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.7.5"
-    graphql-subscriptions "^1.0.0"
-    graphql-tag "^2.9.2"
-    graphql-tools "^4.0.0"
-    graphql-upload "^8.0.2"
-    sha.js "^2.4.11"
-    subscriptions-transport-ws "^0.9.11"
-    ws "^6.0.0"
-
 apollo-server-core@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.7.tgz#85b0310f40cfec43a702569c73af16d88776a6f0"
@@ -1606,10 +1560,10 @@ apollo-server-errors@2.3.0:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
   integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
 
-apollo-server-express@2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.6.tgz#ec2b955354d7dd4d12fe01ea7e983d302071d5b9"
-  integrity sha512-bY/xrr9lZH+hsjchiQuSXpW3ivXfL1h81M5VE9Ppus1PVwwEIar/irBN+PFp97WxERZPDjVZzrRKa+lRHjtJsA==
+apollo-server-express@2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.8.tgz#9f3e29f7087af669f05d75dfd335b4a9383ba48e"
+  integrity sha512-LQzVHknQDkHWffc2qK9dr/qNxQ/WecSKiye5/w10tXrOy3aruTFe67ysG/vMnFZ/puroqiZ2njHzhHZztqQ4sA==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.20"
     "@types/accepts" "^1.3.5"
@@ -1617,7 +1571,7 @@ apollo-server-express@2.6.6:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.0"
     accepts "^1.3.5"
-    apollo-server-core "2.6.6"
+    apollo-server-core "2.6.8"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
@@ -1645,11 +1599,6 @@ apollo-server-module-graphiql@^1.3.4, apollo-server-module-graphiql@^1.4.0:
   resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec"
   integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==
 
-apollo-server-plugin-base@0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.5.tgz#364e4a2fca4d95ddeb9fd3e78940ed1da58865c2"
-  integrity sha512-agiuhknyu3lnnEsqUh99tzxwPCGp+TuDK+TSRTkXU1RUG6lY4C3uJp0JGJw03cP+M6ze73TbRjMA4E68g/ks5A==
-
 apollo-server-plugin-base@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.6.tgz#3a7128437a0f845e7d873fa43ef091ff7bf27975"
@@ -1667,13 +1616,13 @@ apollo-server-testing@~2.6.8:
   dependencies:
     apollo-server-core "2.6.8"
 
-apollo-server@~2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.6.tgz#0570fce4a682eb1de8bc1b86dbe2543de440cd4e"
-  integrity sha512-7Bulb3RnOO4/SGA66LXu3ZHCXIK8MYMrsxy4yti1/adDIUmcniolDqJwOYUGoTmv1AQjRxgJb4TVZ0Dk9nrrYg==
+apollo-server@~2.6.8:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.6.8.tgz#5f3cf5cf4f2feccbded0cb03fa37dcd8260e5c6a"
+  integrity sha512-BxwaGxnD3GPuZAAqsexVHFvDlF/s2X8pILgYQ4x+VhUkMeQ12DHQtKPuxn2v2GYwH0U/GDXNohkgwxF/5eTDsQ==
   dependencies:
-    apollo-server-core "2.6.6"
-    apollo-server-express "2.6.6"
+    apollo-server-core "2.6.8"
+    apollo-server-express "2.6.8"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
@@ -3885,13 +3834,6 @@ graphql-extensions@0.7.4:
   dependencies:
     "@apollographql/apollo-tools" "^0.3.6"
 
-graphql-extensions@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.5.tgz#fab2b9e53cf6014952e6547456d50680ff0ea579"
-  integrity sha512-B1m+/WEJa3IYKWqBPS9W/7OasfPmlHOSz5hpEAq2Jbn6T0FQ/d2YWFf2HBETHR3RR2qfT+55VMiYovl2ga3qcg==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6"
-
 graphql-extensions@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.6.tgz#80cdddf08b0af12525529d1922ee2ea0d0cc8ecf"