Merge branch 'master' of github.com:Human-Connection/Nitro-Web into get_rid_of_resource_type

2025-12-13 07:45:56 +00:00 · 2019-03-12 13:26:56 +01:00 · 2019-03-12 13:26:56 +01:00 · 3b7ffde4c2
commit 3b7ffde4c2
parent 47eaf7dea0 610aa470fb
18 changed files with 825 additions and 257 deletions
--- a/components/Author.vue
+++ b/components/Author.vue
@ -107,7 +107,9 @@
          <ds-flex-item :width="{base: 3}">
            <hc-follow-button
              :follow-id="author.id"
-              @update="voted = true"
+              :is-followed="author.followedByCurrentUser"
+              @optimistic="follow => author.followedByCurrentUser = follow"
+              @update="follow => author.followedByCurrentUser = follow"
            />
          </ds-flex-item>
          <ds-flex-item :width="{base: 1}">
@ -139,21 +141,12 @@ export default {
    trunc: { type: Number, default: null },
    showAuthorPopover: { type: Boolean, default: true }
  },
-  data() {
-    return {
-      voted: false
-    }
-  },
  computed: {
    itsMe() {
      return this.author.slug === this.$store.getters['auth/user'].slug
    },
    fanCount() {
      let count = Number(this.author.followedByCount) || 0
-      if (this.voted) {
-        // NOTE: this is used for presentation
-        count += 1
-      }
      return count
    },
    author() {
--- a/components/FollowButton.vue
+++ b/components/FollowButton.vue
@ -2,12 +2,15 @@
  <ds-button
    :disabled="disabled || !followId"
    :loading="loading"
-    icon="plus"
-    primary
+    :icon="icon"
+    :primary="isFollowed && !hovered"
+    :danger="isFollowed && hovered"
    fullwidth
-    @click.prevent="follow"
+    @mouseenter.native="onHover"
+    @mouseleave.native="hovered = false"
+    @click.prevent="toggle"
  >
-    Folgen
+    {{ label }}
  </ds-button>
 </template>

@ -18,37 +21,69 @@ export default {
  name: 'HcFollowButton',

  props: {
-    followId: { type: String, default: null }
+    followId: { type: String, default: null },
+    isFollowed: { type: Boolean, default: false }
  },
  data() {
    return {
      disabled: false,
-      loading: false
+      loading: false,
+      hovered: false
+    }
+  },
+  computed: {
+    icon() {
+      if (this.isFollowed && this.hovered) {
+        return 'close'
+      } else {
+        return this.isFollowed ? 'check' : 'plus'
+      }
+    },
+    label() {
+      if (this.isFollowed) {
+        return this.$t('followButton.following')
+      } else {
+        return this.$t('followButton.follow')
+      }
+    }
+  },
+  watch: {
+    isFollowed() {
+      this.loading = false
+      this.hovered = false
    }
  },
  methods: {
-    follow() {
-      this.loading = true
+    onHover() {
+      if (!this.disabled && !this.loading) {
+        this.hovered = true
+      }
+    },
+    toggle() {
+      const follow = !this.isFollowed
+      const mutation = follow ? 'follow' : 'unfollow'
+
+      this.hovered = false
+
+      this.$emit('optimistic', follow)
+
      this.$apollo
        .mutate({
          mutation: gql`
-            mutation($myId: ID!, $followId: ID!) {
-              AddUserFollowing(from: { id: $myId }, to: { id: $followId }) {
-                from {
-                  id
-                }
-              }
+            mutation($id: ID!) {
+              ${mutation}(id: $id, type: User)
            }
          `,
          variables: {
-            myId: this.$store.getters['auth/user'].id,
-            followId: this.followId
+            id: this.followId
          }
        })
-        .then(() => {
-          this.loading = false
-          this.disabled = true
-          this.$emit('update')
+        .then(res => {
+          // this.$emit('optimistic', follow ? res.data.follow : follow)
+          this.$emit('update', follow)
+        })
+        .catch(() => {
+          this.$emit('optimistic', !follow)
        })
    }
  }
--- a/components/ShoutButton.vue
+++ b/components/ShoutButton.vue
@ -4,20 +4,25 @@
    style="text-align: center"
  >
    <ds-button
-      :disabled="disabled || loading"
-      danger
+      :loading="loading"
+      :disabled="disabled"
+      :ghost="!shouted"
+      :primary="shouted"
      size="x-large"
      icon="bullhorn"
-      @click="shout"
+      @click="toggle"
    />
    <ds-space margin-bottom="xx-small" />
-    <ds-text color="soft">
+    <ds-text
+      color="soft"
+      class="shout-button-text"
+    >
      <ds-heading
        style="display: inline"
        tag="h3"
      >
        {{ shoutedCount }}x
-      </ds-heading> Empfohlen
+      </ds-heading> {{ $t('shoutButton.shouted') }}
    </ds-text>
  </ds-space>
 </template>
@ -28,41 +33,69 @@ import gql from 'graphql-tag'
 export default {
  props: {
    count: { type: Number, default: 0 },
-    postId: { type: String, default: null }
+    postId: { type: String, default: null },
+    isShouted: { type: Boolean, default: false },
+    disabled: { type: Boolean, default: false }
  },
  data() {
    return {
      loading: false,
-      disabled: false,
-      shoutedCount: this.count
+      shoutedCount: this.count,
+      shouted: false
+    }
+  },
+  watch: {
+    isShouted: {
+      immediate: true,
+      handler: function(shouted) {
+        this.shouted = shouted
+      }
    }
  },
  methods: {
-    shout() {
-      this.loading = true
+    toggle() {
+      const shout = !this.shouted
+      const mutation = shout ? 'shout' : 'unshout'
+      const count = shout ? this.shoutedCount + 1 : this.shoutedCount - 1
+
+      const backup = {
+        shoutedCount: this.shoutedCount,
+        shouted: this.shouted
+      }
+
+      this.shoutedCount = count
+      this.shouted = shout
+
      this.$apollo
        .mutate({
          mutation: gql`
-            mutation($myId: ID!, $postId: ID!) {
-              AddUserShouted(from: { id: $myId }, to: { id: $postId }) {
-                from {
-                  id
-                }
-              }
+            mutation($id: ID!) {
+              ${mutation}(id: $id, type: Post)
            }
          `,
          variables: {
-            myId: this.$store.getters['auth/user'].id,
-            postId: this.postId
+            id: this.postId
          }
        })
-        .then(() => {
+        .then(res => {
+          if (res && res.data) {
+            this.$emit('update', shout)
+          }
+        })
+        .catch(() => {
+          this.shoutedCount = backup.shoutedCount
+          this.shouted = backup.shouted
+        })
+        .finally(() => {
          this.loading = false
-          this.disabled = true
-          this.shoutedCount++
-          this.$emit('update')
        })
    }
  }
 }
 </script>
+
+<style lang="scss">
+.shout-button-text {
+  user-select: none;
+}
+</style>
--- a/graphql/UserProfileQuery.js
+++ b/graphql/UserProfileQuery.js
@ -29,6 +29,7 @@ export default app => {
          slug
          avatar
          followedByCount
+          followedByCurrentUser
          contributionsCount
          commentsCount
          badges {
@ -41,12 +42,14 @@ export default app => {
          }
        }
        followedByCount
+        followedByCurrentUser
        followedBy(first: 7)  {
          id
          name
          slug
          avatar
          followedByCount
+          followedByCurrentUser
          contributionsCount
          commentsCount
          badges {
--- a/locales/de.json
+++ b/locales/de.json
@ -1,13 +1,4 @@
 {
-  "actions": {
-    "loading": "lade",
-    "loadMore": "mehr laden",
-    "create": "Erstellen",
-    "save": "Speichern",
-    "edit": "Bearbeiten",
-    "delete": "Löschen",
-    "cancel": "Abbrechen"
-  },
  "login": {
    "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
    "login": "Einloggen",
@ -93,6 +84,48 @@
      "name": "Einstellungen"
    }
  },
+  "post": {
+    "name": "Beitrag",
+    "moreInfo": {
+      "name": "Mehr Info"
+    },
+    "takeAction": {
+      "name": "Aktiv werden"
+    }
+  },
+  "quotes": {
+    "african": {
+      "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
+      "author": "Afrikanisches Sprichwort"
+    }
+  },
+  "common": {
+    "post": "Beitrag ::: Beiträge",
+    "comment": "Kommentar ::: Kommentare",
+    "letsTalk": "Miteinander reden",
+    "versus": "Versus",
+    "moreInfo": "Mehr Info",
+    "takeAction": "Aktiv werden",
+    "shout": "Empfehlung ::: Empfehlungen",
+    "user": "Benutzer ::: Benutzer",
+    "category": "Kategorie ::: Kategorien",
+    "organization": "Organisation ::: Organisationen",
+    "project": "Projekt ::: Projekte",
+    "tag": "Tag ::: Tags",
+    "name": "Name",
+    "loadMore": "mehr laden",
+    "loading": "wird geladen",
+    "reportContent": "Melden"
+  },
+  "actions": {
+    "loading": "lade",
+    "loadMore": "mehr laden",
+    "create": "Erstellen",
+    "save": "Speichern",
+    "edit": "Bearbeiten",
+    "delete": "Löschen",
+    "cancel": "Abbrechen"
+  },
  "moderation": {
    "name": "Moderation",
    "reports": {
@ -101,14 +134,6 @@
      "submitter": "gemeldet von"
    }
  },
-  "contribution": {
-    "edit": "Beitrag bearbeiten",
-    "delete": "Beitrag löschen"
-  },
-  "comment": {
-    "edit": "Kommentar bearbeiten",
-    "delete": "Kommentar löschen"
-  },
  "disable": {
    "user": {
      "title": "Nutzer sperren",
@ -126,15 +151,6 @@
      "message": "Bist du sicher, dass du den Kommentar \"<b>{name}</b>\" deaktivieren möchtest?"
    }
  },
-  "post": {
-    "name": "Beitrag",
-    "moreInfo": {
-      "name": "Mehr Info"
-    },
-    "takeAction": {
-      "name": "Aktiv werden"
-    }
-  },
  "report": {
    "submit": "Meldung senden",
    "cancel": "Abbrechen",
@ -154,28 +170,19 @@
      "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" melden möchtest?"
    }
  },
-  "quotes": {
-    "african": {
-      "quote": "Viele kleine Leute, an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
-      "author": "Afrikanisches Sprichwort"
-    }
+  "contribution": {
+    "edit": "Beitrag bearbeiten",
+    "delete": "Beitrag löschen"
  },
-  "common": {
-    "reportContent": "Melden",
-    "post": "Beitrag ::: Beiträge",
-    "comment": "Kommentar ::: Kommentare",
-    "letsTalk": "Miteinander reden",
-    "versus": "Versus",
-    "moreInfo": "Mehr Info",
-    "takeAction": "Aktiv werden",
-    "shout": "Empfehlung ::: Empfehlungen",
-    "user": "Benutzer ::: Benutzer",
-    "category": "Kategorie ::: Kategorien",
-    "organization": "Organisation ::: Organisationen",
-    "project": "Projekt ::: Projekte",
-    "tag": "Tag ::: Tags",
-    "name": "Name",
-    "loadMore": "mehr laden",
-    "loading": "wird geladen"
+  "comment": {
+    "edit": "Kommentar bearbeiten",
+    "delete": "Kommentar löschen"
+  },
+  "followButton": {
+    "follow": "Folgen",
+    "following": "Folge Ich"
+  },
+  "shoutButton": {
+    "shouted": "empfohlen"
  }
-}
+}
--- a/locales/en.json
+++ b/locales/en.json
@ -1,13 +1,4 @@
 {
-  "actions": {
-    "loading": "loading",
-    "loadMore": "load more",
-    "create": "Create",
-    "save": "Save",
-    "edit": "Edit",
-    "delete": "Delete",
-    "cancel": "Cancel"
-  },
  "login": {
    "copy": "If you already have a human-connection account, login here.",
    "login": "Login",
@ -93,6 +84,48 @@
      "name": "Settings"
    }
  },
+  "post": {
+    "name": "Post",
+    "moreInfo": {
+      "name": "More info"
+    },
+    "takeAction": {
+      "name": "Take action"
+    }
+  },
+  "quotes": {
+    "african": {
+      "quote": "Many small people in many small places do many small things, that can alter the face of the world.",
+      "author": "African proverb"
+    }
+  },
+  "common": {
+    "post": "Post ::: Posts",
+    "comment": "Comment ::: Comments",
+    "letsTalk": "Let`s Talk",
+    "versus": "Versus",
+    "moreInfo": "More Info",
+    "takeAction": "Take Action",
+    "shout": "Shout ::: Shouts",
+    "user": "User ::: Users",
+    "category": "Category ::: Categories",
+    "organization": "Organization ::: Organizations",
+    "project": "Project ::: Projects",
+    "tag": "Tag ::: Tags",
+    "name": "Name",
+    "loadMore": "load more",
+    "loading": "loading",
+    "reportContent": "Report"
+  },
+  "actions": {
+    "loading": "loading",
+    "loadMore": "load more",
+    "create": "Create",
+    "save": "Save",
+    "edit": "Edit",
+    "delete": "Delete",
+    "cancel": "Cancel"
+  },
  "moderation": {
    "name": "Moderation",
    "reports": {
@ -101,14 +134,6 @@
      "submitter": "reported by"
    }
  },
-  "contribution": {
-    "edit": "Edit Contribution",
-    "delete": "Delete Contribution"
-  },
-  "comment": {
-    "edit": "Edit Comment",
-    "delete": "Delete Comment"
-  },
  "disable": {
    "user": {
      "title": "Disable User",
@ -126,15 +151,6 @@
      "message": "Do you really want to disable the comment from \"<b>{name}</b>\"?"
    }
  },
-  "post": {
-    "name": "Post",
-    "moreInfo": {
-      "name": "More info"
-    },
-    "takeAction": {
-      "name": "Take action"
-    }
-  },
  "report": {
    "submit": "Send Report",
    "cancel": "Cancel",
@ -154,28 +170,19 @@
      "message": "Do you really want to report the comment from \"<b>{name}</b>\"?"
    }
  },
-  "quotes": {
-    "african": {
-      "quote": "Many small people in many small places do many small things, that can alter the face of the world.",
-      "author": "African proverb"
-    }
+  "contribution": {
+    "edit": "Edit Contribution",
+    "delete": "Delete Contribution"
  },
-  "common": {
-    "reportContent": "Report",
-    "post": "Post ::: Posts",
-    "comment": "Comment ::: Comments",
-    "letsTalk": "Let`s Talk",
-    "versus": "Versus",
-    "moreInfo": "More Info",
-    "takeAction": "Take Action",
-    "shout": "Shout ::: Shouts",
-    "user": "User ::: Users",
-    "category": "Category ::: Categories",
-    "organization": "Organization ::: Organizations",
-    "project": "Project ::: Projects",
-    "tag": "Tag ::: Tags",
-    "name": "Name",
-    "loadMore": "load more",
-    "loading": "loading"
+  "comment": {
+    "edit": "Edit Comment",
+    "delete": "Delete Comment"
+  },
+  "followButton": {
+    "follow": "Follow",
+    "following": "Following"
+  },
+  "shoutButton": {
+    "shouted": "shouted"
  }
-}
+}
--- a/locales/es.json
+++ b/locales/es.json
@ -13,7 +13,9 @@
    "memberSince": "Miembro desde",
    "follow": "Seguir",
    "followers": "Seguidores",
-    "following": "Siguiendo"
+    "following": "Siguiendo",
+    "shouted": "Gritar",
+    "commented": "Comentado"
  },
  "settings": {
    "name": "Configuración",
--- a/locales/fr.json
+++ b/locales/fr.json
@ -3,7 +3,7 @@
    "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
    "login": "Connexion",
    "logout": "Déconnexion",
-    "email": "Votre Message électronique",
+    "email": "Votre courriel",
    "password": "Votre mot de passe",
    "moreInfo": "Qu'est-ce que Human Connection?",
    "hello": "Bonjour"
@ -109,6 +109,61 @@
    "tag": "Tag ::: Tags",
    "name": "Nom",
    "loadMore": "charger plus",
-    "loading": "chargement"
+    "loading": "chargement",
+    "reportContent": "Signaler"
+  },
+  "moderation": {
+    "reports": {
+      "empty": "Félicitations, rien à modérer.",
+      "name": "Signalisations",
+      "reporter": "signalé par"
+    }
+  },
+  "disable": {
+    "user": {
+      "title": "Désactiver l'utilisateur",
+      "type": "Utilisateur",
+      "message": "Souhaitez-vous vraiment désactiver l'utilisateur \" <b> {name} </b> \"?"
+    },
+    "contribution": {
+      "title": "Désactiver l'apport",
+      "type": "apport",
+      "message": "Souhaitez-vous vraiment signaler l'entrée\" <b> {name} </b> \"?"
+    },
+    "comment": {
+      "title": "Désactiver le commentaire",
+      "type": "Commentaire",
+      "message": "Souhaitez-vous vraiment désactiver le commentaire de \"<b>{nom}</b>\" ?"
+    }
+  },
+  "report": {
+    "submit": "Envoyer le rapport",
+    "cancel": "Annuler",
+    "user": {
+      "title": "Signaler l'utilisateur",
+      "type": "Utilisateur",
+      "message": "Souhaitez-vous vraiment signaler l'utilisateur \" <b> {name} </b> \"?"
+    },
+    "contribution": {
+      "title": "Signaler l'entrée",
+      "type": "Apport",
+      "message": "Souhaitez-vous vraiment signaler l'entrée\" <b> {name} </b> \"?"
+    },
+    "comment": {
+      "title": "Signaler un commentaire",
+      "type": "Commentaire",
+      "message": "Souhaitez-vous vraiment signaler l'utilisateur \" <b> {name} </b> \"?"
+    }
+  },
+  "actions": {
+    "cancel": "Annuler"
+  },
+  "contribution": {
+    "edit": "Rédiger l'apport",
+    "delete": "Supprimer l'entrée"
+  },
+  "comment": {
+    "edit": "Rédiger un commentaire",
+    "delete": "Supprimer le commentaire"
  }
 }
--- a/locales/it.json
+++ b/locales/it.json
@ -1,6 +1,6 @@
 {
  "login": {
-    "copy": "Se hai già un account di Human Connection, accedi qui.",
+    "copy": "Se sei gia registrato su Human Connection, accedi qui.",
    "login": "Accesso",
    "logout": "Logout",
    "email": "La tua email",
@ -12,13 +12,18 @@
    "name": "Il mio profilo",
    "memberSince": "Membro dal",
    "follow": "Seguire",
-    "followers": "Seguaci",
-    "following": "Seguendo"
+    "followers": "Seguenti",
+    "following": "Seguendo",
+    "shouted": "Gridato",
+    "commented": "Commentato"
  },
  "settings": {
    "name": "Impostazioni",
    "data": {
-      "name": "I tuoi dati"
+      "name": "I tuoi dati",
+      "labelName": "Nome",
+      "labelCity": "La tua città o regione",
+      "labelBio": "Su di te"
    },
    "security": {
      "name": "Sicurezza"
@ -27,7 +32,7 @@
      "name": "Inviti"
    },
    "download": {
-      "name": "Scaricare i dati"
+      "name": "Scaricamento dati"
    },
    "delete": {
      "name": "Elimina Account"
@ -51,7 +56,7 @@
      "projects": "Progetti",
      "invites": "Inviti",
      "follows": "Segue",
-      "shouts": "Grida"
+      "shouts": "Gridi"
    },
    "organizations": {
      "name": "Organizzazioni"
@ -90,25 +95,33 @@
  },
  "quotes": {
    "african": {
-      "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono alterare la faccia del mondo.",
+      "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono cambiare la faccia del mondo.",
      "author": "Proverbio africano"
    }
  },
  "common": {
    "post": "Messaggio ::: Messaggi",
    "comment": "Commento ::: Commenti",
-    "letsTalk": "Parliamo",
-    "versus": "Contro",
+    "letsTalk": "Discutiamo",
+    "versus": "Verso",
    "moreInfo": "Ulteriori informazioni",
    "takeAction": "Agire",
-    "shout": "Grida ::: Grida",
+    "shout": "Grido ::: Gridi",
    "user": "Utente ::: Utenti",
    "category": "Categoria ::: Categorie",
    "organization": "Organizzazione ::: Organizzazioni",
    "project": "Progetto ::: Progetti",
    "tag": "Tag ::: Tag",
    "name": "Nome",
-    "loadMore": "caricare di più",
-    "loading": "caricamento"
+    "loadMore": "Caricare di più",
+    "loading": "Caricamento in corso"
+  },
+  "actions": {
+    "loading": "Caricamento in corso",
+    "loadMore": "Carica di più",
+    "create": "Crea",
+    "save": "Salva",
+    "edit": "Modifica",
+    "delete": "Cancella"
  }
 }
--- a/locales/nl.json
+++ b/locales/nl.json
@ -109,6 +109,51 @@
    "tag": "Tag ::: Tags",
    "name": "Naam",
    "loadMore": "meer laden",
-    "loading": "inlading"
+    "loading": "inlading",
+    "reportContent": "Melden"
+  },
+  "disable": {
+    "comment": {
+      "title": "Commentaar uitschakelen",
+      "type": "Melding",
+      "message": "Wilt u de reactie van \" <b> {name} </b> \" echt uitschakelen ?"
+    }
+  },
+  "report": {
+    "submit": "Verzenden",
+    "cancel": "Annuleren",
+    "user": {
+      "title": "Gebruiker melden",
+      "type": "Gebruiker",
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?"
+    },
+    "contribution": {
+      "title": "Bijdrage melden",
+      "type": "Bijdrage",
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?"
+    },
+    "comment": {
+      "title": "Reactie melden",
+      "type": "Melding",
+      "message": "Wilt u echt het commentaar van \"<b>{name}</b>\" melden?"
+    }
+  },
+  "actions": {
+    "cancel": "Annuleren"
+  },
+  "contribution": {
+    "edit": "Bijdrage bewerken",
+    "delete": "Bijdrage verwijderen"
+  },
+  "comment": {
+    "edit": "Commentaar bewerken",
+    "delete": "Commentaar verwijderen"
+  },
+  "followButton": {
+    "follow": "Volgen",
+    "following": "Volgt"
+  },
+  "shoutButton": {
+    "shouted": "uitgeroepen"
  }
 }
--- a/locales/pl.json
+++ b/locales/pl.json
@ -13,12 +13,17 @@
    "memberSince": "Członek od",
    "follow": "Obserwuj",
    "followers": "Obserwujący",
-    "following": "Obserwowani"
+    "following": "Obserwowani",
+    "shouted": "Krzyknij",
+    "commented": "Skomentuj"
  },
  "settings": {
    "name": "Ustawienia",
    "data": {
-      "name": "Twoje dane"
+      "name": "Twoje dane",
+      "labelName": "Twoje dane",
+      "labelCity": "Twoje miasto lub region",
+      "labelBio": "O Tobie"
    },
    "security": {
      "name": "Bezpieczeństwo"
@ -51,7 +56,7 @@
      "projects": "Projekty",
      "invites": "Zaproszenia",
      "follows": "Obserwowań",
-      "shouts": "   okrzyk"
+      "shouts": "Okrzyk"
    },
    "organizations": {
      "name": "Organizacje"
@ -109,6 +114,75 @@
    "tag": "Tag ::: Tagi",
    "name": "imię",
    "loadMore": "załaduj więcej",
-    "loading": "ładowanie"
+    "loading": "ładowanie",
+    "reportContent": "Raport"
+  },
+  "actions": {
+    "loading": "ładowanie",
+    "loadMore": "załaduj więcej",
+    "create": "Stwórz",
+    "save": "Zapisz",
+    "edit": "Edytuj",
+    "delete": "Usuń",
+    "cancel": "Anuluj"
+  },
+  "moderation": {
+    "name": "Moderacja",
+    "reports": {
+      "empty": "Gratulacje, moderacja nie jest potrzebna",
+      "name": "Raporty",
+      "reporter": "zgłoszone przez"
+    }
+  },
+  "disable": {
+    "user": {
+      "title": "Ukryj użytkownika",
+      "type": "Użytkownik",
+      "message": "Czy na pewno chcesz wyłączyć użytkownika \" <b> {name} </b> \"?"
+    },
+    "contribution": {
+      "title": "Ukryj wpis",
+      "type": "Wpis / Post",
+      "message": "Czy na pewno chcesz ukryć wpis \" <b> tytuł} </b> \"?"
+    },
+    "comment": {
+      "title": "Ukryj wpis",
+      "type": "Komentarz",
+      "message": "Czy na pewno chcesz ukryć komentarz użytkownika\"<b>(Imie/Avatar</b>\"?"
+    }
+  },
+  "report": {
+    "submit": "Wyślij raport",
+    "cancel": "Anuluj",
+    "user": {
+      "title": "Zgłoś użytkownika",
+      "type": "Użytkownik",
+      "message": "Czy na pewno chcesz zgłosić użytkownika \" <b> {Imie} </b> \"?"
+    },
+    "contribution": {
+      "title": "Zgłoś wpis",
+      "type": "Wpis / Post",
+      "message": "Czy na pewno chcesz zgłosić ten wpis użytkownika \" <b> {Imie} </b> \"?"
+    },
+    "comment": {
+      "title": "Zgłoś komentarz",
+      "type": "Komentarz",
+      "message": "Czy na pewno chcesz zgłosić komentarz użytkownika\"<b>(Imie/Avatar</b>\"?"
+    }
+  },
+  "contribution": {
+    "edit": "Edytuj wpis",
+    "delete": "Usuń wpis"
+  },
+  "comment": {
+    "edit": "Edytuj komentarz",
+    "delete": "Usuń komentarz"
+  },
+  "followButton": {
+    "follow": "Obserwuj",
+    "following": "Obserwowani"
+  },
+  "shoutButton": {
+    "shouted": "krzyczeć"
  }
 }
--- a/locales/pt.json
+++ b/locales/pt.json
@ -1,7 +1,7 @@
 {
  "login": {
-    "copy": "Se você já tem uma conta no Human Connection, faça o login aqui.",
-    "login": "Login",
+    "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
+    "login": "Entrar",
    "logout": "Sair",
    "email": "Seu email",
    "password": "Sua senha",
@ -13,12 +13,17 @@
    "memberSince": "Membro desde",
    "follow": "Seguir",
    "followers": "Seguidores",
-    "following": "Seguindo"
+    "following": "Seguindo",
+    "shouted": "Aclamou",
+    "commented": "Comentou"
  },
  "settings": {
    "name": "Configurações",
    "data": {
-      "name": "Seus Dados"
+      "name": "Seus dados",
+      "labelName": "Seu nome",
+      "labelCity": "Sua cidade ou estado",
+      "labelBio": "Sobre você"
    },
    "security": {
      "name": "Segurança"
@ -30,7 +35,7 @@
      "name": "Baixar dados"
    },
    "delete": {
-      "name": "Deletar conta"
+      "name": "Apagar conta"
    },
    "organizations": {
      "name": "Minhas Organizações"
@ -40,18 +45,18 @@
    }
  },
  "admin": {
-    "name": "Administrator",
+    "name": "Administração",
    "dashboard": {
      "name": "Painel de controle",
      "users": "Usuários",
-      "posts": "Pastagens",
+      "posts": "Postagens",
      "comments": "Comentários",
      "notifications": "Notificações",
      "organizations": "Organizações",
      "projects": "Projetos",
      "invites": "Convites",
-      "follows": "Seguidores",
-      "shouts": "Gritos"
+      "follows": "Segue",
+      "shouts": "Aclamações"
    },
    "organizations": {
      "name": "Organizações"
@ -68,12 +73,12 @@
    "categories": {
      "name": "Categorias",
      "categoryName": "Nome",
-      "postCount": "Pastagens"
+      "postCount": "Postagens"
    },
    "tags": {
      "name": "Etiquetas",
      "tagCountUnique": "Usuários",
-      "tagCount": "Pastagens"
+      "tagCount": "Postagens"
    },
    "settings": {
      "name": "Configurações"
@ -90,25 +95,94 @@
  },
  "quotes": {
    "african": {
-      "quote": "Pequenos grupos de pessoas, em pequenos locais podem fazer várias coisas pequenas, mas que podem alterar o mundo ao nosso redor.",
-      "author": "Provérbio Africano"
+      "quote": "Muitas pessoas pequenas, em muitos lugares pequenos, fazem muitas coisas pequenas, que podem mudar a face do mundo.",
+      "author": "Provérbio africano"
    }
  },
  "common": {
-    "post": "Post ::: Postagens",
+    "post": "Postagem ::: Postagens",
    "comment": "Comentário ::: Comentários",
-    "letsTalk": "Vamos falar",
-    "versus": "Versus",
+    "letsTalk": "Vamos Conversar",
+    "versus": "Contra",
    "moreInfo": "Mais informações",
    "takeAction": "Tomar uma ação",
-    "shout": "Grito ::: Gritos",
+    "shout": "Aclamação ::: Aclamações",
    "user": "Usuário ::: Usuários",
    "category": "Categoria ::: Categorias",
    "organization": "Organização ::: Organizações",
    "project": "Projeto ::: Projetos",
-    "tag": "Tag ::: Tags",
+    "tag": "Etiqueta ::: Etiquetas",
    "name": "Nome",
-    "loadMore": "carregar mais",
-    "loading": "carregando"
+    "loadMore": "Carregar mais",
+    "loading": "Carregando",
+    "reportContent": "Denunciar"
+  },
+  "actions": {
+    "loading": "Carregando",
+    "loadMore": "Carregar mais",
+    "create": "Criar",
+    "save": "Salvar",
+    "edit": "Editar",
+    "delete": "Apagar",
+    "cancel": "Cancelar"
+  },
+  "moderation": {
+    "name": "Moderação",
+    "reports": {
+      "empty": "Parabéns, nada a moderar.",
+      "name": "Denúncias",
+      "reporter": "Denunciado por"
+    }
+  },
+  "disable": {
+    "user": {
+      "title": "Desativar usuário",
+      "type": "Usuário",
+      "message": "Você realmente deseja desativar o usuário \" <b> {name} </b> \"?"
+    },
+    "contribution": {
+      "title": "Desativar Contribuição",
+      "type": "Contribuição",
+      "message": "Você realmente deseja desativar a contribuição \" <b> {name} </b> \"?"
+    },
+    "comment": {
+      "title": "Desativar comentário",
+      "type": "Comentário",
+      "message": "Você realmente deseja desativar o comentário de \" <b> {name} </b> \"?"
+    }
+  },
+  "report": {
+    "submit": "Enviar denúncia",
+    "cancel": "Cancelar",
+    "user": {
+      "title": "Denunciar usuário",
+      "type": "Usuário",
+      "message": "Você realmente deseja denunciar o usuário \" <b> {name} </b> \"?"
+    },
+    "contribution": {
+      "title": "Denunciar Contribuição",
+      "type": "Contribuição",
+      "message": "Você realmente deseja denunciar a contribuição \" <b> {name} </b> \"?"
+    },
+    "comment": {
+      "title": "Denunciar Comentário",
+      "type": "Comentário",
+      "message": "Você realmente deseja denunciar o comentário de \"<b>{name}</b>\"?"
+    }
+  },
+  "contribution": {
+    "edit": "Editar Contribuição",
+    "delete": "Apagar Contribuição"
+  },
+  "comment": {
+    "edit": "Editar Comentário",
+    "delete": "Apagar Comentário"
+  },
+  "followButton": {
+    "follow": "Seguir",
+    "following": "Seguindo"
+  },
+  "shoutButton": {
+    "shouted": "Aclamou"
  }
 }
--- a/package.json
+++ b/package.json
@ -54,8 +54,8 @@
    "nuxt-env": "~0.1.0",
    "portal-vue": "~1.5.1",
    "string-hash": "^1.1.3",
-    "tiptap": "^1.13.0",
-    "tiptap-extensions": "^1.13.0",
+    "tiptap": "^1.14.0",
+    "tiptap-extensions": "^1.14.0",
    "v-tooltip": "~2.0.0-rc.33",
    "vue-count-to": "~1.0.13",
    "vue-izitoast": "1.1.2",
@ -71,7 +71,7 @@
    "@vue/test-utils": "~1.0.0-beta.29",
    "babel-core": "~7.0.0-bridge.0",
    "babel-eslint": "~10.0.1",
-    "babel-jest": "~24.1.0",
+    "babel-jest": "~24.3.1",
    "cypress-cucumber-preprocessor": "~1.11.0",
    "eslint": "~5.15.1",
    "eslint-config-prettier": "~3.6.0",
@ -83,7 +83,7 @@
    "nodemon": "~1.18.10",
    "prettier": "~1.14.3",
    "sass-loader": "~7.1.0",
-    "vue-jest": "~3.0.3",
+    "vue-jest": "~3.0.4",
    "vue-svg-loader": "~0.11.0"
  }
 }
--- a/pages/index.vue
+++ b/pages/index.vue
@ -108,6 +108,7 @@ export default {
                shoutedCount
                commentsCount
                followedByCount
+                followedByCurrentUser
                location {
                  name: name${this.$i18n.locale().toUpperCase()}
                }
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@ -28,7 +28,9 @@
    <ds-space margin="xx-large" />
    <hc-shout-button
      v-if="post.author"
+      :disabled="isAuthor(post.author.id)"
      :count="post.shoutedCount"
+      :is-shouted="post.shoutedByCurrentUser"
      :post-id="post.id"
    />
    <!-- Categories -->
@ -188,9 +190,10 @@ export default {
                contributionsCount
                commentsCount
                followedByCount
+                followedByCurrentUser
                location {
-                    name: name${this.$i18n.locale().toUpperCase()}
-                  }
+                  name: name${this.$i18n.locale().toUpperCase()}
+                }
                badges {
                  id
                  key
@ -215,6 +218,7 @@ export default {
                  contributionsCount
                  commentsCount
                  followedByCount
+                  followedByCurrentUser
                  location {
                    name: name${this.$i18n.locale().toUpperCase()}
                  }
@ -231,6 +235,7 @@ export default {
                icon
              }
              shoutedCount
+              shoutedByCurrentUser
            }
          }
        `)
--- a/pages/post/_slug/more-info.vue
+++ b/pages/post/_slug/more-info.vue
@ -109,6 +109,7 @@ export default {
                  avatar
                  contributionsCount
                  followedByCount
+                  followedByCurrentUser
                  commentsCount
                  location {
                    name: name${this.$i18n.locale().toUpperCase()}
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@ -61,7 +61,7 @@
          <ds-flex>
            <ds-flex-item>
              <no-ssr>
-                <ds-number :label="$t('profile.following')">
+                <ds-number :label="$t('profile.followers')">
                  <hc-count-to
                    slot="count"
                    :end-val="followedByCount"
@ -71,7 +71,7 @@
            </ds-flex-item>
            <ds-flex-item>
              <no-ssr>
-                <ds-number :label="$t('profile.followers')">
+                <ds-number :label="$t('profile.following')">
                  <hc-count-to
                    slot="count"
                    :end-val="Number(user.followingCount) || 0"
@ -86,7 +86,9 @@
            <hc-follow-button
              v-if="!myProfile"
              :follow-id="user.id"
-              @update="voted = true && fetchUser()"
+              :is-followed="user.followedByCurrentUser"
+              @optimistic="follow => user.followedByCurrentUser = follow"
+              @update="follow => fetchUser()"
            />
          </ds-space>
          <template v-if="user.about">
@ -335,10 +337,6 @@ export default {
    },
    followedByCount() {
      let count = Number(this.user.followedByCount) || 0
-      if (this.voted) {
-        // NOTE: this is used for presentation
-        count += 1
-      }
      return count
    },
    user() {
--- a/yarn.lock
+++ b/yarn.lock
@ -850,6 +850,14 @@
    lodash "^4.17.11"
    to-fast-properties "^2.0.0"

+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 "@csstools/convert-colors@^1.4.0":
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
@ -902,6 +910,73 @@
    portal-vue "~1.5.1"
    vue "~2.6.7"

+"@jest/console@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.3.0.tgz#7bd920d250988ba0bf1352c4493a48e1cb97671e"
+  integrity sha512-NaCty/OOei6rSDcbPdMiCbYCI0KGFGPgGO6B09lwWt5QTxnkuhKYET9El5u5z1GAcSxkQmSMtM63e24YabCWqA==
+  dependencies:
+    "@jest/source-map" "^24.3.0"
+    "@types/node" "*"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/fake-timers@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.3.0.tgz#0a7f8b877b78780c3fa5c3f8683cc0aaf9488331"
+  integrity sha512-rHwVI17dGMHxHzfAhnZ04+wFznjFfZ246QugeBnbiYr7/bDosPD2P1qeNjWnJUUcfl0HpS6kkr+OB/mqSJxQFg==
+  dependencies:
+    "@jest/types" "^24.3.0"
+    "@types/node" "*"
+    jest-message-util "^24.3.0"
+    jest-mock "^24.3.0"
+
+"@jest/source-map@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
+  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.3.0.tgz#4c0b1c9716212111920f7cf8c4329c69bc81924a"
+  integrity sha512-j7UZ49T8C4CVipEY99nLttnczVTtLyVzFfN20OiBVn7awOs0U3endXSTq7ouPrLR5y4YjI5GDcbcvDUjgeamzg==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/types" "^24.3.0"
+    "@types/istanbul-lib-coverage" "^1.1.0"
+
+"@jest/transform@^24.3.1":
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.3.1.tgz#ce9e1329eb5e640f493bcd5c8eb9970770959bfc"
+  integrity sha512-PpjylI5goT4Si69+qUjEeHuKjex0LjjrqJzrMYzlOZn/+SCumGKuGC0UQFeEPThyGsFvWH1Q4gj0R66eOHnIpw==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.3.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.3.1"
+    jest-regex-util "^24.3.0"
+    jest-util "^24.3.0"
+    micromatch "^3.1.10"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
+"@jest/types@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.3.0.tgz#3f6e117e47248a9a6b5f1357ec645bd364f7ad23"
+  integrity sha512-VoO1F5tU2n/93QN/zaZ7Q8SeV/Rj+9JJOgbvKbBwy4lenvmdj1iDaQEPXGTKrO6OSvDeb2drTFipZJYxgo6kIQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^1.1.0"
+    "@types/yargs" "^12.0.9"
+
 "@nuxt/babel-preset-app@2.4.5":
  version "2.4.5"
  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.4.5.tgz#707043fe4686b7375df0917cca9134b7681ae9bf"
@ -1236,6 +1311,39 @@
  dependencies:
    "@types/node" "*"

+"@types/babel__core@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.0.tgz#710f2487dda4dcfd010ca6abb2b4dc7394365c51"
+  integrity sha512-wJTeJRt7BToFx3USrCDs2BhEi4ijBInTQjOIukj6a/5tEkwpFMVZ+1ppgmE+Q/FQyc5P/VWUbx7I9NELrKruHA==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
+  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"
+  integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/blob-util@1.3.3":
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a"
@ -1313,6 +1421,11 @@
    "@types/express-serve-static-core" "*"
    "@types/serve-static" "*"

+"@types/istanbul-lib-coverage@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a"
+  integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==
+
 "@types/jquery@*":
  version "3.3.29"
  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.29.tgz#680a2219ce3c9250483722fccf5570d1e2d08abd"
@ -1406,6 +1519,11 @@
  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
  integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==

+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
 "@types/strip-bom@^3.0.0":
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
@ -1424,6 +1542,11 @@
    "@types/events" "*"
    "@types/node" "*"

+"@types/yargs@^12.0.9":
+  version "12.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
+  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+
 "@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"
@ -2379,13 +2502,16 @@ babel-eslint@~10.0.1:
    eslint-scope "3.7.1"
    eslint-visitor-keys "^1.0.0"

-babel-jest@^24.1.0, babel-jest@~24.1.0:
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.1.0.tgz#441e23ef75ded3bd547e300ac3194cef87b55190"
-  integrity sha512-MLcagnVrO9ybQGLEfZUqnOzv36iQzU7Bj4elm39vCukumLVSfoX+tRy3/jW7lUKc7XdpRmB/jech6L/UCsSZjw==
+babel-jest@^24.1.0, babel-jest@~24.3.1:
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.3.1.tgz#168468a37e90426520c5293da4f55e1a512063b0"
+  integrity sha512-6KaXyUevY0KAxD5Ba+EBhyfwvc+R2f7JV7BpBZ5T8yJGgj0M1hYDfRhDq35oD5MzprMf/ggT81nEuLtMyxfDIg==
  dependencies:
+    "@jest/transform" "^24.3.1"
+    "@jest/types" "^24.3.0"
+    "@types/babel__core" "^7.1.0"
    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.1.0"
+    babel-preset-jest "^24.3.0"
    chalk "^2.4.2"
    slash "^2.0.0"

@ -2422,10 +2548,12 @@ babel-plugin-istanbul@^5.1.0:
    istanbul-lib-instrument "^3.0.0"
    test-exclude "^5.0.0"

-babel-plugin-jest-hoist@^24.1.0:
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.1.0.tgz#dfecc491fb15e2668abbd690a697a8fd1411a7f8"
-  integrity sha512-gljYrZz8w1b6fJzKcsfKsipSru2DU2DmQ39aB6nV3xQ0DDv3zpIzKGortA5gknrhNnPN8DweaEgrnZdmbGmhnw==
+babel-plugin-jest-hoist@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.3.0.tgz#f2e82952946f6e40bb0a75d266a3790d854c8b5b"
+  integrity sha512-nWh4N1mVH55Tzhx2isvUN5ebM5CDUvIpXPZYMRazQughie/EqGnbR+czzoQlhUmJG9pPJmYDRhvocotb2THl1w==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"

 babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
  version "6.26.2"
@ -2445,13 +2573,13 @@ babel-plugin-transform-strict-mode@^6.24.1:
    babel-runtime "^6.22.0"
    babel-types "^6.24.1"

-babel-preset-jest@^24.1.0:
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.1.0.tgz#83bc564fdcd4903641af65ec63f2f5de6b04132e"
-  integrity sha512-FfNLDxFWsNX9lUmtwY7NheGlANnagvxq8LZdl5PKnVG3umP+S/g0XbVBfwtA4Ai3Ri/IMkWabBz3Tyk9wdspcw==
+babel-preset-jest@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz#db88497e18869f15b24d9c0e547d8e0ab950796d"
+  integrity sha512-VGTV2QYBa/Kn3WCOKdfS31j9qomaXSgJqi65B6o05/1GsJyj9LVhSljM9ro4S+IBGj/ENhNBuH9bpqzztKAQSw==
  dependencies:
    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.1.0"
+    babel-plugin-jest-hoist "^24.3.0"

 babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
  version "6.26.0"
@ -4973,6 +5101,11 @@ exec-sh@^0.2.0:
  dependencies:
    merge "^1.2.0"

+exec-sh@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+
 execa@0.10.0:
  version "0.10.0"
  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
@ -6971,6 +7104,21 @@ jest-haste-map@^24.0.0:
    micromatch "^3.1.10"
    sane "^3.0.0"

+jest-haste-map@^24.3.1:
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.3.1.tgz#b4a66dbe1e6bc45afb9cd19c083bff81cdd535a1"
+  integrity sha512-OTMQle+astr1lWKi62Ccmk2YWn6OtUoU/8JpJdg8zdsnpFIry/k0S4sQ4nWocdM07PFdvqcthWc78CkCE6sXvA==
+  dependencies:
+    "@jest/types" "^24.3.0"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.3.0"
+    jest-util "^24.3.0"
+    jest-worker "^24.3.1"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+
 jest-jasmine2@^24.1.0:
  version "24.1.0"
  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.1.0.tgz#8377324b967037c440f0a549ee0bbd9912055db6"
@ -7017,16 +7165,42 @@ jest-message-util@^24.0.0:
    slash "^2.0.0"
    stack-utils "^1.0.1"

+jest-message-util@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.3.0.tgz#e8f64b63ebc75b1a9c67ee35553752596e70d4a9"
+  integrity sha512-lXM0YgKYGqN5/eH1NGw4Ix+Pk2I9Y77beyRas7xM24n+XTTK3TbT0VkT3L/qiyS7WkW0YwyxoXnnAaGw4hsEDA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.3.0"
+    "@jest/types" "^24.3.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.0.0:
  version "24.0.0"
  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.0.0.tgz#9a4b53e01d66a0e780f7d857462d063e024c617d"
  integrity sha512-sQp0Hu5fcf5NZEh1U9eIW2qD0BwJZjb63Yqd98PQJFvf/zzUTBoUAwv/Dc/HFeNHIw1f3hl/48vNn+j3STaI7A==

+jest-mock@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.3.0.tgz#95a86b6ad474e3e33227e6dd7c4ff6b07e18d3cb"
+  integrity sha512-AhAo0qjbVWWGvcbW5nChFjR0ObQImvGtU6DodprNziDOt+pP0CBdht/sYcNIOXeim8083QUi9bC8QdKB8PTK4Q==
+  dependencies:
+    "@jest/types" "^24.3.0"
+
 jest-regex-util@^24.0.0:
  version "24.0.0"
  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.0.0.tgz#4feee8ec4a358f5bee0a654e94eb26163cb9089a"
  integrity sha512-Jv/uOTCuC+PY7WpJl2mpoI+WbY2ut73qwwO9ByJJNwOCwr1qWhEW2Lyi2S9ZewUdJqeVpEBisdEVZSI+Zxo58Q==

+jest-regex-util@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
+  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
+
 jest-resolve-dependencies@^24.1.0:
  version "24.1.0"
  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.1.0.tgz#78f738a2ec59ff4d00751d9da56f176e3f589f6c"
@ -7097,6 +7271,11 @@ jest-serializer@^24.0.0:
  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0.tgz#522c44a332cdd194d8c0531eb06a1ee5afb4256b"
  integrity sha512-9FKxQyrFgHtx3ozU+1a8v938ILBE7S8Ko3uiAVjT8Yfi2o91j/fj81jacCQZ/Ihjiff/VsUCXVgQ+iF1XdImOw==

+jest-serializer@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.3.0.tgz#074e307300d1451617cf2630d11543ee4f74a1c8"
+  integrity sha512-RiSpqo2OFbVLJN/PgAOwQIUeHDfss6NBUDTLhjiJM8Bb5rMrwRqHfkaqahIsOf9cXXB5UjcqDCzbQ7AIoMqWkg==
+
 jest-snapshot@^24.1.0:
  version "24.1.0"
  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.1.0.tgz#85e22f810357aa5994ab61f236617dc2205f2f5b"
@ -7127,6 +7306,25 @@ jest-util@^24.0.0:
    slash "^2.0.0"
    source-map "^0.6.0"

+jest-util@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.3.0.tgz#a549ae9910fedbd4c5912b204bb1bcc122ea0057"
+  integrity sha512-eKIAC+MTKWZthUUVOwZ3Tc5a0cKMnxalQHr6qZ4kPzKn6k09sKvsmjCygqZ1SxVVfUKoa8Sfn6XDv9uTJ1iXTg==
+  dependencies:
+    "@jest/console" "^24.3.0"
+    "@jest/fake-timers" "^24.3.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/test-result" "^24.3.0"
+    "@jest/types" "^24.3.0"
+    "@types/node" "*"
+    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.0.0:
  version "24.0.0"
  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.0.0.tgz#aa8571a46983a6538328fef20406b4a496b6c020"
@ -7156,6 +7354,15 @@ jest-worker@^24.0.0:
    merge-stream "^1.0.1"
    supports-color "^6.1.0"

+jest-worker@^24.3.1:
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.3.1.tgz#c1759dd2b1d5541b09a2e5e1bc3288de6c9d8632"
+  integrity sha512-ZCoAe/iGLzTJvWHrO8fyx3bmEQhpL16SILJmWHKe8joHhyF3z00psF1sCRT54DoHw5GJG0ZpUtGy+ylvwA4haA==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
 jest@~24.1.0:
  version "24.1.0"
  resolved "https://registry.yarnpkg.com/jest/-/jest-24.1.0.tgz#b1e1135caefcf2397950ecf7f90e395fde866fd2"
@ -9866,10 +10073,10 @@ prosemirror-gapcursor@^1.0.3:
    prosemirror-state "^1.0.0"
    prosemirror-view "^1.0.0"

-prosemirror-history@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.3.tgz#5fb8591adfc272afaaf0b41bec64ee7d9522a118"
-  integrity sha512-IfFGbhafSx+R3aq7nLJGkXeu2iaUiP8mkU3aRu2uQcIIjU8Fq7RJfuvhIOJ2RNUoSyqF/ANkdTjnZ74F5eHs1Q==
+prosemirror-history@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.4.tgz#313a15489a78795321f3a37d53d8c68610c5adb6"
+  integrity sha512-Kk2UisC9EzYcsNv+ILiQJWpsu0rbT6+oAAkvseFUHnudtfkmYAJu1+Xp3F0xTTCVmQdSqSLVk8qydllXUUOU4Q==
  dependencies:
    prosemirror-state "^1.2.2"
    prosemirror-transform "^1.0.0"
@ -9932,15 +10139,15 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0:
  dependencies:
    prosemirror-model "^1.0.0"

-prosemirror-utils@^0.7.5:
+prosemirror-utils@^0.7.6:
  version "0.7.6"
  resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.7.6.tgz#c462ddfbf2452e56e4b25d1f02b34caccddb0f33"
  integrity sha512-vzsCBTiJ56R3nRDpIJnKOJzsZP7KFO8BkXk7zvQgQiXpml2o/djPCRhuyaFc7VTqSHlLPQHVI1feTLAwHp+prQ==

-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.7.1.tgz#f0ea75faa6d7bd25ea22897dd5bae35708c59a28"
-  integrity sha512-UFY/h4i5H1Yen8u2ZTve0WL+nh/y1qU3geC3SrWl5yIKSgGbvllD5vr5LxmeRgVsY8hb+oDXRHk5KvLwqmu7Lg==
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.8.3.tgz#f8deff22c7d371f63db2686ac6f3661ded1b3ae3"
+  integrity sha512-CAW3SycaJgfPlWwYcDGiwNaCwcikBLSFAgLF+H+bTn0aCAUzcl2DXQdU9dMvK3HeWG+6Xn/QPQbhyyqCcV3ZBw==
  dependencies:
    prosemirror-model "^1.1.0"
    prosemirror-state "^1.0.0"
@ -10213,7 +10420,7 @@ readdirp@^2.0.0, readdirp@^2.2.1:
    micromatch "^3.1.10"
    readable-stream "^2.0.2"

-realpath-native@^1.0.0, realpath-native@^1.0.2:
+realpath-native@^1.0.0, realpath-native@^1.0.2, realpath-native@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
@ -10636,6 +10843,21 @@ sane@^3.0.0:
  optionalDependencies:
    fsevents "^1.2.3"

+sane@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181"
+  integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
 sass-graph@^2.2.4:
  version "2.2.4"
  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@ -11602,45 +11824,45 @@ timsort@^0.3.0:
  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=

-tiptap-commands@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.6.0.tgz#567b7b218bd7d1c1214534a2007acbb7b8d06688"
-  integrity sha512-9HO8UYJz1qGyqsHn0+PifmndlRTInqfcb7vjNDvqWQA2P7r8koJqrP8CYMR0DXQHlys1druJnaBaOzLa1d5PQQ==
+tiptap-commands@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.7.0.tgz#d15cec2cb09264b5c1f6f712dab8819bb9ab7e13"
+  integrity sha512-JhgvBPIhGnisEdxD6gmM3U76BUlKF9n1LW1X/dO1AUOsm3Xc9tQB5BIOV/DpZTvrjntLP3AUTfd+yJeRIz5CPA==
  dependencies:
    prosemirror-commands "^1.0.7"
    prosemirror-inputrules "^1.0.1"
    prosemirror-schema-list "^1.0.2"
    prosemirror-state "^1.2.2"
-    tiptap-utils "^1.2.0"
+    tiptap-utils "^1.3.0"

-tiptap-extensions@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.13.0.tgz#1c78223d68f4c321909c5448764d2b5a32bad7f3"
-  integrity sha512-56y5uXAnkdZ/9MmTuk2fmbglUwmfECVOz2DZh/5OI5nsPclVNk+OFjNFEbZ91rb3fC4NOtFdfNQVKyqrBe9pNA==
+tiptap-extensions@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.14.0.tgz#5517afd1ca556715a8cce6c022c88584a762004a"
+  integrity sha512-WzYukrUHGGjCi3+F156LEVn5R58Pw1F6zKHT2o4SMHuv0LrWTIJK1XsDv8uwi/szfTlXm9BJ4MKmRbDulBeioQ==
  dependencies:
    lowlight "^1.11.0"
-    prosemirror-history "^1.0.3"
+    prosemirror-history "^1.0.4"
    prosemirror-state "^1.2.2"
    prosemirror-tables "^0.7.10"
-    prosemirror-utils "^0.7.5"
-    prosemirror-view "^1.7.1"
-    tiptap "^1.13.0"
-    tiptap-commands "^1.6.0"
+    prosemirror-utils "^0.7.6"
+    prosemirror-view "^1.8.3"
+    tiptap "^1.14.0"
+    tiptap-commands "^1.7.0"

-tiptap-utils@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.2.0.tgz#e1e566af1212acff6b2e3c4ca6edc21ebf306440"
-  integrity sha512-p8Q0UfNhYHXqMDSwvCc6x0Vm95AYgM/f1V+8oNu9FI0aRWwXpTwIJj+1CAGO1mb6NFUSxn9HcZaUvEcBKR5WzQ==
+tiptap-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.3.0.tgz#bfc77cf57c07cd5c1f1d33f65ef94c4190506b77"
+  integrity sha512-b9GRQB3Kilu9Yq6hwjjzQgZtQDXDOrB/vZPV5OzwcKRN5a9PfLGrTLJ5LbU414Vcy9HTXiqX2pq0o5FslJhHpg==
  dependencies:
    prosemirror-model "^1.7.0"
    prosemirror-state "^1.2.2"
    prosemirror-tables "^0.7.9"
-    prosemirror-utils "^0.7.5"
+    prosemirror-utils "^0.7.6"

-tiptap@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.13.0.tgz#52b086fc8d4df7534123d31571366dd90ee62a23"
-  integrity sha512-kwzgtOY5PnbSfzMyNPFchI/Cyi1O3kFNiRP7K4p6t0zcNCXy9EaWgaM/U2bKArI0/HxG/GSPM6RTTCCOF3I6EA==
+tiptap@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.14.0.tgz#8dd84b199533e08f0dcc34b39d517ea73e20fb95"
+  integrity sha512-38gCYeJx5O83oTnpfgMGGrjem1ZNDK2waaUMq+bkYPaQwvvtyMDGffvEIT9/jcLvA+WYfaNp8BWnn1rqNpYKxA==
  dependencies:
    prosemirror-commands "^1.0.7"
    prosemirror-dropcursor "^1.1.1"
@ -11649,9 +11871,9 @@ tiptap@^1.13.0:
    prosemirror-keymap "^1.0.1"
    prosemirror-model "^1.7.0"
    prosemirror-state "^1.2.1"
-    prosemirror-view "^1.7.1"
-    tiptap-commands "^1.6.0"
-    tiptap-utils "^1.2.0"
+    prosemirror-view "^1.8.3"
+    tiptap-commands "^1.7.0"
+    tiptap-utils "^1.3.0"

 title-case@^2.1.1:
  version "2.1.1"
@ -12243,10 +12465,10 @@ vue-izitoast@1.1.2:
  dependencies:
    izitoast "^1.3.0"

-vue-jest@~3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.3.tgz#80f664712f2678b1d8bb3af0f2c0bef5efa8de31"
-  integrity sha512-QwFQjkv2vXYPKUkNZkMbV/ZTHyQhRM1JY8nP68dRLQmdvCN+VUEKhlByH/PgPqDr2p/NuhaM3PUjJ9nreR++3w==
+vue-jest@~3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.4.tgz#b6a2b0d874968f26fa775ac901903fece531e08b"
+  integrity sha512-PY9Rwt4OyaVlA+KDJJ0614CbEvNOkffDI9g9moLQC/2DDoo0YrqZm7dHi13Q10uoK5Nt5WCYFdeAheOExPah0w==
  dependencies:
    babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
    chalk "^2.1.0"