From aca3562e229f4618cd8733fa76c782d2d4e23fe8 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 22 Mar 2019 14:40:23 -0300
Subject: [PATCH 01/32] Migrate PRs from archived repos to monorepo

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/resolvers/user_management.js      | 19 +++++
 backend/src/schema.graphql                    |  2 +
 cypress/integration/SocialMedia.feature       | 14 ++++
 cypress/integration/common/settings.js        | 27 +++++++
 webapp/locales/en.json                        |  5 ++
 webapp/pages/settings.vue                     |  4 +
 webapp/pages/settings/my-social-media.vue     | 75 +++++++++++++++++++
 webapp/store/auth.js                          |  1 +
 9 files changed, 148 insertions(+)
 create mode 100644 cypress/integration/SocialMedia.feature
 create mode 100644 webapp/pages/settings/my-social-media.vue

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 736ce20a9..0f45304fd 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -57,6 +57,7 @@ const permissions = shield({
     UpdateBadge: isAdmin,
     DeleteBadge: isAdmin,
     AddUserBadges: isAdmin,
+    addSocialMedia: isAuthenticated,
     // AddBadgeRewarded: isAdmin,
     // RemoveBadgeRewarded: isAdmin,
     reward: isAdmin,
diff --git a/backend/src/resolvers/user_management.js b/backend/src/resolvers/user_management.js
index 26dfb81db..d77b67c82 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/resolvers/user_management.js
@@ -100,6 +100,25 @@ export default {
 
         return encode(currentUser)
       }
+    },
+    addSocialMedia: async (_, { url }, { driver, user }) => {
+      const session = driver.session()
+
+      const { email } = user
+      const result = await session.run(
+        `MATCH (user:User {email: $userEmail})
+         SET user.socialMedia = [$url]
+         RETURN user {.socialMedia}`,
+        {
+          userEmail: email,
+          url
+        }
+      )
+      session.close()
+      const [currentUser] = result.records.map(record => {
+        return record.get('user')
+      })
+      return !!currentUser.socialMedia
     }
   }
 }
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index 3b1d95a95..6d757cb41 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -26,6 +26,7 @@ type Mutation {
   disable(id: ID!): ID
   enable(id: ID!): ID
   reward(fromBadgeId: ID!, toUserId: ID!): ID
+  addSocialMedia(url: String!): Boolean!
   unreward(fromBadgeId: ID!, toUserId: ID!): ID
   "Shout the given Type and ID"
   shout(id: ID!, type: ShoutTypeEnum): Boolean! @cypher(statement: """
@@ -120,6 +121,7 @@ type User {
   location: Location @cypher(statement: "MATCH (this)-[:IS_IN]->(l:Location) RETURN l")
   locationName: String
   about: String
+  socialMedia: [String]
 
   createdAt: String
   updatedAt: String
diff --git a/cypress/integration/SocialMedia.feature b/cypress/integration/SocialMedia.feature
new file mode 100644
index 000000000..05ecfc882
--- /dev/null
+++ b/cypress/integration/SocialMedia.feature
@@ -0,0 +1,14 @@
+Feature: List Social Media Accounts
+  As a User
+  I'd like to enter my social media
+  So I can show them to other users to get in contact
+
+  Background:
+    Given I have a user account
+    And I am logged in
+    And I am on the "settings" page
+
+  Scenario: Adding Social Media
+    Given I click on the "My social media" link
+    Then I should be on the "/settings/my-social-media" page
+    And I should be able to add a social media link
diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index 3aa6022a8..c87d15aec 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -61,3 +61,30 @@ Then(
   'I can see my new name {string} when I click on my profile picture in the top right',
   name => matchNameInUserMenu(name)
 )
+
+When('I click on the {string} link', link => {
+  cy.get('a')
+    .contains(link)
+    .click()
+})
+
+Then('I should be on the {string} page', page => {
+  cy.location()
+    .should(loc => {
+      expect(loc.pathname).to.eq(page)
+    })
+    .get('h3')
+    .should('contain', 'My social media')
+})
+
+Then('I should be able to add a social media link', () => {
+  cy.get("input[name='social-media']")
+    .type('https://freeradical.zone/@mattwr18')
+    .get('button')
+    .contains('Add social media')
+    .click()
+    .get('.iziToast-message')
+    .should('contain', 'Updated user')
+    .get('a')
+    .contains("src='https://freeradical.zone/@mattwr18'")
+})
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index fe92f901a..b3e2909ca 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -47,6 +47,11 @@
     },
     "languages": {
       "name": "Languages"
+    },
+    "social-media": {
+      "name": "My social media",
+      "submit": "Add social media",
+      "success": "Updated user"
     }
   },
   "admin": {
diff --git a/webapp/pages/settings.vue b/webapp/pages/settings.vue
index 9e2d63056..0352975d0 100644
--- a/webapp/pages/settings.vue
+++ b/webapp/pages/settings.vue
@@ -54,6 +54,10 @@ export default {
         {
           name: this.$t('settings.languages.name'),
           path: `/settings/languages`
+        },
+        {
+          name: this.$t('settings.social-media.name'),
+          path: `/settings/my-social-media`
         }
       ]
     }
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
new file mode 100644
index 000000000..07d981a76
--- /dev/null
+++ b/webapp/pages/settings/my-social-media.vue
@@ -0,0 +1,75 @@
+<template>
+  <ds-card :header="$t('settings.social-media.name')">
+    <div>
+      <ds-input
+        v-model="value"
+        placeholder="Add social media url"
+        name="social-media"
+        :schema="{type: 'url'}"
+      />
+    </div>
+    <ds-space margin-top="base">
+      <div>
+        <ds-button
+          primary
+          @click="handleAddSocialMedia"
+        >
+          {{ $t('settings.social-media.submit') }}
+        </ds-button>
+      </div>
+    </ds-space>
+    <ds-space 
+      v-if="currentUser.socialMedia && currentUser.socialMedia.length"
+      margin-top="base"
+      margin="x-small"
+    >
+      <div>
+        <img
+          :src="currentUser.socialMedia[0] + '/favicon.ico'"
+          alt=""
+        >
+      </div>
+    </ds-space>
+  </ds-card>
+</template>
+<script>
+import gql from 'graphql-tag'
+import { mapGetters } from 'vuex'
+
+export default {
+  props: {
+    socialMedia: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      value: ''
+    }
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'auth/user'
+    })
+  },
+  methods: {
+    handleAddSocialMedia() {
+      this.$apollo
+        .mutate({
+          mutation: gql`
+            mutation($url: String!) {
+              addSocialMedia(url: $url)
+            }
+          `,
+          variables: {
+            url: this.value
+          }
+        })
+        .then(() =>
+          this.$toast.success(this.$t('settings.social-media.success'))
+        )
+    }
+  }
+}
+</script>
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 4785ff0c0..2f99b7fd5 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -83,6 +83,7 @@ export const actions = {
             role
             about
             locationName
+            socialMedia
           }
         }`)
     })

From 599f3814bac1a8a905d6d077a9d04857e955ef15 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 25 Mar 2019 20:10:49 -0300
Subject: [PATCH 02/32] Create users with default socialMedia, append url

- It was such that every time a user updates their social media it would replace the existing url with the one to be added.
creating a user with a default empty array means that we can concatenate the url to the array and not have a complicated cypher query
to account for an intial NULL value.

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
---
 backend/src/resolvers/user_management.js | 9 +++++----
 backend/src/schema.graphql               | 2 +-
 backend/src/seed/factories/users.js      | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/backend/src/resolvers/user_management.js b/backend/src/resolvers/user_management.js
index d77b67c82..814aee3fb 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/resolvers/user_management.js
@@ -32,7 +32,7 @@ export default {
       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, .password, .role, .disabled} as user LIMIT 1',
         {
           userEmail: email
         }
@@ -107,8 +107,9 @@ export default {
       const { email } = user
       const result = await session.run(
         `MATCH (user:User {email: $userEmail})
-         SET user.socialMedia = [$url]
-         RETURN user {.socialMedia}`,
+        SET user.socialMedia = user.socialMedia + $url
+        RETURN user {.socialMedia}
+        `,
         {
           userEmail: email,
           url
@@ -118,7 +119,7 @@ export default {
       const [currentUser] = result.records.map(record => {
         return record.get('user')
       })
-      return !!currentUser.socialMedia
+      return currentUser.socialMedia
     }
   }
 }
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index 6d757cb41..e4530c435 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -26,7 +26,7 @@ type Mutation {
   disable(id: ID!): ID
   enable(id: ID!): ID
   reward(fromBadgeId: ID!, toUserId: ID!): ID
-  addSocialMedia(url: String!): Boolean!
+  addSocialMedia(url: String!): [String]!
   unreward(fromBadgeId: ID!, toUserId: ID!): ID
   "Shout the given Type and ID"
   shout(id: ID!, type: ShoutTypeEnum): Boolean! @cypher(statement: """
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index 491b3f9e1..b6b2384b7 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -25,7 +25,8 @@ export default function create (params) {
         about: "${about}",
         role: ${role},
         disabled: ${disabled},
-        deleted: ${deleted}
+        deleted: ${deleted},
+        socialMedia: []
       ) {
         id
         name
@@ -34,6 +35,7 @@ export default function create (params) {
         role
         deleted
         disabled
+        socialMedia
       }
     }
   `

From 7da9baf74866a278a8d1b67f7414695b00d06141 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 25 Mar 2019 20:18:49 -0300
Subject: [PATCH 03/32] Update socialMediaIconUrl, display linked icons

- After successfully adding a socialMedia, update the sociaMeidaIconUrl, and iterate over them to display their icons, which link to the user's profile.

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
---
 webapp/pages/settings/my-social-media.vue | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 07d981a76..334d21770 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -23,11 +23,17 @@
       margin-top="base"
       margin="x-small"
     >
-      <div>
-        <img
-          :src="currentUser.socialMedia[0] + '/favicon.ico'"
-          alt=""
-        >
+      <div
+        v-for="socialMediaIconUrl in socialMediaIconUrl"
+        :key="socialMediaIconUrl"
+      >
+        <a>
+          <img
+            :src="socialMediaIcon.match(/^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)[0] + '/favicon.ico'"
+            :href="socialMediaIcon"
+            alt=""
+          >
+        </a>
       </div>
     </ds-space>
   </ds-card>
@@ -38,7 +44,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   props: {
-    socialMedia: {
+    socialMediaIconUrl: {
       type: Array,
       default: () => []
     }
@@ -66,9 +72,12 @@ export default {
             url: this.value
           }
         })
-        .then(() =>
-          this.$toast.success(this.$t('settings.social-media.success'))
+        .then(
+          response => (this.socialMediaIconUrl = response.data.addSocialMedia)
         )
+        .finally(() => {
+          this.$toast.success(this.$t('settings.social-media.success'))
+        })
     }
   }
 }

From 597d1a0cb02aaf559e216ab103003e730cb4ae9e Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 26 Mar 2019 17:43:23 -0300
Subject: [PATCH 04/32] Pull in icons from currentUser

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
---
 webapp/pages/settings/my-social-media.vue | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 334d21770..6bccd9949 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -24,13 +24,13 @@
       margin="x-small"
     >
       <div
-        v-for="socialMediaIconUrl in socialMediaIconUrl"
+        v-for="socialMediaIconUrl in currentUser.socialMedia"
         :key="socialMediaIconUrl"
       >
         <a>
           <img
-            :src="socialMediaIcon.match(/^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)[0] + '/favicon.ico'"
-            :href="socialMediaIcon"
+            :src="socialMediaIconUrl.match(/^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)[0] + '/favicon.ico'"
+            :href="socialMediaIconUrl"
             alt=""
           >
         </a>
@@ -43,12 +43,6 @@ import gql from 'graphql-tag'
 import { mapGetters } from 'vuex'
 
 export default {
-  props: {
-    socialMediaIconUrl: {
-      type: Array,
-      default: () => []
-    }
-  },
   data() {
     return {
       value: ''
@@ -72,12 +66,7 @@ export default {
             url: this.value
           }
         })
-        .then(
-          response => (this.socialMediaIconUrl = response.data.addSocialMedia)
-        )
-        .finally(() => {
-          this.$toast.success(this.$t('settings.social-media.success'))
-        })
+        .then(this.$toast.success(this.$t('settings.social-media.success')))
     }
   }
 }

From 08c2e5d708754a4b22e784d903ac140f26c51191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 27 Mar 2019 13:56:28 +0100
Subject: [PATCH 05/32] I was able to save an empty string as social media

---
 backend/src/resolvers/user_management.spec.js | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/resolvers/user_management.spec.js
index 1c21adac1..a6ef48ee5 100644
--- a/backend/src/resolvers/user_management.spec.js
+++ b/backend/src/resolvers/user_management.spec.js
@@ -309,3 +309,30 @@ describe('change password', () => {
     })
   })
 })
+
+describe('addSocialMedia', () => {
+  let client
+  let headers
+  const mutation = `
+    mutation($url: String!) {
+      addSocialMedia(url: $url)
+    }
+  `
+
+  describe('authenticated', () => {
+    beforeEach(async () => {
+      headers = await login({ email: 'test@example.org', password: '1234' })
+      client = new GraphQLClient(host, { headers })
+    })
+
+    it('rejects empty string', async () => {
+      const variables = { url: '' }
+      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
+    })
+
+    it('validates URLs', async () => {
+      const variables = { url: 'not-a-url' }
+      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
+    })
+  })
+})

From 8fb9ebd2b5ba5dcd6e23755ce0d808610564e28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 27 Mar 2019 14:07:24 +0100
Subject: [PATCH 06/32] Expose bug: Server-side render error

---
 webapp/pages/settings/my-social-media.spec.js | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 webapp/pages/settings/my-social-media.spec.js

diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
new file mode 100644
index 000000000..b3e198a6f
--- /dev/null
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -0,0 +1,60 @@
+import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+import MySocialMedia from './my-social-media.vue'
+import Vue from 'vue'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+
+describe('my-social-media.vue', () => {
+  let wrapper
+  let Wrapper
+  let store
+  let mocks
+  let getters
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn()
+    }
+    getters = {
+      'auth/user': () => {
+        return {}
+      }
+    }
+  })
+
+  describe('shallowMount', () => {
+    const Wrapper = () => {
+      store = new Vuex.Store({
+        getters
+      })
+      return shallowMount(MySocialMedia, { store, mocks, localVue })
+    }
+
+    it('renders', () => {
+      wrapper = Wrapper()
+      expect(wrapper.contains('div')).toBe(true)
+    })
+
+    describe('given currentUser has social media accounts', () => {
+      beforeEach(() => {
+        getters = {
+          'auth/user': () => {
+            return {
+              socialMedia: ['']
+            }
+          }
+        }
+      })
+
+      it('renders', () => {
+        wrapper = Wrapper()
+        expect(wrapper.contains('div')).toBe(true)
+      })
+    })
+  })
+})

From 9de652c631e5630ee819452e317e75c819241a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 27 Mar 2019 14:16:00 +0100
Subject: [PATCH 07/32] Fix render error bug

:raised_hands: @mattwr18
---
 webapp/pages/settings/my-social-media.vue | 25 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 6bccd9949..1552c5512 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -18,19 +18,19 @@
         </ds-button>
       </div>
     </ds-space>
-    <ds-space 
-      v-if="currentUser.socialMedia && currentUser.socialMedia.length"
+    <ds-space
+      v-if="socialMediaLinks"
       margin-top="base"
       margin="x-small"
     >
       <div
-        v-for="socialMediaIconUrl in currentUser.socialMedia"
-        :key="socialMediaIconUrl"
+        v-for="link in socialMediaLinks"
+        :key="link.url"
       >
         <a>
           <img
-            :src="socialMediaIconUrl.match(/^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)[0] + '/favicon.ico'"
-            :href="socialMediaIconUrl"
+            :src="link.favicon"
+            :href="link.url"
             alt=""
           >
         </a>
@@ -51,7 +51,18 @@ export default {
   computed: {
     ...mapGetters({
       currentUser: 'auth/user'
-    })
+    }),
+    socialMediaLinks() {
+      const { socialMedia = [] } = this.currentUser
+      return socialMedia.map(url => {
+        const matches = url.match(
+          /^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g
+        )
+        const [domain] = matches || []
+        const favicon = domain ? `${domain}/favicon.ico` : null
+        return { url, favicon }
+      })
+    }
   },
   methods: {
     handleAddSocialMedia() {

From 209b63715fa65c8f08655874e1da514928a74421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 27 Mar 2019 14:28:20 +0100
Subject: [PATCH 08/32] Show social media links as list

---
 webapp/pages/settings/my-social-media.vue | 38 ++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 1552c5512..201c0759f 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -1,5 +1,25 @@
 <template>
   <ds-card :header="$t('settings.social-media.name')">
+    <ds-space
+      v-if="socialMediaLinks"
+      margin-top="base"
+      margin="x-small"
+    >
+      <ds-list>
+        <ds-list-item
+          v-for="link in socialMediaLinks"
+          :key="link.url"
+        >
+          <a :href="link.url">
+            <img
+              :src="link.favicon"
+              alt=""
+            >
+            {{ link.url }}
+          </a>
+        </ds-list-item>
+      </ds-list>
+    </ds-space>
     <div>
       <ds-input
         v-model="value"
@@ -18,24 +38,6 @@
         </ds-button>
       </div>
     </ds-space>
-    <ds-space
-      v-if="socialMediaLinks"
-      margin-top="base"
-      margin="x-small"
-    >
-      <div
-        v-for="link in socialMediaLinks"
-        :key="link.url"
-      >
-        <a>
-          <img
-            :src="link.favicon"
-            :href="link.url"
-            alt=""
-          >
-        </a>
-      </div>
-    </ds-space>
   </ds-card>
 </template>
 <script>

From 94288ced543de406409103ab1b2ba40436dee561 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 28 Mar 2019 15:54:45 -0300
Subject: [PATCH 09/32] Update currentUser after successful addSocialMedia
 mutation

Co-authored-by: Mike Aono <aonomike@gmail.com>
---
 webapp/pages/settings/my-social-media.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 201c0759f..44350cdde 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -13,7 +13,9 @@
           <a :href="link.url">
             <img
               :src="link.favicon"
-              alt=""
+              alt="Social Media link"
+              width="16"
+              height="16"
             >
             {{ link.url }}
           </a>
@@ -42,7 +44,7 @@
 </template>
 <script>
 import gql from 'graphql-tag'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   data() {
@@ -67,6 +69,9 @@ export default {
     }
   },
   methods: {
+    ...mapMutations({
+      setCurrentUser: 'auth/SET_USER'
+    }),
     handleAddSocialMedia() {
       this.$apollo
         .mutate({
@@ -77,9 +82,19 @@ export default {
           `,
           variables: {
             url: this.value
+          },
+          update: (store, { data }) => {
+            const socialMedia = data.addSocialMedia
+            this.setCurrentUser({
+              ...this.currentUser,
+              socialMedia
+            })
           }
         })
