Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222

2025-12-13 07:45:56 +00:00 · 2019-08-19 16:55:29 +02:00 · 2019-08-19 16:55:29 +02:00 · 3b09c31cbb
commit 3b09c31cbb
parent 314dfcf413 13d9965599
57 changed files with 977 additions and 789 deletions
--- a/backend/package.json
+++ b/backend/package.json
@ -42,7 +42,7 @@
    ]
  },
  "dependencies": {
-    "@hapi/joi": "^15.1.0",
+    "@hapi/joi": "^15.1.1",
    "activitystrea.ms": "~2.1.3",
    "apollo-cache-inmemory": "~1.6.3",
    "apollo-client": "~2.6.4",
@ -55,9 +55,9 @@
    "cheerio": "~1.0.0-rc.3",
    "cors": "~2.8.5",
    "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-beta.4",
+    "date-fns": "2.0.0-beta.5",
    "debug": "~4.1.1",
-    "dotenv": "~8.0.0",
+    "dotenv": "~8.1.0",
    "express": "^4.17.1",
    "faker": "Marak/faker.js#master",
    "graphql": "~14.4.2",
@ -89,7 +89,7 @@
    "metascraper-youtube": "^5.6.3",
    "minimatch": "^3.0.4",
    "neo4j-driver": "~1.7.5",
-    "neo4j-graphql-js": "^2.7.0",
+    "neo4j-graphql-js": "^2.7.1",
    "neode": "^0.3.1",
    "node-fetch": "~2.6.0",
    "nodemailer": "^6.3.0",
@ -124,7 +124,7 @@
    "eslint-plugin-promise": "~4.2.1",
    "eslint-plugin-standard": "~4.0.0",
    "graphql-request": "~1.8.2",
-    "jest": "~24.8.0",
+    "jest": "~24.9.0",
    "nodemon": "~1.19.1",
    "prettier": "~1.18.2",
    "supertest": "~4.0.2"
--- a/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
+++ b/backend/src/middleware/handleHtmlContent/handleContentData.spec.js
@ -198,7 +198,6 @@ describe('Hashtags', () => {
      Post(id: $id) {
        tags {
          id
-          name
        }
      }
    }
@ -234,10 +233,7 @@ describe('Hashtags', () => {
      })

      it('both Hashtags are created with the "id" set to their "name"', async () => {
-        const expected = [
-          { id: 'Democracy', name: 'Democracy' },
-          { id: 'Liberty', name: 'Liberty' },
-        ]
+        const expected = [{ id: 'Democracy' }, { id: 'Liberty' }]
        await expect(
          query({ query: postWithHastagsQuery, variables: postWithHastagsVariables }),
        ).resolves.toEqual(
@ -277,10 +273,7 @@ describe('Hashtags', () => {
            },
          })

-          const expected = [
-            { id: 'Elections', name: 'Elections' },
-            { id: 'Liberty', name: 'Liberty' },
-          ]
+          const expected = [{ id: 'Elections' }, { id: 'Liberty' }]
          await expect(
            query({ query: postWithHastagsQuery, variables: postWithHastagsVariables }),
          ).resolves.toEqual(
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@ -151,7 +151,6 @@ export default {
        friendsCount: '<-[:FRIENDS]->(related:User)',
        followingCount: '-[:FOLLOWS]->(related:User)',
        followedByCount: '<-[:FOLLOWS]-(related:User)',
-        commentsCount: '-[:WROTE]->(r:Comment)',
        commentedCount: '-[:WROTE]->(:Comment)-[:COMMENTS]->(related:Post)',
        shoutedCount: '-[:SHOUTED]->(related:Post)',
        badgesCount: '<-[:REWARDED]-(related:Badge)',
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@ -29,11 +29,6 @@ type Post {
  categories: [Category]! @relation(name: "CATEGORIZED", direction: "OUT")

  comments: [Comment]! @relation(name: "COMMENTS", direction: "IN")
-  commentsCount: Int!
-    @cypher(
-      statement: "MATCH (this)<-[:COMMENTS]-(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true  RETURN COUNT(r)"
-    )
-
  shoutedBy: [User]! @relation(name: "SHOUTED", direction: "IN")
  shoutedCount: Int!
    @cypher(
--- a/backend/src/schema/types/type/Tag.gql
+++ b/backend/src/schema/types/type/Tag.gql
@ -1,6 +1,5 @@
 type Tag {
  id: ID!
-  name: String!
  taggedPosts: [Post]! @relation(name: "TAGGED", direction: "IN")
  taggedOrganizations: [Organization]! @relation(name: "TAGGED", direction: "IN")
  taggedCount: Int! @cypher(statement: "MATCH (this)<-[:TAGGED]-(p) RETURN COUNT(DISTINCT p)")
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@ -64,7 +64,6 @@ type User {
  )

  comments: [Comment]! @relation(name: "WROTE", direction: "OUT")
-  commentsCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)")
  commentedCount: Int! @cypher(statement: "MATCH (this)-[:WROTE]->(r:Comment)-[:COMMENTS]->(p:Post) WHERE NOT r.deleted = true AND NOT r.disabled = true AND NOT p.deleted = true AND NOT p.disabled = true RETURN COUNT(DISTINCT(p))")

  shouted: [Post]! @relation(name: "SHOUTED", direction: "OUT")
@ -143,7 +142,6 @@ type Query {
    followedByCount: Int
    followedByCurrentUser: Boolean
    contributionsCount: Int
-    commentsCount: Int
    commentedCount: Int
    shoutedCount: Int
    badgesCount: Int
--- a/backend/src/seed/factories/tags.js
+++ b/backend/src/seed/factories/tags.js
@ -5,9 +5,9 @@ export default function(params) {

  return {
    mutation: `
-      mutation($id: ID!, $name: String!) {
-        CreateTag(id: $id, name: $name) {
-          name
+      mutation($id: ID!) {
+        CreateTag(id: $id) {
+          id
        }
      }
    `,
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@ -42,9 +42,9 @@ Given("we have a selection of tags and categories as well as posts", () => {
      slug: "health-wellbeing",
      icon: "medkit"
    })
-    .create("Tag", { id: "t1", name: "Ecology" })
-    .create("Tag", { id: "t2", name: "Nature" })
-    .create("Tag", { id: "t3", name: "Democracy" });
+    .create("Tag", { id: "Ecology" })
+    .create("Tag", { id: "Nature" })
+    .create("Tag", { id: "Democracy" });

  const someAuthor = {
    id: "authorId",
@ -71,14 +71,14 @@ Given("we have a selection of tags and categories as well as posts", () => {
    .relate("Post", "Categories", { from: "p0", to: "cat1" })
    .relate("Post", "Categories", { from: "p1", to: "cat2" })
    .relate("Post", "Categories", { from: "p2", to: "cat1" })
-    .relate("Post", "Tags", { from: "p0", to: "t1" })
-    .relate("Post", "Tags", { from: "p0", to: "t2" })
-    .relate("Post", "Tags", { from: "p0", to: "t3" })
-    .relate("Post", "Tags", { from: "p1", to: "t2" })
-    .relate("Post", "Tags", { from: "p1", to: "t3" })
-    .relate("Post", "Tags", { from: "p2", to: "t2" })
-    .relate("Post", "Tags", { from: "p2", to: "t3" })
-    .relate("Post", "Tags", { from: "p3", to: "t3" });
+    .relate("Post", "Tags", { from: "p0", to: "Ecology" })
+    .relate("Post", "Tags", { from: "p0", to: "Nature" })
+    .relate("Post", "Tags", { from: "p0", to: "Democracy" })
+    .relate("Post", "Tags", { from: "p1", to: "Nature" })
+    .relate("Post", "Tags", { from: "p1", to: "Democracy" })
+    .relate("Post", "Tags", { from: "p2", to: "Nature" })
+    .relate("Post", "Tags", { from: "p2", to: "Democracy" })
+    .relate("Post", "Tags", { from: "p3", to: "Democracy" });
 });

 Given("we have the following user accounts:", table => {
@ -260,7 +260,7 @@ Then("the first post on the landing page has the title:", title => {
 Then(
  "the page {string} returns a 404 error with a message:",
  (route, message) => {
-    // TODO: how can we check HTTP codes with cypress?
+    cy.request({ url: route, failOnStatusCode: false }).its('status').should('eq', 404)
    cy.visit(route, { failOnStatusCode: false });
    cy.get(".error").should("contain", message);
  }
--- a/deployment/legacy-migration/maintenance-worker/migration/mongo/export.sh
+++ b/deployment/legacy-migration/maintenance-worker/migration/mongo/export.sh
@ -38,14 +38,12 @@ export_collection "emotions"
 export_collection_query "follows" "{'foreignService': 'organizations'}" "organizations"
 export_collection_query "follows" "{'foreignService': 'users'}" "users"
 export_collection "invites"
-export_collection "notifications"
 export_collection "organizations"
 export_collection "pages"
 export_collection "projects"
 export_collection "settings"
 export_collection "shouts"
 export_collection "status"
-export_collection "systemnotifications"
 export_collection "users"
 export_collection "userscandos"
 export_collection "usersettings"
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
@ -148,6 +148,6 @@ MATCH (c:Category {id: categoryId})
 MERGE (p)-[:CATEGORIZED]->(c)
 WITH p, post.tags AS tags
 UNWIND tags AS tag
-MERGE (t:Tag {id: tag, name: tag})
+MERGE (t:Tag {id: apoc.text.clean(tag), disabled: false, deleted: false})
 MERGE (p)-[:TAGGED]->(t)
 ;
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql
@ -1 +1,2 @@
-MATCH (n:User) DETACH DELETE n;
+MATCH (n:User) DETACH DELETE n;
+MATCH (e:EmailAddress) DETACH DELETE e;
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql
@ -94,12 +94,11 @@
      }
    }
 */
-
 CALL apoc.load.json("file:${IMPORT_CHUNK_PATH_CQL_FILE}") YIELD value as user
 MERGE(u:User {id: user._id["$oid"]})
 ON CREATE SET
 u.name       = user.name,
-u.slug       = user.slug,
+u.slug       = COALESCE(user.slug, apoc.text.random(20, "[A-Za-z]")),
 u.email      = user.email,
 u.encryptedPassword   = user.password,
 u.avatar     = replace(user.avatar, 'https://api-alpha.human-connection.org', ''),
--- a/neo4j/db_setup.sh
+++ b/neo4j/db_setup.sh
@ -29,7 +29,6 @@ CREATE CONSTRAINT ON (u:User)          ASSERT u.id IS UNIQUE;
 CREATE CONSTRAINT ON (o:Organization)  ASSERT o.id IS UNIQUE;
 CREATE CONSTRAINT ON (t:Tag)           ASSERT t.id IS UNIQUE;

-
 CREATE CONSTRAINT ON (p:Post)          ASSERT p.slug IS UNIQUE;
 CREATE CONSTRAINT ON (c:Category)      ASSERT c.slug IS UNIQUE;
 CREATE CONSTRAINT ON (u:User)          ASSERT u.slug IS UNIQUE;
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@ -67,7 +67,7 @@ import { mapGetters, mapMutations } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 import ContentViewer from '~/components/Editor/ContentViewer'
-import HcEditCommentForm from '~/components/comments/EditCommentForm/EditCommentForm'
+import HcEditCommentForm from '~/components/EditCommentForm/EditCommentForm'

 export default {
  data: function() {
--- a/webapp/components/CommentForm/CommentForm.spec.js
+++ b/webapp/components/CommentForm/CommentForm.spec.js
@ -1,5 +1,5 @@
 import { mount, createLocalVue } from '@vue/test-utils'
-import CommentForm from './index.vue'
+import CommentForm from './CommentForm'
 import Styleguide from '@human-connection/styleguide'
 import Vuex from 'vuex'
 import MutationObserver from 'mutation-observer'
--- a/webapp/components/comments/CommentForm/index.vue
+++ b/webapp/components/comments/CommentForm/index.vue
@ -24,10 +24,10 @@

 <script>
 import gql from 'graphql-tag'
-import HcEditor from '~/components/Editor/Editor'
-import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
-import CommentMutations from '~/graphql/CommentMutations.js'
 import { mapGetters } from 'vuex'
+import HcEditor from '~/components/Editor/Editor'
+import PostQuery from '~/graphql/PostQuery'
+import CommentMutations from '~/graphql/CommentMutations'

 export default {
  components: {
@ -35,7 +35,6 @@ export default {
  },
  props: {
    post: { type: Object, default: () => {} },
-    comments: { type: Array, default: () => [] },
  },
  data() {
    return {
@ -70,18 +69,18 @@ export default {
      this.disabled = true
      this.$apollo
        .mutate({
-          mutation: CommentMutations().CreateComment,
+          mutation: CommentMutations(this.$i18n).CreateComment,
          variables: {
            postId: this.post.id,
            content: this.form.content,
          },
          update: (store, { data: { CreateComment } }) => {
            const data = store.readQuery({
-              query: PostCommentsQuery(this.$i18n),
+              query: PostQuery(this.$i18n),
              variables: { slug: this.post.slug },
            })
            data.Post[0].comments.push(CreateComment)
-            store.writeQuery({ query: PostCommentsQuery(this.$i18n), data })
+            store.writeQuery({ query: PostQuery(this.$i18n), data })
          },
        })
        .then(res => {
@ -98,14 +97,16 @@ export default {
  apollo: {
    User: {
      query() {
-        return gql(`{
-          User(orderBy: slug_asc) {
-            id
-            slug
-            name
-            avatar
+        return gql`
+          {
+            User(orderBy: slug_asc) {
+              id
+              slug
+              name
+              avatar
+            }
          }
-        }`)
+        `
      },
      result(result) {
        this.users = result.data.User
--- a/webapp/components/comments/CommentList/CommentList.spec.js
+++ b/webapp/components/comments/CommentList/CommentList.spec.js
@ -1,5 +1,5 @@
 import { config, mount, createLocalVue } from '@vue/test-utils'
-import CommentList from '.'
+import CommentList from './CommentList'
 import Empty from '~/components/Empty'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
@ -21,63 +21,52 @@ describe('CommentList.vue', () => {
  let store
  let wrapper
  let propsData
-  let data
-
-  propsData = {
-    post: {
-      id: 1,
-    },
-  }
-  store = new Vuex.Store({
-    getters: {
-      'auth/user': () => {
-        return {}
-      },
-    },
-  })
-  mocks = {
-    $t: jest.fn(),
-    $filters: {
-      truncate: a => a,
-    },
-    $apollo: {
-      queries: {
-        Post: {
-          refetch: jest.fn(),
-        },
-      },
-    },
-  }
-  data = () => {
-    return {
-      comments: [],
-    }
-  }

  describe('shallowMount', () => {
+    beforeEach(() => {
+      propsData = {
+        post: {
+          id: 1,
+          comments: [{ id: 'comment134', contentExcerpt: 'this is a comment' }],
+        },
+      }
+      store = new Vuex.Store({
+        getters: {
+          'auth/user': () => {
+            return {}
+          },
+        },
+      })
+      mocks = {
+        $t: jest.fn(),
+        $filters: {
+          truncate: a => a,
+        },
+        $apollo: {
+          queries: {
+            Post: {
+              refetch: jest.fn(),
+            },
+          },
+        },
+      }
+    })
+
    const Wrapper = () => {
      return mount(CommentList, {
        store,
        mocks,
        localVue,
        propsData,
-        data,
      })
    }

    beforeEach(() => {
      wrapper = Wrapper()
-      wrapper.setData({
-        comments: [
-          {
-            id: 'c1',
-            contentExcerpt: 'this is a comment',
-          },
-        ],
-      })
    })

    it('displays a message icon when there are no comments to display', () => {
+      propsData.post.comments = []
      expect(Wrapper().findAll(Empty)).toHaveLength(1)
    })

--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@ -4,25 +4,25 @@
      <span>
        <ds-icon name="comments" />
        <ds-tag
-          v-if="comments"
+          v-if="post.comments.length"
          style="margin-top: -4px; margin-left: -12px; position: absolute;"
          color="primary"
          size="small"
          round
        >
-          {{ comments.length }}
+          {{ post.comments.length }}
        </ds-tag>
        &nbsp; Comments
      </span>
    </h3>
    <ds-space margin-bottom="large" />
-    <div v-if="comments && comments.length" id="comments" class="comments">
+    <div v-if="post.comments && post.comments.length" id="comments" class="comments">
      <comment
-        v-for="(comment, index) in comments"
+        v-for="(comment, index) in post.comments"
        :key="comment.id"
        :comment="comment"
        :post="post"
-        @deleteComment="comments.splice(index, 1)"
+        @deleteComment="post.comments.splice(index, 1)"
      />
    </div>
    <hc-empty v-else name="empty" icon="messages" />
@ -31,7 +31,6 @@
 <script>
 import Comment from '~/components/Comment.vue'
 import HcEmpty from '~/components/Empty.vue'
-import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'

 export default {
  components: {
@ -41,29 +40,5 @@ export default {
  props: {
    post: { type: Object, default: () => {} },
  },
-  data() {
-    return {
-      comments: [],
-    }
-  },
-  watch: {
-    Post(post) {
-      const [first] = post
-      this.comments = (first && first.comments) || []
-    },
-  },
-  apollo: {
-    Post: {
-      query() {
-        return PostCommentsQuery(this.$i18n)
-      },
-      variables() {
-        return {
-          slug: this.post.slug,
-        }
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
 }
 </script>
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@ -244,9 +244,8 @@ export default {
      query() {
        return gql`
          {
-            Tag(orderBy: name_asc) {
+            Tag(orderBy: id_asc) {
              id
-              name
            }
          }
        `
--- a/webapp/components/CountTo.vue
+++ b/webapp/components/CountTo.vue
@ -2,7 +2,7 @@
  <span>
    <no-ssr placeholder="0" tag="span">
      <count-to
-        :start-val="lastEndVal || startVal"
+        :start-val="startVal"
        :end-val="endVal"
        :duration="duration"
        :autoplay="autoplay"
@ -20,28 +20,10 @@ export default {
  },
  props: {
    startVal: { type: Number, default: 0 },
-    endVal: { type: Number, required: true },
+    endVal: { type: Number, default: 0 },
    duration: { type: Number, default: 3000 },
    autoplay: { type: Boolean, default: true },
    separator: { type: String, default: '.' },
  },
-  data() {
-    return {
-      lastEndVal: null,
-      isReady: false,
-    }
-  },
-  watch: {
-    endVal(endVal) {
-      if (this.isReady && this.startVal === 0 && !this.lastEndVal) {
-        this.lastEndVal = this.endVal
-      }
-    },
-  },
-  mounted() {
-    setTimeout(() => {
-      this.isReady = true
-    }, 500)
-  },
 }
 </script>
--- a/webapp/components/DeleteData/DeleteData.spec.js
+++ b/webapp/components/DeleteData/DeleteData.spec.js
@ -48,7 +48,7 @@ describe('DeleteData.vue', () => {
    }
    getters = {
      'auth/user': () => {
-        return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentsCount: 3 }
+        return { id: 'u343', name: deleteAccountName, contributionsCount: 2, commentedCount: 3 }
      },
    }
    actions = { 'auth/logout': jest.fn() }
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@ -30,12 +30,12 @@
              }}
            </label>
            <ds-space margin-bottom="small" />
-            <label v-if="currentUser.commentsCount" class="checkbox-container">
+            <label v-if="currentUser.commentedCount" class="checkbox-container">
              <input type="checkbox" v-model="deleteComments" />
              <span class="checkmark"></span>
              {{
-                $t('settings.deleteUserAccount.commentsCount', {
-                  count: currentUser.commentsCount,
+                $t('settings.deleteUserAccount.commentedCount', {
+                  count: currentUser.commentedCount,
                })
              }}
            </label>
--- a/webapp/components/comments/EditCommentForm/EditCommentForm.vue
+++ b/webapp/components/comments/EditCommentForm/EditCommentForm.vue
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@ -12,15 +12,13 @@
          @click="selectItem(item)"
        >
          <div v-if="isMention">@{{ item.slug }}</div>
-          <div v-if="isHashtag">#{{ item.name }}</div>
+          <div v-if="isHashtag">#{{ item.id }}</div>
        </div>
        <div v-if="isHashtag">
          <!-- if query is not empty and is find fully in the suggestions array ... -->
-          <div v-if="query && !filteredItems.find(el => el.name === query)">
+          <div v-if="query && !filteredItems.find(el => el.id === query)">
            <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
-            <div class="suggestion-list__item" @click="selectItem({ name: query })">
-              #{{ query }}
-            </div>
+            <div class="suggestion-list__item" @click="selectItem({ id: query })">#{{ query }}</div>
          </div>
          <!-- otherwise if sanitized query is empty advice the user to add a char -->
          <div v-else-if="!query">
@ -40,9 +38,7 @@
          <!-- if "query" is not empty -->
          <div v-else>
            <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
-            <div class="suggestion-list__item" @click="selectItem({ name: query })">
-              #{{ query }}
-            </div>
+            <div class="suggestion-list__item" @click="selectItem({ id: query })">#{{ query }}</div>
          </div>
        </div>
      </div>
@ -455,7 +451,7 @@ export default {
    // For hashtags handles pressing of space.
    spaceHandler() {
      if (this.suggestionType === this.hashtagSuggestionType && this.query !== '') {
-        this.selectItem({ name: this.query })
+        this.selectItem({ id: this.query })
      }
    },
    // we have to replace our suggestion text with a mention
@ -467,8 +463,8 @@ export default {
          label: item.slug,
        },
        hashtag: {
-          id: item.name,
-          label: item.name,
+          id: item.id,
+          label: item.id,
        },
      }
      this.insertMentionOrHashtag({
--- a/webapp/components/PostCard/PostCard.story.js
+++ b/webapp/components/PostCard/PostCard.story.js
@ -24,7 +24,7 @@ const post = {
    deleted: false,
    contributionsCount: 25,
    shoutedCount: 5,
-    commentsCount: 39,
+    commentedCount: 39,
    followedByCount: 2,
    followedByCurrentUser: true,
    location: null,
@ -38,7 +38,7 @@ const post = {
    ],
    __typename: 'User',
  },
-  commentsCount: 12,
+  commentedCount: 12,
  categories: [],
  shoutedCount: 421,
  __typename: 'Post',
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@ -48,9 +48,9 @@
            </span>
            &nbsp;
            <!-- Comments Count -->
-            <span :style="{ opacity: post.commentsCount ? 1 : 0.5 }">
+            <span :style="{ opacity: post.commentedCount ? 1 : 0.5 }">
              <ds-icon name="comments" />
-              <small>{{ post.commentsCount }}</small>
+              <small>{{ post.commentedCount }}</small>
            </span>
            <!-- Menu -->
            <content-menu
--- a/webapp/components/SearchInput.spec.js
+++ b/webapp/components/SearchInput.spec.js
@ -122,7 +122,7 @@ describe('SearchInput.vue', () => {
                name: 'Trick',
                slug: 'trick',
              },
-              commentsCount: 0,
+              commentedCount: 0,
              createdAt: '2019-03-13T11:00:20.835Z',
              id: 'p10',
              label: 'Eos aut illo omnis quis eaque et iure aut.',
--- a/webapp/components/SearchInput.vue
+++ b/webapp/components/SearchInput.vue
@ -46,7 +46,7 @@
                  <ds-flex-item>
                    <ds-text size="small" color="softer" class="search-meta">
                      <span style="text-align: right;">
-                        <b>{{ option.commentsCount }}</b>
+                        <b>{{ option.commentedCount }}</b>
                        <ds-icon name="comments" />
                      </span>
                      <span style="width: 36px; display: inline-block; text-align: right;">
--- a/webapp/components/Tag/index.vue
+++ b/webapp/components/Tag/index.vue
@ -1,7 +1,7 @@
 <template>
  <ds-tag>
    <ds-icon name="tag" />
-    {{ name }}
+    {{ id }}
  </ds-tag>
 </template>

@ -9,7 +9,7 @@
 export default {
  name: 'HcTag',
  props: {
-    name: { type: String, required: true },
+    id: { type: String, required: true },
  },
 }
 </script>
--- a/webapp/components/Tag/spec.js
+++ b/webapp/components/Tag/spec.js
@ -6,20 +6,20 @@ const localVue = createLocalVue()
 localVue.use(Styleguide)

 describe('Tag', () => {
-  let name
+  let id

  let Wrapper = () => {
    return shallowMount(Tag, {
      localVue,
      propsData: {
-        name,
+        id,
      },
    })
  }

  describe('given a String for Name', () => {
    beforeEach(() => {
-      name = 'Liebe'
+      id = 'Liebe'
    })

    it('shows Name', () => {
--- a/webapp/components/User/index.vue
+++ b/webapp/components/User/index.vue
@ -50,7 +50,11 @@
        <ds-flex style="margin-top: -10px">
          <ds-flex-item class="ds-tab-nav-item">
            <ds-space margin="small">
-              <ds-number :count="fanCount" :label="$t('profile.followers')" size="x-large" />
+              <ds-number
+                :count="user.followedByCount"
+                :label="$t('profile.followers')"
+                size="x-large"
+              />
            </ds-space>
          </ds-flex-item>
          <ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active">
@ -64,8 +68,8 @@
          <ds-flex-item class="ds-tab-nav-item">
            <ds-space margin="small">
              <ds-number
-                :count="user.commentsCount"
-                :label="$t('common.comment', null, user.commentsCount)"
+                :count="user.commentedCount"
+                :label="$t('common.comment', null, user.commentedCount)"
              />
            </ds-space>
          </ds-flex-item>
@ -121,10 +125,6 @@ export default {
    itsMe() {
      return this.user.slug === this.$store.getters['auth/user'].slug
    },
-    fanCount() {
-      let count = Number(this.user.followedByCount) || 0
-      return count
-    },
    userLink() {
      const { id, slug } = this.user
      if (!(id && slug)) return ''
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@ -1,6 +1,6 @@
 import gql from 'graphql-tag'

-export default () => {
+export default i18n => {
  return {
    CreateComment: gql`
      mutation($postId: ID!, $content: String!) {
@ -8,15 +8,26 @@ export default () => {
          id
          contentExcerpt
          content
+          createdAt
+          disabled
+          deleted
          author {
            id
            slug
            name
            avatar
+            disabled
+            deleted
+            shoutedCount
+            contributionsCount
+            commentedCount
+            followedByCount
+            followedByCurrentUser
+            badges {
+              id
+              icon
+            }
          }
-          createdAt
-          deleted
-          disabled
        }
      }
    `,
@ -24,8 +35,19 @@ export default () => {
      mutation($content: String!, $id: ID!) {
        UpdateComment(content: $content, id: $id) {
          id
-          content
          contentExcerpt
+          content
+          createdAt
+          disabled
+          deleted
+          author {
+            id
+            slug
+            name
+            avatar
+            disabled
+            deleted
+          }
        }
      }
    `,
--- a/webapp/graphql/CommentQuery.js
+++ b/webapp/graphql/CommentQuery.js
@ -17,7 +17,7 @@ export default app => {
          deleted
          shoutedCount
          contributionsCount
-          commentsCount
+          commentedCount
          followedByCount
          followedByCurrentUser
          location {
--- a/webapp/graphql/PostCommentsQuery.js
+++ b/webapp/graphql/PostCommentsQuery.js
@ -1,39 +0,0 @@
-import gql from 'graphql-tag'
-
-export default i18n => {
-  const lang = i18n.locale().toUpperCase()
-  return gql(`
-    query Post($slug: String!) {
-      Post(slug: $slug) {
-        comments(orderBy: createdAt_asc) {
-          id
-          contentExcerpt
-          content
-          createdAt
-          disabled
-          deleted
-          author {
-            id
-            slug
-            name
-            avatar
-            disabled
-            deleted
-            shoutedCount
-            contributionsCount
-            commentsCount
-            followedByCount
-            followedByCurrentUser
-            location {
-              name: name${lang}
-            }
-            badges {
-              id
-              icon
-            }
-          }
-        }
-      }
-    }
-  `)
-}
--- a/webapp/graphql/PostQuery.js
+++ b/webapp/graphql/PostQuery.js
@ -22,7 +22,7 @@ export default i18n => {
            deleted
            shoutedCount
            contributionsCount
-            commentsCount
+            commentedCount
            followedByCount
            followedByCurrentUser
            location {
@ -34,12 +34,12 @@ export default i18n => {
            }
          }
          tags {
-            name
+            id
          }
-          commentsCount
-          comments(orderBy: createdAt_desc) {
+          comments(orderBy: createdAt_asc) {
            id
            contentExcerpt
+            content
            createdAt
            disabled
            deleted
@ -52,7 +52,7 @@ export default i18n => {
              deleted
              shoutedCount
              contributionsCount
-              commentsCount
+              commentedCount
              followedByCount
              followedByCurrentUser
              location {
@ -99,7 +99,7 @@ export const filterPosts = i18n => {
        deleted
        contributionsCount
        shoutedCount
-        commentsCount
+        commentedCount
        followedByCount
        followedByCurrentUser
        location {
@ -110,7 +110,6 @@ export const filterPosts = i18n => {
          icon
        }
      }
-      commentsCount
      categories {
        id
        name
--- a/webapp/graphql/UserProfile/User.js
+++ b/webapp/graphql/UserProfile/User.js
@ -2,7 +2,7 @@ import gql from 'graphql-tag'

 export default i18n => {
  const lang = i18n.locale().toUpperCase()
-  return gql(`
+  return gql`
    query User($id: ID!) {
      User(id: $id) {
        id
@ -35,7 +35,7 @@ export default i18n => {
          followedByCount
          followedByCurrentUser
          contributionsCount
-          commentsCount
+          commentedCount
          badges {
            id
            icon
@ -57,7 +57,7 @@ export default i18n => {
          followedByCount
          followedByCurrentUser
          contributionsCount
-          commentsCount
+          commentedCount
          badges {
            id
            icon
@ -66,12 +66,11 @@ export default i18n => {
            name: name${lang}
          }
        }
-        contributionsCount
        socialMedia {
          id
          url
        }
      }
    }
-  `)
+  `
 }
--- a/webapp/graphql/UserProfile/Post.js
+++ b/webapp/graphql/UserProfile/Post.js
@ -1,38 +0,0 @@
-import gql from 'graphql-tag'
-
-export default i18n => {
-  const lang = i18n.locale().toUpperCase()
-  return gql(`
-    query Post($filter: _PostFilter, $first: Int, $offset: Int) {
-      Post(filter: $filter, first: $first, offset: $offset, orderBy: createdAt_desc) {
-        id
-        slug
-        title
-        contentExcerpt
-        shoutedCount
-        commentsCount
-        deleted
-        image
-        createdAt
-        disabled
-        deleted
-        categories {
-          id
-          name
-          icon
-        }
-        author {
-          id
-          slug
-          avatar
-          name
-          disabled
-          deleted
-          location {
-            name: name${lang}
-          }
-        }
-      }
-    }
-  `)
-}
--- a/webapp/graphql/settings/BlockedUsers.js
+++ b/webapp/graphql/settings/BlockedUsers.js
@ -1,7 +1,7 @@
 import gql from 'graphql-tag'

 export const BlockedUsers = () => {
-  return gql(`
+  return gql`
    {
      blockedUsers {
        id
@ -13,27 +13,31 @@ export const BlockedUsers = () => {
        deleted
      }
    }
-  `)
+  `
 }

 export const Block = () => {
-  return gql(`mutation($id:ID!) {
-    block(id: $id) {
-      id
-      name
-      isBlocked
-      followedByCurrentUser
+  return gql`
+    mutation($id: ID!) {
+      block(id: $id) {
+        id
+        name
+        isBlocked
+        followedByCurrentUser
+      }
    }
-  }`)
+  `
 }

 export const Unblock = () => {
-  return gql(`mutation($id:ID!) {
-    unblock(id: $id) {
-      id
-      name
-      isBlocked
-      followedByCurrentUser
+  return gql`
+    mutation($id: ID!) {
+      unblock(id: $id) {
+        id
+        name
+        isBlocked
+        followedByCurrentUser
+      }
    }
-  }`)
+  `
 }
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@ -171,7 +171,7 @@
    "deleteUserAccount": {
      "name": "Daten löschen",
      "contributionsCount": "Meine {count} Beiträge löschen",
-      "commentsCount": "Meine {count} Kommentare löschen",
+      "commentedCount": "Meine {count} Kommentare löschen",
      "accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.",
      "accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen <b>WEDER VERWALTEN NOCH WIEDERHERSTELLEN!</b>",
      "success": "Konto erfolgreich gelöscht!",
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@ -171,7 +171,7 @@
    "deleteUserAccount": {
      "name": "Delete data",
      "contributionsCount": "Delete my {count} posts",
-      "commentsCount": "Delete my {count} comments",
+      "commentedCount": "Delete my {count} comments",
      "accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
      "accountWarning": "You <b>CAN'T MANAGE</b> and <b>CAN'T RECOVER</b> your Account, Posts, or Comments after deleting your account!",
      "success": "Account successfully deleted!",
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@ -121,7 +121,7 @@
    "deleteUserAccount": {
      "name": "Usuń dane",
      "contributionsCount": "Usuń {count} moich postów",
-      "commentsCount": "Usuń {count} moich komentarzy",
+      "commentedCount": "Usuń {count} moich komentarzy",
      "accountDescription": "Be aware that your Post and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
      "accountWarning": "Po usunięcie Twojego konta, nie możesz <b>ZARZĄDZAĆ</b> ani <b>ODZYSKAĆ</b> danych, wpisów oraz komentarzy!",
      "success": "Konto zostało usunięte",
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@ -100,6 +100,7 @@ module.exports = {
    { src: '~/plugins/v-tooltip.js', ssr: false },
    { src: '~/plugins/izi-toast.js', ssr: false },
    { src: '~/plugins/vue-filters.js' },
+    { src: '~/plugins/vue-infinite-scroll.js', ssr: false },
  ],

  router: {
--- a/webapp/package.json
+++ b/webapp/package.json
@ -50,8 +50,8 @@
    ]
  },
  "dependencies": {
-    "@human-connection/styleguide": "0.5.17",
-    "@nuxtjs/apollo": "^4.0.0-rc10",
+    "@human-connection/styleguide": "0.5.19",
+    "@nuxtjs/apollo": "^4.0.0-rc9",
    "@nuxtjs/axios": "~5.5.4",
    "@nuxtjs/dotenv": "~1.4.0",
    "@nuxtjs/style-resources": "~1.0.0",
@ -60,7 +60,7 @@
    "apollo-client": "~2.6.4",
    "cookie-universal-nuxt": "~2.0.17",
    "cross-env": "~5.2.0",
-    "date-fns": "2.0.0-beta.4",
+    "date-fns": "2.0.0-beta.5",
    "express": "~4.17.1",
    "graphql": "~14.4.2",
    "isemail": "^3.2.0",
@ -76,6 +76,7 @@
    "tiptap-extensions": "~1.26.2",
    "v-tooltip": "~2.0.2",
    "vue-count-to": "~1.0.13",
+    "vue-infinite-scroll": "^2.0.2",
    "vue-izitoast": "roschaefer/vue-izitoast#patch-1",
    "vuex-i18n": "~1.13.1",
    "vue-sweetalert-icons": "~4.2.0",
@ -94,7 +95,7 @@
    "@vue/test-utils": "~1.0.0-beta.29",
    "babel-core": "~7.0.0-bridge.0",
    "babel-eslint": "~10.0.2",
-    "babel-jest": "~24.8.0",
+    "babel-jest": "~24.9.0",
    "babel-loader": "~8.0.6",
    "babel-preset-vue": "~2.0.2",
    "core-js": "~2.6.9",
--- a/webapp/pages/admin/index.vue
+++ b/webapp/pages/admin/index.vue
@ -7,7 +7,7 @@
            <ds-space margin="small">
              <ds-number :count="0" :label="$t('admin.dashboard.users')" size="x-large" uppercase>
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countUsers || 0" />
+                  <hc-count-to :end-val="statistics.countUsers" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -16,7 +16,7 @@
            <ds-space margin="small">
              <ds-number :count="0" :label="$t('admin.dashboard.posts')" size="x-large" uppercase>
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countPosts || 0" />
+                  <hc-count-to :end-val="statistics.countPosts" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -30,7 +30,7 @@
                uppercase
              >
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countComments || 0" />
+                  <hc-count-to :end-val="statistics.countComments" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -44,7 +44,7 @@
                uppercase
              >
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countNotifications || 0" />
+                  <hc-count-to :end-val="statistics.countNotifications" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -58,7 +58,7 @@
                uppercase
              >
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countOrganizations || 0" />
+                  <hc-count-to :end-val="statistics.countOrganizations" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -72,7 +72,7 @@
                uppercase
              >
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countProjects || 0" />
+                  <hc-count-to :end-val="statistics.countProjects" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -81,7 +81,7 @@
            <ds-space margin="small">
              <ds-number :count="0" :label="$t('admin.dashboard.invites')" size="x-large" uppercase>
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countInvites || 0" />
+                  <hc-count-to :end-val="statistics.countInvites" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -90,7 +90,7 @@
            <ds-space margin="small">
              <ds-number :count="0" :label="$t('admin.dashboard.follows')" size="x-large" uppercase>
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countFollows || 0" />
+                  <hc-count-to :end-val="statistics.countFollows" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -99,7 +99,7 @@
            <ds-space margin="small">
              <ds-number :count="0" :label="$t('admin.dashboard.shouts')" size="x-large" uppercase>
                <no-ssr slot="count">
-                  <hc-count-to :start-val="0" :end-val="statistics.countShouts || 0" />
+                  <hc-count-to :end-val="statistics.countShouts" />
                </no-ssr>
              </ds-number>
            </ds-space>
@ -128,9 +128,6 @@ export default {
      return process.client
    },
  },
-  mounted() {
-    this.$apollo.queries.statistics.startPolling(5000)
-  },
  apollo: {
    statistics: {
      query: gql`
--- a/webapp/pages/admin/tags.vue
+++ b/webapp/pages/admin/tags.vue
@ -1,12 +1,12 @@
 <template>
  <ds-card :header="$t('admin.tags.name')">
    <ds-table :data="Tag" :fields="fields" condensed>
-      <template slot="id" slot-scope="scope">
+      <template slot="index" slot-scope="scope">
        {{ scope.index + 1 }}.
      </template>
-      <template slot="name" slot-scope="scope">
+      <template slot="id" slot-scope="scope">
        <nuxt-link :to="{ path: '/', query: { hashtag: scope.row.id } }">
-          <b>#{{ scope.row.name | truncate(20) }}</b>
+          <b>#{{ scope.row.id | truncate(20) }}</b>
        </nuxt-link>
      </template>
    </ds-table>
@ -25,8 +25,8 @@ export default {
  computed: {
    fields() {
      return {
-        id: this.$t('admin.tags.number'),
-        name: this.$t('admin.tags.name'),
+        index: this.$t('admin.tags.number'),
+        id: this.$t('admin.tags.name'),
        taggedCountUnique: {
          label: this.$t('admin.tags.tagCountUnique'),
          align: 'right',
@ -44,7 +44,6 @@ export default {
        query {
          Tag(first: 20, orderBy: taggedCountUnique_desc) {
            id
-            name
            taggedCount
            taggedCountUnique
          }
--- a/webapp/pages/index.spec.js
+++ b/webapp/pages/index.spec.js
@ -5,6 +5,7 @@ import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
 import VTooltip from 'v-tooltip'
 import FilterMenu from '~/components/FilterMenu/FilterMenu'
+import InfiniteScroll from '~/plugins/vue-infinite-scroll'

 const localVue = createLocalVue()

@ -12,6 +13,7 @@ localVue.use(Vuex)
 localVue.use(Styleguide)
 localVue.use(Filters)
 localVue.use(VTooltip)
+localVue.use(InfiniteScroll)

 config.stubs['no-ssr'] = '<span><slot /></span>'
 config.stubs['router-link'] = '<span><slot /></span>'
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@ -33,7 +33,16 @@
        primary
      />
    </no-ssr>
-    <hc-load-more v-if="hasMore" :loading="$apollo.loading" @click="showMoreContributions" />
+    <div
+      v-if="hasMore"
+      v-infinite-scroll="showMoreContributions"
+      :infinite-scroll-immediate-check="true"
+      :infinite-scroll-disabled="$apollo.loading"
+      :infinite-scroll-distance="10"
+      :infinite-scroll-throttle-delay="800"
+    >
+      <hc-load-more v-if="true" :loading="$apollo.loading" @click="showMoreContributions" />
+    </div>
  </div>
 </template>

@ -87,7 +96,7 @@ export default {
          label: this.$t('sorting.commented'),
          value: 'Commented',
          icons: 'comment',
-          order: 'commentsCount_desc',
+          order: 'commentedCount_desc',
        },
      ],
    }
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@ -38,7 +38,7 @@
      <!-- Tags -->
      <div v-if="post.tags && post.tags.length" class="tags">
        <ds-space margin="xx-small" />
-        <hc-tag v-for="tag in post.tags" :key="tag.id" :name="tag.name" />
+        <hc-tag v-for="tag in post.tags" :key="tag.id" :id="tag.id" />
      </div>
      <ds-space margin-top="x-large">
        <ds-flex :gutter="{ lg: 'small' }">
@ -81,10 +81,10 @@ import HcTag from '~/components/Tag'
 import ContentMenu from '~/components/ContentMenu'
 import HcUser from '~/components/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
-import HcCommentForm from '~/components/comments/CommentForm'
-import HcCommentList from '~/components/comments/CommentList'
+import HcCommentForm from '~/components/CommentForm/CommentForm'
+import HcCommentList from '~/components/CommentList/CommentList'
 import { postMenuModalsData, deletePostMutation } from '~/components/utils/PostHelpers'
-import PostQuery from '~/graphql/PostQuery.js'
+import PostQuery from '~/graphql/PostQuery'
 import HcEmotions from '~/components/Emotions/Emotions'

 export default {
@ -122,29 +122,6 @@ export default {
      this.title = this.post.title
    },
  },
-  async asyncData(context) {
-    const {
-      params,
-      error,
-      app: { apolloProvider, $i18n },
-    } = context
-    const client = apolloProvider.defaultClient
-    const query = PostQuery($i18n)
-    const variables = { slug: params.slug }
-    const {
-      data: { Post },
-    } = await client.query({ query, variables })
-    if (Post.length <= 0) {
-      // TODO: custom 404 error page with translations
-      const message = 'This post could not be found'
-      return error({ statusCode: 404, message })
-    }
-    const [post] = Post
-    return {
-      post,
-      title: post.title,
-    }
-  },
  mounted() {
    setTimeout(() => {
      // NOTE: quick fix for jumping flexbox implementation
@ -175,6 +152,19 @@ export default {
      }
    },
  },
+  apollo: {
+    Post: {
+      query() {
+        return PostQuery(this.$i18n)
+      },
+      variables() {
+        return {
+          slug: this.$route.params.slug,
+        }
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
 }
 </script>

@ -187,7 +177,6 @@ export default {
  }

  .post-card {
-    // max-width: 800px;
    margin: auto;

    .comments {
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@ -91,7 +91,7 @@ export default {
                slug
                contentExcerpt
                shoutedCount
-                commentsCount
+                commentedCount
                categories {
                  id
                  name
@ -105,7 +105,7 @@ export default {
                  contributionsCount
                  followedByCount
                  followedByCurrentUser
-                  commentsCount
+                  commentedCount
                  location {
                    name: name${this.$i18n.locale().toUpperCase()}
                  }
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@ -3,12 +3,14 @@ import ProfileSlug from './_slug.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
+import InfiniteScroll from '~/plugins/vue-infinite-scroll'

 const localVue = createLocalVue()

 localVue.use(Vuex)
 localVue.use(Styleguide)
 localVue.use(Filters)
+localVue.use(InfiniteScroll)
 localVue.filter('date', d => d)

 config.stubs['no-ssr'] = '<span><slot /></span>'
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@ -43,14 +43,14 @@
            <ds-flex-item>
              <no-ssr>
                <ds-number :label="$t('profile.followers')">
-                  <hc-count-to slot="count" :end-val="followedByCount" />
+                  <hc-count-to slot="count" :end-val="user.followedByCount" />
                </ds-number>
              </no-ssr>
            </ds-flex-item>
            <ds-flex-item>
              <no-ssr>
                <ds-number :label="$t('profile.following')">
-                  <hc-count-to slot="count" :end-val="Number(user.followingCount) || 0" />
+                  <hc-count-to slot="count" :end-val="user.followingCount" />
                </ds-number>
              </no-ssr>
            </ds-flex-item>
@ -229,7 +229,14 @@
            </ds-flex-item>
          </template>
        </ds-flex>
-        <hc-load-more v-if="hasMore" :loading="$apollo.loading" @click="showMoreContributions" />
+        <div
+          v-if="hasMore"
+          v-infinite-scroll="showMoreContributions"
+          infinite-scroll-disabled="$apollo.loading"
+          infinite-scroll-distance="10"
+        >
+          <hc-load-more :loading="$apollo.loading" @click="showMoreContributions" />
+        </div>
      </ds-flex-item>
    </ds-flex>
  </div>
@ -247,9 +254,9 @@ import HcEmpty from '~/components/Empty.vue'
 import ContentMenu from '~/components/ContentMenu'
 import HcUpload from '~/components/Upload'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
-import PostQuery from '~/graphql/UserProfile/Post.js'
-import UserQuery from '~/graphql/UserProfile/User.js'
-import { Block, Unblock } from '~/graphql/settings/BlockedUsers.js'
+import { filterPosts } from '~/graphql/PostQuery'
+import UserQuery from '~/graphql/User'
+import { Block, Unblock } from '~/graphql/settings/BlockedUsers'

 const tabToFilterMapping = ({ tab, id }) => {
  return {
@ -302,10 +309,6 @@ export default {
    myProfile() {
      return this.$route.params.id === this.$store.getters['auth/user'].id
    },
-    followedByCount() {
-      let count = Number(this.user.followedByCount) || 0
-      return count
-    },
    user() {
      return this.User ? this.User[0] : {}
    },
@ -394,7 +397,7 @@ export default {
  apollo: {
    Post: {
      query() {
-        return PostQuery(this.$i18n)
+        return filterPosts(this.$i18n)
      },
      variables() {
        return {
--- a/webapp/plugins/vue-infinite-scroll.js
+++ b/webapp/plugins/vue-infinite-scroll.js
@ -0,0 +1,4 @@
+import Vue from 'vue'
+import infiniteScroll from 'vue-infinite-scroll'
+
+Vue.use(infiniteScroll)
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@ -80,7 +80,7 @@ export const actions = {
          about
          locationName
          contributionsCount
-          commentsCount
+          commentedCount
          socialMedia {
            id
            url
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@ -88,7 +88,7 @@ export const actions = {
              deleted
              contributionsCount
              shoutedCount
-              commentsCount
+              commentedCount
              followedByCount
              followedByCurrentUser
              location {
@ -99,7 +99,6 @@ export const actions = {
                icon
              }
            }
-            commentsCount
            categories {
              id
              name
--- a/webapp/store/search.js
+++ b/webapp/store/search.js
@ -45,15 +45,14 @@ export const actions = {
    commit('SET_QUICK_PENDING', true)
    await this.app.apolloProvider.defaultClient
      .query({
-        query: gql(`
+        query: gql`
          query findPosts($query: String!) {
            findPosts(query: $query, limit: 10) {
              id
              slug
              label: title
-              value: title,
+              value: title
              shoutedCount
-              commentsCount
              createdAt
              author {
                id
@ -62,7 +61,7 @@ export const actions = {
              }
            }
          }
-        `),
+        `,
        variables: {
          query: value.replace(/\s/g, '~ ') + '~',
        },
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@ -966,12 +966,12 @@
    supports-color "^5.5.0"
    tslib "^1.9.3"

-"@human-connection/styleguide@0.5.17":
-  version "0.5.17"
-  resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.17.tgz#99816579616c8d5be6c66ee86c39cb6c4e694878"
-  integrity sha512-Qlo29eOi97lHls40Ms1hbGC29Aoz/W6BLoX/no5TQgHlP4qm+OK7Ra75g0sbj3a2x1Q4mZthUDWcqtjTYf6brw==
+"@human-connection/styleguide@0.5.19":
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/@human-connection/styleguide/-/styleguide-0.5.19.tgz#ab5df5e421bb8e8259747c0f48b1f324ad013c43"
+  integrity sha512-UrmHtIvJ+bi0s4Q2Xjh0lIcBYcGiiOeIp34XT16CO4Oe/ziZZ/bFph5kTgrYtrIz42qucmNHZ8TxN5gYRD1MoQ==
  dependencies:
-    vue "^2.6.6"
+    vue "^2.6.10"

 "@jest/console@^24.7.1":
  version "24.7.1"
@ -982,6 +982,15 @@
    chalk "^2.0.1"
    slash "^2.0.0"

+"@jest/console@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
+  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+  dependencies:
+    "@jest/source-map" "^24.9.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
 "@jest/core@^24.8.0":
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"
@ -1034,6 +1043,15 @@
    jest-message-util "^24.8.0"
    jest-mock "^24.8.0"

+"@jest/fake-timers@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
+  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+
 "@jest/reporters@^24.8.0":
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729"
@ -1070,6 +1088,15 @@
    graceful-fs "^4.1.15"
    source-map "^0.6.0"

+"@jest/source-map@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
+  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
 "@jest/test-result@^24.8.0":
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
@ -1079,6 +1106,15 @@
    "@jest/types" "^24.8.0"
    "@types/istanbul-lib-coverage" "^2.0.0"

+"@jest/test-result@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
+  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
 "@jest/test-sequencer@^24.8.0":
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b"
@ -1089,35 +1125,36 @@
    jest-runner "^24.8.0"
    jest-runtime "^24.8.0"

-"@jest/transform@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
-  integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
+"@jest/transform@^24.8.0", "@jest/transform@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
+  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
  dependencies:
    "@babel/core" "^7.1.0"
-    "@jest/types" "^24.8.0"
+    "@jest/types" "^24.9.0"
    babel-plugin-istanbul "^5.1.0"
    chalk "^2.0.1"
    convert-source-map "^1.4.0"
    fast-json-stable-stringify "^2.0.0"
    graceful-fs "^4.1.15"
-    jest-haste-map "^24.8.0"
-    jest-regex-util "^24.3.0"
-    jest-util "^24.8.0"
+    jest-haste-map "^24.9.0"
+    jest-regex-util "^24.9.0"
+    jest-util "^24.9.0"
    micromatch "^3.1.10"
+    pirates "^4.0.1"
    realpath-native "^1.1.0"
    slash "^2.0.0"
    source-map "^0.6.1"
    write-file-atomic "2.4.1"

-"@jest/types@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
-  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
+"@jest/types@^24.8.0", "@jest/types@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
  dependencies:
    "@types/istanbul-lib-coverage" "^2.0.0"
    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^12.0.9"
+    "@types/yargs" "^13.0.0"

 "@mrmlnc/readdir-enhanced@^2.2.1":
  version "2.2.1"
@ -1372,13 +1409,14 @@
    webpack-node-externals "^1.7.2"
    webpackbar "^3.2.0"

-"@nuxtjs/apollo@^4.0.0-rc10":
-  version "4.0.0-rc10"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc10.tgz#0a7ed15f1a4a7d3d4b6ca3652ed0314085dc3ffe"
-  integrity sha512-c8bxYpaOGQe7ZAXwYTne+48EViXYyCOV3T5khAhNk7YFFAkz6r12ouUYZ1aZr/BYczKZNPAlcJdmWAldE29Qzg==
+"@nuxtjs/apollo@^4.0.0-rc9":
+  version "4.0.0-rc9"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc9.tgz#9a00166bc88caddc5af25fd43135c99cf1e8e149"
+  integrity sha512-s69feXtdn4qrWxX8uF4+PzDRRG+NkfazEHfP3W8sG+PFxE6BASe8iW/zsaggOEw3MXG2ZjEd09jlsVoNNZB03g==
  dependencies:
-    cookie-universal "^2.0.16"
+    cookie "^0.4.0"
    isomorphic-fetch "^2.2.1"
+    js-cookie "^2.2.0"
    vue-apollo "^3.0.0-rc.2"
    vue-cli-plugin-apollo "^0.21.0"
    webpack-node-externals "^1.7.2"
@ -2210,11 +2248,23 @@
    "@types/events" "*"
    "@types/node" "*"

+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
 "@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
  version "12.0.12"
  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==

+"@types/yargs@^13.0.0":
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz#a64674fc0149574ecd90ba746e932b5a5f7b3653"
+  integrity sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/zen-observable@^0.8.0":
  version "0.8.0"
  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
@ -3503,16 +3553,16 @@ babel-helper-vue-jsx-merge-props@^2.0.2:
  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
  integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==

-babel-jest@^24.8.0, babel-jest@~24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
-  integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
+babel-jest@^24.8.0, babel-jest@~24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
+  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
  dependencies:
-    "@jest/transform" "^24.8.0"
-    "@jest/types" "^24.8.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
    "@types/babel__core" "^7.1.0"
    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.6.0"
+    babel-preset-jest "^24.9.0"
    chalk "^2.4.2"
    slash "^2.0.0"

@ -3570,10 +3620,10 @@ babel-plugin-istanbul@^5.1.0:
    istanbul-lib-instrument "^3.3.0"
    test-exclude "^5.2.3"

-babel-plugin-jest-hoist@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
-  integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
+babel-plugin-jest-hoist@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
+  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
  dependencies:
    "@types/babel__traverse" "^7.0.6"

@ -3772,13 +3822,13 @@ babel-polyfill@6.26.0:
    core-js "^2.5.0"
    regenerator-runtime "^0.10.5"

-babel-preset-jest@^24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
-  integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
+babel-preset-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
+  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
  dependencies:
    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.6.0"
+    babel-plugin-jest-hoist "^24.9.0"

 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
  version "0.5.0"
@ -5045,7 +5095,7 @@ cookie-universal@^2.0.16:
    "@types/cookie" "^0.3.1"
    cookie "^0.3.1"

-cookie@0.4.0:
+cookie@0.4.0, cookie@^0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
@ -5534,10 +5584,10 @@ data-urls@^1.0.0:
    whatwg-mimetype "^2.2.0"
    whatwg-url "^7.0.0"

-date-fns@2.0.0-beta.4:
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.4.tgz#3e1bf33a15da69481f81972c4a50aad762a81f2c"
-  integrity sha512-xekjYm7ZDBuzePM/GBodhi3hW3P8dd2RbuIOLBjet2E6EGFR82wHTTXCSGuDEoapqlDvsx88ymRsq85lbM7dDw==
+date-fns@2.0.0-beta.5:
+  version "2.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-beta.5.tgz#90885db3772802d55519cd12acd49de56aca1059"
+  integrity sha512-GS5yi964NDFNoja9yOdWFj9T97T67yLrUeJZgddHaVfc/6tHWtX7RXocuubmZkNzrZUZ9BqBOW7jTR5OoWjJ1w==

 date-fns@^1.27.2:
  version "1.30.1"
@ -8753,6 +8803,25 @@ jest-haste-map@^24.8.0:
  optionalDependencies:
    fsevents "^1.2.7"

+jest-haste-map@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
+  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    anymatch "^2.0.0"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.9.0"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 jest-jasmine2@^24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
@ -8806,6 +8875,20 @@ jest-message-util@^24.8.0:
    slash "^2.0.0"
    stack-utils "^1.0.1"

+jest-message-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
+  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^2.0.1"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
+    stack-utils "^1.0.1"
+
 jest-mock@^24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
@ -8813,6 +8896,13 @@ jest-mock@^24.8.0:
  dependencies:
    "@jest/types" "^24.8.0"

+jest-mock@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
+  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
+  dependencies:
+    "@jest/types" "^24.9.0"
+
 jest-pnp-resolver@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
@ -8823,6 +8913,11 @@ jest-regex-util@^24.3.0:
  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==

+jest-regex-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
+  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
+
 jest-resolve-dependencies@^24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
@ -8902,6 +8997,11 @@ jest-serializer@^24.4.0:
  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
  integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==

+jest-serializer@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
+  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
+
 jest-snapshot@^24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
@ -8938,6 +9038,24 @@ jest-util@^24.8.0:
    slash "^2.0.0"
    source-map "^0.6.0"

+jest-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
+  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/source-map" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    callsites "^3.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
+    mkdirp "^0.5.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+
 jest-validate@^24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
@ -8971,6 +9089,14 @@ jest-worker@^24.6.0:
    merge-stream "^1.0.1"
    supports-color "^6.1.0"

+jest-worker@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^6.1.0"
+
 jest@~24.8.0:
  version "24.8.0"
  resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
@ -8995,6 +9121,11 @@ js-beautify@^1.6.14:
    mkdirp "~0.5.1"
    nopt "~4.0.1"

+js-cookie@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+
 js-levenshtein@^1.1.3:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@ -14887,9 +15018,13 @@ vue-hot-reload-api@^2.3.0:
  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf"
  integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==

+vue-infinite-scroll@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711"
+  integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A==
+
 vue-izitoast@roschaefer/vue-izitoast#patch-1:
  version "1.1.2"
-  uid ba6b03eb24c7c04c299e64a9703e101bf158ae50
  resolved "https://codeload.github.com/roschaefer/vue-izitoast/tar.gz/ba6b03eb24c7c04c299e64a9703e101bf158ae50"
  dependencies:
    izitoast "^1.3.0"
@ -15015,7 +15150,7 @@ vue2-dropzone@3.5.8:
  dependencies:
    dropzone "^5.5.1"

-vue@^2.6.10, vue@^2.6.6:
+vue@^2.6.10:
  version "2.6.10"
  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
  integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==