-        .then(this.$toast.success(this.$t('settings.social-media.success')))
+        .then(
+          this.$toast.success(this.$t('settings.social-media.success')),
+          (this.value = '')
+        )
     }
   }
 }

From 80f664dd7839f704f0a55412655fd2c23abbd941 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 2 Apr 2019 18:05:45 -0300
Subject: [PATCH 10/32] Match user by id instead of email, update feature

---
 backend/src/resolvers/user_management.js |  7 ++++---
 cypress/integration/SocialMedia.feature  |  4 +++-
 cypress/integration/common/settings.js   | 12 +++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/backend/src/resolvers/user_management.js b/backend/src/resolvers/user_management.js
index 814aee3fb..fc8ca36b3 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/resolvers/user_management.js
@@ -104,14 +104,14 @@ export default {
     addSocialMedia: async (_, { url }, { driver, user }) => {
       const session = driver.session()
 
-      const { email } = user
+      const { id } = user
       const result = await session.run(
-        `MATCH (user:User {email: $userEmail})
+        `MATCH (user:User {id: $userId})
         SET user.socialMedia = user.socialMedia + $url
         RETURN user {.socialMedia}
         `,
         {
-          userEmail: email,
+          userId: id,
           url
         }
       )
@@ -119,6 +119,7 @@ export default {
       const [currentUser] = result.records.map(record => {
         return record.get('user')
       })
+      console.log(currentUser)
       return currentUser.socialMedia
     }
   }
diff --git a/cypress/integration/SocialMedia.feature b/cypress/integration/SocialMedia.feature
index 05ecfc882..91ee9919c 100644
--- a/cypress/integration/SocialMedia.feature
+++ b/cypress/integration/SocialMedia.feature
@@ -11,4 +11,6 @@ Feature: List Social Media Accounts
   Scenario: Adding Social Media
     Given I click on the "My social media" link
     Then I should be on the "/settings/my-social-media" page
-    And I should be able to add a social media link
+    When I add a social media link
+    Then it gets saved successfully
+    And the new social media link shows up on the page
\ No newline at end of file
diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index c87d15aec..d31baefce 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -77,14 +77,20 @@ Then('I should be on the {string} page', page => {
     .should('contain', 'My social media')
 })
 
-Then('I should be able to add a social media link', () => {
+Then('I add a social media link', () => {
   cy.get("input[name='social-media']")
     .type('https://freeradical.zone/@mattwr18')
     .get('button')
     .contains('Add social media')
     .click()
-    .get('.iziToast-message')
+})
+
+Then('it gets saved successfully', () => {
+  cy.get('.iziToast-message')
     .should('contain', 'Updated user')
-    .get('a')
+})
+
+Then('the new social media link shows up on the page', () => {
+  cy.get('a')
     .contains("src='https://freeradical.zone/@mattwr18'")
 })

From 9f6de23805e2bd14c38601ee2f219547fe1f87d4 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 3 Apr 2019 08:59:32 -0300
Subject: [PATCH 11/32] Add graphql-constraint-directive, uri contstraint

- currently not compiling with "Error: Unknown directive "constraint""

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
---
 backend/package.json                     |  1 +
 backend/src/resolvers/user_management.js |  2 +-
 backend/src/schema.graphql               | 11 +++++++++-
 backend/src/server.js                    |  4 ++++
 backend/yarn.lock                        | 26 +++++++++++++++++++++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 83417635d..ec3d78ce3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -52,6 +52,7 @@
     "express": "~4.16.4",
     "faker": "~4.1.0",
     "graphql": "~14.2.0",
+    "graphql-constraint-directive": "^1.3.0",
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
diff --git a/backend/src/resolvers/user_management.js b/backend/src/resolvers/user_management.js
index fc8ca36b3..14327ca36 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/resolvers/user_management.js
@@ -119,7 +119,7 @@ export default {
       const [currentUser] = result.records.map(record => {
         return record.get('user')
       })
-      console.log(currentUser)
+
       return currentUser.socialMedia
     }
   }
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index e4530c435..c9a3d919d 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -26,7 +26,7 @@ type Mutation {
   disable(id: ID!): ID
   enable(id: ID!): ID
   reward(fromBadgeId: ID!, toUserId: ID!): ID
-  addSocialMedia(url: String!): [String]!
+  addSocialMedia(url: urlInput): [String]!
   unreward(fromBadgeId: ID!, toUserId: ID!): ID
   "Shout the given Type and ID"
   shout(id: ID!, type: ShoutTypeEnum): Boolean! @cypher(statement: """
@@ -310,3 +310,12 @@ type SharedInboxEndpoint {
   id: ID!
   uri: String
 }
+
+type SocialMedia {
+  id: ID!
+  uri: String
+}
+
+input urlInput {
+  url: String! @constraint(format: "uri")
+}
\ No newline at end of file
diff --git a/backend/src/server.js b/backend/src/server.js
index efa9a17c0..7b5ad31e1 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -10,6 +10,9 @@ import applyScalars from './bootstrap/scalars'
 import { getDriver } from './bootstrap/neo4j'
 import helmet from 'helmet'
 import decode from './jwt/decode'
+// import ConstraintDirective from 'graphql-constraint-directive'
+const ConstraintDirective = require('graphql-constraint-directive')
+
 
 dotenv.config()
 // check env and warn
@@ -25,6 +28,7 @@ const debug = process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'tr
 
 let schema = makeAugmentedSchema({
   typeDefs,
+  schemaDirectives: { constraint: ConstraintDirective },
   resolvers,
   config: {
     query: {
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 53f6926dc..1dae8d21e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1336,7 +1336,7 @@ apollo-link-http@~1.5.14:
     apollo-link-http-common "^0.2.13"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3, apollo-link@^1.2.4:
+apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.2, apollo-link@^1.2.3, apollo-link@^1.2.4:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -3646,6 +3646,14 @@ graphql-auth-directives@^2.1.0:
     graphql-tools "^4.0.4"
     jsonwebtoken "^8.3.0"
 
+graphql-constraint-directive@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/graphql-constraint-directive/-/graphql-constraint-directive-1.3.0.tgz#f041cc0429155fb3f4ef6941b4add42fa4b77a3f"
+  integrity sha512-z3LTSUbwkvvpu6/ywccGfNg+7pXp+cjEzgioaK/QDsHIehKju1SM6KPBTDVPugSJbVXb8M80Jxt6mOC7t//SmA==
+  dependencies:
+    graphql-tools "^3.0.1"
+    validator "^10.2.0"
+
 graphql-custom-directives@~0.2.14:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/graphql-custom-directives/-/graphql-custom-directives-0.2.14.tgz#88611b8cb074477020ad85af47bfe168c4c23992"
@@ -3757,6 +3765,17 @@ graphql-tag@^2.9.2, graphql-tag@~2.10.1:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
+graphql-tools@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-3.1.1.tgz#d593358f01e7c8b1671a17b70ddb034dea9dbc50"
+  integrity sha512-yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg==
+  dependencies:
+    apollo-link "^1.2.2"
+    apollo-utilities "^1.0.1"
+    deprecated-decorator "^0.1.6"
+    iterall "^1.1.3"
+    uuid "^3.1.0"
+
 graphql-tools@^4.0.0, graphql-tools@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.4.tgz#ca08a63454221fdde825fe45fbd315eb2a6d566b"
@@ -7842,6 +7861,11 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validator@^10.2.0:
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
+  integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

From a51190d4e9b1498805b74ca6159e2d0cb6757514 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 4 Apr 2019 15:43:06 -0300
Subject: [PATCH 12/32] Add custom resolver for createSocialMedia

---
 .../src/middleware/permissionsMiddleware.js   |  2 +-
 backend/src/resolvers/socialMedia.js          | 22 ++++++++++++++++++
 backend/src/resolvers/user_management.js      | 23 +------------------
 backend/src/resolvers/user_management.spec.js | 12 ++++++----
 backend/src/schema.graphql                    | 15 ++++++++----
 backend/src/seed/factories/users.js           |  6 ++---
 6 files changed, 43 insertions(+), 37 deletions(-)
 create mode 100644 backend/src/resolvers/socialMedia.js

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 0f45304fd..29b2e64b9 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -57,7 +57,7 @@ const permissions = shield({
     UpdateBadge: isAdmin,
     DeleteBadge: isAdmin,
     AddUserBadges: isAdmin,
-    addSocialMedia: isAuthenticated,
+    CreateSocialMedia: isAuthenticated,
     // AddBadgeRewarded: isAdmin,
     // RemoveBadgeRewarded: isAdmin,
     reward: isAdmin,
diff --git a/backend/src/resolvers/socialMedia.js b/backend/src/resolvers/socialMedia.js
new file mode 100644
index 000000000..40c540645
--- /dev/null
+++ b/backend/src/resolvers/socialMedia.js
@@ -0,0 +1,22 @@
+import { neo4jgraphql } from 'neo4j-graphql-js'
+
+export default {
+  Mutation: {
+    createSocialMedia: async (object, params, context, resolveInfo) => {
+      const result = await neo4jgraphql(object, params, context, resolveInfo, true)
+
+      const session = context.driver.session()
+      await session.run(
+        'MATCH (owner:User {id: $userId}), (socialMedia:SocialMedia {id: $socialMediaId}) ' +
+        'MERGE (socialMedia)<-[:OWNED]-(owner) ' +
+        'RETURN owner', {
+          userId: context.user.id,
+          socialMediaId: result.id
+        }
+      )
+      session.close()
+
+      return result
+    }
+  }
+}
diff --git a/backend/src/resolvers/user_management.js b/backend/src/resolvers/user_management.js
index 14327ca36..c20baaf51 100644
--- a/backend/src/resolvers/user_management.js
+++ b/backend/src/resolvers/user_management.js
@@ -100,27 +100,6 @@ export default {
 
         return encode(currentUser)
       }
-    },
-    addSocialMedia: async (_, { url }, { driver, user }) => {
-      const session = driver.session()
-
-      const { id } = user
-      const result = await session.run(
-        `MATCH (user:User {id: $userId})
-        SET user.socialMedia = user.socialMedia + $url
-        RETURN user {.socialMedia}
-        `,
-        {
-          userId: id,
-          url
-        }
-      )
-      session.close()
-      const [currentUser] = result.records.map(record => {
-        return record.get('user')
-      })
-
-      return currentUser.socialMedia
     }
   }
-}
+}
\ No newline at end of file
diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/resolvers/user_management.spec.js
index a6ef48ee5..ac3856c52 100644
--- a/backend/src/resolvers/user_management.spec.js
+++ b/backend/src/resolvers/user_management.spec.js
@@ -310,12 +310,14 @@ describe('change password', () => {
   })
 })
 
-describe('addSocialMedia', () => {
+describe('CreateSocialMedia', () => {
   let client
   let headers
   const mutation = `
-    mutation($url: String!) {
-      addSocialMedia(url: $url)
+    mutation($input: SocialMediaInput) {
+      CreateSocialMedia(input: $input) {
+        url
+      }
     }
   `
 
@@ -326,12 +328,12 @@ describe('addSocialMedia', () => {
     })
 
     it('rejects empty string', async () => {
-      const variables = { url: '' }
+      const variables = { input: { url: '' } }
       await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
     })
 
     it('validates URLs', async () => {
-      const variables = { url: 'not-a-url' }
+      const variables = { input: { url: 'not-a-url' } }
       await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
     })
   })
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index c9a3d919d..80bb3530e 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -26,7 +26,7 @@ type Mutation {
   disable(id: ID!): ID
   enable(id: ID!): ID
   reward(fromBadgeId: ID!, toUserId: ID!): ID
-  addSocialMedia(url: urlInput): [String]!
+  createSocialMedia(input: SocialMediaInput): SocialMedia
   unreward(fromBadgeId: ID!, toUserId: ID!): ID
   "Shout the given Type and ID"
   shout(id: ID!, type: ShoutTypeEnum): Boolean! @cypher(statement: """
@@ -121,7 +121,7 @@ type User {
   location: Location @cypher(statement: "MATCH (this)-[:IS_IN]->(l:Location) RETURN l")
   locationName: String
   about: String
-  socialMedia: [String]
+  socialMedia: [SocialMedia]! @relation(name: "OWNED", direction: "OUT")
 
   createdAt: String
   updatedAt: String
@@ -313,9 +313,14 @@ type SharedInboxEndpoint {
 
 type SocialMedia {
   id: ID!
-  uri: String
+  url: String
+  ownedBy: [User]! @relation(name: "OWNED", direction: "IN")
 }
 
-input urlInput {
+input SocialMediaInput {
   url: String! @constraint(format: "uri")
-}
\ No newline at end of file
+}
+
+directive @constraint(
+  format: String
+) on INPUT_FIELD_DEFINITION
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index 6b2ac9439..f9479fdbb 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -1,7 +1,7 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
 
-export default function create (params) {
+export default function create(params) {
   const {
     id = uuid(),
     name = faker.name.findName(),
@@ -27,8 +27,7 @@ export default function create (params) {
         about: "${about}",
         role: ${role},
         disabled: ${disabled},
-        deleted: ${deleted},
-        socialMedia: []
+        deleted: ${deleted}
       ) {
         id
         name
@@ -38,7 +37,6 @@ export default function create (params) {
         role
         deleted
         disabled
-        socialMedia
       }
     }
   `

From 5df54309b1a2760d2bba92d634846415ce861080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 5 Apr 2019 00:05:23 +0200
Subject: [PATCH 13/32] So close @mattwr18

---
 backend/src/graphql-schema.js        | 4 +++-
 backend/src/resolvers/socialMedia.js | 2 +-
 backend/src/schema.graphql           | 6 +-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql-schema.js b/backend/src/graphql-schema.js
index 57b2ffb6c..4a592e908 100644
--- a/backend/src/graphql-schema.js
+++ b/backend/src/graphql-schema.js
@@ -7,6 +7,7 @@ import reports from './resolvers/reports.js'
 import posts from './resolvers/posts.js'
 import moderation from './resolvers/moderation.js'
 import rewards from './resolvers/rewards.js'
+import socialMedia from './resolvers/socialMedia.js'
 
 export const typeDefs = fs
   .readFileSync(
@@ -24,6 +25,7 @@ export const resolvers = {
     ...reports.Mutation,
     ...posts.Mutation,
     ...moderation.Mutation,
-    ...rewards.Mutation
+    ...rewards.Mutation,
+    ...socialMedia.Mutation
   }
 }
diff --git a/backend/src/resolvers/socialMedia.js b/backend/src/resolvers/socialMedia.js
index 40c540645..f201f4365 100644
--- a/backend/src/resolvers/socialMedia.js
+++ b/backend/src/resolvers/socialMedia.js
@@ -2,7 +2,7 @@ import { neo4jgraphql } from 'neo4j-graphql-js'
 
 export default {
   Mutation: {
-    createSocialMedia: async (object, params, context, resolveInfo) => {
+    CreateSocialMedia: async (object, params, context, resolveInfo) => {
       const result = await neo4jgraphql(object, params, context, resolveInfo, true)
 
       const session = context.driver.session()
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index 80bb3530e..4d7f070cf 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -318,9 +318,5 @@ type SocialMedia {
 }
 
 input SocialMediaInput {
-  url: String! @constraint(format: "uri")
+  url: String!
 }
-
-directive @constraint(
-  format: String
-) on INPUT_FIELD_DEFINITION

From 24d4259510d7ce4e21ff2958739c55334958eef7 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 5 Apr 2019 09:15:22 -0300
Subject: [PATCH 14/32] Add validURLMiddleware, remove unused package, extract
 tests

---
 backend/package.json                          |  1 -
 backend/src/middleware/index.js               |  4 +-
 backend/src/middleware/validUrlMiddleware.js  | 18 +++++++
 backend/src/resolvers/socialMedia.js          |  7 ++-
 backend/src/resolvers/socialMedia.spec.js     | 49 +++++++++++++++++++
 backend/src/resolvers/user_management.spec.js | 28 -----------
 backend/src/schema.graphql                    |  4 --
 backend/src/server.js                         |  3 --
 backend/yarn.lock                             | 26 +---------
 9 files changed, 74 insertions(+), 66 deletions(-)
 create mode 100644 backend/src/middleware/validUrlMiddleware.js
 create mode 100644 backend/src/resolvers/socialMedia.spec.js

diff --git a/backend/package.json b/backend/package.json
index 8f1bc2de2..2457b9dee 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -48,7 +48,6 @@
     "express": "~4.16.4",
     "faker": "~4.1.0",
     "graphql": "~14.2.1",
-    "graphql-constraint-directive": "^1.3.0",
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
diff --git a/backend/src/middleware/index.js b/backend/src/middleware/index.js
index 8f86a88e6..3073264ba 100644
--- a/backend/src/middleware/index.js
+++ b/backend/src/middleware/index.js
@@ -10,6 +10,7 @@ import permissionsMiddleware from './permissionsMiddleware'
 import userMiddleware from './userMiddleware'
 import includedFieldsMiddleware from './includedFieldsMiddleware'
 import orderByMiddleware from './orderByMiddleware'
+import validUrlMiddleware from './validUrlMiddleware'
 
 export default schema => {
   let middleware = [
@@ -22,7 +23,8 @@ export default schema => {
     softDeleteMiddleware,
     userMiddleware,
     includedFieldsMiddleware,
-    orderByMiddleware
+    orderByMiddleware,
+    validUrlMiddleware
   ]
 
   // add permisions middleware at the first position (unless we're seeding)
diff --git a/backend/src/middleware/validUrlMiddleware.js b/backend/src/middleware/validUrlMiddleware.js
new file mode 100644
index 000000000..f5fdae9d4
--- /dev/null
+++ b/backend/src/middleware/validUrlMiddleware.js
@@ -0,0 +1,18 @@
+const validURL = str => {
+  const isValid = str.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)
+  return !!isValid
+}
+
+export default {
+  Mutation: {
+    CreateSocialMedia: async (resolve, root, args, context, info) => {
+      let socialMedia
+      if (validURL(args.url)) {
+        socialMedia = await resolve(root, args, context, info)
+      } else {
+        throw Error('Input is not a URL')
+      }
+      return socialMedia
+    }
+  }
+}
\ No newline at end of file
diff --git a/backend/src/resolvers/socialMedia.js b/backend/src/resolvers/socialMedia.js
index f201f4365..a24cc6802 100644
--- a/backend/src/resolvers/socialMedia.js
+++ b/backend/src/resolvers/socialMedia.js
@@ -4,12 +4,11 @@ export default {
   Mutation: {
     CreateSocialMedia: async (object, params, context, resolveInfo) => {
       const result = await neo4jgraphql(object, params, context, resolveInfo, true)
-
       const session = context.driver.session()
       await session.run(
-        'MATCH (owner:User {id: $userId}), (socialMedia:SocialMedia {id: $socialMediaId}) ' +
-        'MERGE (socialMedia)<-[:OWNED]-(owner) ' +
-        'RETURN owner', {
+        `MATCH (owner:User {id: $userId}), (socialMedia:SocialMedia {id: $socialMediaId})
+        MERGE (socialMedia)<-[:OWNED]-(owner) 
+        RETURN owner`, {
           userId: context.user.id,
           socialMediaId: result.id
         }
diff --git a/backend/src/resolvers/socialMedia.spec.js b/backend/src/resolvers/socialMedia.spec.js
new file mode 100644
index 000000000..92a08823e
--- /dev/null
+++ b/backend/src/resolvers/socialMedia.spec.js
@@ -0,0 +1,49 @@
+import Factory from '../seed/factories'
+import { GraphQLClient } from 'graphql-request'
+import { host, login } from '../jest/helpers'
+
+const factory = Factory()
+
+describe('CreateSocialMedia', () => {
+  let client
+  let headers
+  const mutation = `
+    mutation($url: String!) {
+      CreateSocialMedia(url: $url) {
+        url
+      }
+    }
+  `
+  beforeEach(async () => {
+    await factory.create('User', {
+      avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg',
+      id: 'acb2d923-f3af-479e-9f00-61b12e864666',
+      name: 'Matilde Hermiston',
+      slug: 'matilde-hermiston',
+      role: 'user',
+      email: 'test@example.org',
+      password: '1234'
+    })
+  })
+  
+  afterEach(async () => {
+    await factory.cleanDatabase()
+  })
+
+  describe('authenticated', () => {
+    beforeEach(async () => {
+      headers = await login({ email: 'test@example.org', password: '1234' })
+      client = new GraphQLClient(host, { headers })
+    })
+
+    it('rejects empty string', async () => {
+      const variables = { url: '' }
+      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
+    })
+
+    it('validates URLs', async () => {
+      const variables = { url: 'not-a-url' }
+      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
+    })
+  })
+})
\ No newline at end of file
diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/resolvers/user_management.spec.js
index ac3856c52..c059ec78e 100644
--- a/backend/src/resolvers/user_management.spec.js
+++ b/backend/src/resolvers/user_management.spec.js
@@ -310,31 +310,3 @@ describe('change password', () => {
   })
 })
 
-describe('CreateSocialMedia', () => {
-  let client
-  let headers
-  const mutation = `
-    mutation($input: SocialMediaInput) {
-      CreateSocialMedia(input: $input) {
-        url
-      }
-    }
-  `
-
-  describe('authenticated', () => {
-    beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
-    })
-
-    it('rejects empty string', async () => {
-      const variables = { input: { url: '' } }
-      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
-    })
-
-    it('validates URLs', async () => {
-      const variables = { input: { url: 'not-a-url' } }
-      await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
-    })
-  })
-})
diff --git a/backend/src/schema.graphql b/backend/src/schema.graphql
index 3c229a8fd..94e28d0d7 100644
--- a/backend/src/schema.graphql
+++ b/backend/src/schema.graphql
@@ -26,7 +26,6 @@ type Mutation {
   disable(id: ID!): ID
   enable(id: ID!): ID
   reward(fromBadgeId: ID!, toUserId: ID!): ID
-  createSocialMedia(input: SocialMediaInput): SocialMedia
   unreward(fromBadgeId: ID!, toUserId: ID!): ID
   "Shout the given Type and ID"
   shout(id: ID!, type: ShoutTypeEnum): Boolean! @cypher(statement: """
@@ -327,6 +326,3 @@ type SocialMedia {
   ownedBy: [User]! @relation(name: "OWNED", direction: "IN")
 }
 
-input SocialMediaInput {
-  url: String!
-}
diff --git a/backend/src/server.js b/backend/src/server.js
index 7b5ad31e1..0dff63635 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -10,8 +10,6 @@ import applyScalars from './bootstrap/scalars'
 import { getDriver } from './bootstrap/neo4j'
 import helmet from 'helmet'
 import decode from './jwt/decode'
-// import ConstraintDirective from 'graphql-constraint-directive'
-const ConstraintDirective = require('graphql-constraint-directive')
 
 
 dotenv.config()
@@ -28,7 +26,6 @@ const debug = process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'tr
 
 let schema = makeAugmentedSchema({
   typeDefs,
-  schemaDirectives: { constraint: ConstraintDirective },
   resolvers,
   config: {
     query: {
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f9f530d1b..68e6cb931 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1386,7 +1386,7 @@ apollo-link-http@~1.5.14:
     apollo-link-http-common "^0.2.13"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.2, apollo-link@^1.2.3, apollo-link@^1.2.4:
+apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3, apollo-link@^1.2.4:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -3660,14 +3660,6 @@ graphql-auth-directives@^2.1.0:
     graphql-tools "^4.0.4"
     jsonwebtoken "^8.3.0"
 
-graphql-constraint-directive@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/graphql-constraint-directive/-/graphql-constraint-directive-1.3.0.tgz#f041cc0429155fb3f4ef6941b4add42fa4b77a3f"
-  integrity sha512-z3LTSUbwkvvpu6/ywccGfNg+7pXp+cjEzgioaK/QDsHIehKju1SM6KPBTDVPugSJbVXb8M80Jxt6mOC7t//SmA==
-  dependencies:
-    graphql-tools "^3.0.1"
-    validator "^10.2.0"
-
 graphql-custom-directives@~0.2.14:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/graphql-custom-directives/-/graphql-custom-directives-0.2.14.tgz#88611b8cb074477020ad85af47bfe168c4c23992"
@@ -3779,17 +3771,6 @@ graphql-tag@^2.9.2, graphql-tag@~2.10.1:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
-graphql-tools@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-3.1.1.tgz#d593358f01e7c8b1671a17b70ddb034dea9dbc50"
-  integrity sha512-yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg==
-  dependencies:
-    apollo-link "^1.2.2"
-    apollo-utilities "^1.0.1"
-    deprecated-decorator "^0.1.6"
-    iterall "^1.1.3"
-    uuid "^3.1.0"
-
 graphql-tools@^4.0.0, graphql-tools@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.4.tgz#ca08a63454221fdde825fe45fbd315eb2a6d566b"
@@ -7775,11 +7756,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^10.2.0:
-  version "10.11.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
-  integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
-
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

From 4de8407620d4a30c1f6d6e1440cedd1414b71574 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 8 Apr 2019 12:05:57 -0300
Subject: [PATCH 15/32] Rename variable, mutation

- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
---
 backend/src/resolvers/socialMedia.js      | 6 +++---
 webapp/pages/settings/my-social-media.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/resolvers/socialMedia.js b/backend/src/resolvers/socialMedia.js
index a24cc6802..3adf0e2d0 100644
--- a/backend/src/resolvers/socialMedia.js
+++ b/backend/src/resolvers/socialMedia.js
@@ -3,19 +3,19 @@ import { neo4jgraphql } from 'neo4j-graphql-js'
 export default {
   Mutation: {
     CreateSocialMedia: async (object, params, context, resolveInfo) => {
-      const result = await neo4jgraphql(object, params, context, resolveInfo, true)
+      const socialMedia = await neo4jgraphql(object, params, context, resolveInfo, true)
       const session = context.driver.session()
       await session.run(
         `MATCH (owner:User {id: $userId}), (socialMedia:SocialMedia {id: $socialMediaId})
         MERGE (socialMedia)<-[:OWNED]-(owner) 
         RETURN owner`, {
           userId: context.user.id,
-          socialMediaId: result.id
+          socialMediaId: socialMedia.id
         }
       )
       session.close()
 
-      return result
+      return socialMedia
     }
   }
 }
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 44350cdde..dcf45c78e 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -77,7 +77,7 @@ export default {
         .mutate({
           mutation: gql`
             mutation($url: String!) {
-              addSocialMedia(url: $url)
+              CreateSocialMedia(url: $url)
             }
           `,
           variables: {

From 4c808e135b6fcf669401f0d519bc0c426b596ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 10 Apr 2019 15:20:43 +0200
Subject: [PATCH 16/32] Fix 400 error

cc @mattwr18

What helped me to track down the problem was to compare the local
changes to master:

First, make it easy to compare with master:

1. `git fetch origin`
2. `git merge origin/master`
3. Resolve conflicts

Then track the error down:

1. `git checkout origin/master -- .`
2. `git reset`
3. Add more and more changes back and wait until the error shows up
  - `git checkout backend`
  - `git checkout webapp` bingo

See https://github.com/Human-Connection/Human-Connection/pull/237#issuecomment-481485741
---
 webapp/store/auth.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 2f99b7fd5..7b7fd2601 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -83,7 +83,10 @@ export const actions = {
             role
             about
             locationName
-            socialMedia
+            socialMedia {
+              id
+              url
+            }
           }
         }`)
     })

From edd37db8fe13eb3cc8ba56e110e85fe9c6a557bc Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Wed, 10 Apr 2019 20:33:37 -0300
Subject: [PATCH 17/32] Update frontend to display urls, update currentUser

---
 webapp/pages/settings/my-social-media.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index dcf45c78e..c031f54a4 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -58,7 +58,8 @@ export default {
     }),
     socialMediaLinks() {
       const { socialMedia = [] } = this.currentUser
-      return socialMedia.map(url => {
+      return socialMedia.map(socialMedia => {
+        const { url } = socialMedia
         const matches = url.match(
           /^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g
         )
@@ -77,14 +78,19 @@ export default {
         .mutate({
           mutation: gql`
             mutation($url: String!) {
-              CreateSocialMedia(url: $url)
+              CreateSocialMedia(url: $url) {
+                url
+              }
             }
           `,
           variables: {
             url: this.value
           },
           update: (store, { data }) => {
-            const socialMedia = data.addSocialMedia
+            const socialMedia = [
+              ...this.currentUser.socialMedia,
+              data.CreateSocialMedia
+            ]
             this.setCurrentUser({
               ...this.currentUser,
               socialMedia

From 9bdd0742c9ffde68e988abbb7d3b156232b88efb Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 11 Apr 2019 16:35:22 -0300
Subject: [PATCH 18/32] Update tests, start test driving new scenario

- tests had become outdated thanks to new implementation details, namely that a socialMedia node is being created and associated with a user instead of it being an attribute of the User
- scenario to ensure other user's can view my social media
---
 cypress/integration/SocialMedia.feature       | 10 +++++++---
 cypress/integration/common/settings.js        |  9 +++++++--
 webapp/pages/settings/my-social-media.spec.js |  4 +++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/cypress/integration/SocialMedia.feature b/cypress/integration/SocialMedia.feature
index 91ee9919c..6386b94ee 100644
--- a/cypress/integration/SocialMedia.feature
+++ b/cypress/integration/SocialMedia.feature
@@ -6,11 +6,15 @@ Feature: List Social Media Accounts
   Background:
     Given I have a user account
     And I am logged in
-    And I am on the "settings" page
 
   Scenario: Adding Social Media
-    Given I click on the "My social media" link
+    Given I am on the "settings" page
+    And I click on the "My social media" link
     Then I should be on the "/settings/my-social-media" page
     When I add a social media link
     Then it gets saved successfully
-    And the new social media link shows up on the page
\ No newline at end of file
+    And the new social media link shows up on the page
+
+  Scenario: Other user's viewing my Social Media
+    Given people visit my profile page
+    Then they should be able to see my social media links
\ No newline at end of file
diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index d31baefce..395208b1a 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -91,6 +91,11 @@ Then('it gets saved successfully', () => {
 })
 
 Then('the new social media link shows up on the page', () => {
-  cy.get('a')
-    .contains("src='https://freeradical.zone/@mattwr18'")
+  cy.get('a[href="https://freeradical.zone/@mattwr18"]')
+    .should('have.length', 1)
 })
+
+Then('they should be able to see my social media links', () => {
+  cy.get('.ds-card-content')
+    
+})
\ No newline at end of file
diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
index b3e198a6f..8af15f2a8 100644
--- a/webapp/pages/settings/my-social-media.spec.js
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -45,7 +45,9 @@ describe('my-social-media.vue', () => {
         getters = {
           'auth/user': () => {
             return {
-              socialMedia: ['']
+              socialMedia: [
+                { id: 's1', url: 'https://freeradical.zone/@mattwr18' }
+              ]
             }
           }
         }

From 60c56f8872ed3f90b547ab0162dedfda5ea858a2 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 11 Apr 2019 16:38:31 -0300
Subject: [PATCH 19/32] Start adding social media card section to user profile

---
 webapp/graphql/UserProfileQuery.js |  4 +++
 webapp/pages/profile/_id/_slug.vue | 42 ++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/webapp/graphql/UserProfileQuery.js b/webapp/graphql/UserProfileQuery.js
index f0d7720ae..16e7e1440 100644
--- a/webapp/graphql/UserProfileQuery.js
+++ b/webapp/graphql/UserProfileQuery.js
@@ -98,6 +98,10 @@ export default app => {
             }
           }
         }
+        socialMedia {
+          id
+          url
+        }
       }
     }
   `)
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 38bf847a2..e516f061b 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -202,6 +202,35 @@
             </p>
           </template>
         </ds-card>
+        <ds-space />
+        <ds-card style="position: relative; height: auto;">
+          <ds-space
+            v-if="user.socialMedia && user.socialMedia.length"
+            margin="x-small"
+          >
+            <ds-text
+              tag="h5"
+              color="soft"
+            >
+              Where else can I find {{ user.name | truncate(15) }}?
+            </ds-text>
+            <template v-if="user.socialMedia && user.socialMedia.length">
+              <ds-space
+                v-for="link in socialMediaLinks"
+                :key="link.username"
+                margin="x-small"
+              >
+                <!-- TODO: find better solution for rendering errors -->
+                <ds-avatar
+                  :image="link.favicon"
+                />
+                <a :href="link.url">
+                  {{ link.username }}
+                </a>
+              </ds-space>
+            </template>
+          </ds-space>
+        </ds-card>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
         <ds-flex
@@ -348,6 +377,19 @@ export default {
         return []
       }
       return this.uniq(this.user.contributions.filter(post => !post.deleted))
+    },
+    socialMediaLinks() {
+      const { socialMedia = [] } = this.user
+      return socialMedia.map(socialMedia => {
+        const { url } = socialMedia
+        const matches = url.match(
+          /^(?:https?:\/\/)?(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g
+        )
+        const [domain] = matches || []
+        const favicon = domain ? `${domain}/favicon.ico` : null
+        const username = url.split('/')[3]
+        return { url, username, favicon }
+      })
     }
   },
   watch: {

From 8f32df259715307cd85a6f6e635aa841b9d96319 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 11 Apr 2019 21:22:33 -0300
Subject: [PATCH 20/32] Add translation, linkify avatar

---
 webapp/locales/en.json             |  3 ++-
 webapp/pages/profile/_id/_slug.vue | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0c341b765..ffe28f7a9 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -15,7 +15,8 @@
     "followers": "Followers",
     "following": "Following",
     "shouted": "Shouted",
-    "commented": "Commented"
+    "commented": "Commented",
+    "socialMedia": "Where else can I find"
   },
   "search": {
     "placeholder": "Search",
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index e516f061b..797645574 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -203,6 +203,10 @@
           </template>
         </ds-card>
         <ds-space />
+        <ds-space 
+          v-if="user.socialMedia && user.socialMedia.length"
+          margin="x-small"
+        />
         <ds-card style="position: relative; height: auto;">
           <ds-space
             v-if="user.socialMedia && user.socialMedia.length"
@@ -212,7 +216,7 @@
               tag="h5"
               color="soft"
             >
-              Where else can I find {{ user.name | truncate(15) }}?
+              {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
             </ds-text>
             <template v-if="user.socialMedia && user.socialMedia.length">
               <ds-space
@@ -221,10 +225,10 @@
                 margin="x-small"
               >
                 <!-- TODO: find better solution for rendering errors -->
-                <ds-avatar
-                  :image="link.favicon"
-                />
                 <a :href="link.url">
+                  <ds-avatar
+                    :image="link.favicon"
+                  />
                   {{ link.username }}
                 </a>
               </ds-space>

From 1e4fad842567a24ca435783a4b91c48052199318 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 11 Apr 2019 21:23:17 -0300
Subject: [PATCH 21/32] Add cucumber scenario, component tests

---
 cypress/integration/SocialMedia.feature       |  3 +-
 cypress/integration/common/settings.js        | 17 ++++++--
 webapp/pages/settings/my-social-media.spec.js | 42 +++++++++++++++----
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/cypress/integration/SocialMedia.feature b/cypress/integration/SocialMedia.feature
index 6386b94ee..a535b507a 100644
--- a/cypress/integration/SocialMedia.feature
+++ b/cypress/integration/SocialMedia.feature
@@ -16,5 +16,6 @@ Feature: List Social Media Accounts
     And the new social media link shows up on the page
 
   Scenario: Other user's viewing my Social Media
-    Given people visit my profile page
+    Given I have added a social media link
+    When people visit my profile page
     Then they should be able to see my social media links
\ No newline at end of file
diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index 395208b1a..675ecc677 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -79,7 +79,7 @@ Then('I should be on the {string} page', page => {
 
 Then('I add a social media link', () => {
   cy.get("input[name='social-media']")
-    .type('https://freeradical.zone/@mattwr18')
+    .type('https://freeradical.zone/peter-pan')
     .get('button')
     .contains('Add social media')
     .click()
@@ -91,11 +91,22 @@ Then('it gets saved successfully', () => {
 })
 
 Then('the new social media link shows up on the page', () => {
-  cy.get('a[href="https://freeradical.zone/@mattwr18"]')
+  cy.get('a[href="https://freeradical.zone/peter-pan"]')
     .should('have.length', 1)
 })
 
+Given('I have added a social media link', () => {
+  cy.openPage('/settings/my-social-media')
+    .get("input[name='social-media']")
+    .type('https://freeradical.zone/peter-pan')
+    .get('button')
+    .contains('Add social media')
+    .click()
+})
+
 Then('they should be able to see my social media links', () => {
   cy.get('.ds-card-content')
-    
+    .contains('Where else can I find Peter Pan?')
+    .get('a[href="https://freeradical.zone/peter-pan"]')
+    .should('have.length', 1)
 })
\ No newline at end of file
diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
index 8af15f2a8..591a2d9a6 100644
--- a/webapp/pages/settings/my-social-media.spec.js
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import MySocialMedia from './my-social-media.vue'
 import Vue from 'vue'
 import Vuex from 'vuex'
@@ -15,10 +15,23 @@ describe('my-social-media.vue', () => {
   let store
   let mocks
   let getters
+  let input
+  let submitBtn
+  const socialMediaUrl = 'https://freeradical.zone/@mattwr18'
 
   beforeEach(() => {
     mocks = {
-      $t: jest.fn()
+      $t: jest.fn(),
+      $apollo: {
+        mutate: jest
+          .fn()
+          .mockRejectedValue({ message: 'Ouch!' })
+          .mockResolvedValueOnce({ data: { CreateSocialMeda: { id: 's1', url: socialMediaUrl } }})
+      },
+      $toast: {
+        error: jest.fn(),
+        success: jest.fn()
+      }
     }
     getters = {
       'auth/user': () => {
@@ -27,12 +40,12 @@ describe('my-social-media.vue', () => {
     }
   })
 
-  describe('shallowMount', () => {
+  describe('mount', () => {
     const Wrapper = () => {
       store = new Vuex.Store({
         getters
       })
-      return shallowMount(MySocialMedia, { store, mocks, localVue })
+      return mount(MySocialMedia, { store, mocks, localVue })
     }
 
     it('renders', () => {
@@ -40,22 +53,35 @@ describe('my-social-media.vue', () => {
       expect(wrapper.contains('div')).toBe(true)
     })
 
-    describe('given currentUser has social media accounts', () => {
+    describe('given currentUser has a social media account linked', () => {
       beforeEach(() => {
         getters = {
           'auth/user': () => {
             return {
               socialMedia: [
-                { id: 's1', url: 'https://freeradical.zone/@mattwr18' }
+                { id: 's1', url: socialMediaUrl }
               ]
             }
           }
         }
       })
 
-      it('renders', () => {
+      it("displays a link to the currentUser's social media", () => {
         wrapper = Wrapper()
-        expect(wrapper.contains('div')).toBe(true)
+        const socialMediaLink = wrapper.find('a')
+        expect(socialMediaLink.attributes().href).toBe(socialMediaUrl)
+      })
+    })
+
+    describe('currentUser does not have a social media account linked', () => {
+      it('allows a user to add a social media link', () => {
+        wrapper = Wrapper()
+        input = wrapper.find({ name: 'social-media' })
+        input.element.value = socialMediaUrl
+        input.trigger('input')
+        submitBtn = wrapper.find('.ds-button')
+        submitBtn.trigger('click')
+        expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
       })
     })
   })

From 366c5d776bf90bc3c3f0f5d6353512827c1d2d54 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 11 Apr 2019 22:28:18 -0300
Subject: [PATCH 22/32] Fix lint

---
 backend/src/middleware/validUrlMiddleware.js  | 4 ++--
 backend/src/resolvers/socialMedia.spec.js     | 4 ++--
 backend/src/resolvers/user_management.spec.js | 1 -
 backend/src/seed/factories/users.js           | 2 +-
 backend/src/server.js                         | 1 -
 webapp/pages/settings/my-social-media.spec.js | 8 ++++----
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/backend/src/middleware/validUrlMiddleware.js b/backend/src/middleware/validUrlMiddleware.js
index f5fdae9d4..37f06199c 100644
--- a/backend/src/middleware/validUrlMiddleware.js
+++ b/backend/src/middleware/validUrlMiddleware.js
@@ -1,5 +1,5 @@
 const validURL = str => {
-  const isValid = str.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:\/\n?]+)/g)
+  const isValid = str.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:/\n?]+)/g)
   return !!isValid
 }
 
@@ -15,4 +15,4 @@ export default {
       return socialMedia
     }
   }
-}
\ No newline at end of file
+}
diff --git a/backend/src/resolvers/socialMedia.spec.js b/backend/src/resolvers/socialMedia.spec.js
index 92a08823e..b97316543 100644
--- a/backend/src/resolvers/socialMedia.spec.js
+++ b/backend/src/resolvers/socialMedia.spec.js
@@ -25,7 +25,7 @@ describe('CreateSocialMedia', () => {
       password: '1234'
     })
   })
-  
+
   afterEach(async () => {
     await factory.cleanDatabase()
   })
@@ -46,4 +46,4 @@ describe('CreateSocialMedia', () => {
       await expect(client.request(mutation, variables)).rejects.toThrow('Input is not a URL')
     })
   })
-})
\ No newline at end of file
+})
diff --git a/backend/src/resolvers/user_management.spec.js b/backend/src/resolvers/user_management.spec.js
index c059ec78e..1c21adac1 100644
--- a/backend/src/resolvers/user_management.spec.js
+++ b/backend/src/resolvers/user_management.spec.js
@@ -309,4 +309,3 @@ describe('change password', () => {
     })
   })
 })
-
diff --git a/backend/src/seed/factories/users.js b/backend/src/seed/factories/users.js
index f9479fdbb..9fe957515 100644
--- a/backend/src/seed/factories/users.js
+++ b/backend/src/seed/factories/users.js
@@ -1,7 +1,7 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
 
-export default function create(params) {
+export default function create (params) {
   const {
     id = uuid(),
     name = faker.name.findName(),
diff --git a/backend/src/server.js b/backend/src/server.js
index 5861646f4..fe0d4ee1d 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -11,7 +11,6 @@ import { getDriver } from './bootstrap/neo4j'
 import helmet from 'helmet'
 import decode from './jwt/decode'
 
-
 dotenv.config()
 // check env and warn
 const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET', 'PRIVATE_KEY_PASSPHRASE']
diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
index 591a2d9a6..c8fc45d31 100644
--- a/webapp/pages/settings/my-social-media.spec.js
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -26,7 +26,9 @@ describe('my-social-media.vue', () => {
         mutate: jest
           .fn()
           .mockRejectedValue({ message: 'Ouch!' })
-          .mockResolvedValueOnce({ data: { CreateSocialMeda: { id: 's1', url: socialMediaUrl } }})
+          .mockResolvedValueOnce({
+            data: { CreateSocialMeda: { id: 's1', url: socialMediaUrl } }
+          })
       },
       $toast: {
         error: jest.fn(),
@@ -58,9 +60,7 @@ describe('my-social-media.vue', () => {
         getters = {
           'auth/user': () => {
             return {
-              socialMedia: [
-                { id: 's1', url: socialMediaUrl }
-              ]
+              socialMedia: [{ id: 's1', url: socialMediaUrl }]
             }
           }
         }

From 444f01f879870d83745eec2249194c596f2ccb89 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 12 Apr 2019 08:34:06 -0300
Subject: [PATCH 23/32] Refactor test, component

- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
---
 webapp/pages/profile/_id/_slug.vue            | 58 +++++++++----------
 webapp/pages/settings/my-social-media.spec.js |  4 +-
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 797645574..ae66c252d 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -202,39 +202,37 @@
             </p>
           </template>
         </ds-card>
-        <ds-space />
         <ds-space 
           v-if="user.socialMedia && user.socialMedia.length"
-          margin="x-small"
-        />
-        <ds-card style="position: relative; height: auto;">
-          <ds-space
-            v-if="user.socialMedia && user.socialMedia.length"
-            margin="x-small"
-          >
-            <ds-text
-              tag="h5"
-              color="soft"
+          margin="large"
+        >
+          <ds-card style="position: relative; height: auto;">
+            <ds-space
+              margin="x-small"
             >
-              {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
-            </ds-text>
-            <template v-if="user.socialMedia && user.socialMedia.length">
-              <ds-space
-                v-for="link in socialMediaLinks"
-                :key="link.username"
-                margin="x-small"
+              <ds-text
+                tag="h5"
+                color="soft"
               >
-                <!-- TODO: find better solution for rendering errors -->
-                <a :href="link.url">
-                  <ds-avatar
-                    :image="link.favicon"
-                  />
-                  {{ link.username }}
-                </a>
-              </ds-space>
-            </template>
-          </ds-space>
-        </ds-card>
+                {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
+              </ds-text>
+              <template>
+                <ds-space
+                  v-for="link in socialMediaLinks"
+                  :key="link.username"
+                  margin="x-small"
+                >
+                  <a :href="link.url">
+                    <ds-avatar
+                      :image="link.favicon"
+                    />
+                    {{ link.username }}
+                  </a>
+                </ds-space>
+              </template>
+            </ds-space>
+          </ds-card>
+        </ds-space>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
         <ds-flex
@@ -391,7 +389,7 @@ export default {
         )
         const [domain] = matches || []
         const favicon = domain ? `${domain}/favicon.ico` : null
-        const username = url.split('/')[3]
+        const username = url.split('/').pop()
         return { url, username, favicon }
       })
     }
diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
index c8fc45d31..4f48a2835 100644
--- a/webapp/pages/settings/my-social-media.spec.js
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -68,8 +68,8 @@ describe('my-social-media.vue', () => {
 
       it("displays a link to the currentUser's social media", () => {
         wrapper = Wrapper()
-        const socialMediaLink = wrapper.find('a')
-        expect(socialMediaLink.attributes().href).toBe(socialMediaUrl)
+        const socialMediaLink = wrapper.find('a').attributes().href
+        expect(socialMediaLink).toBe(socialMediaUrl)
       })
     })
 

From b75650ba38a16f5cb0c2a23d940f8375f3fba825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 12 Apr 2019 17:49:55 +0200
Subject: [PATCH 24/32] Organize feature locations suggested by @datenbrei

---
 cypress/integration/{ => user_profile}/SocialMedia.feature | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cypress/integration/{ => user_profile}/SocialMedia.feature (100%)

diff --git a/cypress/integration/SocialMedia.feature b/cypress/integration/user_profile/SocialMedia.feature
similarity index 100%
rename from cypress/integration/SocialMedia.feature
rename to cypress/integration/user_profile/SocialMedia.feature

From 85973be5b051d09523a82e61b19b0aa70e70f9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 12 Apr 2019 18:00:25 +0200
Subject: [PATCH 25/32] Contribute German translations for social media

---
 webapp/locales/de.json | 8 +++++++-
 webapp/locales/en.json | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6e47d7122..94ca1ac1b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -15,7 +15,8 @@
     "followers": "Folgen",
     "following": "Folgt",
     "shouted": "Empfohlen",
-    "commented": "Kommentiert"
+    "commented": "Kommentiert",
+    "socialMedia": "Wo sonst finde ich"
   },
   "search": {
     "placeholder": "Suchen",
@@ -51,6 +52,11 @@
     },
     "languages": {
       "name": "Sprachen"
+    },
+    "social-media": {
+      "name": "Soziale Medien",
+      "submit": "Link hinzufügen",
+      "success": "Profil aktualisiert"
     }
   },
   "admin": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index ffe28f7a9..40cc766d0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -54,9 +54,9 @@
       "name": "Languages"
     },
     "social-media": {
-      "name": "My social media",
-      "submit": "Add social media",
-      "success": "Updated user"
+      "name": "Social media",
+      "submit": "Add link",
+      "success": "Updated user profile"
     }
   },
   "admin": {

From 7bc0851b9080718dc6ae70b850e5ee0e14298fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 12 Apr 2019 20:40:36 +0200
Subject: [PATCH 26/32] Fix cypress test looking for English translations

Oops, I edited the translations and did not think of cypress tests that
might depend on them, sorry cc @mattwr18
---
 cypress/integration/common/settings.js               | 8 ++++----
 cypress/integration/user_profile/SocialMedia.feature | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index 675ecc677..e1f3cc5a8 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -74,14 +74,14 @@ Then('I should be on the {string} page', page => {
       expect(loc.pathname).to.eq(page)
     })
     .get('h3')
-    .should('contain', 'My social media')
+    .should('contain', 'Social media')
 })
 
 Then('I add a social media link', () => {
   cy.get("input[name='social-media']")
     .type('https://freeradical.zone/peter-pan')
     .get('button')
-    .contains('Add social media')
+    .contains('Add link')
     .click()
 })
 
@@ -100,7 +100,7 @@ Given('I have added a social media link', () => {
     .get("input[name='social-media']")
     .type('https://freeradical.zone/peter-pan')
     .get('button')
-    .contains('Add social media')
+    .contains('Add link')
     .click()
 })
 
@@ -109,4 +109,4 @@ Then('they should be able to see my social media links', () => {
     .contains('Where else can I find Peter Pan?')
     .get('a[href="https://freeradical.zone/peter-pan"]')
     .should('have.length', 1)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/user_profile/SocialMedia.feature b/cypress/integration/user_profile/SocialMedia.feature
index a535b507a..988923c17 100644
--- a/cypress/integration/user_profile/SocialMedia.feature
+++ b/cypress/integration/user_profile/SocialMedia.feature
@@ -9,7 +9,7 @@ Feature: List Social Media Accounts
 
   Scenario: Adding Social Media
     Given I am on the "settings" page
-    And I click on the "My social media" link
+    And I click on the "Social media" link
     Then I should be on the "/settings/my-social-media" page
     When I add a social media link
     Then it gets saved successfully
@@ -18,4 +18,4 @@ Feature: List Social Media Accounts
   Scenario: Other user's viewing my Social Media
     Given I have added a social media link
     When people visit my profile page
-    Then they should be able to see my social media links
\ No newline at end of file
+    Then they should be able to see my social media links

From c67825392c30f0d1bca0fe28af74fd27ba4a943e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 12 Apr 2019 20:43:03 +0200
Subject: [PATCH 27/32] Silence expected error messages on build server

@ulfgebhardt we have a quite lengthy log output on our build server.
This `2> /dev/null` prevents the server from writing log output for
expected errors. E.g. we're testing if a user can log in with incorrect
credentials or we try to create duplicates for unique slugs. All of this
will output errors to the command line which we're not interested in.

We could think of configuring the `package.json` in a way that outputs
these error messages in case we set an environment variable:
```
DEBUG=1 yarn run test:jest
```
That would be an option. Or use the `debug` npm packages that
@Mastercuber has introduced.
---
 backend/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index a3f03f1fb..beb46da10 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -10,8 +10,8 @@
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,graphql",
     "lint": "eslint src --config .eslintrc.js",
     "test": "run-s test:jest test:cucumber",
-    "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev",
-    "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev",
+    "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev 2> /dev/null",
+    "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev 2> /dev/null",
     "test:jest:cmd": "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand",
     "test:cucumber:cmd": "wait-on tcp:4001 tcp:4123 && cucumber-js --require-module @babel/register --exit test/",
     "test:jest:cmd:debug": "wait-on tcp:4001 tcp:4123 && node --inspect-brk ./node_modules/.bin/jest -i --forceExit --detectOpenHandles --runInBand",
@@ -94,4 +94,4 @@
     "nodemon": "~1.18.11",
     "supertest": "~4.0.2"
   }
-}
\ No newline at end of file
+}

From fb6262a16af6c32e9b989696d2df0dd2aee31dd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 15 Apr 2019 04:47:18 +0000
Subject: [PATCH 28/32] Bump graphql-shield from 5.3.2 to 5.3.3 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.2 to 5.3.3.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.2...v5.3.3)

Signed-off-by: dependabot[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 a3f03f1fb..d67a73464 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -50,7 +50,7 @@
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~3.0.2",
-    "graphql-shield": "~5.3.2",
+    "graphql-shield": "~5.3.3",
     "graphql-tag": "~2.10.1",
     "graphql-yoga": "~1.17.4",
     "helmet": "~3.16.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 29de5d201..e97262494 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1104,10 +1104,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.9":
-  version "0.26.9"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.9.tgz#8a619ac4d2b8dcacb0d81345746018303b479919"
-  integrity sha512-C7HdLLs1ZNPbYeNsSX++fMosxWAwzVeUs9wc76XlKJrKvLEyNwXMDUjag75EVAPxlZ36YiRJ6iTy4zc5Dbtndw==
+"@types/yup@0.26.12":
+  version "0.26.12"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.12.tgz#60fc1a485923a929699d2107fac46e6769707c4a"
+  integrity sha512-lWCsvLer6G84Gj7yh+oFGRuGHsqZd1Dwu47CVVL0ATw+bOnGDgMNHbTn80p1onT66fvLfN8FnRA3eRANsnnbbQ==
 
 "@types/zen-observable@^0.5.3":
   version "0.5.4"
@@ -3743,12 +3743,12 @@ graphql-request@~1.8.2:
   dependencies:
     cross-fetch "2.2.2"
 
-graphql-shield@~5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.2.tgz#2d47907ed9882a0636cb8ade6087123309d215ef"
-  integrity sha512-fib7rSr5aS/WHL3+Aa5LXhcCuPGEIDXmzfGtFjUXkUiZ6E5u+bDSL+9KRXo/p14A28GkJF+1Vu1hlg9H/QFG1w==
+graphql-shield@~5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-5.3.3.tgz#e3fbdb2a5f927fe1bb660ccf60c614defcc3aed4"
+  integrity sha512-9Hdmp71ewi9w7Tj1x8CSl3arWvtQOYKpZrsSBid2Vpr6BISAKe/2edEfgP4xYIKAkmpclG0Gl7ID5+qt1RJu7A==
   dependencies:
-    "@types/yup" "0.26.9"
+    "@types/yup" "0.26.12"
     lightercollective "^0.2.0"
     object-hash "^1.3.1"
     yup "^0.27.0"

From 38c2ee4fcccff9417b1f63efc186124263d66ec4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 15 Apr 2019 04:47:45 +0000
Subject: [PATCH 29/32] Bump eslint-plugin-import from 2.16.0 to 2.17.1 in
 /backend

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.16.0 to 2.17.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.16.0...v2.17.1)

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

diff --git a/backend/package.json b/backend/package.json
index a3f03f1fb..518987ada 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -84,7 +84,7 @@
     "cucumber": "~5.1.0",
     "eslint": "~5.16.0",
     "eslint-config-standard": "~12.0.0",
-    "eslint-plugin-import": "~2.16.0",
+    "eslint-plugin-import": "~2.17.1",
     "eslint-plugin-jest": "~22.4.1",
     "eslint-plugin-node": "~8.0.1",
     "eslint-plugin-promise": "~4.1.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 29de5d201..11c1efd16 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1609,6 +1609,14 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
@@ -2892,7 +2900,7 @@ es-abstract@^1.4.3:
     is-callable "^1.1.3"
     is-regex "^1.0.4"
 
-es-abstract@^1.5.1:
+es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -2989,10 +2997,10 @@ eslint-import-resolver-node@^0.3.2:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-module-utils@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
-  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
+eslint-module-utils@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
+  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
   dependencies:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
@@ -3005,21 +3013,22 @@ eslint-plugin-es@^1.3.1:
     eslint-utils "^1.3.0"
     regexpp "^2.0.1"
 
-eslint-plugin-import@~2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz#97ac3e75d0791c4fac0e15ef388510217be7f66f"
-  integrity sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==
+eslint-plugin-import@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.1.tgz#b888feb4d9b3ee155113c8dccdd4bec5db33bdf4"
+  integrity sha512-lzD9uvRvW4MsHzIOMJEDSb5MOV9LzgxRPBaovvOhJqzgxRHYfGy9QOrMuwHIh5ehKFJ7Z3DcrcGKDQ0IbP0EdQ==
   dependencies:
+    array-includes "^3.0.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.3.0"
+    eslint-module-utils "^2.4.0"
     has "^1.0.3"
     lodash "^4.17.11"
     minimatch "^3.0.4"
     read-pkg-up "^2.0.0"
-    resolve "^1.9.0"
+    resolve "^1.10.0"
 
 eslint-plugin-jest@~22.4.1:
   version "22.4.1"
@@ -6677,7 +6686,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==

From 2762b080a267de15707284c304f9c5b377fb38a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 15 Apr 2019 04:54:01 +0000
Subject: [PATCH 30/32] Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp

Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[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 02347edee..c5bf762f8 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -53,7 +53,7 @@
     "string-hash": "^1.1.3",
     "tiptap": "^1.14.0",
     "tiptap-extensions": "^1.14.0",
-    "v-tooltip": "~2.0.0",
+    "v-tooltip": "~2.0.1",
     "vue-count-to": "~1.0.13",
     "vue-izitoast": "1.1.2",
     "vue-sweetalert-icons": "~3.2.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index eac609862..ab18089ef 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6758,11 +6758,6 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.merge@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
-  integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
-
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -10807,12 +10802,12 @@ uuid@^3.1.0, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-v-tooltip@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/v-tooltip/-/v-tooltip-2.0.0.tgz#022c9019198119cd735f9f09d7208043c651bdae"
-  integrity sha512-AXUUA7G06AiGmmxh+Om0/kgw52OTNzNxAXxomgH+ehPVr5GRJKp9b8lxJBWwQkUcdULYOE5u8Nf2IQ1gIJeP3g==
+v-tooltip@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/v-tooltip/-/v-tooltip-2.0.1.tgz#ba959552651dfa33210170ac9cfcce3525abe797"
+  integrity sha512-Ifby9zx34MtzZRSYlr+tFQjXxHd8NZG9YoEHdeSQb8qwFGRQZhc8JVnxKBKUDGFowLUEzfX4e3mVmqrLw7b5oQ==
   dependencies:
-    lodash.merge "^4.6.1"
+    lodash "^4.17.11"
     popper.js "^1.15.0"
     vue-resize "^0.4.5"
 

From bd5b3f4ffbade20d4862bf4d2227e2c036dfa9d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Mon, 15 Apr 2019 04:55:09 +0000
Subject: [PATCH 31/32] Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in
 /webapp

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

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

diff --git a/webapp/package.json b/webapp/package.json
index 02347edee..708574bd8 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -62,7 +62,7 @@
   "devDependencies": {
     "@babel/core": "~7.4.3",
     "@babel/preset-env": "~7.4.3",
-    "@vue/cli-shared-utils": "~3.5.1",
+    "@vue/cli-shared-utils": "~3.6.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 eac609862..66add2e68 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1473,10 +1473,10 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.3"
     camelcase "^5.0.0"
 
-"@vue/cli-shared-utils@~3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.5.1.tgz#71d66f06fc619ba28df279bd7d37ba1ba29c9066"
-  integrity sha512-hCB7UbKeeC41w2Q8+Q7jmw3gHdq+ltRqp80S3uDRRGxwiOhxrSmdBHMzKUjh01L8bXOBRgvLey+BERi1Nj9n6Q==
+"@vue/cli-shared-utils@~3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.6.0.tgz#43937a2ea42b809dcd35d9348edf318ebc28b0d9"
+  integrity sha512-C8nTiJ7o+dncNLyOIOZF8P4bMJdOVXhWOuwyZKqn8k3CcsQVzuLyCKUHHezWc+sI+PJi4wIg2ZffCiueeIXZ+w==
   dependencies:
     chalk "^2.4.1"
     execa "^1.0.0"
@@ -1485,10 +1485,10 @@
     lru-cache "^5.1.1"
     node-ipc "^9.1.1"
     opn "^5.3.0"
-    ora "^3.1.0"
+    ora "^3.4.0"
     request "^2.87.0"
     request-promise-native "^1.0.7"
-    semver "^5.5.0"
+    semver "^6.0.0"
     string.prototype.padstart "^3.0.0"
 
 "@vue/component-compiler-utils@^2.5.1":
@@ -1816,6 +1816,11 @@ ansi-regex@^4.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
   integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
 
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -7676,16 +7681,16 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-ora@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-3.2.0.tgz#67e98a7e11f7f0ac95deaaaf11bb04de3d09e481"
-  integrity sha512-XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA==
+ora@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
+  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
   dependencies:
     chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-spinners "^2.0.0"
     log-symbols "^2.2.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
 orderedmap@^1.0.0:
@@ -10047,6 +10052,13 @@ strip-ansi@^5.0.0:
   dependencies:
     ansi-regex "^4.0.0"
 
+strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"

From 989fc018cf97733d9d7d309c7f12eb4e1ee8340c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Mon, 15 Apr 2019 17:47:02 +0200
Subject: [PATCH 32/32] Disable cypress test recordings

Because of: https://github.com/Human-Connection/Human-Connection/issues/470
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c858fc186..cd43b771f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ script:
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test --ci --verbose=false
   - docker-compose exec -d backend yarn run test:before:seeder
-  - yarn run cypress:run --record --key $CYPRESS_TOKEN
+  - yarn run cypress:run
 
 after_success:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh